From 88990d640a89091a8f7b0b2493377ac24118afe8 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Thu, 10 Aug 2023 12:51:53 -0400
Subject: [PATCH 001/160] SOLR-16920: Add Test full package lifecycle (#1826),
 fix parsing of repository.json mimetype

Github is a common place to store the repository.json file used by Solr Packages.  While the file is .json, the mimetype from Github is text/plain, so this fixes the client being used to load the repository.json to accept text/plain as well as application/json mimetypes.
---
 solr/CHANGES.txt                              |  2 ++
 .../DefaultPackageRepository.java             | 20 ++++++++++++++--
 solr/packaging/test/test_packages.bats        | 23 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d5d12bf7cf8..e961fdfa2ec 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -112,6 +112,8 @@ Bug Fixes
 
 * SOLR-16360: Atomic update on boolean fields doesn't reflect when value starts with "1", "t" or "T" (Rahul Goswami, Justin Sweeney, David Smiley)
 
+* PR#1826: Allow looking up Solr Package repo when that URL references a raw repository.json hosted on Github when the file is JSON but the mimetype used is text/plain. (Eric Pugh)
+
 Dependency Upgrades
 ---------------------
 (No changes)
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/DefaultPackageRepository.java b/solr/core/src/java/org/apache/solr/packagemanager/DefaultPackageRepository.java
index 32533625e60..820391804e1 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/DefaultPackageRepository.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/DefaultPackageRepository.java
@@ -23,7 +23,9 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -106,13 +108,15 @@ public Path download(String artifactName) throws SolrException, IOException {
 
   private void initPackages() {
     // We need http 1.1 protocol here because we are talking to the repository server and not to
-    // solr actually.
+    // an actual Solr server.
     // We use an Http2SolrClient so that we do not need a raw jetty http client for this GET.
+    // We may get a text/plain mimetype for the repository.json (for instance when looking up a repo
+    // on Github), so use custom ResponseParser.
     try (Http2SolrClient client =
         new Http2SolrClient.Builder(repositoryURL).useHttp1_1(true).build()) {
       GenericSolrRequest request =
           new GenericSolrRequest(SolrRequest.METHOD.GET, "/repository.json");
-      request.setResponseParser(new JsonMapResponseParser());
+      request.setResponseParser(new TalkToRepoResponseParser());
       NamedList<Object> resp = client.request(request);
       SolrPackage[] items =
           PackageUtils.getMapper().readValue("[" + resp.jsonStr() + "]", SolrPackage[].class);
@@ -128,4 +132,16 @@ private void initPackages() {
       log.debug("Found {} packages in repository '{}'", packages.size(), name);
     }
   }
+
+  /**
+   * Github links for repository.json are returned in JSON format but with text/plain mimetype, so
+   * this works around that issue.
+   */
+  private static class TalkToRepoResponseParser extends JsonMapResponseParser {
+
+    @Override
+    public Collection<String> getContentTypes() {
+      return Set.of("application/json", "text/plain");
+    }
+  }
 }
diff --git a/solr/packaging/test/test_packages.bats b/solr/packaging/test/test_packages.bats
index fd7410b5dd8..3dda0e718e8 100644
--- a/solr/packaging/test/test_packages.bats
+++ b/solr/packaging/test/test_packages.bats
@@ -47,7 +47,7 @@ teardown() {
   assert_output --partial "Available packages:"
 }
 
-@test "deploying and undeploying of packages" {
+@test "deploying and undeploying a collection level package" {
   run solr start -c -Denable.packages=true
 
   solr create -c foo-1.2
@@ -65,3 +65,24 @@ teardown() {
   refute_output --partial "Invalid collection"
   assert_output --partial "Package PACKAGE_NAME not deployed on collection foo-1.2"
 }
+
+# This test is useful if you are debugging/working with packages.
+# We have commented it out for now since it depends on a live internet
+# connection to run.  This could be updated with a local Repo server if we had
+# a package that is part of the Solr project to use.
+# @test "deploying and undeploying a cluster level package" {
+#  run solr start -c -Denable.packages=true
+  
+#  run solr package add-repo splainer "https://raw.githubusercontent.com/o19s/splainer/main/solr-splainer-package/repo"
+#  assert_output --partial "Added repository: splainer"
+  
+#  run solr package list-available
+#  assert_output --partial "solr-splainer 		Splainer for Solr"
+#  run solr package install solr-splainer
+#  assert_output --partial "solr-splainer installed."
+
+#  run solr package deploy solr-splainer -y -cluster
+#  assert_output --partial "Deployment successful"
+  
+#  run -0 curl --fail http://localhost:8983/v2/splainer/index.html
+# }

From 8724b1d093633d0363b256384cfa75a9e5197f80 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Fri, 11 Aug 2023 15:15:19 -0700
Subject: [PATCH 002/160] SOLR-14667 Make zkClientTimeout consistent and based
 on a system property (#1831)

---
 solr/CHANGES.txt                              |  2 +
 .../java/org/apache/solr/cli/AuthTool.java    | 13 ++--
 .../solr/cli/ConfigSetDownloadTool.java       |  3 +-
 .../apache/solr/cli/ConfigSetUploadTool.java  |  3 +-
 .../java/org/apache/solr/cli/ZkCpTool.java    |  3 +-
 .../java/org/apache/solr/cli/ZkLsTool.java    |  3 +-
 .../org/apache/solr/cli/ZkMkrootTool.java     |  3 +-
 .../java/org/apache/solr/cli/ZkMvTool.java    |  3 +-
 .../java/org/apache/solr/cli/ZkRmTool.java    |  3 +-
 .../src/java/org/apache/solr/cloud/ZkCLI.java |  6 +-
 .../org/apache/solr/cloud/ZkController.java   | 13 ++--
 .../org/apache/solr/core/CloudConfig.java     |  4 +-
 .../org/apache/solr/core/ZkContainer.java     |  3 +-
 .../solr/packagemanager/PackageManager.java   |  3 +-
 .../schema/ManagedIndexSchemaFactory.java     |  2 +-
 .../impl/ZkClientClusterStateProvider.java    | 10 ++-
 .../solr/common/cloud/SolrZkClient.java       | 27 +++++---
 .../solrj/impl/CloudHttp2SolrClient.java      | 66 +++++++++++--------
 .../solrj/impl/CloudLegacySolrClient.java     | 61 +++++++++--------
 .../solrj/impl/SolrZkClientTimeout.java       | 29 ++++++++
 .../org/apache/solr/util/TestHarness.java     |  3 +-
 21 files changed, 168 insertions(+), 95 deletions(-)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e961fdfa2ec..9951772eecc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -89,6 +89,8 @@ Improvements
   circumstances as they are generated and more likely to remain up-to-date with future API changes.
   (Jason Gerlowski, David Smiley, Houston Putman)
 
+* SOLR-14667: Make zkClientTimeout consistent and based on a system property. The defauls values are stored in a single place referenced everywhere and they are based on system properties (Alex Deparvu)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/cli/AuthTool.java b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
index a502fa77cef..318f9feaced 100644
--- a/solr/core/src/java/org/apache/solr/cli/AuthTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
@@ -34,6 +34,7 @@
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.lucene.util.Constants;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.security.Sha256AuthenticationProvider;
@@ -187,7 +188,8 @@ private int handleKerberos(CommandLine cli) throws Exception {
             try (SolrZkClient zkClient =
                 new SolrZkClient.Builder()
                     .withUrl(zkHost)
-                    .withTimeout(10000, TimeUnit.MILLISECONDS)
+                    .withTimeout(
+                        SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
                     .build()) {
               checkSecurityJsonExists(zkClient);
             } catch (Exception ex) {
@@ -206,7 +208,8 @@ private int handleKerberos(CommandLine cli) throws Exception {
             try (SolrZkClient zkClient =
                 new SolrZkClient.Builder()
                     .withUrl(zkHost)
-                    .withTimeout(10000, TimeUnit.MILLISECONDS)
+                    .withTimeout(
+                        SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
                     .build()) {
               zkClient.setData(
                   "/security.json", securityJson.getBytes(StandardCharsets.UTF_8), true);
@@ -321,7 +324,7 @@ private int handleBasicAuth(CommandLine cli) throws Exception {
           try (SolrZkClient zkClient =
               new SolrZkClient.Builder()
                   .withUrl(zkHost)
-                  .withTimeout(10000, TimeUnit.MILLISECONDS)
+                  .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
                   .build()) {
             checkSecurityJsonExists(zkClient);
           }
@@ -384,7 +387,7 @@ private int handleBasicAuth(CommandLine cli) throws Exception {
           try (SolrZkClient zkClient =
               new SolrZkClient.Builder()
                   .withUrl(zkHost)
-                  .withTimeout(10000, TimeUnit.MILLISECONDS)
+                  .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
                   .build()) {
             zkClient.setData("/security.json", securityJson.getBytes(StandardCharsets.UTF_8), true);
           }
@@ -479,7 +482,7 @@ private void clearSecurityJson(CommandLine cli, boolean updateIncludeFileOnly) t
       try (SolrZkClient zkClient =
           new SolrZkClient.Builder()
               .withUrl(zkHost)
-              .withTimeout(10000, TimeUnit.MILLISECONDS)
+              .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
               .build()) {
         zkClient.setData("/security.json", "{}".getBytes(StandardCharsets.UTF_8), true);
       }
diff --git a/solr/core/src/java/org/apache/solr/cli/ConfigSetDownloadTool.java b/solr/core/src/java/org/apache/solr/cli/ConfigSetDownloadTool.java
index 8603af39513..c11e0e70a79 100644
--- a/solr/core/src/java/org/apache/solr/cli/ConfigSetDownloadTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ConfigSetDownloadTool.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,7 +80,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
       String confName = cli.getOptionValue("confname");
diff --git a/solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java b/solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java
index a36370784dd..5fd4a538bd7 100644
--- a/solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.core.ConfigSetService;
@@ -86,7 +87,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
       Path confPath =
diff --git a/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java b/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java
index 571db1351c2..02379d5748a 100644
--- a/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,7 +79,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
       String src = cli.getOptionValue("src");
diff --git a/solr/core/src/java/org/apache/solr/cli/ZkLsTool.java b/solr/core/src/java/org/apache/solr/cli/ZkLsTool.java
index 5f4d6d83fca..24f1c80144e 100644
--- a/solr/core/src/java/org/apache/solr/cli/ZkLsTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ZkLsTool.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +73,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
 
diff --git a/solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java b/solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java
index 8a9b7d769d8..e41187839f4 100644
--- a/solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +72,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
 
diff --git a/solr/core/src/java/org/apache/solr/cli/ZkMvTool.java b/solr/core/src/java/org/apache/solr/cli/ZkMvTool.java
index 6c147c85594..6506aa9176e 100644
--- a/solr/core/src/java/org/apache/solr/cli/ZkMvTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ZkMvTool.java
@@ -24,6 +24,7 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,7 +79,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
       String src = cli.getOptionValue("src");
diff --git a/solr/core/src/java/org/apache/solr/cli/ZkRmTool.java b/solr/core/src/java/org/apache/solr/cli/ZkRmTool.java
index 0ca4694ac89..dad5bdbbe94 100644
--- a/solr/core/src/java/org/apache/solr/cli/ZkRmTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ZkRmTool.java
@@ -24,6 +24,7 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,7 +85,7 @@ public void runImpl(CommandLine cli) throws Exception {
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
       if (!recurse && zkClient.getChildren(znode, null, true).size() != 0) {
         throw new SolrServerException(
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
index ef2f29cb62a..c1f9b826529 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
@@ -42,6 +42,7 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.solr.cli.CLIO;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ClusterProperties;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -299,8 +300,9 @@ public static void main(String[] args)
       try (SolrZkClient zkClient =
           new SolrZkClient.Builder()
               .withUrl(zkServerAddress)
-              .withTimeout(30000, TimeUnit.MILLISECONDS)
-              .withConnTimeOut(30000, TimeUnit.MILLISECONDS)
+              .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
+              .withConnTimeOut(
+                  SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS)
               .withReconnectListener(() -> {})
               .withCompressor(compressor)
               .build()) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index c812b7767cb..c93a7dfef99 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -62,6 +62,7 @@
 import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;
 import org.apache.solr.client.solrj.impl.SolrClientCloudManager;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;
 import org.apache.solr.client.solrj.request.CoreAdminRequest.WaitForState;
 import org.apache.solr.cloud.overseer.ClusterStateMutator;
@@ -233,8 +234,6 @@ public String toString() {
 
   private boolean genericCoreNodeNames;
 
-  private int clientTimeout;
-
   private volatile boolean isClosed;
 
   private final ConcurrentHashMap<String, Throwable> replicasMetTragicEvent =
@@ -331,7 +330,7 @@ public ZkController(
     this.leaderVoteWait = cloudConfig.getLeaderVoteWait();
     this.leaderConflictResolveWait = cloudConfig.getLeaderConflictResolveWait();
 
-    this.clientTimeout = cloudConfig.getZkClientTimeout();
+    int clientTimeout = cloudConfig.getZkClientTimeout();
 
     String connectionStrategy = System.getProperty("solr.zookeeper.connectionStrategy");
     ZkClientConnectionStrategy strat =
@@ -1188,8 +1187,8 @@ public static boolean checkChrootPath(String zkHost, boolean create)
     SolrZkClient tmpClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost.substring(0, zkHost.indexOf('/')))
-            .withTimeout(60000, TimeUnit.MILLISECONDS)
-            .withConnTimeOut(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
+            .withConnTimeOut(SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build();
     boolean exists = tmpClient.exists(chrootPath, true);
     if (!exists && create) {
@@ -2339,10 +2338,6 @@ public boolean clearAsyncId(String asyncId) throws KeeperException {
     }
   }
 
-  public int getClientTimeout() {
-    return clientTimeout;
-  }
-
   public Overseer getOverseer() {
     return overseer;
   }
diff --git a/solr/core/src/java/org/apache/solr/core/CloudConfig.java b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
index 5cc3e58e37e..790aa333012 100644
--- a/solr/core/src/java/org/apache/solr/core/CloudConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.core;
 
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.SolrException;
 
 public class CloudConfig {
@@ -179,7 +180,6 @@ public String getStateCompressorClass() {
 
   public static class CloudConfigBuilder {
 
-    private static final int DEFAULT_ZK_CLIENT_TIMEOUT = 45000;
     private static final int DEFAULT_LEADER_VOTE_WAIT = 180000; // 3 minutes
     private static final int DEFAULT_LEADER_CONFLICT_RESOLVE_WAIT = 180000;
     private static final int DEFAULT_CREATE_COLLECTION_ACTIVE_WAIT = 45; // 45 seconds
@@ -188,7 +188,7 @@ public static class CloudConfigBuilder {
         -1; // By default compression for state is disabled
 
     private String zkHost;
-    private int zkClientTimeout = Integer.getInteger("zkClientTimeout", DEFAULT_ZK_CLIENT_TIMEOUT);
+    private int zkClientTimeout = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
     private final int hostPort;
     private final String hostName;
     private boolean useGenericCoreNames;
diff --git a/solr/core/src/java/org/apache/solr/core/ZkContainer.java b/solr/core/src/java/org/apache/solr/core/ZkContainer.java
index 23be2346099..f7ea012b249 100644
--- a/solr/core/src/java/org/apache/solr/core/ZkContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/ZkContainer.java
@@ -29,6 +29,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.cloud.SolrZkServer;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.AlreadyClosedException;
@@ -111,7 +112,7 @@ public void initZooKeeper(final CoreContainer cc, CloudConfig config) {
       }
     }
 
-    int zkClientConnectTimeout = 30000;
+    int zkClientConnectTimeout = SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT;
 
     if (zookeeperHost != null) {
 
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
index a8387b4c669..79b9fa1c9c3 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
@@ -42,6 +42,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.SolrZkClientTimeout;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.request.V2Request;
 import org.apache.solr.client.solrj.request.beans.PackagePayload;
@@ -83,7 +84,7 @@ public PackageManager(SolrClient solrClient, String solrUrl, String zkHost) {
     this.zkClient =
         new SolrZkClient.Builder()
             .withUrl(zkHost)
-            .withTimeout(30000, TimeUnit.MILLISECONDS)
+            .withTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS)
             .build();
     log.info("Done initializing a zkClient instance...");
   }
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
index 1cc5903ba4e..9008b3e443e 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
@@ -485,7 +485,7 @@ private void zkUgradeToManagedSchema() {
       // Rename the non-managed schema znode in ZooKeeper
       final String nonManagedSchemaPath = zkLoader.getConfigSetZkPath() + "/" + resourceName;
       try {
-        ZkCmdExecutor zkCmdExecutor = new ZkCmdExecutor(zkController.getClientTimeout());
+        ZkCmdExecutor zkCmdExecutor = new ZkCmdExecutor(zkClient.getZkClientTimeout());
         if (zkController.pathExists(nonManagedSchemaPath)) {
           // First, copy the non-managed schema znode content to the upgraded schema znode
           byte[] bytes = zkController.getZkClient().getData(nonManagedSchemaPath, null, null, true);
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
index ff805fced17..075c1e4d3de 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout.SolrZkClientTimeoutAware;
 import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ClusterState;
@@ -40,14 +41,15 @@
 import org.slf4j.LoggerFactory;
 
 /** Retrieves cluster state from Zookeeper */
-public class ZkClientClusterStateProvider implements ClusterStateProvider {
+public class ZkClientClusterStateProvider
+    implements ClusterStateProvider, SolrZkClientTimeoutAware {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   volatile ZkStateReader zkStateReader;
   private boolean closeZkStateReader = true;
   private final String zkHost;
-  private int zkConnectTimeout = 15000;
-  private int zkClientTimeout = 45000;
+  private int zkConnectTimeout = SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT;
+  private int zkClientTimeout = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
 
   private volatile boolean isClosed = false;
 
@@ -306,6 +308,7 @@ public int getZkConnectTimeout() {
   }
 
   /** Set the connect timeout to the zookeeper ensemble in ms */
+  @Override
   public void setZkConnectTimeout(int zkConnectTimeout) {
     this.zkConnectTimeout = zkConnectTimeout;
   }
@@ -315,6 +318,7 @@ public int getZkClientTimeout() {
   }
 
   /** Set the timeout to the zookeeper ensemble in ms */
+  @Override
   public void setZkClientTimeout(int zkClientTimeout) {
     this.zkClientTimeout = zkClientTimeout;
   }
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
index b7aeec05b7d..ddbd70d375f 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
@@ -34,6 +34,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.annotation.JsonProperty;
@@ -70,8 +71,6 @@ public class SolrZkClient implements Closeable {
 
   static final String NEWL = System.getProperty("line.separator");
 
-  static final int DEFAULT_CLIENT_CONNECT_TIMEOUT = 30000;
-
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private ConnectionManager connManager;
@@ -1127,8 +1126,8 @@ public NodeData(Stat stat, byte[] data) {
 
   public static class Builder {
     public String zkServerAddress;
-    public int zkClientTimeout = DEFAULT_CLIENT_CONNECT_TIMEOUT;
-    public int zkClientConnectTimeout = DEFAULT_CLIENT_CONNECT_TIMEOUT;
+    public int zkClientTimeout = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
+    public int zkClientConnectTimeout = SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT;
     public OnReconnect onReconnect;
     public BeforeReconnect beforeReconnect;
     public ZkClientConnectionStrategy connectionStrategy;
@@ -1143,13 +1142,25 @@ public Builder withUrl(String server) {
       return this;
     }
 
-    public Builder withTimeout(int i, TimeUnit unit) {
-      this.zkClientTimeout = (int) unit.toMillis(i);
+    /**
+     * Sets the Zk client session timeout
+     *
+     * @param zkClientTimeout timeout value
+     * @param unit time unit
+     */
+    public Builder withTimeout(int zkClientTimeout, TimeUnit unit) {
+      this.zkClientTimeout = Math.toIntExact(unit.toMillis(zkClientTimeout));
       return this;
     }
 
-    public Builder withConnTimeOut(int i, TimeUnit unit) {
-      this.zkClientConnectTimeout = (int) unit.toMillis(i);
+    /**
+     * Sets the Zk connection timeout
+     *
+     * @param zkConnectTimeout timeout value
+     * @param unit time unit
+     */
+    public Builder withConnTimeOut(int zkConnectTimeout, TimeUnit unit) {
+      this.zkClientConnectTimeout = Math.toIntExact(unit.toMillis(zkConnectTimeout));
       return this;
     }
 
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 5222275c069..6311acf1b29 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
@@ -24,6 +24,7 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.ResponseParser;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout.SolrZkClientTimeoutAware;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrException;
@@ -73,31 +74,7 @@ protected CloudHttp2SolrClient(Builder builder) {
     if (builder.responseParser != null) {
       this.myClient.setParser(builder.responseParser);
     }
-    if (builder.stateProvider == null) {
-      if (builder.zkHosts != null && builder.solrUrls != null) {
-        throw new IllegalArgumentException(
-            "Both zkHost(s) & solrUrl(s) have been specified. Only specify one.");
-      }
-      if (builder.zkHosts != null) {
-        this.stateProvider =
-            ClusterStateProvider.newZkClusterStateProvider(builder.zkHosts, builder.zkChroot);
-      } else if (builder.solrUrls != null && !builder.solrUrls.isEmpty()) {
-        try {
-          this.stateProvider = new Http2ClusterStateProvider(builder.solrUrls, builder.httpClient);
-        } catch (Exception e) {
-          throw new RuntimeException(
-              "Couldn't initialize a HttpClusterStateProvider (is/are the "
-                  + "Solr server(s), "
-                  + builder.solrUrls
-                  + ", down?)",
-              e);
-        }
-      } else {
-        throw new IllegalArgumentException("Both zkHosts and solrUrl cannot be null.");
-      }
-    } else {
-      this.stateProvider = builder.stateProvider;
-    }
+    this.stateProvider = builder.stateProvider;
 
     this.collectionStateCache.timeToLiveMs =
         TimeUnit.MILLISECONDS.convert(builder.timeToLiveSeconds, TimeUnit.SECONDS);
@@ -159,6 +136,8 @@ public static class Builder {
     private String defaultCollection;
     private long timeToLiveSeconds = 60;
     private int parallelCacheRefreshesLocks = 3;
+    private int zkConnectTimeout = SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT;
+    private int zkClientTimeout = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
 
     /**
      * Provide a series of Solr URLs to be used when configuring {@link CloudHttp2SolrClient}
@@ -389,13 +368,42 @@ public Builder withInternalClientBuilder(Http2SolrClient.Builder internalClientB
       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 CloudHttp2SolrClient} based on the provided configuration. */
     public CloudHttp2SolrClient build() {
       if (stateProvider == null) {
-        if (!zkHosts.isEmpty()) {
-          stateProvider =
-              ClusterStateProvider.newZkClusterStateProvider(zkHosts, Builder.this.zkChroot);
-        } else if (!this.solrUrls.isEmpty()) {
+        if (!zkHosts.isEmpty() && !solrUrls.isEmpty()) {
+          throw new IllegalArgumentException(
+              "Both zkHost(s) & solrUrl(s) have been specified. Only specify one.");
+        } else if (!zkHosts.isEmpty()) {
+          stateProvider = ClusterStateProvider.newZkClusterStateProvider(zkHosts, zkChroot);
+          if (stateProvider instanceof SolrZkClientTimeoutAware) {
+            var timeoutAware = (SolrZkClientTimeoutAware) stateProvider;
+            timeoutAware.setZkClientTimeout(zkClientTimeout);
+            timeoutAware.setZkConnectTimeout(zkConnectTimeout);
+          }
+        } else if (!solrUrls.isEmpty()) {
           try {
             stateProvider = new Http2ClusterStateProvider(solrUrls, httpClient);
           } catch (Exception e) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java
index 4a94359fca5..c1bc6811411 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java
@@ -26,6 +26,7 @@
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout.SolrZkClientTimeoutAware;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.DocCollection;
@@ -61,31 +62,7 @@ public class CloudLegacySolrClient extends CloudSolrClient {
    */
   protected CloudLegacySolrClient(Builder builder) {
     super(builder.shardLeadersOnly, builder.parallelUpdates, builder.directUpdatesToLeadersOnly);
-    if (builder.stateProvider == null) {
-      if (builder.zkHosts != null && builder.solrUrls != null) {
-        throw new IllegalArgumentException(
-            "Both zkHost(s) & solrUrl(s) have been specified. Only specify one.");
-      }
-      if (builder.zkHosts != null) {
-        this.stateProvider =
-            ClusterStateProvider.newZkClusterStateProvider(builder.zkHosts, builder.zkChroot);
-      } else if (builder.solrUrls != null && !builder.solrUrls.isEmpty()) {
-        try {
-          this.stateProvider = new HttpClusterStateProvider(builder.solrUrls, builder.httpClient);
-        } catch (Exception e) {
-          throw new RuntimeException(
-              "Couldn't initialize a HttpClusterStateProvider (is/are the "
-                  + "Solr server(s), "
-                  + builder.solrUrls
-                  + ", down?)",
-              e);
-        }
-      } else {
-        throw new IllegalArgumentException("Both zkHosts and solrUrl cannot be null.");
-      }
-    } else {
-      this.stateProvider = builder.stateProvider;
-    }
+    this.stateProvider = builder.stateProvider;
     this.retryExpiryTimeNano = builder.retryExpiryTimeNano;
     this.defaultCollection = builder.defaultCollection;
     this.collectionStateCache.timeToLiveMs =
@@ -194,6 +171,8 @@ public static class Builder extends SolrClientBuilder<Builder> {
     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;
 
     /** Constructor for use by subclasses. This constructor was public prior to version 9.0 */
     protected Builder() {}
@@ -370,11 +349,41 @@ public Builder withDefaultCollection(String collection) {
       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()) {
+        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);
+          if (stateProvider instanceof SolrZkClientTimeoutAware) {
+            var timeoutAware = (SolrZkClientTimeoutAware) stateProvider;
+            timeoutAware.setZkClientTimeout(zkClientTimeout);
+            timeoutAware.setZkConnectTimeout(zkConnectTimeout);
+          }
         } else if (!this.solrUrls.isEmpty()) {
           try {
             stateProvider = new HttpClusterStateProvider(solrUrls, httpClient);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java
new file mode 100644
index 00000000000..0a0cfd7fdad
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+public class SolrZkClientTimeout {
+  public static final int DEFAULT_ZK_CLIENT_TIMEOUT = Integer.getInteger("zkClientTimeout", 30000);
+  public static final int DEFAULT_ZK_CONNECT_TIMEOUT =
+      Integer.getInteger("zkConnectTimeout", 15000);
+
+  interface SolrZkClientTimeoutAware {
+    void setZkClientTimeout(int zkClientTimeout);
+
+    void setZkConnectTimeout(int zkConnectTimeout);
+  }
+}
diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
index 3384a03d0be..157f0a935e2 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
@@ -190,7 +191,7 @@ public static NodeConfig buildTestNodeConfig(Path solrHome) {
             ? null
             : new CloudConfig.CloudConfigBuilder(
                     System.getProperty("host"), Integer.getInteger("hostPort", 8983))
-                .setZkClientTimeout(Integer.getInteger("zkClientTimeout", 30000))
+                .setZkClientTimeout(SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT)
                 .setZkHost(System.getProperty("zkHost"))
                 .build();
 

From 3b2b1b7f790986c84671c505e8055afb4dc59c76 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Mon, 14 Aug 2023 11:17:13 -0400
Subject: [PATCH 003/160] SOLR-16926: Give override for EmbeddedZK bind host
 (#1836)

---
 solr/CHANGES.txt                              |  4 ++
 solr/bin/solr                                 |  4 ++
 solr/bin/solr.cmd                             |  4 ++
 solr/bin/solr.in.cmd                          |  2 +
 solr/bin/solr.in.sh                           |  2 +
 .../org/apache/solr/cloud/SolrZkServer.java   | 41 ++++++-----
 .../org/apache/solr/cloud/ZkController.java   | 34 +--------
 .../org/apache/solr/util/AddressUtils.java    | 64 +++++++++++++++++
 .../docker/templates/Dockerfile.body.template |  3 +-
 .../cloud_multi_node_embedded_zk/test.sh      | 70 +++++++++++++++++++
 .../cases/prometheus-exporter-cloud/test.sh   | 51 ++++++++++++++
 .../test.sh                                   |  0
 solr/server/solr/zoo.cfg                      |  3 -
 .../deployment-guide/pages/securing-solr.adoc | 13 ++++
 .../pages/major-changes-in-solr-9.adoc        |  4 ++
 15 files changed, 242 insertions(+), 57 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/util/AddressUtils.java
 create mode 100755 solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh
 create mode 100755 solr/docker/tests/cases/prometheus-exporter-cloud/test.sh
 rename solr/docker/tests/cases/{prometheus-exporter => prometheus-exporter-standalone}/test.sh (100%)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9951772eecc..a0ff03bc0bc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -91,6 +91,10 @@ Improvements
 
 * SOLR-14667: Make zkClientTimeout consistent and based on a system property. The defauls values are stored in a single place referenced everywhere and they are based on system properties (Alex Deparvu)
 
+* SOLR-16926: The embedded Zookeeper's bind host can now be overridden, but still defaults to "127.0.0.1".
+  This is useful when using the ZkCli on a remote Solr using the embedded ZK, or Solr running in a Docker container.
+  The SOLR_ZK_EMBEDDED_HOST envVar or -Dsolr.zk.embedded.host sysProp control this bind address. (Houston Putman)
+
 Optimizations
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index 3ff7832037a..bae4b722432 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1494,6 +1494,10 @@ if [ -n "${SOLR_JETTY_HOST:-}" ]; then
   SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")
 fi
 
+if [ -n "${SOLR_ZK_EMBEDDED_HOST:-}" ]; then
+  SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")
+fi
+
 : "${STOP_PORT:=$((SOLR_PORT - 1000))}"
 
 if [ "$SCRIPT_CMD" == "start" ] || [ "$SCRIPT_CMD" == "restart" ] ; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 61414f807da..4055bad6d00 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -955,6 +955,10 @@ IF DEFINED SOLR_JETTY_HOST (
   set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%"
 )
 
+IF DEFINED SOLR_ZK_EMBEDDED_HOST (
+  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%"
+)
+
 IF "%SCRIPT_CMD%"=="start" (
   REM see if Solr is already running using netstat
   For /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":%SOLR_PORT% "') do (
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index 0ca0c12c3d5..5f982cb16b5 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -130,6 +130,8 @@ REM set this value as narrowly as required before going to production. In
 REM environments where security is not a concern, 0.0.0.0 can be used to allow
 REM Solr to accept connections on all network interfaces.
 REM set SOLR_JETTY_HOST=127.0.0.1
+REM Sets the network interface the Embedded ZK binds to.
+REM set SOLR_ZK_EMBEDDED_HOST=127.0.0.1
 
 REM Restrict access to solr by IP address.
 REM Specify a comma-separated list of addresses or networks, for example:
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index b1dc6ab5ab4..117ef1761a9 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -154,6 +154,8 @@
 # environments where security is not a concern, 0.0.0.0 can be used to allow
 # Solr to accept connections on all network interfaces.
 #SOLR_JETTY_HOST="127.0.0.1"
+# Sets the network interface the Embedded ZK binds to.
+#SOLR_ZK_EMBEDDED_HOST="127.0.0.1"
 
 # Enables HTTPS. It is implictly true if you set SOLR_SSL_KEY_STORE. Use this config
 # to enable https module with custom jetty configuration.
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
index f340f4d6c4d..ee7a14733ed 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -20,9 +20,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.lang.invoke.MethodHandles;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
@@ -30,6 +28,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.servlet.SolrDispatchFilter;
+import org.apache.solr.util.AddressUtils;
 import org.apache.zookeeper.server.ServerConfig;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
@@ -72,7 +71,15 @@ public String getClientString() {
     if (zkRun == null) return null;
 
     InetSocketAddress addr = zkProps.getClientPortAddress();
-    return addr.getHostString() + ":" + addr.getPort();
+    String hostName;
+    // We cannot advertise 0.0.0.0, so choose the best host to advertise
+    // (the same that the Solr Node defaults to)
+    if (addr.getAddress().isAnyLocalAddress()) {
+      hostName = AddressUtils.getHostToAdvertise();
+    } else {
+      hostName = addr.getAddress().getHostAddress();
+    }
+    return hostName + ":" + addr.getPort();
   }
 
   public void parseConfig() {
@@ -101,6 +108,10 @@ public void parseConfig() {
     try {
       props = SolrZkServerProps.getProperties(zooCfgPath);
       SolrZkServerProps.injectServers(props, zkRun, zkHost);
+      // This is the address that the embedded Zookeeper will bind to. Like Solr, it defaults to
+      // "127.0.0.1".
+      props.setProperty(
+          "clientPortAddress", System.getProperty("solr.zk.embedded.host", "127.0.0.1"));
       if (props.getProperty("clientPort") == null) {
         props.setProperty("clientPort", Integer.toString(solrPort + 1000));
       }
@@ -145,14 +156,16 @@ public void start() {
     if (zkProps.getServers().size() > 1) {
       if (log.isInfoEnabled()) {
         log.info(
-            "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}",
-            zkProps.getClientPortAddress().getPort());
+            "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}",
+            zkProps.getClientPortAddress().getPort(),
+            zkProps.getClientPortAddress().getAddress().getHostAddress());
       }
     } else {
       if (log.isInfoEnabled()) {
         log.info(
-            "STARTING EMBEDDED STANDALONE ZOOKEEPER SERVER at port {}",
-            zkProps.getClientPortAddress().getPort());
+            "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}",
+            zkProps.getClientPortAddress().getPort(),
+            zkProps.getClientPortAddress().getAddress().getHostAddress());
       }
     }
 
@@ -268,20 +281,6 @@ public void setDataDir(File dataDir) {
     this.dataDir = dataDir;
   }
 
-  public void setClientPort(int clientPort) {
-    if (clientPortAddress != null) {
-      try {
-        this.clientPortAddress =
-            new InetSocketAddress(
-                InetAddress.getByName(clientPortAddress.getHostName()), clientPort);
-      } catch (UnknownHostException e) {
-        throw new RuntimeException(e);
-      }
-    } else {
-      this.clientPortAddress = new InetSocketAddress(clientPort);
-    }
-  }
-
   /**
    * Parse config from a Properties.
    *
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index c93a7dfef99..25f097cc8c8 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -31,15 +31,11 @@
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Array;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -121,6 +117,7 @@
 import org.apache.solr.logging.MDCLoggingContext;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.update.UpdateLog;
+import org.apache.solr.util.AddressUtils;
 import org.apache.solr.util.RTimer;
 import org.apache.solr.util.RefCounted;
 import org.apache.zookeeper.CreateMode;
@@ -875,35 +872,8 @@ public SolrCloudManager getSolrCloudManager() {
   // normalize host removing any url scheme.
   // input can be null, host, or url_prefix://host
   private String normalizeHostName(String host) {
-
     if (host == null || host.length() == 0) {
-      String hostaddress;
-      try {
-        hostaddress = InetAddress.getLocalHost().getHostAddress();
-      } catch (UnknownHostException e) {
-        hostaddress = "127.0.0.1"; // cannot resolve system hostname, fall through
-      }
-      // Re-get the IP again for "127.0.0.1", the other case we trust the hosts
-      // file is right.
-      if ("127.0.0.1".equals(hostaddress)) {
-        Enumeration<NetworkInterface> netInterfaces = null;
-        try {
-          netInterfaces = NetworkInterface.getNetworkInterfaces();
-          while (netInterfaces.hasMoreElements()) {
-            NetworkInterface ni = netInterfaces.nextElement();
-            Enumeration<InetAddress> ips = ni.getInetAddresses();
-            while (ips.hasMoreElements()) {
-              InetAddress ip = ips.nextElement();
-              if (ip.isSiteLocalAddress()) {
-                hostaddress = ip.getHostAddress();
-              }
-            }
-          }
-        } catch (Exception e) {
-          log.error("Error while looking for a better host name than 127.0.0.1", e);
-        }
-      }
-      host = hostaddress;
+      host = AddressUtils.getHostToAdvertise();
     } else {
       if (URLUtil.hasScheme(host)) {
         host = URLUtil.removeScheme(host);
diff --git a/solr/core/src/java/org/apache/solr/util/AddressUtils.java b/solr/core/src/java/org/apache/solr/util/AddressUtils.java
new file mode 100644
index 00000000000..ca03e26cf85
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/AddressUtils.java
@@ -0,0 +1,64 @@
+/*
+ * 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.util;
+
+import java.lang.invoke.MethodHandles;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Simple utilities for working Hostname/IP Addresses */
+public final class AddressUtils {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  // normalize host removing any url scheme.
+  // input can be null, host, or url_prefix://host
+  public static String getHostToAdvertise() {
+    String hostaddress;
+    try {
+      hostaddress = InetAddress.getLocalHost().getHostAddress();
+    } catch (UnknownHostException e) {
+      hostaddress =
+          InetAddress.getLoopbackAddress()
+              .getHostAddress(); // cannot resolve system hostname, fall through
+    }
+    // Re-get the IP again for "127.0.0.1", the other case we trust the hosts
+    // file is right.
+    if ("127.0.0.1".equals(hostaddress)) {
+      try {
+        var netInterfaces = NetworkInterface.getNetworkInterfaces();
+        while (netInterfaces.hasMoreElements()) {
+          NetworkInterface ni = netInterfaces.nextElement();
+          Enumeration<InetAddress> ips = ni.getInetAddresses();
+          while (ips.hasMoreElements()) {
+            InetAddress ip = ips.nextElement();
+            if (ip.isSiteLocalAddress()) {
+              hostaddress = ip.getHostAddress();
+            }
+          }
+        }
+      } catch (Exception e) {
+        log.error("Error while looking for a better host name than 127.0.0.1", e);
+      }
+    }
+    return hostaddress;
+  }
+}
diff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.template
index 7282642a73f..d754b9d7e42 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -45,7 +45,8 @@ ENV SOLR_USER="solr" \
     SOLR_PID_DIR=/var/solr \
     SOLR_LOGS_DIR=/var/solr/logs \
     LOG4J_PROPS=/var/solr/log4j2.xml \
-    SOLR_JETTY_HOST="0.0.0.0"
+    SOLR_JETTY_HOST="0.0.0.0" \
+    SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
 
 RUN set -ex; \
   groupadd -r --gid "$SOLR_GID" "$SOLR_GROUP"; \
diff --git a/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh b/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh
new file mode 100755
index 00000000000..2ee47103264
--- /dev/null
+++ b/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+# 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.
+
+set -euo pipefail
+
+TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
+source "${TEST_DIR}/../../shared.sh"
+
+echo "Running base solr node w/embeddedZk - $container_name"
+docker run --name "${container_name}" -d "$tag" solr-fg -c
+
+wait_for_container_and_solr "${container_name}"
+
+solr_ip=$(docker inspect --format="{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" "${container_name}")
+
+
+container_cleanup "${container_name}-2"
+
+echo "Running additional solr node - $container_name-2"
+docker run --name "$container_name-2" -d \
+  --env "ZK_HOST=${solr_ip}:9983" \
+  "$tag" solr-fg -c
+
+wait_for_container_and_solr "${container_name}-2"
+
+echo "Check live nodes"
+data=$(docker exec --user=solr "${container_name}-2" wget -q -O - 'http://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS')
+
+if ! grep -q "${solr_ip}:8983" <<<"$data"; then
+  echo "Test $TEST_NAME $tag failed; could not find first solr node in cluster state of second node"
+  echo "$data"
+  exit 1
+fi
+
+echo "Creating distributed collection"
+data=$(docker exec --user=solr "$container_name" solr create -c test -rf 1 -s 2)
+
+if ! grep -q "Created collection 'test'" <<<"$data"; then
+  echo "Test $TEST_NAME $tag failed; could not create distributed collection"
+  echo "$data"
+  exit 1
+fi
+
+echo "Submitting Solr query"
+data=$(docker exec --user=solr "${container_name}-2" wget -q -O - 'http://localhost:8983/solr/test/select?q=*:*')
+
+if ! grep -q '"numFound":0' <<<"$data"; then
+  echo "Test $TEST_NAME $tag failed; could not query distributed collection"
+  echo "$data"
+  exit 1
+fi
+
+
+container_cleanup "${container_name}-2"
+container_cleanup "$container_name"
+
+echo "Test $TEST_NAME $tag succeeded"
diff --git a/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh b/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh
new file mode 100755
index 00000000000..6407dfeb272
--- /dev/null
+++ b/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# 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.
+
+set -euo pipefail
+
+TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
+source "${TEST_DIR}/../../shared.sh"
+
+container_cleanup "${container_name}-solr"
+
+echo "Running $container_name"
+docker run --name "${container_name}-solr" -d "$tag" solr-fg -c
+
+wait_for_container_and_solr "${container_name}-solr"
+
+solr_ip=$(docker inspect --format="{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" "${container_name}-solr")
+
+docker run --name "$container_name" -d \
+  --env "ZK_HOST=${solr_ip}:9983" \
+  --env "SCRAPE_INTERVAL=1" \
+  --env "CLUSTER_ID=myCluster" \
+  "$tag" "solr-exporter"
+
+wait_for_container_and_solr_exporter "${container_name}"
+
+echo "Checking prometheus data"
+data=$(docker exec --user=solr "$container_name" wget -q -O - 'http://localhost:8989/metrics')
+
+if ! grep -E -q "solr_collections_live_nodes{zk_host=\"${solr_ip}:9983\",cluster_id=\"myCluster\",} 1.0" <<<"$data"; then
+  echo "Test $TEST_NAME $tag failed; did not find correct data"
+  echo "$data"
+  exit 1
+fi
+
+container_cleanup "${container_name}-solr"
+container_cleanup "$container_name"
+
+echo "Test $TEST_NAME $tag succeeded"
diff --git a/solr/docker/tests/cases/prometheus-exporter/test.sh b/solr/docker/tests/cases/prometheus-exporter-standalone/test.sh
similarity index 100%
rename from solr/docker/tests/cases/prometheus-exporter/test.sh
rename to solr/docker/tests/cases/prometheus-exporter-standalone/test.sh
diff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfg
index 4ef8dcea2ae..7c32425e718 100644
--- a/solr/server/solr/zoo.cfg
+++ b/solr/server/solr/zoo.cfg
@@ -11,9 +11,6 @@ syncLimit=5
 # dataDir=/opt/zookeeper/data
 # NOTE: Solr defaults the dataDir to <solrHome>/zoo_data
 
-# the address that embedded zookeeper will bind to
-clientPortAddress=127.0.0.1
-
 # the port at which the clients will connect
 # clientPort=2181
 # NOTE: Solr sets this based on zkRun / zkHost params
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
index 3732cea17cb..9a4fdea3898 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
@@ -115,4 +115,17 @@ This can be done by setting a `SOLR_JETTY_HOST` value in your environment's "inc
  ----
  SOLR_JETTY_HOST="0.0.0.0"
  ----
+
+The same setting is also available as the `-Dsolr.jetty.host` System Property.
+
+The same is true for the embedded Zookeeper, if it is run with Solr.
+By default, the embedded Zookeeper only listens on the loopback interface ("127.0.0.1")
+The bind host is controlled via the `SOLR_ZK_EMBEDDED_HOST` value in your environment's "include script" (`solr.in.sh` or `solr.in.cmd`):
+
+[source,bash]
+ ----
+ SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
+ ----
+
+The same setting is also available as the `-Dsolr.zk.embedded.host` System Property.
 // end::security-network-binding-1[]
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 750919eabef..2e670ca9f06 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -76,6 +76,10 @@ Upgrading existing clouds and use-cases that have custom configSets will not be
 * The default `minimalFreeDiskGB` value has been lowered from `20GB` to `5GB` when using the xref:configuration-guide:replica-placement-plugins.adoc#affinityplacementfactory[AffinityPlacementPlugin].
 Therefore, when using the default settings, nodes that were previously excluded from Replica placements due to low available disk space may be selected after upgrading.
 
+=== Embedded Zookeeper
+* The Embedded Zookeeper can now be configured to listen to (or bind to) more hosts than just `localhost`,
+see the  xref:deployment-guide:securing-solr.adoc#network-configuration[Network Configuration documentation] for more information.
+
 
 == Solr 9.3
 === Binary Releases

From b0d3085b83994b1636e455f95e6858aab7039e29 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 15 Aug 2023 20:52:07 +0200
Subject: [PATCH 004/160] Update io.netty:* to v4.1.96.Final (#1813)

---
 .../netty-buffer-4.1.94.Final.jar.sha1        |  1 -
 .../netty-buffer-4.1.96.Final.jar.sha1        |  1 +
 .../netty-codec-4.1.94.Final.jar.sha1         |  1 -
 .../netty-codec-4.1.96.Final.jar.sha1         |  1 +
 .../netty-codec-http-4.1.94.Final.jar.sha1    |  1 -
 .../netty-codec-http-4.1.96.Final.jar.sha1    |  1 +
 .../netty-codec-http2-4.1.94.Final.jar.sha1   |  1 -
 .../netty-codec-http2-4.1.96.Final.jar.sha1   |  1 +
 .../netty-codec-socks-4.1.94.Final.jar.sha1   |  1 -
 .../netty-codec-socks-4.1.96.Final.jar.sha1   |  1 +
 .../netty-common-4.1.94.Final.jar.sha1        |  1 -
 .../netty-common-4.1.96.Final.jar.sha1        |  1 +
 .../netty-handler-4.1.94.Final.jar.sha1       |  1 -
 .../netty-handler-4.1.96.Final.jar.sha1       |  1 +
 .../netty-handler-proxy-4.1.94.Final.jar.sha1 |  1 -
 .../netty-handler-proxy-4.1.96.Final.jar.sha1 |  1 +
 .../netty-resolver-4.1.94.Final.jar.sha1      |  1 -
 .../netty-resolver-4.1.96.Final.jar.sha1      |  1 +
 .../netty-transport-4.1.94.Final.jar.sha1     |  1 -
 .../netty-transport-4.1.96.Final.jar.sha1     |  1 +
 ...nsport-classes-epoll-4.1.94.Final.jar.sha1 |  1 -
 ...nsport-classes-epoll-4.1.96.Final.jar.sha1 |  1 +
 ...ansport-native-epoll-4.1.94.Final.jar.sha1 |  1 -
 ...ansport-native-epoll-4.1.96.Final.jar.sha1 |  1 +
 ...t-native-unix-common-4.1.94.Final.jar.sha1 |  1 -
 ...t-native-unix-common-4.1.96.Final.jar.sha1 |  1 +
 versions.lock                                 | 26 +++++++++----------
 versions.props                                |  2 +-
 28 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 solr/licenses/netty-buffer-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1

diff --git a/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1
deleted file mode 100644
index 5ab0cfb858d..00000000000
--- a/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eec248b26f16e888688e5bb37b7eeda76b78d2f7
diff --git a/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..c2e6b557029
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+4b80fffbe77485b457bf844289bf1801f61b9e91
diff --git a/solr/licenses/netty-codec-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.94.Final.jar.sha1
deleted file mode 100644
index 863ee90d58c..00000000000
--- a/solr/licenses/netty-codec-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c70ef20ca338558147887df60f46341bc47f6900
diff --git a/solr/licenses/netty-codec-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..2b1de703195
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0
diff --git a/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1
deleted file mode 100644
index cdc34be07ff..00000000000
--- a/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e5404764092c1f6305ad5719078f46ab228d587
diff --git a/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..dbcc61d860e
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+a4d0d95df5026965c454902ef3d6d84b81f89626
diff --git a/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1
deleted file mode 100644
index 957bf6c2893..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f651595784d6cca4cbca6a8ad74c48fceed6cea8
diff --git a/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..226c1b7d206
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6
diff --git a/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1
deleted file mode 100644
index 24cf1720029..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9192c7cda295d75f236a13a0b1f5a008f05d516
diff --git a/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..7928c87eeb5
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+f53c52dbddaa4a02a51430405792d3f30a89b147
diff --git a/solr/licenses/netty-common-4.1.94.Final.jar.sha1 b/solr/licenses/netty-common-4.1.94.Final.jar.sha1
deleted file mode 100644
index 532256b817b..00000000000
--- a/solr/licenses/netty-common-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad4ecf779ebc794cd351f57792f56ea01387b868
diff --git a/solr/licenses/netty-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-common-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..cb5590c8416
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+d10c167623cbc471753f950846df241d1021655c
diff --git a/solr/licenses/netty-handler-4.1.94.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.94.Final.jar.sha1
deleted file mode 100644
index e05fe7897d1..00000000000
--- a/solr/licenses/netty-handler-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd9121ce24d6d3f2898946d04b0ef3ec548b00b4
diff --git a/solr/licenses/netty-handler-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..a1f0cd55210
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+7840d7523d709e02961b647546f9d9dde1699306
diff --git a/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1
deleted file mode 100644
index bbaaa1fab18..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-26ba9d30b8f7b095155b9ac63378d6d9386d85c3
diff --git a/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..aa3d220477a
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38
diff --git a/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1
deleted file mode 100644
index edc89616fce..00000000000
--- a/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e96f649e8e9dcb29a1f8e95328b99c9eb6cf76c2
diff --git a/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..9f0e6ac60de
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+0e51db5568a881e0f9b013b35617c597dc32f130
diff --git a/solr/licenses/netty-transport-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.94.Final.jar.sha1
deleted file mode 100644
index 0934b80923d..00000000000
--- a/solr/licenses/netty-transport-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec783a737f96991a87b1d5794e2f9eb2024d708a
diff --git a/solr/licenses/netty-transport-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..7d0cc889525
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+dbd15ca244be28e1a98ed29b9d755edbfa737e02
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1
deleted file mode 100644
index 120f42fad3b..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-240e36cd5c2ffaf655913f8857f2d58b26394679
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..a05cc215dcc
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+b0369501645f6e71f89ff7f77b5c5f52510a2e31
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1
deleted file mode 100644
index b9e9bfe13df..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f77c54f1877d9ed51f207eb64a5634bdcc7efa1
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..21a85fa4799
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+9faf365396c933f1b39b60d129391c6c6c43fb86
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1
deleted file mode 100644
index 95d73ae8259..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3fa5f9d04b6b782d869d6e0657d896eeadca5866
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..72071232dfb
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+daf8578cade63a01525ee9d70371fa78e6e91094
diff --git a/versions.lock b/versions.lock
index ee128a6f95d..97a8faa8d31 100644
--- a/versions.lock
+++ b/versions.lock
@@ -108,19 +108,19 @@ io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)
 io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)
-io.netty:netty-buffer:4.1.94.Final (10 constraints: ac994cf0)
-io.netty:netty-codec:4.1.94.Final (5 constraints: 60455680)
-io.netty:netty-codec-http:4.1.94.Final (3 constraints: 522408ed)
-io.netty:netty-codec-http2:4.1.94.Final (1 constraints: ed0a94cb)
-io.netty:netty-codec-socks:4.1.94.Final (1 constraints: 140fab6c)
-io.netty:netty-common:4.1.94.Final (12 constraints: 24b37164)
-io.netty:netty-handler:4.1.94.Final (3 constraints: 6f2b2d3c)
-io.netty:netty-handler-proxy:4.1.94.Final (1 constraints: ed0a94cb)
-io.netty:netty-resolver:4.1.94.Final (2 constraints: 581a1732)
-io.netty:netty-transport:4.1.94.Final (9 constraints: f98bf530)
-io.netty:netty-transport-classes-epoll:4.1.94.Final (1 constraints: b112f81e)
-io.netty:netty-transport-native-epoll:4.1.94.Final (1 constraints: db0f188f)
-io.netty:netty-transport-native-unix-common:4.1.94.Final (4 constraints: 583daf95)
+io.netty:netty-buffer:4.1.96.Final (10 constraints: c0990f02)
+io.netty:netty-codec:4.1.96.Final (5 constraints: 6a45dc83)
+io.netty:netty-codec-http:4.1.96.Final (3 constraints: 582436ee)
+io.netty:netty-codec-http2:4.1.96.Final (1 constraints: ed0a94cb)
+io.netty:netty-codec-socks:4.1.96.Final (1 constraints: 160fb96c)
+io.netty:netty-common:4.1.96.Final (12 constraints: 3cb3817d)
+io.netty:netty-handler:4.1.96.Final (3 constraints: 732b553d)
+io.netty:netty-handler-proxy:4.1.96.Final (1 constraints: ed0a94cb)
+io.netty:netty-resolver:4.1.96.Final (2 constraints: 5c1a8332)
+io.netty:netty-transport:4.1.96.Final (9 constraints: 0b8c6f3f)
+io.netty:netty-transport-classes-epoll:4.1.96.Final (1 constraints: b312061f)
+io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: db0f188f)
+io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d1997)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index afad823b7aa..9f7b6e400a5 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
-io.netty:*=4.1.94.Final
+io.netty:*=4.1.96.Final
 io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
 io.opentracing:*=0.33.0
 io.prometheus:*=0.16.0

From 194b2050c0b62094e746097c046f792682bf471d Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:50:12 +0200
Subject: [PATCH 005/160] Update dependency org.apache.commons:commons-lang3 to
 v3.13.0 (#1814)

---
 solr/licenses/commons-lang3-3.12.0.jar.sha1 | 1 -
 solr/licenses/commons-lang3-3.13.0.jar.sha1 | 1 +
 versions.lock                               | 2 +-
 versions.props                              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/commons-lang3-3.12.0.jar.sha1
 create mode 100644 solr/licenses/commons-lang3-3.13.0.jar.sha1

diff --git a/solr/licenses/commons-lang3-3.12.0.jar.sha1 b/solr/licenses/commons-lang3-3.12.0.jar.sha1
deleted file mode 100644
index 8846a21387e..00000000000
--- a/solr/licenses/commons-lang3-3.12.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e
diff --git a/solr/licenses/commons-lang3-3.13.0.jar.sha1 b/solr/licenses/commons-lang3-3.13.0.jar.sha1
new file mode 100644
index 00000000000..e2d4d379fe0
--- /dev/null
+++ b/solr/licenses/commons-lang3-3.13.0.jar.sha1
@@ -0,0 +1 @@
+b7263237aa89c1f99b327197c41d0669707a462e
diff --git a/versions.lock b/versions.lock
index 97a8faa8d31..9556f8c0982 100644
--- a/versions.lock
+++ b/versions.lock
@@ -174,7 +174,7 @@ org.apache.commons:commons-compress:1.23.0 (3 constraints: fd1bd8d1)
 org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.12.0 (5 constraints: 9b3e0e36)
+org.apache.commons:commons-lang3:3.13.0 (5 constraints: 9c3eb936)
 org.apache.commons:commons-math3:3.6.1 (5 constraints: f431a634)
 org.apache.commons:commons-text:1.10.0 (1 constraints: d911adf8)
 org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
diff --git a/versions.props b/versions.props
index 9f7b6e400a5..71c8f2671d0 100644
--- a/versions.props
+++ b/versions.props
@@ -38,7 +38,7 @@ org.apache.commons:commons-collections4=4.4
 org.apache.commons:commons-compress=1.23.0
 org.apache.commons:commons-configuration2=2.9.0
 org.apache.commons:commons-exec=1.3
-org.apache.commons:commons-lang3=3.12.0
+org.apache.commons:commons-lang3=3.13.0
 org.apache.commons:commons-math3=3.6.1
 org.apache.curator:*=4.3.0
 org.apache.hadoop.thirdparty:*=1.1.1

From ef3e4498689a4bb5ffbfd05ef6854e12cfa895e9 Mon Sep 17 00:00:00 2001
From: Jonathon Henderson <8791010+jrhenderson1988@users.noreply.github.com>
Date: Wed, 16 Aug 2023 14:35:30 +0100
Subject: [PATCH 006/160] SOLR-16928: Add missing unit tests for
 RegexFileFilter and StrUtils.toLower (#1837)

* SOLR-16928: Add missing unit tests for RegexFileFilter and StrUtils.toLower

* SOLR-16928: Add license to RegexFileFilterTest
---
 .../apache/solr/util/RegexFileFilterTest.java | 49 +++++++++++++++++++
 .../test/org/apache/solr/util/TestUtils.java  |  7 +++
 2 files changed, 56 insertions(+)
 create mode 100644 solr/core/src/test/org/apache/solr/util/RegexFileFilterTest.java

diff --git a/solr/core/src/test/org/apache/solr/util/RegexFileFilterTest.java b/solr/core/src/test/org/apache/solr/util/RegexFileFilterTest.java
new file mode 100644
index 00000000000..8e69018c941
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/util/RegexFileFilterTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.util;
+
+import java.io.File;
+import org.apache.solr.SolrTestCase;
+import org.junit.Test;
+
+public class RegexFileFilterTest extends SolrTestCase {
+
+  private final RegexFileFilter endsWithDotTxt = new RegexFileFilter(".*\\.txt$");
+  private final RegexFileFilter alphaWithTxtOrPdfExt = new RegexFileFilter("^[a-z]+\\.(txt|pdf)$");
+
+  @Test
+  public void testAcceptTrue() {
+    assertTrue(endsWithDotTxt.accept(new File("/foo/bar/baz.txt")));
+    assertTrue(endsWithDotTxt.accept(new File("/baz.txt")));
+    assertTrue(endsWithDotTxt.accept(new File("~/baz.txt")));
+    assertTrue(endsWithDotTxt.accept(new File("~/1234-abc_.txt")));
+    assertTrue(endsWithDotTxt.accept(new File(".txt")));
+    assertTrue(alphaWithTxtOrPdfExt.accept(new File("/foo/bar.txt")));
+    assertTrue(alphaWithTxtOrPdfExt.accept(new File("/foo/baz.pdf")));
+  }
+
+  @Test
+  public void testAcceptFalse() {
+    assertFalse(endsWithDotTxt.accept(new File("/foo/bar.tx")));
+    assertFalse(endsWithDotTxt.accept(new File("/foo/bar.txts")));
+    assertFalse(endsWithDotTxt.accept(new File("/foo/bar.exe")));
+    assertFalse(alphaWithTxtOrPdfExt.accept(new File("/foo/bar/b4z.txt")));
+    assertFalse(alphaWithTxtOrPdfExt.accept(new File("/foo/bar/baz.jpg")));
+    assertFalse(alphaWithTxtOrPdfExt.accept(new File("~/foo-bar.txt")));
+    assertFalse(alphaWithTxtOrPdfExt.accept(new File("~/foobar123.txt")));
+  }
+}
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index c2a0f85d146..90b118b7f1c 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -109,6 +109,13 @@ public void testSplitEscaping() {
     assertEquals("/h/s", arr.get(0));
   }
 
+  public void testToLower() {
+    assertEquals(List.of(), StrUtils.toLower(List.of()));
+    assertEquals(List.of(""), StrUtils.toLower(List.of("")));
+    assertEquals(List.of("foo"), StrUtils.toLower(List.of("foo")));
+    assertEquals(List.of("bar", "baz-123"), StrUtils.toLower(List.of("BAR", "Baz-123")));
+  }
+
   public void testNamedLists() {
     SimpleOrderedMap<Integer> map = new SimpleOrderedMap<>();
     map.add("test", 10);

From 21740acc3392645ffc08b4dd07e26e8235a03880 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 16 Aug 2023 11:04:51 -0700
Subject: [PATCH 007/160] SOLR-16859 Missing Proxy support for Http2SolrClient
 (#1779)

---
 solr/CHANGES.txt                              |  2 +
 .../client/solrj/impl/Http2SolrClient.java    | 52 ++++++++++
 .../solrj/impl/Http2SolrClientProxyTest.java  | 95 +++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a0ff03bc0bc..b7606af3ba7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,8 @@ Bug Fixes
 
 * PR#1826: Allow looking up Solr Package repo when that URL references a raw repository.json hosted on Github when the file is JSON but the mimetype used is text/plain. (Eric Pugh)
 
+* SOLR-16859: Missing Proxy support for Http2SolrClient (Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 (No changes)
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 648504a816a..25513a74dd4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -76,7 +76,12 @@
 import org.apache.solr.common.util.Utils;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
+import org.eclipse.jetty.client.HttpProxy;
+import org.eclipse.jetty.client.Origin.Address;
+import org.eclipse.jetty.client.Origin.Protocol;
 import org.eclipse.jetty.client.ProtocolHandlers;
+import org.eclipse.jetty.client.ProxyConfiguration;
+import org.eclipse.jetty.client.Socks4Proxy;
 import org.eclipse.jetty.client.api.AuthenticationStore;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
@@ -281,6 +286,8 @@ private HttpClient createHttpClient(Builder builder) {
     if (builder.connectionTimeoutMillis != null)
       httpClient.setConnectTimeout(builder.connectionTimeoutMillis);
 
+    setupProxy(builder, httpClient);
+
     try {
       httpClient.start();
     } catch (Exception e) {
@@ -291,6 +298,29 @@ private HttpClient createHttpClient(Builder builder) {
     return httpClient;
   }
 
+  private void setupProxy(Builder builder, HttpClient httpClient) {
+    if (builder.proxyHost == null) {
+      return;
+    }
+    Address address = new Address(builder.proxyHost, builder.proxyPort);
+
+    final ProxyConfiguration.Proxy proxy;
+    if (builder.proxyIsSocks4) {
+      proxy = new Socks4Proxy(address, builder.proxyIsSecure);
+    } else {
+      final Protocol protocol;
+      if (builder.useHttp1_1) {
+        protocol = HttpClientTransportOverHTTP.HTTP11;
+      } else {
+        // see HttpClientTransportOverHTTP2#newOrigin
+        String protocolName = builder.proxyIsSecure ? "h2" : "h2c";
+        protocol = new Protocol(List.of(protocolName), false);
+      }
+      proxy = new HttpProxy(address, builder.proxyIsSecure, protocol);
+    }
+    httpClient.getProxyConfiguration().addProxy(proxy);
+  }
+
   @Override
   public void close() {
     // we wait for async requests, so far devs don't want to give sugar for this
@@ -1018,6 +1048,10 @@ public static class Builder {
     protected ResponseParser responseParser;
     private Set<String> urlParamNames;
     private CookieStore cookieStore = getDefaultCookieStore();
+    private String proxyHost;
+    private int proxyPort;
+    private boolean proxyIsSocks4;
+    private boolean proxyIsSecure;
 
     public Builder() {}
 
@@ -1241,6 +1275,24 @@ public Builder withCookieStore(CookieStore cookieStore) {
       this.cookieStore = cookieStore;
       return this;
     }
+
+    /**
+     * 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
+     */
+    public Builder withProxyConfiguration(
+        String host, int port, boolean isSocks4, boolean isSecure) {
+      this.proxyHost = host;
+      this.proxyPort = port;
+      this.proxyIsSocks4 = isSocks4;
+      this.proxyIsSecure = isSecure;
+      return this;
+    }
   }
 
   public Set<String> getUrlParamNames() {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
new file mode 100644
index 00000000000..09f3601c47b
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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 com.carrotsearch.randomizedtesting.RandomizedTest;
+import java.nio.file.Path;
+import java.util.Properties;
+import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.embedded.JettyConfig;
+import org.apache.solr.embedded.JettySolrRunner;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Http2SolrClientProxyTest extends SolrJettyTestBase {
+
+  // TODO add SSL test
+
+  @BeforeClass
+  public static void beforeTest() throws Exception {
+    RandomizedTest.assumeFalse(sslConfig.isSSLMode());
+
+    JettyConfig jettyConfig =
+        JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
+    createAndStartJettyWithProxy(legacyExampleCollection1SolrHome(), new Properties(), jettyConfig);
+  }
+
+  public static JettySolrRunner createAndStartJettyWithProxy(
+      String solrHome, Properties nodeProperties, JettyConfig jettyConfig) throws Exception {
+
+    initCore(null, null, solrHome);
+
+    Path coresDir = createTempDir().resolve("cores");
+
+    Properties props = new Properties();
+    props.setProperty("name", DEFAULT_TEST_CORENAME);
+    props.setProperty("configSet", "collection1");
+    props.setProperty("config", "${solrconfig:solrconfig.xml}");
+    props.setProperty("schema", "${schema:schema.xml}");
+
+    writeCoreProperties(coresDir.resolve("core"), props, "RestTestBase");
+
+    Properties nodeProps = new Properties(nodeProperties);
+    nodeProps.setProperty("coreRootDirectory", coresDir.toString());
+    nodeProps.setProperty("configSetBaseDir", solrHome);
+
+    jetty = new JettySolrRunner(solrHome, nodeProps, jettyConfig, true);
+    jetty.start();
+    port = jetty.getLocalPort();
+    return jetty;
+  }
+
+  /** Setup a simple http proxy and verify a request works */
+  @Test
+  public void testProxy() throws Exception {
+    var proxy = jetty.getProxy();
+    assertNotNull(proxy);
+
+    String host = proxy.getUrl().getHost();
+    String url = "http://" + host + ":" + (proxy.getUrl().getPort() + 10) + "/solr";
+
+    var builder =
+        new Http2SolrClient.Builder(url)
+            .withProxyConfiguration(host, proxy.getListenPort(), false, false);
+
+    try (Http2SolrClient client = builder.build()) {
+      String id = "1234";
+      SolrInputDocument doc = new SolrInputDocument();
+      doc.addField("id", id);
+      client.add(DEFAULT_TEST_COLLECTION_NAME, doc);
+      client.commit(DEFAULT_TEST_COLLECTION_NAME);
+      assertEquals(
+          1,
+          client
+              .query(DEFAULT_TEST_COLLECTION_NAME, new SolrQuery("id:" + id))
+              .getResults()
+              .getNumFound());
+    }
+  }
+}

From c3aef6e8551bd757605fc308c4b19d9c784cfe68 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 16 Aug 2023 11:34:39 -0700
Subject: [PATCH 008/160] Refactor ZkCmdExecutor, move all ensureExists methods
 to ZkMaintenanceUtils (#1840)

---
 .../org/apache/solr/cloud/DistributedMap.java |  5 +-
 .../org/apache/solr/cloud/LeaderElector.java  | 11 +--
 .../solr/cloud/OverseerElectionContext.java   |  5 +-
 .../cloud/ShardLeaderElectionContextBase.java |  4 +-
 .../org/apache/solr/cloud/ZkController.java   | 17 ++--
 .../apache/solr/cloud/ZkDistributedQueue.java |  6 +-
 .../admin/api/CreateCollectionAPI.java        | 11 +--
 .../schema/ManagedIndexSchemaFactory.java     |  5 +-
 .../apache/solr/cloud/ZkSolrClientTest.java   | 10 +-
 .../solr/common/cloud/ZkCmdExecutor.java      | 60 ------------
 .../solr/common/cloud/ZkMaintenanceUtils.java | 94 +++++++++++++++----
 11 files changed, 108 insertions(+), 120 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
index ece2589310a..323c378f71d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
@@ -22,7 +22,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
@@ -42,9 +42,8 @@ public class DistributedMap {
   public DistributedMap(SolrZkClient zookeeper, String dir) {
     this.dir = dir;
 
-    ZkCmdExecutor cmdExecutor = new ZkCmdExecutor(zookeeper.getZkClientTimeout());
     try {
-      cmdExecutor.ensureExists(dir, zookeeper);
+      ZkMaintenanceUtils.ensureExists(dir, zookeeper);
     } catch (KeeperException e) {
       throw new SolrException(ErrorCode.SERVER_ERROR, e);
     } catch (InterruptedException e) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
index 7b0de72eca5..6a003b19955 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
@@ -28,7 +28,7 @@
 import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZooKeeperException;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -61,8 +61,6 @@ public class LeaderElector {
 
   protected SolrZkClient zkClient;
 
-  private ZkCmdExecutor zkCmdExecutor;
-
   private volatile ElectionContext context;
 
   private ElectionWatcher watcher;
@@ -72,13 +70,11 @@ public class LeaderElector {
 
   public LeaderElector(SolrZkClient zkClient) {
     this.zkClient = zkClient;
-    zkCmdExecutor = new ZkCmdExecutor(zkClient.getZkClientTimeout());
   }
 
   public LeaderElector(
       SolrZkClient zkClient, ContextKey key, Map<ContextKey, ElectionContext> electionContexts) {
     this.zkClient = zkClient;
-    zkCmdExecutor = new ZkCmdExecutor(zkClient.getZkClientTimeout());
     this.electionContexts = electionContexts;
     this.contextKey = key;
   }
@@ -366,10 +362,11 @@ public void process(WatchedEvent event) {
   public void setup(final ElectionContext context) throws InterruptedException, KeeperException {
     String electZKPath = context.electionPath + LeaderElector.ELECTION_NODE;
     if (context instanceof OverseerElectionContext) {
-      zkCmdExecutor.ensureExists(electZKPath, zkClient);
+      ZkMaintenanceUtils.ensureExists(electZKPath, zkClient);
     } else {
       // we use 2 param so that replica won't create /collection/{collection} if it doesn't exist
-      zkCmdExecutor.ensureExists(electZKPath, (byte[]) null, CreateMode.PERSISTENT, zkClient, 2);
+      ZkMaintenanceUtils.ensureExists(
+          electZKPath, (byte[]) null, CreateMode.PERSISTENT, zkClient, 2);
     }
 
     this.context = context;
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
index 2d2669af2ce..8eb8a6d1386 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
@@ -23,7 +23,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.util.Utils;
 import org.apache.zookeeper.CreateMode;
@@ -43,8 +43,7 @@ public OverseerElectionContext(
     this.overseer = overseer;
     this.zkClient = zkClient;
     try {
-      new ZkCmdExecutor(zkClient.getZkClientTimeout())
-          .ensureExists(Overseer.OVERSEER_ELECT, zkClient);
+      ZkMaintenanceUtils.ensureExists(Overseer.OVERSEER_ELECT, zkClient);
     } catch (KeeperException e) {
       throw new SolrException(ErrorCode.SERVER_ERROR, e);
     } catch (InterruptedException e) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
index c6ac7421d95..32706698d8b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
@@ -27,7 +27,6 @@
 import org.apache.solr.common.cloud.PerReplicaStatesOps;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
 import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
@@ -79,11 +78,10 @@ public ShardLeaderElectionContextBase(
     this.collection = collection;
 
     String parent = ZkMaintenanceUtils.getZkParent(leaderPath);
-    ZkCmdExecutor zcmd = new ZkCmdExecutor(30000);
     // only if /collections/{collection} exists already do we succeed in creating this path
     log.info("make sure parent is created {}", parent);
     try {
-      zcmd.ensureExists(parent, (byte[]) null, CreateMode.PERSISTENT, zkClient, 2);
+      ZkMaintenanceUtils.ensureExists(parent, (byte[]) null, CreateMode.PERSISTENT, zkClient, 2);
     } catch (KeeperException e) {
       throw new RuntimeException(e);
     } catch (InterruptedException e) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 25f097cc8c8..c27e79c8274 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -87,10 +87,10 @@
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkACLProvider;
 import org.apache.solr.common.cloud.ZkClientConnectionStrategy;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
 import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.cloud.ZkCredentialsInjector;
 import org.apache.solr.common.cloud.ZkCredentialsProvider;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.cloud.ZooKeeperException;
@@ -915,20 +915,19 @@ boolean isClosed() {
    */
   public static void createClusterZkNodes(SolrZkClient zkClient)
       throws KeeperException, InterruptedException, IOException {
-    ZkCmdExecutor cmdExecutor = new ZkCmdExecutor(zkClient.getZkClientTimeout());
-    cmdExecutor.ensureExists(ZkStateReader.LIVE_NODES_ZKNODE, zkClient);
-    cmdExecutor.ensureExists(ZkStateReader.NODE_ROLES, zkClient);
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.LIVE_NODES_ZKNODE, zkClient);
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.NODE_ROLES, zkClient);
     for (NodeRoles.Role role : NodeRoles.Role.values()) {
-      cmdExecutor.ensureExists(NodeRoles.getZNodeForRole(role), zkClient);
+      ZkMaintenanceUtils.ensureExists(NodeRoles.getZNodeForRole(role), zkClient);
       for (String mode : role.supportedModes()) {
-        cmdExecutor.ensureExists(NodeRoles.getZNodeForRoleMode(role, mode), zkClient);
+        ZkMaintenanceUtils.ensureExists(NodeRoles.getZNodeForRoleMode(role, mode), zkClient);
       }
     }
 
-    cmdExecutor.ensureExists(ZkStateReader.COLLECTIONS_ZKNODE, zkClient);
-    cmdExecutor.ensureExists(ZkStateReader.ALIASES, zkClient);
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.COLLECTIONS_ZKNODE, zkClient);
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.ALIASES, zkClient);
     byte[] emptyJson = "{}".getBytes(StandardCharsets.UTF_8);
-    cmdExecutor.ensureExists(ZkStateReader.SOLR_SECURITY_CONF_PATH, emptyJson, zkClient);
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.SOLR_SECURITY_CONF_PATH, emptyJson, zkClient);
     repairSecurityJson(zkClient);
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
index 39a1de01feb..57db14740c5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
@@ -37,7 +37,7 @@
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.ConnectionManager.IsClosed;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.util.Pair;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -134,10 +134,8 @@ public ZkDistributedQueue(
       IsClosed higherLevelIsClosed) {
     this.dir = dir;
 
-    ZkCmdExecutor cmdExecutor =
-        new ZkCmdExecutor(zookeeper.getZkClientTimeout(), higherLevelIsClosed);
     try {
-      cmdExecutor.ensureExists(dir, zookeeper);
+      ZkMaintenanceUtils.ensureExists(dir, zookeeper);
     } catch (KeeperException e) {
       throw new SolrException(ErrorCode.SERVER_ERROR, e);
     } catch (InterruptedException e) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java
index a33c4a51f3b..b8ae2dca46f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java
@@ -68,7 +68,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ClusterProperties;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CollectionAdminParams;
@@ -265,9 +265,8 @@ private static Integer readIntegerDefaultFromClusterProp(
   private static void createSysConfigSet(CoreContainer coreContainer)
       throws KeeperException, InterruptedException {
     SolrZkClient zk = coreContainer.getZkController().getZkStateReader().getZkClient();
-    ZkCmdExecutor cmdExecutor = new ZkCmdExecutor(zk.getZkClientTimeout());
-    cmdExecutor.ensureExists(ZkStateReader.CONFIGS_ZKNODE, zk);
-    cmdExecutor.ensureExists(
+    ZkMaintenanceUtils.ensureExists(ZkStateReader.CONFIGS_ZKNODE, zk);
+    ZkMaintenanceUtils.ensureExists(
         ZkStateReader.CONFIGS_ZKNODE + "/" + CollectionAdminParams.SYSTEM_COLL, zk);
 
     try {
@@ -280,7 +279,7 @@ private static void createSysConfigSet(CoreContainer coreContainer)
         data = inputStream.readAllBytes();
       }
       assert data != null && data.length > 0;
-      cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
+      ZkMaintenanceUtils.ensureExists(path, data, CreateMode.PERSISTENT, zk);
       path =
           ZkStateReader.CONFIGS_ZKNODE
               + "/"
@@ -292,7 +291,7 @@ private static void createSysConfigSet(CoreContainer coreContainer)
         data = inputStream.readAllBytes();
       }
       assert data != null && data.length > 0;
-      cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
+      ZkMaintenanceUtils.ensureExists(path, data, CreateMode.PERSISTENT, zk);
     } catch (IOException e) {
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
     }
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
index 9008b3e443e..73187383bd8 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
@@ -32,7 +32,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.NamedList;
@@ -485,12 +485,11 @@ private void zkUgradeToManagedSchema() {
       // Rename the non-managed schema znode in ZooKeeper
       final String nonManagedSchemaPath = zkLoader.getConfigSetZkPath() + "/" + resourceName;
       try {
-        ZkCmdExecutor zkCmdExecutor = new ZkCmdExecutor(zkClient.getZkClientTimeout());
         if (zkController.pathExists(nonManagedSchemaPath)) {
           // First, copy the non-managed schema znode content to the upgraded schema znode
           byte[] bytes = zkController.getZkClient().getData(nonManagedSchemaPath, null, null, true);
           final String upgradedSchemaPath = nonManagedSchemaPath + UPGRADED_SCHEMA_EXTENSION;
-          zkCmdExecutor.ensureExists(upgradedSchemaPath, zkController.getZkClient());
+          ZkMaintenanceUtils.ensureExists(upgradedSchemaPath, zkController.getZkClient());
           zkController.getZkClient().setData(upgradedSchemaPath, bytes, true);
           // Then delete the non-managed schema znode
           if (zkController.getZkClient().exists(nonManagedSchemaPath, true)) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
index a9ed66f70ff..4503c862d50 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
@@ -30,6 +30,7 @@
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Op;
@@ -394,12 +395,11 @@ public void testSkipPathPartsOnMakePath() throws Exception {
 
       zkClient.clean("/");
 
-      ZkCmdExecutor zkCmdExecutor = new ZkCmdExecutor(30000);
       expectThrows(
           KeeperException.NoNodeException.class,
           "We should not be able to create this path",
           () ->
-              zkCmdExecutor.ensureExists(
+              ZkMaintenanceUtils.ensureExists(
                   "/collection/collection/leader",
                   (byte[]) null,
                   CreateMode.PERSISTENT,
@@ -412,7 +412,7 @@ public void testSkipPathPartsOnMakePath() throws Exception {
           KeeperException.NoNodeException.class,
           "We should not be able to create this path",
           () ->
-              zkCmdExecutor.ensureExists(
+              ZkMaintenanceUtils.ensureExists(
                   "/collections/collection/leader",
                   (byte[]) null,
                   CreateMode.PERSISTENT,
@@ -421,7 +421,7 @@ public void testSkipPathPartsOnMakePath() throws Exception {
       zkClient.makePath("/collection/collection", true);
 
       byte[] bytes = new byte[10];
-      zkCmdExecutor.ensureExists(
+      ZkMaintenanceUtils.ensureExists(
           "/collection/collection", bytes, CreateMode.PERSISTENT, zkClient, 2);
 
       byte[] returnedBytes = zkClient.getData("/collection/collection", null, null, true);
@@ -430,7 +430,7 @@ public void testSkipPathPartsOnMakePath() throws Exception {
 
       zkClient.makePath("/collection/collection/leader", true);
 
-      zkCmdExecutor.ensureExists(
+      ZkMaintenanceUtils.ensureExists(
           "/collection/collection/leader", (byte[]) null, CreateMode.PERSISTENT, zkClient, 2);
     }
   }
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
index 06134f1fbae..01924b3c044 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
@@ -19,9 +19,7 @@
 import java.lang.invoke.MethodHandles;
 import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.cloud.ConnectionManager.IsClosed;
-import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -94,64 +92,6 @@ private boolean isClosed() {
     return isClosed != null && isClosed.isClosed();
   }
 
-  /**
-   * Create a persistent znode with no data if it does not already exist
-   *
-   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
-   */
-  public void ensureExists(String path, final SolrZkClient zkClient)
-      throws KeeperException, InterruptedException {
-    ensureExists(path, null, CreateMode.PERSISTENT, zkClient, 0);
-  }
-
-  /**
-   * Create a persistent znode with the given data if it does not already exist
-   *
-   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
-   */
-  public void ensureExists(String path, final byte[] data, final SolrZkClient zkClient)
-      throws KeeperException, InterruptedException {
-    ensureExists(path, data, CreateMode.PERSISTENT, zkClient, 0);
-  }
-
-  /**
-   * Create a znode with the given mode and data if it does not already exist
-   *
-   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
-   */
-  public void ensureExists(
-      String path, final byte[] data, CreateMode createMode, final SolrZkClient zkClient)
-      throws KeeperException, InterruptedException {
-    ensureExists(path, data, createMode, zkClient, 0);
-  }
-
-  /**
-   * Create a node if it does not exist
-   *
-   * @param path the path at which to create the znode
-   * @param data the optional data to set on the znode
-   * @param createMode the mode with which to create the znode
-   * @param zkClient the client to use to check and create
-   * @param skipPathParts how many path elements to skip
-   */
-  public void ensureExists(
-      final String path,
-      final byte[] data,
-      CreateMode createMode,
-      final SolrZkClient zkClient,
-      int skipPathParts)
-      throws KeeperException, InterruptedException {
-
-    if (zkClient.exists(path, true)) {
-      return;
-    }
-    try {
-      zkClient.makePath(path, data, createMode, null, true, true, skipPathParts);
-    } catch (NodeExistsException ignored) {
-      // it's okay if another beats us creating the node
-    }
-  }
-
   /**
    * Performs a retry delay if this is not the first attempt
    *
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java
index 7ade32ebf3d..34d770c7a12 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java
@@ -37,6 +37,7 @@
 import org.apache.solr.common.util.StrUtils;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -589,28 +590,87 @@ public static boolean isFileForbiddenInConfigSets(String filePath) {
     int lastDot = filePath.lastIndexOf('.');
     return lastDot >= 0 && USE_FORBIDDEN_FILE_TYPES.contains(filePath.substring(lastDot + 1));
   }
-}
 
-class ZkCopier implements ZkMaintenanceUtils.ZkVisitor {
+  /**
+   * Create a persistent znode with no data if it does not already exist
+   *
+   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
+   */
+  public static void ensureExists(String path, final SolrZkClient zkClient)
+      throws KeeperException, InterruptedException {
+    ensureExists(path, null, CreateMode.PERSISTENT, zkClient, 0);
+  }
+
+  /**
+   * Create a persistent znode with the given data if it does not already exist
+   *
+   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
+   */
+  public static void ensureExists(String path, final byte[] data, final SolrZkClient zkClient)
+      throws KeeperException, InterruptedException {
+    ensureExists(path, data, CreateMode.PERSISTENT, zkClient, 0);
+  }
+
+  /**
+   * Create a znode with the given mode and data if it does not already exist
+   *
+   * @see #ensureExists(String, byte[], CreateMode, SolrZkClient, int)
+   */
+  public static void ensureExists(
+      String path, final byte[] data, CreateMode createMode, final SolrZkClient zkClient)
+      throws KeeperException, InterruptedException {
+    ensureExists(path, data, createMode, zkClient, 0);
+  }
 
-  String source;
-  String dest;
-  SolrZkClient zkClient;
+  /**
+   * Create a node if it does not exist
+   *
+   * @param path the path at which to create the znode
+   * @param data the optional data to set on the znode
+   * @param createMode the mode with which to create the znode
+   * @param zkClient the client to use to check and create
+   * @param skipPathParts how many path elements to skip
+   */
+  public static void ensureExists(
+      final String path,
+      final byte[] data,
+      CreateMode createMode,
+      final SolrZkClient zkClient,
+      int skipPathParts)
+      throws KeeperException, InterruptedException {
 
-  ZkCopier(SolrZkClient zkClient, String source, String dest) {
-    this.source = source;
-    this.dest = dest;
-    if (dest.endsWith("/")) {
-      this.dest = dest.substring(0, dest.length() - 1);
+    if (zkClient.exists(path, true)) {
+      return;
+    }
+    try {
+      zkClient.makePath(path, data, createMode, null, true, true, skipPathParts);
+    } catch (NodeExistsException ignored) {
+      // it's okay if another beats us creating the node
     }
-    this.zkClient = zkClient;
   }
 
-  @Override
-  public void visit(String path) throws InterruptedException, KeeperException {
-    String finalDestination = dest;
-    if (path.equals(source) == false) finalDestination += "/" + path.substring(source.length() + 1);
-    zkClient.makePath(finalDestination, false, true);
-    zkClient.setData(finalDestination, zkClient.getData(path, null, null, true), true);
+  static class ZkCopier implements ZkMaintenanceUtils.ZkVisitor {
+
+    String source;
+    String dest;
+    SolrZkClient zkClient;
+
+    ZkCopier(SolrZkClient zkClient, String source, String dest) {
+      this.source = source;
+      this.dest = dest;
+      if (dest.endsWith("/")) {
+        this.dest = dest.substring(0, dest.length() - 1);
+      }
+      this.zkClient = zkClient;
+    }
+
+    @Override
+    public void visit(String path) throws InterruptedException, KeeperException {
+      String finalDestination = dest;
+      if (path.equals(source) == false)
+        finalDestination += "/" + path.substring(source.length() + 1);
+      zkClient.makePath(finalDestination, false, true);
+      zkClient.setData(finalDestination, zkClient.getData(path, null, null, true), true);
+    }
   }
 }

From 7f5d98a2749980f967896c9424d18bdfcdb1d0dd Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Wed, 16 Aug 2023 20:49:53 +0200
Subject: [PATCH 009/160] Update dependency org.openjdk.jmh:jmh-core to v1.37
 (#1838)

---
 solr/licenses/jmh-core-1.36.jar.sha1 | 1 -
 solr/licenses/jmh-core-1.37.jar.sha1 | 1 +
 versions.lock                        | 4 ++--
 versions.props                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 solr/licenses/jmh-core-1.36.jar.sha1
 create mode 100644 solr/licenses/jmh-core-1.37.jar.sha1

diff --git a/solr/licenses/jmh-core-1.36.jar.sha1 b/solr/licenses/jmh-core-1.36.jar.sha1
deleted file mode 100644
index 14878efb422..00000000000
--- a/solr/licenses/jmh-core-1.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a69117788322630fc5f228bc804771335d41b1b
diff --git a/solr/licenses/jmh-core-1.37.jar.sha1 b/solr/licenses/jmh-core-1.37.jar.sha1
new file mode 100644
index 00000000000..12dc78b52de
--- /dev/null
+++ b/solr/licenses/jmh-core-1.37.jar.sha1
@@ -0,0 +1 @@
+896f27e49105b35ea1964319c83d12082e7a79ef
diff --git a/versions.lock b/versions.lock
index 9556f8c0982..f0320208225 100644
--- a/versions.lock
+++ b/versions.lock
@@ -175,7 +175,7 @@ org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
 org.apache.commons:commons-lang3:3.13.0 (5 constraints: 9c3eb936)
-org.apache.commons:commons-math3:3.6.1 (5 constraints: f431a634)
+org.apache.commons:commons-math3:3.6.1 (5 constraints: 57322799)
 org.apache.commons:commons-text:1.10.0 (1 constraints: d911adf8)
 org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
 org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)
@@ -334,7 +334,7 @@ org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
 org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)
 org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: 59105498)
 org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)
-org.openjdk.jmh:jmh-core:1.36 (1 constraints: de04fb30)
+org.openjdk.jmh:jmh-core:1.37 (1 constraints: df04fc30)
 org.osgi:org.osgi.resource:1.0.0 (1 constraints: e60f2999)
 org.osgi:org.osgi.service.serviceloader:1.0.0 (1 constraints: e60f2999)
 org.osgi:osgi.annotation:8.1.0 (1 constraints: 0b051636)
diff --git a/versions.props b/versions.props
index 71c8f2671d0..4ba9d7b879f 100644
--- a/versions.props
+++ b/versions.props
@@ -64,7 +64,7 @@ org.hsqldb:hsqldb=2.7.1
 org.immutables:value-annotations=2.9.3
 org.jctools:jctools-core=4.0.1
 org.mockito:mockito*=5.3.1
-org.openjdk.jmh:*=1.36
+org.openjdk.jmh:*=1.37
 org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=4.3.0

From 0c2e39bbbfb081fba8a24df903027d7f3d174b79 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 16 Aug 2023 21:13:16 -0700
Subject: [PATCH 010/160] Update io.opentelemetry to 1.29.0 (#1846)

---
 .../kotlin-stdlib-jdk7-1.6.0.jar.sha1         |  1 -
 .../kotlin-stdlib-jdk7-1.6.20.jar.sha1        |  1 +
 .../kotlin-stdlib-jdk8-1.6.0.jar.sha1         |  1 -
 .../kotlin-stdlib-jdk8-1.6.20.jar.sha1        |  1 +
 solr/licenses/okhttp-4.10.0.jar.sha1          |  1 -
 solr/licenses/okhttp-4.11.0.jar.sha1          |  1 +
 solr/licenses/okio-jvm-3.0.0.jar.sha1         |  1 -
 solr/licenses/okio-jvm-3.2.0.jar.sha1         |  1 +
 .../opentelemetry-api-1.21.0.jar.sha1         |  1 -
 .../opentelemetry-api-1.29.0.jar.sha1         |  1 +
 ...telemetry-api-events-1.29.0-alpha.jar.sha1 |  1 +
 ...entelemetry-api-logs-1.21.0-alpha.jar.sha1 |  1 -
 .../opentelemetry-context-1.21.0.jar.sha1     |  1 -
 .../opentelemetry-context-1.29.0.jar.sha1     |  1 +
 ...ntelemetry-exporter-common-1.21.0.jar.sha1 |  1 -
 ...ntelemetry-exporter-common-1.29.0.jar.sha1 |  1 +
 ...pentelemetry-exporter-otlp-1.21.0.jar.sha1 |  1 -
 ...pentelemetry-exporter-otlp-1.29.0.jar.sha1 |  1 +
 ...metry-exporter-otlp-common-1.21.0.jar.sha1 |  1 -
 ...metry-exporter-otlp-common-1.29.0.jar.sha1 |  1 +
 ...try-exporter-sender-okhttp-1.29.0.jar.sha1 |  1 +
 ...-extension-incubator-1.29.0-alpha.jar.sha1 |  1 +
 ...try-opentracing-shim-1.21.0-alpha.jar.sha1 |  1 -
 ...telemetry-opentracing-shim-1.29.0.jar.sha1 |  1 +
 .../opentelemetry-sdk-1.21.0.jar.sha1         |  1 -
 .../opentelemetry-sdk-1.29.0.jar.sha1         |  1 +
 .../opentelemetry-sdk-common-1.21.0.jar.sha1  |  1 -
 .../opentelemetry-sdk-common-1.29.0.jar.sha1  |  1 +
 ...ension-autoconfigure-1.21.0-alpha.jar.sha1 |  1 -
 ...dk-extension-autoconfigure-1.29.0.jar.sha1 |  1 +
 ...xtension-autoconfigure-spi-1.21.0.jar.sha1 |  1 -
 ...xtension-autoconfigure-spi-1.29.0.jar.sha1 |  1 +
 ...entelemetry-sdk-logs-1.21.0-alpha.jar.sha1 |  1 -
 .../opentelemetry-sdk-logs-1.29.0.jar.sha1    |  1 +
 .../opentelemetry-sdk-metrics-1.21.0.jar.sha1 |  1 -
 .../opentelemetry-sdk-metrics-1.29.0.jar.sha1 |  1 +
 .../opentelemetry-sdk-trace-1.21.0.jar.sha1   |  1 -
 .../opentelemetry-sdk-trace-1.29.0.jar.sha1   |  1 +
 ...pentelemetry-semconv-1.21.0-alpha.jar.sha1 |  1 -
 ...pentelemetry-semconv-1.29.0-alpha.jar.sha1 |  1 +
 solr/modules/opentelemetry/build.gradle       |  2 +-
 versions.lock                                 | 49 ++++++++++---------
 versions.props                                |  2 +-
 43 files changed, 48 insertions(+), 45 deletions(-)
 delete mode 100644 solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
 delete mode 100644 solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
 delete mode 100644 solr/licenses/okhttp-4.10.0.jar.sha1
 create mode 100644 solr/licenses/okhttp-4.11.0.jar.sha1
 delete mode 100644 solr/licenses/okio-jvm-3.0.0.jar.sha1
 create mode 100644 solr/licenses/okio-jvm-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-api-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-api-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-context-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-context-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1

diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
deleted file mode 100644
index a48893479ee..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da6bdc87391322974a43ccc00a25536ae74dad51
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
new file mode 100644
index 00000000000..e649f57208c
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
@@ -0,0 +1 @@
+f8629f336bad4001c89e9cffa5ef3d4b5d0f5e22
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
deleted file mode 100644
index 50cd854fef6..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-baf82c475e9372c25407f3d132439e4aa803b8b8
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
new file mode 100644
index 00000000000..dcea4bda07a
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
@@ -0,0 +1 @@
+dab8089bca6ac0e394c37281ea8cff2f99acd421
diff --git a/solr/licenses/okhttp-4.10.0.jar.sha1 b/solr/licenses/okhttp-4.10.0.jar.sha1
deleted file mode 100644
index 16cf73975de..00000000000
--- a/solr/licenses/okhttp-4.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd63657ac15770ed1420647154c9f44645533bef
diff --git a/solr/licenses/okhttp-4.11.0.jar.sha1 b/solr/licenses/okhttp-4.11.0.jar.sha1
new file mode 100644
index 00000000000..443d3088eec
--- /dev/null
+++ b/solr/licenses/okhttp-4.11.0.jar.sha1
@@ -0,0 +1 @@
+436932d695b2c43f2c86b8111c596179cd133d56
diff --git a/solr/licenses/okio-jvm-3.0.0.jar.sha1 b/solr/licenses/okio-jvm-3.0.0.jar.sha1
deleted file mode 100644
index 663b07539a3..00000000000
--- a/solr/licenses/okio-jvm-3.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ab5a73fa2ccb4a36b0b5c69fe10b16d0255bcf8
diff --git a/solr/licenses/okio-jvm-3.2.0.jar.sha1 b/solr/licenses/okio-jvm-3.2.0.jar.sha1
new file mode 100644
index 00000000000..e410b57207f
--- /dev/null
+++ b/solr/licenses/okio-jvm-3.2.0.jar.sha1
@@ -0,0 +1 @@
+332d1c5dc82b0241cb1d35bb0901d28470cc89ca
diff --git a/solr/licenses/opentelemetry-api-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.21.0.jar.sha1
deleted file mode 100644
index a745b7e36c0..00000000000
--- a/solr/licenses/opentelemetry-api-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1e3d45bf10061c31179b0d287da83699090b399d
diff --git a/solr/licenses/opentelemetry-api-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.29.0.jar.sha1
new file mode 100644
index 00000000000..7425920b87a
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-1.29.0.jar.sha1
@@ -0,0 +1 @@
+45010687a1181dc886fd12403e48cf76e94c65b1
diff --git a/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
new file mode 100644
index 00000000000..0b08d51c6f2
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
@@ -0,0 +1 @@
+cdc6b637c6374d4ae4be5cad381f6a566fb4310e
diff --git a/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1
deleted file mode 100644
index 1db5505ceb6..00000000000
--- a/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74cf69b29832c134c1ac539ef1fc047f96c39fca
diff --git a/solr/licenses/opentelemetry-context-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.21.0.jar.sha1
deleted file mode 100644
index 87cc9b62d69..00000000000
--- a/solr/licenses/opentelemetry-context-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b26607d39336dfd092e5d4dc148c9e1f3d8043b
diff --git a/solr/licenses/opentelemetry-context-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.29.0.jar.sha1
new file mode 100644
index 00000000000..7f8f3d28249
--- /dev/null
+++ b/solr/licenses/opentelemetry-context-1.29.0.jar.sha1
@@ -0,0 +1 @@
+a4cf6857f268b9637ea330fffc70c1e6421d1d55
diff --git a/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1
deleted file mode 100644
index 8282877f6a2..00000000000
--- a/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d92b4897c6b07f5a452d7a9b6d0f7b010596c31f
diff --git a/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
new file mode 100644
index 00000000000..2f7556109de
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
@@ -0,0 +1 @@
+7fa947205c2e85383c5b24139325f36a9e474067
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1
deleted file mode 100644
index 9b028264554..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-10fae1d61b7901f4d50baf3f9bcc959ad08d7142
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
new file mode 100644
index 00000000000..7146545d1ea
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
@@ -0,0 +1 @@
+471956f2773b5409355a09da6ef4cb8976c82db2
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1
deleted file mode 100644
index 774691534ce..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d378982284bcb440d2529341ce66e18a4d4cd6ff
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
new file mode 100644
index 00000000000..fe86cf5eb9e
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
@@ -0,0 +1 @@
+992edd4ba5d473abcd6b4ca126f11149b2bdba0c
diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
new file mode 100644
index 00000000000..1ea79b62365
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
@@ -0,0 +1 @@
+d3a2848644687cfe541c8b2b4b05f5d4e58c2709
diff --git a/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
new file mode 100644
index 00000000000..e781a342e63
--- /dev/null
+++ b/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
@@ -0,0 +1 @@
+4af0adab426582e9acea130d39b11791ccf0b513
diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1
deleted file mode 100644
index a156a8c7526..00000000000
--- a/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-321f54fc7a0ad717a8eda466d682e78fa140957b
diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
new file mode 100644
index 00000000000..1d378f65bc4
--- /dev/null
+++ b/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
@@ -0,0 +1 @@
+cbe64aea8ea3811911bf6e572f96ec0bc745948d
diff --git a/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1
deleted file mode 100644
index e68cdab696d..00000000000
--- a/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-881e035b0bac54a2b1f73a226cc96267065347d9
diff --git a/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
new file mode 100644
index 00000000000..23cae568fb8
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
@@ -0,0 +1 @@
+5d3a0e83ab6a2849c5b4123d539f994a721ddcd5
diff --git a/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1
deleted file mode 100644
index 12f69983134..00000000000
--- a/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b04a4f6e54aa30b02b86f60b4346a99750fb73b
diff --git a/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
new file mode 100644
index 00000000000..4033aa6f1bf
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
@@ -0,0 +1 @@
+a4a84b83c226c91a54bd0e9244d49908875cea3a
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1
deleted file mode 100644
index 94eb09c3eb0..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b36c7b9009f060b355b301d31ff6ecd68490d8d3
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
new file mode 100644
index 00000000000..635e3eada28
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
@@ -0,0 +1 @@
+36bd08550cbdcc4f58a4949e0f97f97443220a2d
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1
deleted file mode 100644
index f68de258d2d..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7264cbab013612395043985293ca63acd9d00e4a
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
new file mode 100644
index 00000000000..299eb7083b6
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
@@ -0,0 +1 @@
+b810dedc1fc8b28892eca5fa945e1c82cb95be4f
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1
deleted file mode 100644
index 94257a0b2a8..00000000000
--- a/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-afa30fc84dae4d46b473de5977574d719a6cadd1
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
new file mode 100644
index 00000000000..ff6a4151576
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
@@ -0,0 +1 @@
+68151d4465c12183db8edc4f9d8f0a878bada16b
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1
deleted file mode 100644
index 36a3e08b603..00000000000
--- a/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1c254f525c442e7725c0ab6836a5c3df10fda3f
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
new file mode 100644
index 00000000000..813a65b66fc
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
@@ -0,0 +1 @@
+6bb59616f1180286bc2ccf40e34d636984581ba9
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1
deleted file mode 100644
index fc78bc73977..00000000000
--- a/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-83a6f03af6dbab00409ecc96087269bbfa9a8cc7
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
new file mode 100644
index 00000000000..1a9ce5eb65d
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
@@ -0,0 +1 @@
+1008bf3794f6fc10238b1f63d0546ae817ad1783
diff --git a/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1
deleted file mode 100644
index a8fa3b33d98..00000000000
--- a/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c89d57f157d4da3a2306b23bf6366d036a70f05
diff --git a/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
new file mode 100644
index 00000000000..aa0f7608da5
--- /dev/null
+++ b/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
@@ -0,0 +1 @@
+8ee51f51d9c1c959b537c8dba67d7a524204b974
diff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradle
index 0018a710c6b..444d3c6ffb4 100644
--- a/solr/modules/opentelemetry/build.gradle
+++ b/solr/modules/opentelemetry/build.gradle
@@ -22,7 +22,7 @@ description = 'Open Telemetry (OTEL) tracer'
 dependencies {
   implementation project(':solr:core')
 
-  implementation platform('io.opentelemetry:opentelemetry-bom-alpha')
+  implementation platform('io.opentelemetry:opentelemetry-bom')
 
   implementation 'io.opentracing:opentracing-api'
   implementation 'org.slf4j:slf4j-api'
diff --git a/versions.lock b/versions.lock
index f0320208225..c78c403b7d4 100644
--- a/versions.lock
+++ b/versions.lock
@@ -69,9 +69,9 @@ com.mchange:mchange-commons-java:0.2.19 (1 constraints: 84075b75)
 com.pff:java-libpst:0.9.3 (1 constraints: 630cfa01)
 com.rometools:rome:1.18.0 (1 constraints: 910c870e)
 com.rometools:rome-utils:1.18.0 (1 constraints: 10095d96)
-com.squareup.okhttp3:okhttp:4.10.0 (2 constraints: ad259100)
-com.squareup.okio:okio:3.0.0 (1 constraints: 4d0c26fd)
-com.squareup.okio:okio-jvm:3.0.0 (1 constraints: 4a0ac1b9)
+com.squareup.okhttp3:okhttp:4.11.0 (2 constraints: 8126a451)
+com.squareup.okio:okio:3.2.0 (1 constraints: 4f0c2cfd)
+com.squareup.okio:okio-jvm:3.2.0 (1 constraints: 4c0ac7b9)
 com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)
 com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
 com.tdunning:t-digest:3.1 (1 constraints: a804212c)
@@ -124,23 +124,24 @@ io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d199
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
-io.opentelemetry:opentelemetry-api:1.21.0 (9 constraints: fda10c96)
-io.opentelemetry:opentelemetry-api-logs:1.21.0-alpha (2 constraints: a0279d00)
-io.opentelemetry:opentelemetry-bom:1.21.0 (1 constraints: c411a7f3)
-io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha (1 constraints: 69079861)
-io.opentelemetry:opentelemetry-context:1.21.0 (2 constraints: 1d1fd2b3)
-io.opentelemetry:opentelemetry-exporter-common:1.21.0 (3 constraints: 443f09e9)
-io.opentelemetry:opentelemetry-exporter-otlp:1.21.0 (1 constraints: 910fe183)
-io.opentelemetry:opentelemetry-exporter-otlp-common:1.21.0 (2 constraints: 48230b1b)
-io.opentelemetry:opentelemetry-opentracing-shim:1.21.0-alpha (1 constraints: f7137265)
-io.opentelemetry:opentelemetry-sdk:1.21.0 (3 constraints: 96438ee0)
-io.opentelemetry:opentelemetry-sdk-common:1.21.0 (5 constraints: 2355c8a6)
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.21.0-alpha (1 constraints: f7137265)
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.21.0 (2 constraints: d7280b4d)
-io.opentelemetry:opentelemetry-sdk-logs:1.21.0-alpha (4 constraints: 295e5301)
-io.opentelemetry:opentelemetry-sdk-metrics:1.21.0 (5 constraints: e1669a5a)
-io.opentelemetry:opentelemetry-sdk-trace:1.21.0 (3 constraints: dc32bdaf)
-io.opentelemetry:opentelemetry-semconv:1.21.0-alpha (5 constraints: ed6e375b)
+io.opentelemetry:opentelemetry-api:1.29.0 (11 constraints: ceca6768)
+io.opentelemetry:opentelemetry-api-events:1.29.0-alpha (2 constraints: 332f2380)
+io.opentelemetry:opentelemetry-bom:1.29.0 (1 constraints: 3e05483b)
+io.opentelemetry:opentelemetry-context:1.29.0 (2 constraints: 2d1f62b5)
+io.opentelemetry:opentelemetry-exporter-common:1.29.0 (3 constraints: 563d51ae)
+io.opentelemetry:opentelemetry-exporter-otlp:1.29.0 (1 constraints: 990ff983)
+io.opentelemetry:opentelemetry-exporter-otlp-common:1.29.0 (2 constraints: 5823eb1c)
+io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.29.0 (2 constraints: 5823eb1c)
+io.opentelemetry:opentelemetry-extension-incubator:1.29.0-alpha (1 constraints: f414ee96)
+io.opentelemetry:opentelemetry-opentracing-shim:1.29.0 (1 constraints: 990ff983)
+io.opentelemetry:opentelemetry-sdk:1.29.0 (3 constraints: ae4376e7)
+io.opentelemetry:opentelemetry-sdk-common:1.29.0 (6 constraints: 936c396e)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.29.0 (1 constraints: 990ff983)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.29.0 (3 constraints: a63c5427)
+io.opentelemetry:opentelemetry-sdk-logs:1.29.0 (3 constraints: f43275b4)
+io.opentelemetry:opentelemetry-sdk-metrics:1.29.0 (3 constraints: f43275b4)
+io.opentelemetry:opentelemetry-sdk-trace:1.29.0 (3 constraints: f43275b4)
+io.opentelemetry:opentelemetry-semconv:1.29.0-alpha (4 constraints: 175b2583)
 io.opentracing:opentracing-api:0.33.0 (5 constraints: 7244331d)
 io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
 io.opentracing:opentracing-util:0.33.0 (2 constraints: 5013be5a)
@@ -324,10 +325,10 @@ org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)
 org.jctools:jctools-core:4.0.1 (1 constraints: 07050036)
 org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
 org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
-org.jetbrains.kotlin:kotlin-stdlib:1.6.20 (5 constraints: 6c4c1dcd)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 (3 constraints: 352cbb71)
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (3 constraints: 582c9186)
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20 (5 constraints: d04c515f)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 (3 constraints: 342c6071)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20 (1 constraints: e010f5d2)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 (4 constraints: d9389ae4)
 org.junit:junit-bom:5.9.1 (1 constraints: c8116ede)
 org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
 org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
diff --git a/versions.props b/versions.props
index 4ba9d7b879f..45ffbbad5d4 100644
--- a/versions.props
+++ b/versions.props
@@ -23,7 +23,7 @@ commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.96.Final
-io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
+io.opentelemetry:opentelemetry-bom=1.29.0
 io.opentracing:*=0.33.0
 io.prometheus:*=0.16.0
 io.swagger.core.v3:*=2.2.12

From e36023c16dafaad815b24503f5f05e9e40c48cec Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 17 Aug 2023 05:31:15 -0700
Subject: [PATCH 011/160] CHANGES.txt update for io.opentelemetry update
 (#1847)

---
 solr/CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b7606af3ba7..b82508e9e6b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -124,7 +124,8 @@ Bug Fixes
 
 Dependency Upgrades
 ---------------------
-(No changes)
+
+* PR#1846: Update io.opentelemetry to 1.29.0 (Alex Deparvu)
 
 Other Changes
 ---------------------

From 92dede18504518a5542ddd35b0d9cc2887566934 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 17 Aug 2023 05:54:52 -0700
Subject: [PATCH 012/160] SOLR-16536 Replace OpenTracing instrumentation with
 OpenTelemetry (#1841)

OpenTracing libraries were completely removed and replaced with OpenTelemetry libraries
---
 solr/CHANGES.txt                              |   2 +
 solr/core/build.gradle                        |   6 +-
 .../org/apache/solr/api/AnnotatedApi.java     |   2 +-
 .../src/java/org/apache/solr/api/Api.java     |   2 +-
 .../java/org/apache/solr/api/V2HttpCall.java  |  10 +-
 .../org/apache/solr/core/CoreContainer.java   |  10 +-
 .../apache/solr/core/TracerConfigurator.java  |  80 +------
 .../admin/api/RestoreCollectionAPI.java       |   2 +-
 .../handler/component/HttpShardHandler.java   |  12 +-
 .../solr/handler/component/ShardRequest.java  |   5 -
 .../request/DelegatingSolrQueryRequest.java   |   8 +-
 .../apache/solr/request/SolrQueryRequest.java |  22 +-
 .../solr/request/SolrQueryRequestBase.java    |  32 ---
 .../org/apache/solr/servlet/HttpSolrCall.java |  22 +-
 .../org/apache/solr/servlet/ServletUtils.java |  49 +----
 .../solr/servlet/SolrDispatchFilter.java      |  27 +--
 .../solr/update/SolrCmdDistributor.java       |  13 +-
 .../org/apache/solr/update/UpdateCommand.java |  16 +-
 .../solr/util/tracing/HttpServletCarrier.java |  92 --------
 .../tracing/HttpServletRequestGetter.java     |  46 ++++
 ...estCarrier.java => SolrRequestSetter.java} |  25 +--
 .../apache/solr/util/tracing/TraceUtils.java  | 116 +++++++++-
 .../admin/api/AddReplicaPropertyAPITest.java  |   4 +-
 .../admin/api/CoreReplicationAPITest.java     |   4 +-
 .../handler/admin/api/ListAliasesAPITest.java |   4 +-
 ...java => TestHttpServletRequestGetter.java} |  50 ++---
 ...telemetry-opentracing-shim-1.29.0.jar.sha1 |   1 -
 .../opentelemetry-sdk-testing-1.29.0.jar.sha1 |   1 +
 solr/licenses/opentracing-api-0.33.0.jar.sha1 |   1 -
 solr/licenses/opentracing-api-LICENSE-ASL.txt | 201 ------------------
 solr/licenses/opentracing-api-NOTICE.txt      |   0
 .../licenses/opentracing-mock-0.33.0.jar.sha1 |   1 -
 .../licenses/opentracing-mock-LICENSE-ASL.txt | 201 ------------------
 solr/licenses/opentracing-mock-NOTICE.txt     |   0
 .../licenses/opentracing-noop-0.33.0.jar.sha1 |   1 -
 .../licenses/opentracing-noop-LICENSE-ASL.txt | 201 ------------------
 solr/licenses/opentracing-noop-NOTICE.txt     |   0
 .../licenses/opentracing-util-0.33.0.jar.sha1 |   1 -
 .../licenses/opentracing-util-LICENSE-ASL.txt | 201 ------------------
 solr/licenses/opentracing-util-NOTICE.txt     |   0
 solr/modules/opentelemetry/build.gradle       |  14 +-
 .../opentelemetry/ClosableTracerShim.java     |  85 --------
 .../opentelemetry/OtelTracerConfigurator.java |  38 ++--
 .../src/test-files/solr/solr.xml              |   2 +-
 .../CustomTestOtelTracerConfigurator.java     | 104 +++++++++
 .../OtelTracerConfiguratorTest.java           |  44 +---
 .../TestDistributedTracing.java               | 141 ++++++------
 .../pages/major-changes-in-solr-10.adoc       |   2 +
 solr/test-framework/build.gradle              |   2 -
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  36 +---
 versions.lock                                 |  12 +-
 versions.props                                |   1 -
 52 files changed, 496 insertions(+), 1456 deletions(-)
 delete mode 100644 solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
 rename solr/core/src/java/org/apache/solr/util/tracing/{SolrRequestCarrier.java => SolrRequestSetter.java} (60%)
 rename solr/core/src/test/org/apache/solr/util/tracing/{TestHttpServletCarrier.java => TestHttpServletRequestGetter.java} (54%)
 delete mode 100644 solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
 delete mode 100644 solr/licenses/opentracing-api-0.33.0.jar.sha1
 delete mode 100644 solr/licenses/opentracing-api-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/opentracing-api-NOTICE.txt
 delete mode 100644 solr/licenses/opentracing-mock-0.33.0.jar.sha1
 delete mode 100644 solr/licenses/opentracing-mock-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/opentracing-mock-NOTICE.txt
 delete mode 100644 solr/licenses/opentracing-noop-0.33.0.jar.sha1
 delete mode 100644 solr/licenses/opentracing-noop-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/opentracing-noop-NOTICE.txt
 delete mode 100644 solr/licenses/opentracing-util-0.33.0.jar.sha1
 delete mode 100644 solr/licenses/opentracing-util-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/opentracing-util-NOTICE.txt
 delete mode 100644 solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java
 create mode 100644 solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
 rename solr/{core/src/test/org/apache/solr/util/tracing => modules/opentelemetry/src/test/org/apache/solr/opentelemetry}/TestDistributedTracing.java (56%)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b82508e9e6b..098080ed7c2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -17,6 +17,8 @@ Improvements
 
 * SOLR-16800: Solr CLI commands that use -solrUrl now work with a bare url like http://localhost:8983, you no longer need to add the /solr at the end. (Eric Pugh)
 
+* SOLR-16536: Replace OpenTracing instrumentation with OpenTelemetry (Alex Deparvu, janhoy)
+
 Optimizations
 ---------------------
 (No changes)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index d868164cd75..61ecd1713af 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -141,10 +141,8 @@ dependencies {
   implementation 'com.tdunning:t-digest'
 
   // Distributed Tracing
-  api 'io.opentracing:opentracing-api' // Tracer is exposed on some methods
-  implementation 'io.opentracing:opentracing-noop'
-  implementation 'io.opentracing:opentracing-util'
-  testImplementation 'io.opentracing:opentracing-mock'
+  api 'io.opentelemetry:opentelemetry-api' // Tracer is exposed on some methods
+  implementation 'io.opentelemetry:opentelemetry-context'
 
   implementation 'org.apache.commons:commons-exec'
 
diff --git a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
index 7ec6ab6a919..bfe35c47108 100644
--- a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
+++ b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
@@ -215,7 +215,7 @@ public void call(SolrQueryRequest req, SolrQueryResponse rsp) {
     }
 
     for (CommandOperation cmd : cmds) {
-      TraceUtils.ifNotNoop(req.getSpan(), (span) -> span.log("Command: " + cmd.name));
+      TraceUtils.ifNotNoop(req.getSpan(), (span) -> span.addEvent("Command: " + cmd.name));
       commands.get(cmd.name).invoke(req, rsp, cmd);
     }
 
diff --git a/solr/core/src/java/org/apache/solr/api/Api.java b/solr/core/src/java/org/apache/solr/api/Api.java
index 54010912ae2..8e881b7f74e 100644
--- a/solr/core/src/java/org/apache/solr/api/Api.java
+++ b/solr/core/src/java/org/apache/solr/api/Api.java
@@ -41,7 +41,7 @@ public Map<String, JsonSchemaValidator> getCommandSchema() {
     if (commandSchema == null) {
       synchronized (this) {
         if (commandSchema == null) {
-          ValidatingJsonMap commands = getSpec().getMap("commands", null);
+          ValidatingJsonMap commands = spec != null ? getSpec().getMap("commands", null) : null;
           commandSchema =
               commands != null ? Map.copyOf(ApiBag.getParsedSchema(commands)) : Map.of();
         }
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 46c66e403df..92008542a60 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -23,8 +23,7 @@
 import static org.apache.solr.servlet.SolrDispatchFilter.Action.PROCESS;
 import static org.apache.solr.servlet.SolrDispatchFilter.Action.REMOTEQUERY;
 
-import io.opentracing.Span;
-import io.opentracing.tag.Tags;
+import io.opentelemetry.api.trace.Span;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
@@ -65,6 +64,7 @@
 import org.apache.solr.servlet.SolrDispatchFilter;
 import org.apache.solr.servlet.SolrRequestParsers;
 import org.apache.solr.servlet.cache.Method;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.slf4j.Logger;
@@ -499,9 +499,7 @@ protected void populateTracingSpan(Span span) {
         coreOrColName = pathTemplateValues.get("core");
       }
     }
-    if (coreOrColName != null) {
-      span.setTag(Tags.DB_INSTANCE, coreOrColName);
-    }
+    TraceUtils.setDbInstance(span, coreOrColName);
 
     // Get the templatize-ed path, ex: "/c/{collection}"
     final String path = computeEndpointPath();
@@ -521,7 +519,7 @@ protected void populateTracingSpan(Span span) {
       verb = req.getMethod().toLowerCase(Locale.ROOT);
     }
 
-    span.setOperationName(verb + ":" + path);
+    span.updateName(verb + ":" + path);
   }
 
   /** Example: /c/collection1/ and template map collection->collection1 produces /c/{collection}. */
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 f223f41e36f..5606d93dc85 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -31,9 +31,7 @@
 
 import com.github.benmanes.caffeine.cache.Interner;
 import com.google.common.annotations.VisibleForTesting;
-import io.opentracing.Tracer;
-import io.opentracing.noop.NoopTracer;
-import io.opentracing.noop.NoopTracerFactory;
+import io.opentelemetry.api.trace.Tracer;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Path;
@@ -268,7 +266,7 @@ public JerseyAppHandlerCache getJerseyAppHandlerCache() {
 
   protected volatile SolrMetricsContext solrMetricsContext;
 
-  protected volatile Tracer tracer = NoopTracerFactory.create();
+  protected volatile Tracer tracer;
 
   protected MetricsHandler metricsHandler;
 
@@ -695,7 +693,7 @@ public MetricsHandler getMetricsHandler() {
     return metricsHandler;
   }
 
-  /** Never null but may implement {@link NoopTracer}. */
+  /** Never null */
   public Tracer getTracer() {
     return tracer;
   }
@@ -1375,8 +1373,6 @@ public void shutdown() {
       org.apache.lucene.util.IOUtils.closeWhileHandlingException(packageLoader);
     }
     org.apache.lucene.util.IOUtils.closeWhileHandlingException(loader); // best effort
-
-    tracer.close();
   }
 
   public void cancelCoreRecoveries() {
diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
index ba36ed127ec..bc1798863f7 100644
--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
@@ -17,83 +17,23 @@
 
 package org.apache.solr.core;
 
-import io.opentracing.Scope;
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
-import java.lang.invoke.MethodHandles;
-import java.util.concurrent.atomic.AtomicReference;
-import org.apache.solr.common.util.ExecutorUtil;
+import io.opentelemetry.api.trace.Tracer;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.solr.util.tracing.TraceUtils;
 
-/** Produces an OpenTracing {@link Tracer} from configuration. */
+/** Produces a {@link Tracer} from configuration. */
 public abstract class TracerConfigurator implements NamedListInitializedPlugin {
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  public abstract Tracer getTracer();
 
   public static Tracer loadTracer(SolrResourceLoader loader, PluginInfo info) {
-    // In "normal" Solr operation, loadTracer is called once in Solr's lifetime.
-    // In test mode we run many test suites, sometimes multiple servers per test suite.
-    // It's important that the tracing config not change throughout a test suite because of the
-    //   static singleton pattern and assumptions based on this.
-
     if (info != null && info.isEnabled()) {
-      GlobalTracer.registerIfAbsent(
-          () -> {
-            TracerConfigurator configurator =
-                loader.newInstance(info.className, TracerConfigurator.class);
-            configurator.init(info.initArgs);
-            return configurator.getTracer();
-          });
-    }
-    if (GlobalTracer.isRegistered()) {
-      // ideally we would furthermore check that it's not a no-op impl either but
-      //  GlobalTracer.get() always returns a GlobalTracer implementing Tracer that delegates
-      //  to the real Tracer (that may or may not be a No-Op impl).
-      ExecutorUtil.addThreadLocalProvider(new TracerConfigurator.SpanThreadLocalProvider());
+      TracerConfigurator configurator =
+          loader.newInstance(info.className, TracerConfigurator.class);
+      configurator.init(info.initArgs);
+      return configurator.getTracer();
+    } else {
+      return TraceUtils.noop();
     }
-
-    return GlobalTracer.get();
   }
 
-  /**
-   * Propagate the active span across threads. New spans are not created, which means that we're
-   * possibly exposing a Span to a thread that may find that it has already finished, depending on
-   * how the instrumented thread pool is used. It's probably fine to create new spans related to a
-   * finished span? It's not okay to otherwise touch a finished span (e.g. to log or tag).
-   *
-   * <p>This strategy is also used by {@code
-   * brave.propagation.CurrentTraceContext#wrap(java.lang.Runnable)}.
-   */
-  private static class SpanThreadLocalProvider
-      implements ExecutorUtil.InheritableThreadLocalProvider {
-    private final Tracer tracer = GlobalTracer.get();
-
-    @Override
-    public void store(AtomicReference<Object> ctx) {
-      assert tracer == GlobalTracer.get() : "Tracer changed; not supported!";
-      ctx.set(tracer.scopeManager().activeSpan());
-    }
-
-    @Override
-    public void set(AtomicReference<Object> ctx) {
-      final Span span = (Span) ctx.get();
-      if (span != null) {
-        log.trace("Thread received span to do async work: {}", span);
-        final Scope scope = tracer.scopeManager().activate(span);
-        ctx.set(scope);
-      }
-    }
-
-    @Override
-    public void clean(AtomicReference<Object> ctx) {
-      Scope scope = (Scope) ctx.get();
-      if (scope != null) {
-        scope.close();
-      }
-    }
-  }
+  protected abstract Tracer getTracer();
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
index 18caed1933a..1809d83f6b9 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
@@ -108,8 +108,8 @@ public SubResponseAccumulatingJerseyResponse restoreCollection(
     }
 
     final String collectionName = requestBody.collection;
-    recordCollectionForLogAndTracing(collectionName, solrQueryRequest);
     SolrIdentifierValidator.validateCollectionName(collectionName);
+    recordCollectionForLogAndTracing(collectionName, solrQueryRequest);
     if (coreContainer.getAliases().hasAlias(collectionName)) {
       throw new SolrException(
           SolrException.ErrorCode.BAD_REQUEST,
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index 0ad76294335..17fb78a86c6 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -16,9 +16,6 @@
  */
 package org.apache.solr.handler.component;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,7 +47,7 @@
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.request.SolrRequestInfo;
 import org.apache.solr.security.AllowListUrlChecker;
-import org.apache.solr.util.tracing.SolrRequestCarrier;
+import org.apache.solr.util.tracing.TraceUtils;
 
 @NotThreadSafe
 public class HttpShardHandler extends ShardHandler {
@@ -128,8 +125,6 @@ public void submit(
       final ShardRequest sreq, final String shard, final ModifiableSolrParams params) {
     // do this outside of the callable for thread safety reasons
     final List<String> urls = getURLs(shard);
-    final Tracer tracer = sreq.tracer; // not null
-    final Span span = tracer.activeSpan(); // probably not null?
 
     params.remove(CommonParams.WT); // use default (currently javabin)
     params.remove(CommonParams.VERSION);
@@ -171,10 +166,7 @@ public void submit(
 
               @Override
               public void onStart() {
-                if (span != null) {
-                  tracer.inject(
-                      span.context(), Format.Builtin.HTTP_HEADERS, new SolrRequestCarrier(req));
-                }
+                TraceUtils.injectContextIntoRequest(req);
                 SolrRequestInfo requestInfo = SolrRequestInfo.getRequestInfo();
                 if (requestInfo != null)
                   req.setUserPrincipal(requestInfo.getReq().getUserPrincipal());
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java b/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java
index 03b660ff9be..d7d7da04f22 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.solr.handler.component;
 
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -58,9 +56,6 @@ public class ShardRequest {
   /** may be null */
   public String nodeName;
 
-  /** Not null but may implement {@link io.opentracing.noop.NoopTracer}. */
-  public final Tracer tracer = GlobalTracer.get();
-
   // TODO: one could store a list of numbers to correlate where returned docs
   // go in the top-level response rather than looking up by id...
   // this would work well if we ever transitioned to using internal ids and
diff --git a/solr/core/src/java/org/apache/solr/request/DelegatingSolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/DelegatingSolrQueryRequest.java
index 2c9c20d4f06..158f02cdff3 100644
--- a/solr/core/src/java/org/apache/solr/request/DelegatingSolrQueryRequest.java
+++ b/solr/core/src/java/org/apache/solr/request/DelegatingSolrQueryRequest.java
@@ -16,8 +16,7 @@
  */
 package org.apache.solr.request;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
+import io.opentelemetry.api.trace.Span;
 import java.security.Principal;
 import java.util.List;
 import java.util.Map;
@@ -150,11 +149,6 @@ public HttpSolrCall getHttpSolrCall() {
     return delegate.getHttpSolrCall();
   }
 
-  @Override
-  public Tracer getTracer() {
-    return delegate.getTracer();
-  }
-
   @Override
   public Span getSpan() {
     return delegate.getSpan();
diff --git a/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java
index 613ae31d438..113aeff6440 100644
--- a/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java
+++ b/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java
@@ -16,10 +16,7 @@
  */
 package org.apache.solr.request;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.noop.NoopSpan;
-import io.opentracing.util.GlobalTracer;
+import io.opentelemetry.api.trace.Span;
 import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
@@ -136,21 +133,16 @@ default HttpSolrCall getHttpSolrCall() {
     return null;
   }
 
-  /**
-   * Distributed tracing Tracer. Never null but might implement {@link
-   * io.opentracing.noop.NoopTracer}.
-   */
-  default Tracer getTracer() {
-    return GlobalTracer.get(); // default impl is only for some tests
-  }
-
   /**
    * The distributed tracing Span for the request itself; never null. This is useful for adding tags
-   * or updating the operation name of the request span. If you need the current span, which might
-   * not necessarily be the request span, do this instead: {@code tracer.activeSpan()}.
+   * or updating the operation name of the request span. Not null.
    */
   default Span getSpan() {
-    return NoopSpan.INSTANCE;
+    final HttpSolrCall call = getHttpSolrCall();
+    if (call != null) {
+      return call.getSpan();
+    }
+    return Span.getInvalid();
   }
 
   default CoreContainer getCoreContainer() {
diff --git a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java
index f1034b00bec..363022c3979 100644
--- a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java
+++ b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java
@@ -16,10 +16,6 @@
  */
 package org.apache.solr.request;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.noop.NoopSpan;
-import io.opentracing.util.GlobalTracer;
 import java.io.Closeable;
 import java.security.Principal;
 import java.util.Collections;
@@ -38,7 +34,6 @@
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.servlet.HttpSolrCall;
 import org.apache.solr.util.RTimerTree;
 import org.apache.solr.util.RefCounted;
 
@@ -145,33 +140,6 @@ public IndexSchema getSchema() {
     return schema;
   }
 
-  @Override
-  public Tracer getTracer() {
-    final HttpSolrCall call = getHttpSolrCall();
-    if (call != null) {
-      final Tracer tracer = (Tracer) call.getReq().getAttribute(Tracer.class.getName());
-      if (tracer != null) {
-        return tracer;
-      }
-    }
-    if (core != null) {
-      return core.getCoreContainer().getTracer();
-    }
-    return GlobalTracer.get(); // this way is not ideal (particularly in tests) but it's okay
-  }
-
-  @Override
-  public Span getSpan() {
-    final HttpSolrCall call = getHttpSolrCall();
-    if (call != null) {
-      final Span span = (Span) call.getReq().getAttribute(Span.class.getName());
-      if (span != null) {
-        return span;
-      }
-    }
-    return NoopSpan.INSTANCE;
-  }
-
   @Override
   public void updateSchemaToLatest() {
     schema = core.getLatestSchema();
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index dbee25ec32f..f1e5a25693c 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -32,8 +32,7 @@
 import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETRY;
 import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETURN;
 
-import io.opentracing.Span;
-import io.opentracing.tag.Tags;
+import io.opentelemetry.api.trace.Span;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +49,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -626,10 +624,14 @@ protected void handleAdminOrRemoteRequest() throws IOException {
         "handleOrForwardRequest should not be invoked when serving v1 requests.");
   }
 
-  /** Get the span for this request. Not null. */
-  protected Span getSpan() {
-    // Span was put into the request by SolrDispatchFilter
-    return (Span) Objects.requireNonNull(req.getAttribute(Span.class.getName()));
+  /** Get the Span for this request. Not null. */
+  public Span getSpan() {
+    var s = TraceUtils.getSpan(req);
+    if (s != null) {
+      return s;
+    } else {
+      return Span.getInvalid();
+    }
   }
 
   // called after init().
@@ -639,9 +641,7 @@ protected void populateTracingSpan(Span span) {
     if (coreOrColName == null && getCore() != null) {
       coreOrColName = getCore().getName();
     }
-    if (coreOrColName != null) {
-      span.setTag(Tags.DB_INSTANCE, coreOrColName);
-    }
+    TraceUtils.setDbInstance(span, coreOrColName);
 
     // Set operation name.
     String path = getPath();
@@ -655,7 +655,7 @@ protected void populateTracingSpan(Span span) {
     }
     String verb =
         getQueryParams().get(CoreAdminParams.ACTION, req.getMethod()).toLowerCase(Locale.ROOT);
-    span.setOperationName(verb + ":" + path);
+    span.updateName(verb + ":" + path);
   }
 
   public boolean shouldAudit() {
diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
index a286078dafb..5297fe44401 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
@@ -17,12 +17,8 @@
 
 package org.apache.solr.servlet;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.noop.NoopSpan;
-import io.opentracing.noop.NoopTracer;
-import io.opentracing.propagation.Format;
-import io.opentracing.tag.Tags;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.context.Context;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -45,7 +41,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.logging.MDCLoggingContext;
-import org.apache.solr.util.tracing.HttpServletCarrier;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -234,15 +230,14 @@ static void rateLimitRequest(
   private static void traceHttpRequestExecution2(
       HttpServletRequest request, HttpServletResponse response, Runnable tracedExecution)
       throws ServletException, IOException {
-    Tracer tracer = getTracer(request);
-    Span span = buildSpan(tracer, request);
-
-    request.setAttribute(SolrDispatchFilter.ATTR_TRACING_SPAN, span);
-    try (var scope = tracer.scopeManager().activate(span)) {
+    Context context = TraceUtils.extractContext(request);
+    Span span = TraceUtils.startHttpRequestSpan(request, context);
 
+    try (var scope = context.with(span).makeCurrent()) {
       assert scope != null; // prevent javac warning about scope being unused
-      MDCLoggingContext.setTracerId(span.context().toTraceId()); // handles empty string
-
+      TraceUtils.setSpan(request, span);
+      TraceUtils.ifNotNoop(
+          span, s -> MDCLoggingContext.setTracerId(s.getSpanContext().getTraceId()));
       tracedExecution.run();
     } catch (ExceptionWhileTracing e) {
       if (e.e instanceof SolrAuthenticationException) {
@@ -261,31 +256,9 @@ private static void traceHttpRequestExecution2(
         throw new RuntimeException(e.e);
       }
     } finally {
-      span.setTag(Tags.HTTP_STATUS, response.getStatus());
-      span.finish();
-    }
-  }
-
-  private static Tracer getTracer(HttpServletRequest req) {
-    return (Tracer) req.getAttribute(SolrDispatchFilter.ATTR_TRACING_TRACER);
-  }
-
-  protected static Span buildSpan(Tracer tracer, HttpServletRequest request) {
-    if (tracer instanceof NoopTracer) {
-      return NoopSpan.INSTANCE;
-    }
-    Tracer.SpanBuilder spanBuilder =
-        tracer
-            .buildSpan("http.request") // will be changed later
-            .asChildOf(tracer.extract(Format.Builtin.HTTP_HEADERS, new HttpServletCarrier(request)))
-            .withTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
-            .withTag(Tags.HTTP_METHOD, request.getMethod())
-            .withTag(Tags.HTTP_URL, request.getRequestURL().toString());
-    if (request.getQueryString() != null) {
-      spanBuilder.withTag("http.params", request.getQueryString());
+      TraceUtils.setHttpStatus(span, response.getStatus());
+      span.end();
     }
-    spanBuilder.withTag(Tags.DB_TYPE, "solr");
-    return spanBuilder.start();
   }
 
   // we make sure we read the full client request so that the client does
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index cfd9836c4ed..7b9c2b7e90c 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -16,16 +16,13 @@
  */
 package org.apache.solr.servlet;
 
-import static org.apache.solr.security.AuditEvent.EventType;
 import static org.apache.solr.servlet.ServletUtils.closeShield;
 import static org.apache.solr.servlet.ServletUtils.configExcludes;
 import static org.apache.solr.servlet.ServletUtils.excludedPath;
+import static org.apache.solr.util.tracing.TraceUtils.getSpan;
+import static org.apache.solr.util.tracing.TraceUtils.setTracer;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.tag.Tags;
-import io.opentracing.util.GlobalTracer;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
@@ -54,10 +51,12 @@
 import org.apache.solr.logging.MDCSnapshot;
 import org.apache.solr.request.SolrRequestInfo;
 import org.apache.solr.security.AuditEvent;
+import org.apache.solr.security.AuditEvent.EventType;
 import org.apache.solr.security.AuthenticationPlugin;
 import org.apache.solr.security.PKIAuthenticationPlugin;
 import org.apache.solr.security.PublicKeyHandler;
 import org.apache.solr.servlet.CoreContainerProvider.ServiceHolder;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,8 +72,6 @@
 // things like CoreContainer can be requested. (or better yet injected)
 public class SolrDispatchFilter extends BaseSolrFilter implements PathExcluder {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  public static final String ATTR_TRACING_SPAN = Span.class.getName();
-  public static final String ATTR_TRACING_TRACER = Tracer.class.getName();
 
   // TODO: see if we can get rid of the holder here (Servlet spec actually guarantees
   // ContextListeners run before filter init, but JettySolrRunner that we use for tests is
@@ -206,8 +203,7 @@ public void doFilter(
     if (excludedPath(excludePatterns, request, response, chain)) {
       return;
     }
-    Tracer t = getCores() == null ? GlobalTracer.get() : getCores().getTracer();
-    request.setAttribute(ATTR_TRACING_TRACER, t);
+    setTracer(request, getCores().getTracer());
     RateLimitManager rateLimitManager = coreService.getService().getRateLimitManager();
     try {
       ServletUtils.rateLimitRequest(
@@ -228,10 +224,6 @@ public void doFilter(
     }
   }
 
-  private static Span getSpan(HttpServletRequest req) {
-    return (Span) req.getAttribute(ATTR_TRACING_SPAN);
-  }
-
   private void dispatch(
       FilterChain chain, HttpServletRequest request, HttpServletResponse response, boolean retry)
       throws IOException, ServletException, SolrAuthenticationException {
@@ -242,11 +234,12 @@ private void dispatch(
       request = wrappedRequest.get();
     }
 
+    var span = getSpan(request);
     if (getCores().getAuthenticationPlugin() != null) {
       if (log.isDebugEnabled()) {
         log.debug("User principal: {}", request.getUserPrincipal());
       }
-      getSpan(request).setTag(Tags.DB_USER, String.valueOf(request.getUserPrincipal()));
+      TraceUtils.setUser(span, String.valueOf(request.getUserPrincipal()));
     }
 
     HttpSolrCall call = getHttpSolrCall(request, response, retry);
@@ -255,15 +248,15 @@ private void dispatch(
       Action result = call.call();
       switch (result) {
         case PASSTHROUGH:
-          getSpan(request).log("SolrDispatchFilter PASSTHROUGH");
+          span.addEvent("SolrDispatchFilter PASSTHROUGH");
           chain.doFilter(request, response);
           break;
         case RETRY:
-          getSpan(request).log("SolrDispatchFilter RETRY");
+          span.addEvent("SolrDispatchFilter RETRY");
           doFilter(request, response, chain, true); // RECURSION
           break;
         case FORWARD:
-          getSpan(request).log("SolrDispatchFilter FORWARD");
+          span.addEvent("SolrDispatchFilter FORWARD");
           request.getRequestDispatcher(call.getPath()).forward(request, response);
           break;
         case ADMIN:
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index b7687d4eb1b..b40c79a166f 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -16,9 +16,6 @@
  */
 package org.apache.solr.update;
 
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,7 +49,7 @@
 import org.apache.solr.update.processor.DistributedUpdateProcessor;
 import org.apache.solr.update.processor.DistributedUpdateProcessor.LeaderRequestReplicationTracker;
 import org.apache.solr.update.processor.DistributedUpdateProcessor.RollupRequestReplicationTracker;
-import org.apache.solr.util.tracing.SolrRequestCarrier;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -314,13 +311,7 @@ private void submit(final Req req, boolean isCommit) throws IOException {
     if (SolrRequestInfo.getRequestInfo() != null) {
       req.uReq.setUserPrincipal(SolrRequestInfo.getRequestInfo().getReq().getUserPrincipal());
     }
-
-    Tracer tracer = req.cmd.getTracer();
-    Span parentSpan = tracer.activeSpan();
-    if (parentSpan != null) {
-      tracer.inject(
-          parentSpan.context(), Format.Builtin.HTTP_HEADERS, new SolrRequestCarrier(req.uReq));
-    }
+    TraceUtils.injectContextIntoRequest(req.uReq);
 
     if (req.synchronous) {
       blockAndDoRetries();
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateCommand.java b/solr/core/src/java/org/apache/solr/update/UpdateCommand.java
index 9714d712dae..79bbda1f3d3 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateCommand.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateCommand.java
@@ -16,13 +16,11 @@
  */
 package org.apache.solr.update;
 
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
 import org.apache.solr.request.SolrQueryRequest;
 
 /** An index update command encapsulated in an object (Command pattern) */
 public abstract class UpdateCommand implements Cloneable {
-  protected SolrQueryRequest req;
+  protected final SolrQueryRequest req;
   protected long version;
   protected String route;
   protected int flags;
@@ -91,18 +89,6 @@ public SolrQueryRequest getReq() {
     return req;
   }
 
-  public void setReq(SolrQueryRequest req) {
-    this.req = req;
-  }
-
-  /**
-   * Distributed tracing Tracer. Never null but might implement {@link
-   * io.opentracing.noop.NoopTracer}.
-   */
-  public Tracer getTracer() {
-    return (req != null) ? req.getTracer() : GlobalTracer.get();
-  }
-
   @Override
   public UpdateCommand clone() {
     try {
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
deleted file mode 100644
index 21ce05e29d1..00000000000
--- a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
+++ /dev/null
@@ -1,92 +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.util.tracing;
-
-import io.opentracing.propagation.TextMap;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import javax.servlet.http.HttpServletRequest;
-
-/** A Carrier for extract Span context out of request headers */
-public class HttpServletCarrier implements TextMap {
-  private Iterator<Map.Entry<String, String>> it;
-
-  public HttpServletCarrier(HttpServletRequest request) {
-    this.it =
-        new Iterator<>() {
-
-          Enumeration<String> headerNameIt = request.getHeaderNames();
-          String headerName = null;
-          Enumeration<String> headerValue = null;
-
-          @Override
-          public boolean hasNext() {
-            if (headerValue != null && headerValue.hasMoreElements()) {
-              return true;
-            }
-
-            return headerNameIt.hasMoreElements();
-          }
-
-          @Override
-          public Map.Entry<String, String> next() {
-            if (!hasNext()) {
-              throw new NoSuchElementException();
-            }
-
-            if (headerValue == null || !headerValue.hasMoreElements()) {
-              headerName = headerNameIt.nextElement();
-              headerValue = request.getHeaders(headerName);
-            }
-
-            String key = headerName;
-            String val = headerValue.nextElement();
-
-            return new Map.Entry<>() {
-              @Override
-              public String getKey() {
-                return key;
-              }
-
-              @Override
-              public String getValue() {
-                return val;
-              }
-
-              @Override
-              public String setValue(String value) {
-                throw new UnsupportedOperationException();
-              }
-            };
-          }
-        };
-  }
-
-  @Override
-  public Iterator<Map.Entry<String, String>> iterator() {
-    return it;
-  }
-
-  @Override
-  public void put(String key, String value) {
-    throw new UnsupportedOperationException(
-        "HttpServletCarrier should only be used with Tracer.extract()");
-  }
-}
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
new file mode 100644
index 00000000000..f2756566ed9
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
@@ -0,0 +1,46 @@
+/*
+ * 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.util.tracing;
+
+import io.opentelemetry.context.propagation.TextMapGetter;
+import java.util.Iterator;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * {@code HttpServletRequest} aware {@code TextMapGetter} that allows header data to be extracted
+ * from a request
+ */
+public class HttpServletRequestGetter implements TextMapGetter<HttpServletRequest> {
+
+  @Override
+  public Iterable<String> keys(HttpServletRequest carrier) {
+    return new Iterable<String>() {
+      @Override
+      public Iterator<String> iterator() {
+        return carrier.getHeaderNames().asIterator();
+      }
+    };
+  }
+
+  @Override
+  public String get(HttpServletRequest carrier, String key) {
+    if (carrier == null) {
+      return null;
+    }
+    return carrier.getHeader(key);
+  }
+}
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/SolrRequestCarrier.java b/solr/core/src/java/org/apache/solr/util/tracing/SolrRequestSetter.java
similarity index 60%
rename from solr/core/src/java/org/apache/solr/util/tracing/SolrRequestCarrier.java
rename to solr/core/src/java/org/apache/solr/util/tracing/SolrRequestSetter.java
index 6f4917e1b8f..0923d9db014 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/SolrRequestCarrier.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/SolrRequestSetter.java
@@ -17,27 +17,16 @@
 
 package org.apache.solr.util.tracing;
 
-import io.opentracing.propagation.TextMap;
-import java.util.Iterator;
-import java.util.Map;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.solr.client.solrj.SolrRequest;
 
-/** An OpenTracing Carrier for injecting Span context through SolrRequest */
-public class SolrRequestCarrier implements TextMap {
-
-  private final SolrRequest<?> solrRequest;
-
-  public SolrRequestCarrier(SolrRequest<?> solrRequest) {
-    this.solrRequest = solrRequest;
-  }
-
-  @Override
-  public Iterator<Map.Entry<String, String>> iterator() {
-    throw new UnsupportedOperationException("carrier is write-only");
-  }
+/**
+ * {@code SolrRequest} aware {@code TextMapSetter} that allows header data to be added to a request
+ */
+public class SolrRequestSetter implements TextMapSetter<SolrRequest<?>> {
 
   @Override
-  public void put(String key, String value) {
-    solrRequest.addHeader(key, value);
+  public void set(SolrRequest<?> request, String key, String value) {
+    request.addHeader(key, value);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index c7d2f0f0fd9..3505f4daac6 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -16,24 +16,128 @@
  */
 package org.apache.solr.util.tracing;
 
-import io.opentracing.Span;
-import io.opentracing.noop.NoopSpan;
-import io.opentracing.tag.Tags;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.util.function.Consumer;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.request.SolrQueryRequest;
 
 /** Utilities for distributed tracing. */
 public class TraceUtils {
 
+  private static final String REQ_ATTR_TRACING_SPAN = Span.class.getName();
+  private static final String REQ_ATTR_TRACING_TRACER = Tracer.class.getName();
+  private static final Tracer NOOP_TRACER = TracerProvider.noop().get(null);
+
+  public static final String DEFAULT_SPAN_NAME = "http.request";
+  public static final String WRITE_QUERY_RESPONSE_SPAN_NAME = "writeQueryResponse";
+
+  public static final AttributeKey<String> TAG_DB = AttributeKey.stringKey("db.instance");
+  public static final AttributeKey<String> TAG_DB_TYPE = AttributeKey.stringKey("db.type");
+  public static final AttributeKey<String> TAG_USER = AttributeKey.stringKey("db.user");
+  public static final AttributeKey<Long> TAG_HTTP_STATUS =
+      AttributeKey.longKey("http.response.status_code");
+  public static final AttributeKey<String> TAG_HTTP_METHOD =
+      AttributeKey.stringKey("http.request.method");
+  public static final AttributeKey<String> TAG_HTTP_URL = AttributeKey.stringKey("http.url");
+  public static final AttributeKey<String> TAG_HTTP_PARAMS = AttributeKey.stringKey("http.params");
+  public static final AttributeKey<String> TAG_RESPONSE_WRITER =
+      AttributeKey.stringKey("responseWriter");
+  public static final AttributeKey<String> TAG_CONTENT_TYPE = AttributeKey.stringKey("contentType");
+
+  @Deprecated
+  private static final AttributeKey<String> TAG_HTTP_METHOD_DEP =
+      AttributeKey.stringKey("http.method");
+
+  @Deprecated
+  private static final AttributeKey<Long> TAG_HTTP_STATUS_DEP =
+      AttributeKey.longKey("http.status_code");
+
+  public static final String TAG_DB_TYPE_SOLR = "solr";
+
+  public static Tracer noop() {
+    return NOOP_TRACER;
+  }
+
+  public static TextMapPropagator getTextMapPropagator() {
+    return GlobalOpenTelemetry.getPropagators().getTextMapPropagator();
+  }
+
   public static void setDbInstance(SolrQueryRequest req, String coreOrColl) {
-    if (req != null && coreOrColl != null) {
-      ifNotNoop(req.getSpan(), (span) -> span.setTag(Tags.DB_INSTANCE, coreOrColl));
+    if (req != null) {
+      setDbInstance(req.getSpan(), coreOrColl);
+    }
+  }
+
+  public static void setDbInstance(Span span, String coreOrColName) {
+    if (coreOrColName != null) {
+      span.setAttribute(TAG_DB, coreOrColName);
     }
   }
 
+  public static void setUser(Span span, String user) {
+    span.setAttribute(TAG_USER, user);
+  }
+
+  public static void setHttpStatus(Span span, int httpStatus) {
+    span.setAttribute(TAG_HTTP_STATUS, httpStatus);
+    span.setAttribute(TAG_HTTP_STATUS_DEP, httpStatus);
+  }
+
   public static void ifNotNoop(Span span, Consumer<Span> consumer) {
-    if (span != null && !(span instanceof NoopSpan)) {
+    if (span.isRecording()) {
       consumer.accept(span);
     }
   }
+
+  public static void setSpan(HttpServletRequest req, Span span) {
+    req.setAttribute(REQ_ATTR_TRACING_SPAN, span);
+  }
+
+  public static Span getSpan(HttpServletRequest req) {
+    return (Span) req.getAttribute(REQ_ATTR_TRACING_SPAN);
+  }
+
+  public static void setTracer(HttpServletRequest req, Tracer t) {
+    req.setAttribute(REQ_ATTR_TRACING_TRACER, t);
+  }
+
+  public static Tracer getTracer(HttpServletRequest req) {
+    return (Tracer) req.getAttribute(REQ_ATTR_TRACING_TRACER);
+  }
+
+  public static Context extractContext(HttpServletRequest req) {
+    TextMapPropagator textMapPropagator = getTextMapPropagator();
+    return textMapPropagator.extract(Context.current(), req, new HttpServletRequestGetter());
+  }
+
+  public static void injectContextIntoRequest(SolrRequest<?> req) {
+    TextMapPropagator textMapPropagator = getTextMapPropagator();
+    textMapPropagator.inject(Context.current(), req, new SolrRequestSetter());
+  }
+
+  public static Span startHttpRequestSpan(HttpServletRequest request, Context context) {
+    Tracer tracer = getTracer(request);
+    SpanBuilder spanBuilder =
+        tracer
+            .spanBuilder(DEFAULT_SPAN_NAME) // will be changed later
+            .setParent(context)
+            .setSpanKind(SpanKind.SERVER)
+            .setAttribute(TAG_HTTP_METHOD, request.getMethod())
+            .setAttribute(TAG_HTTP_METHOD_DEP, request.getMethod())
+            .setAttribute(TAG_HTTP_URL, request.getRequestURL().toString());
+    if (request.getQueryString() != null) {
+      spanBuilder.setAttribute(TAG_HTTP_PARAMS, request.getQueryString());
+    }
+    spanBuilder.setAttribute(TAG_DB_TYPE, TAG_DB_TYPE_SOLR);
+    return spanBuilder.startSpan();
+  }
 }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/AddReplicaPropertyAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/AddReplicaPropertyAPITest.java
index 501d22b130c..6de9c823536 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/AddReplicaPropertyAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/AddReplicaPropertyAPITest.java
@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import io.opentracing.noop.NoopSpan;
+import io.opentelemetry.api.trace.Span;
 import java.util.Map;
 import java.util.Optional;
 import org.apache.solr.SolrTestCaseJ4;
@@ -73,7 +73,7 @@ public void setUp() throws Exception {
     when(mockCommandRunner.runCollectionCommand(any(), any(), anyLong()))
         .thenReturn(new OverseerSolrResponse(new NamedList<>()));
     mockQueryRequest = mock(SolrQueryRequest.class);
-    when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE);
+    when(mockQueryRequest.getSpan()).thenReturn(Span.getInvalid());
     queryResponse = new SolrQueryResponse();
     messageCapturer = ArgumentCaptor.forClass(ZkNodeProps.class);
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/CoreReplicationAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/CoreReplicationAPITest.java
index 19fd1ea96e2..e6fe9edad0b 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/CoreReplicationAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/CoreReplicationAPITest.java
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import io.opentracing.noop.NoopSpan;
+import io.opentelemetry.api.trace.Span;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,7 +53,7 @@ public void setUp() throws Exception {
     super.setUp();
     setUpMocks();
     mockQueryRequest = mock(SolrQueryRequest.class);
-    when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE);
+    when(mockQueryRequest.getSpan()).thenReturn(Span.getInvalid());
     queryResponse = new SolrQueryResponse();
     coreReplicationAPI = new CoreReplicationAPIMock(mockCore, mockQueryRequest, queryResponse);
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
index 4cb4d065e36..2a6607c40b6 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import io.opentracing.noop.NoopSpan;
+import io.opentelemetry.api.trace.Span;
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
@@ -67,7 +67,7 @@ public void setUp() throws Exception {
     when(mockCoreContainer.getZkController()).thenReturn(zkController);
 
     mockQueryRequest = mock(SolrQueryRequest.class);
-    when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE);
+    when(mockQueryRequest.getSpan()).thenReturn(Span.getInvalid());
     queryResponse = new SolrQueryResponse();
 
     getAliasesAPI = new ListAliasesAPI(mockCoreContainer, mockQueryRequest, queryResponse);
diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
similarity index 54%
rename from solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java
rename to solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
index 4001af36b1c..d2b5fdf9bbb 100644
--- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java
+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
@@ -17,10 +17,6 @@
 
 package org.apache.solr.util.tracing;
 
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -29,37 +25,43 @@
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.solr.SolrTestCaseJ4;
+import javax.servlet.http.HttpServletRequestWrapper;
+import org.apache.solr.SolrTestCase;
+import org.eclipse.jetty.server.Request;
 import org.junit.Test;
-import org.mockito.stubbing.Answer;
 
-public class TestHttpServletCarrier extends SolrTestCaseJ4 {
+public class TestHttpServletRequestGetter extends SolrTestCase {
 
   @Test
   public void test() {
-    SolrTestCaseJ4.assumeWorkingMockito();
-    HttpServletRequest req = mock(HttpServletRequest.class);
     Map<String, Set<String>> headers =
         Map.of(
-            "a", Set.of("a", "b", "c"),
-            "b", Set.of("a", "b"),
-            "c", Set.of("a"));
+            "a", Set.of("0"),
+            "b", Set.of("1"),
+            "c", Set.of("2"));
+
+    HttpServletRequest req =
+        new HttpServletRequestWrapper(new Request(null, null)) {
+
+          @Override
+          public String getHeader(String name) {
+            return headers.get(name).iterator().next();
+          }
 
-    when(req.getHeaderNames()).thenReturn(Collections.enumeration(headers.keySet()));
-    when(req.getHeaders(anyString()))
-        .thenAnswer(
-            (Answer<Enumeration<String>>)
-                inv -> {
-                  String key = inv.getArgument(0);
-                  return Collections.enumeration(headers.get(key));
-                });
+          @Override
+          public Enumeration<String> getHeaderNames() {
+            return Collections.enumeration(headers.keySet());
+          }
+        };
 
-    HttpServletCarrier servletCarrier = new HttpServletCarrier(req);
-    Iterator<Map.Entry<String, String>> it = servletCarrier.iterator();
+    HttpServletRequestGetter httpServletRequestGetter = new HttpServletRequestGetter();
+    Iterator<String> it = httpServletRequestGetter.keys(req).iterator();
     Map<String, Set<String>> resultBack = new HashMap<>();
     while (it.hasNext()) {
-      Map.Entry<String, String> entry = it.next();
-      resultBack.computeIfAbsent(entry.getKey(), k -> new HashSet<>()).add(entry.getValue());
+      String key = it.next();
+      resultBack
+          .computeIfAbsent(key, k -> new HashSet<>())
+          .add(httpServletRequestGetter.get(req, key));
     }
     assertEquals(headers, resultBack);
   }
diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
deleted file mode 100644
index 1d378f65bc4..00000000000
--- a/solr/licenses/opentelemetry-opentracing-shim-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbe64aea8ea3811911bf6e572f96ec0bc745948d
diff --git a/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
new file mode 100644
index 00000000000..87fa435be2c
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
@@ -0,0 +1 @@
+3f36cd924e7631a6888d2280a3b368b3dce3acfc
diff --git a/solr/licenses/opentracing-api-0.33.0.jar.sha1 b/solr/licenses/opentracing-api-0.33.0.jar.sha1
deleted file mode 100644
index c7b2aafb365..00000000000
--- a/solr/licenses/opentracing-api-0.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-67336cfb9d93779c02e1fda4c87801d352720eda
diff --git a/solr/licenses/opentracing-api-LICENSE-ASL.txt b/solr/licenses/opentracing-api-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/opentracing-api-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/opentracing-api-NOTICE.txt b/solr/licenses/opentracing-api-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/opentracing-mock-0.33.0.jar.sha1 b/solr/licenses/opentracing-mock-0.33.0.jar.sha1
deleted file mode 100644
index 684a6c3d912..00000000000
--- a/solr/licenses/opentracing-mock-0.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68f907743a5b355a8e975fdd3df0d2e106bbad6c
diff --git a/solr/licenses/opentracing-mock-LICENSE-ASL.txt b/solr/licenses/opentracing-mock-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/opentracing-mock-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/opentracing-mock-NOTICE.txt b/solr/licenses/opentracing-mock-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/opentracing-noop-0.33.0.jar.sha1 b/solr/licenses/opentracing-noop-0.33.0.jar.sha1
deleted file mode 100644
index ea4e70775a2..00000000000
--- a/solr/licenses/opentracing-noop-0.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-074b9950a587f53fbdb48c3f1f84f1ece8c10592
diff --git a/solr/licenses/opentracing-noop-LICENSE-ASL.txt b/solr/licenses/opentracing-noop-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/opentracing-noop-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/opentracing-noop-NOTICE.txt b/solr/licenses/opentracing-noop-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/opentracing-util-0.33.0.jar.sha1 b/solr/licenses/opentracing-util-0.33.0.jar.sha1
deleted file mode 100644
index b0c42dcc5bf..00000000000
--- a/solr/licenses/opentracing-util-0.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-132630f17e198a1748f23ce33597efdf4a807fb9
diff --git a/solr/licenses/opentracing-util-LICENSE-ASL.txt b/solr/licenses/opentracing-util-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/opentracing-util-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/opentracing-util-NOTICE.txt b/solr/licenses/opentracing-util-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradle
index 444d3c6ffb4..4426f67649e 100644
--- a/solr/modules/opentelemetry/build.gradle
+++ b/solr/modules/opentelemetry/build.gradle
@@ -21,17 +21,13 @@ description = 'Open Telemetry (OTEL) tracer'
 
 dependencies {
   implementation project(':solr:core')
+  implementation project(':solr:solrj')
 
   implementation platform('io.opentelemetry:opentelemetry-bom')
-
-  implementation 'io.opentracing:opentracing-api'
   implementation 'org.slf4j:slf4j-api'
 
-  implementation 'io.opentelemetry:opentelemetry-sdk'
-  implementation 'io.opentelemetry:opentelemetry-sdk-trace'
+  implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure'
-  implementation 'io.opentelemetry:opentelemetry-opentracing-shim'
-  runtimeOnly 'io.opentelemetry:opentelemetry-semconv'
   runtimeOnly 'io.opentelemetry:opentelemetry-exporter-otlp'
   // End users must recompile with jaeger exporter and/or zipkin exporter if they need these
 
@@ -46,8 +42,8 @@ dependencies {
   compileOnly 'org.apache.tomcat:annotations-api'
 
   testImplementation project(':solr:test-framework')
-  testImplementation project(':solr:solrj')
-  testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
   testImplementation 'junit:junit'
-  testImplementation 'io.opentracing:opentracing-util'
+  testImplementation 'io.opentelemetry:opentelemetry-sdk'
+  testImplementation 'io.opentelemetry:opentelemetry-sdk-trace'
+  testImplementation 'io.opentelemetry:opentelemetry-sdk-testing'
 }
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java
deleted file mode 100644
index ee7fb962ce9..00000000000
--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java
+++ /dev/null
@@ -1,85 +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.opentelemetry;
-
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentracing.Scope;
-import io.opentracing.ScopeManager;
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format;
-import java.lang.invoke.MethodHandles;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Delegate shim that forwards all calls to the actual {@link
- * io.opentelemetry.opentracingshim.OpenTracingShim}, and in addition calls {@link
- * SdkTracerProvider#close()} to really close the OTEL SDK tracer when the OT shim is closed.
- *
- * <p>TODO: This can be removed once we migrate Solr instrumentation from OpenTracing to
- * OpenTelemetry
- */
-public class ClosableTracerShim implements Tracer {
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private final Tracer shim;
-  private final SdkTracerProvider sdkTracerProvider;
-
-  public ClosableTracerShim(Tracer shim, SdkTracerProvider sdkTracerProvider) {
-    this.shim = shim;
-    this.sdkTracerProvider = sdkTracerProvider;
-  }
-
-  @Override
-  public ScopeManager scopeManager() {
-    return shim.scopeManager();
-  }
-
-  @Override
-  public Span activeSpan() {
-    return shim.activeSpan();
-  }
-
-  @Override
-  public Scope activateSpan(Span span) {
-    return shim.activateSpan(span);
-  }
-
-  @Override
-  public SpanBuilder buildSpan(String operationName) {
-    return shim.buildSpan(operationName);
-  }
-
-  @Override
-  public <C> void inject(SpanContext spanContext, Format<C> format, C carrier) {
-    shim.inject(spanContext, format, carrier);
-  }
-
-  @Override
-  public <C> SpanContext extract(Format<C> format, C carrier) {
-    return shim.extract(format, carrier);
-  }
-
-  @Override
-  public void close() {
-    shim.close();
-    log.debug("Closing wrapped OTEL tracer instance.");
-    sdkTracerProvider.forceFlush();
-    sdkTracerProvider.close();
-  }
-}
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
index 6b876c7c1b6..25d819718dc 100644
--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
@@ -16,10 +16,9 @@
  */
 package org.apache.solr.opentelemetry;
 
-import io.opentelemetry.opentracingshim.OpenTracingShim;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentracing.Tracer;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -27,26 +26,45 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.TracerConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * OpenTracing TracerConfigurator implementation which exports spans to OpenTelemetry in OTLP
- * format. This impl re-uses the existing OpenTracing instrumentation through a shim, and takes care
- * of properly closing the backing Tracer when Solr shuts down.
+ * Tracing TracerConfigurator implementation which exports spans to OpenTelemetry in OTLP format.
  */
 public class OtelTracerConfigurator extends TracerConfigurator {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  // Copy of environment. Can be overridden by tests
-  Map<String, String> currentEnv = System.getenv();
+
+  private final Map<String, String> currentEnv;
+
+  public OtelTracerConfigurator() {
+    this(System.getenv());
+  }
+
+  OtelTracerConfigurator(Map<String, String> currentEnv) {
+    this.currentEnv = currentEnv;
+  }
 
   @Override
   public Tracer getTracer() {
+    // TODO remove reliance on global
+    return GlobalOpenTelemetry.getTracer("solr");
+  }
+
+  @Override
+  public void init(NamedList<?> args) {
+    prepareConfiguration();
+    AutoConfiguredOpenTelemetrySdk.initialize();
+  }
+
+  void prepareConfiguration() {
     setDefaultIfNotConfigured("OTEL_SERVICE_NAME", "solr");
     setDefaultIfNotConfigured("OTEL_TRACES_EXPORTER", "otlp");
     setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
     setDefaultIfNotConfigured("OTEL_TRACES_SAMPLER", "parentbased_always_on");
+    setDefaultIfNotConfigured("OTEL_PROPAGATORS", "tracecontext,baggage");
     addOtelResourceAttributes(Map.of("host.name", System.getProperty("host")));
 
     final String currentConfig = getCurrentOtelConfigAsString();
@@ -62,10 +80,6 @@ public Tracer getTracer() {
     }
     System.setProperty("otel.metrics.exporter", "none");
     System.setProperty("otel.logs.exporter", "none");
-
-    OpenTelemetrySdk otelSdk = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk();
-    Tracer shim = OpenTracingShim.createTracerShim(otelSdk);
-    return new ClosableTracerShim(shim, otelSdk.getSdkTracerProvider());
   }
 
   /**
diff --git a/solr/modules/opentelemetry/src/test-files/solr/solr.xml b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
index 6ad63be5e84..76926369f0d 100644
--- a/solr/modules/opentelemetry/src/test-files/solr/solr.xml
+++ b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
@@ -34,7 +34,7 @@
     <int name="connTimeout">${connTimeout:15000}</int>
   </shardHandlerFactory>
 
-  <tracerConfig name="tracerConfig" class="org.apache.solr.opentelemetry.OtelTracerConfigurator" />
+  <tracerConfig name="tracerConfig" class="org.apache.solr.opentelemetry.CustomTestOtelTracerConfigurator" />
 
   <solrcloud>
     <str name="host">127.0.0.1</str>
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
new file mode 100644
index 00000000000..bad6cce7d9f
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
@@ -0,0 +1,104 @@
+/*
+ * 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.opentelemetry;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import java.lang.invoke.MethodHandles;
+import org.apache.solr.common.util.NamedList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CustomTestOtelTracerConfigurator extends OtelTracerConfigurator {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  static {
+    if (System.getProperty("host") == null) {
+      System.setProperty("host", "localhost");
+    }
+  }
+
+  private static InMemorySpanExporter exporter;
+  private static volatile boolean isRegistered = false;
+  private static OpenTelemetrySdk otelSdk = null;
+
+  @Override
+  public synchronized Tracer getTracer() {
+    if (!isRegistered) {
+      throw new IllegalStateException(
+          "Tracer is not initialized. you need to call #prepareForTest for correct setup");
+    }
+    return super.getTracer();
+  }
+
+  @Override
+  public void init(NamedList<?> args) {
+    // prevent parent from init otel
+  }
+
+  public static synchronized void prepareForTest() {
+    CustomTestOtelTracerConfigurator.resetForTest();
+    isRegistered = true;
+    System.setProperty("otel.traces.exporter", "none");
+
+    // force early init
+    CustomTestOtelTracerConfigurator tracer = new CustomTestOtelTracerConfigurator();
+    tracer.prepareConfiguration();
+
+    bootOtel();
+  }
+
+  private static void bootOtel() {
+    try {
+      exporter = InMemorySpanExporter.create();
+      otelSdk =
+          AutoConfiguredOpenTelemetrySdk.builder()
+              .setResultAsGlobal()
+              .addTracerProviderCustomizer(
+                  (builder, props) ->
+                      builder.addSpanProcessor(SimpleSpanProcessor.create(exporter)))
+              .build()
+              .getOpenTelemetrySdk();
+    } catch (RuntimeException e) {
+      log.error("Error on OTEL init ", e);
+    }
+  }
+
+  public static InMemorySpanExporter getInMemorySpanExporter() {
+    return exporter;
+  }
+
+  public static synchronized void resetForTest() {
+    if (isRegistered) {
+      isRegistered = false;
+      if (otelSdk != null) {
+        otelSdk.close();
+      }
+      if (exporter != null) {
+        exporter.close();
+        exporter = null;
+      }
+      System.clearProperty("otel.traces.exporter");
+      GlobalOpenTelemetry.resetForTest();
+    }
+  }
+}
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
index 5aef12103da..b4825c4e7fd 100644
--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
@@ -16,18 +16,13 @@
  */
 package org.apache.solr.opentelemetry;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import io.opentracing.util.GlobalTracer;
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.cloud.MiniSolrCloudCluster;
-import org.apache.solr.common.util.ExecutorUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-@ThreadLeakLingering(linger = 10000)
 public class OtelTracerConfiguratorTest extends SolrTestCaseJ4 {
   private OtelTracerConfigurator instance;
 
@@ -35,8 +30,7 @@ public class OtelTracerConfiguratorTest extends SolrTestCaseJ4 {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    instance = new OtelTracerConfigurator();
-    instance.currentEnv =
+    Map<String, String> currentEnv =
         Map.of(
             "OTELNOTHERE", "foo",
             "OTEL_K1", "env-k1",
@@ -44,10 +38,8 @@ public void setUp() throws Exception {
     System.setProperty("otelnothere", "bar");
     System.setProperty("otel.k1", "prop-k1");
     System.setProperty("otel.k3", "prop-k3");
-
-    // to be safe because this test tests tracing.
-    resetGlobalTracer();
-    ExecutorUtil.resetThreadLocalProviders();
+    System.setProperty("host", "my.solr.host");
+    instance = new OtelTracerConfigurator(currentEnv);
   }
 
   @Override
@@ -57,7 +49,8 @@ public void tearDown() throws Exception {
     System.clearProperty("otelnothere");
     System.clearProperty("otel.k1");
     System.clearProperty("otel.k3");
-    System.clearProperty("otel.bsp.export.timeout");
+    System.clearProperty("host");
+    System.clearProperty("otel.resource.attributes");
   }
 
   @Test
@@ -93,28 +86,11 @@ public void testSetDefaultIfNotConfigured() {
   }
 
   @Test
-  public void testInjected() throws Exception {
+  public void testResourceAttributes() throws Exception {
     System.setProperty("otel.resource.attributes", "foo=bar,ILLEGAL-LACKS-VALUE,");
-    System.setProperty("host", "my.solr.host");
-    // Make sure the batch exporter times out before our thread lingering time of 10s
-    instance.setDefaultIfNotConfigured("OTEL_BSP_SCHEDULE_DELAY", "1000");
-    instance.setDefaultIfNotConfigured("OTEL_BSP_EXPORT_TIMEOUT", "2000");
-    MiniSolrCloudCluster cluster =
-        new MiniSolrCloudCluster.Builder(2, createTempDir())
-            .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
-            .withSolrXml(getFile("solr/solr.xml").toPath())
-            .build();
-    try {
-      assertTrue(
-          "Tracer shim not registered with GlobalTracer",
-          GlobalTracer.get().toString().contains("ClosableTracerShim"));
-      assertEquals(
-          List.of("host.name=my.solr.host", "foo=bar"),
-          List.of(System.getProperty("otel.resource.attributes").split(",")));
-    } finally {
-      cluster.shutdown();
-      System.clearProperty("otel.resource.attributes");
-      System.clearProperty("host");
-    }
+    instance.prepareConfiguration();
+    assertEquals(
+        List.of("host.name=my.solr.host", "foo=bar"),
+        List.of(System.getProperty("otel.resource.attributes").split(",")));
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestDistributedTracing.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
similarity index 56%
rename from solr/core/src/test/org/apache/solr/util/tracing/TestDistributedTracing.java
rename to solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
index b28f15e18bd..dea832e87f6 100644
--- a/solr/core/src/test/org/apache/solr/util/tracing/TestDistributedTracing.java
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.solr.util.tracing;
+package org.apache.solr.opentelemetry;
 
-import io.opentracing.mock.MockSpan;
-import io.opentracing.mock.MockTracer;
-import io.opentracing.util.GlobalTracer;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -34,56 +37,60 @@
 import org.apache.solr.client.solrj.response.V2Response;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.util.LogLevel;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@LogLevel("org.apache.solr.core.TracerConfigurator=trace")
 public class TestDistributedTracing extends SolrCloudTestCase {
-  private static final String COLLECTION = "collection1";
 
-  static MockTracer tracer;
+  private static final String COLLECTION = "collection1";
 
   @BeforeClass
-  public static void beforeTest() throws Exception {
-    tracer = new MockTracer();
-    assertTrue(GlobalTracer.registerIfAbsent(tracer));
+  public static void setupCluster() throws Exception {
+    // force early init
+    CustomTestOtelTracerConfigurator.prepareForTest();
 
     configureCluster(4)
-        .addConfig(
-            "config", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
+        .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
+        .withSolrXml(TEST_PATH().resolve("solr.xml"))
         .configure();
+
+    assertNotEquals(
+        "Expecting active otel, not noop impl",
+        TracerProvider.noop(),
+        GlobalOpenTelemetry.get().getTracerProvider());
+
     CollectionAdminRequest.createCollection(COLLECTION, "config", 2, 2)
-        .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
         .process(cluster.getSolrClient());
     cluster.waitForActiveCollection(COLLECTION, 2, 4);
   }
 
   @AfterClass
-  public static void afterTest() {
-    tracer = null;
+  public static void afterClass() {
+    CustomTestOtelTracerConfigurator.resetForTest();
   }
 
   @Test
   public void test() throws IOException, SolrServerException {
     // TODO it would be clearer if we could compare the complete Span tree between reality
-    //   and what we assert it looks like in a structured visual way.
+    // and what we assert it looks like in a structured visual way.
 
+    getAndClearSpans(); // reset
     CloudSolrClient cloudClient = cluster.getSolrClient();
-    List<MockSpan> finishedSpans;
 
     // Indexing
     cloudClient.add(COLLECTION, sdoc("id", "1"));
-    finishedSpans = getAndClearSpans();
-    finishedSpans.removeIf(x -> !x.tags().get("http.url").toString().endsWith("/update"));
+    var finishedSpans = getAndClearSpans();
+    finishedSpans.removeIf(
+        span ->
+            span.getAttributes().get(TraceUtils.TAG_HTTP_URL) == null
+                || !span.getAttributes().get(TraceUtils.TAG_HTTP_URL).endsWith("/update"));
     assertEquals(2, finishedSpans.size());
     assertOneSpanIsChildOfAnother(finishedSpans);
     // core because cloudClient routes to core
-    assertEquals("post:/{core}/update", finishedSpans.get(0).operationName());
-    assertDbInstanceCore(finishedSpans.get(0));
+    assertEquals("post:/{core}/update", finishedSpans.get(0).getName());
+    assertCoreName(finishedSpans.get(0));
 
     cloudClient.add(COLLECTION, sdoc("id", "2"));
     cloudClient.add(COLLECTION, sdoc("id", "3"));
@@ -94,54 +101,58 @@ public void test() throws IOException, SolrServerException {
     // Searching
     cloudClient.query(COLLECTION, new SolrQuery("*:*"));
     finishedSpans = getAndClearSpans();
-    finishedSpans.removeIf(x -> !x.tags().get("http.url").toString().endsWith("/select"));
+    finishedSpans.removeIf(
+        span ->
+            span.getAttributes().get(TraceUtils.TAG_HTTP_URL) == null
+                || !span.getAttributes().get(TraceUtils.TAG_HTTP_URL).endsWith("/select"));
     // one from client to server, 2 for execute query, 2 for fetching documents
     assertEquals(5, finishedSpans.size());
-    assertEquals(1, finishedSpans.stream().filter(s -> s.parentId() == 0).count());
-    long parentId =
+    assertEquals(1, finishedSpans.stream().filter(TestDistributedTracing::isRootSpan).count());
+    var parentTraceId =
         finishedSpans.stream()
-            .filter(s -> s.parentId() == 0)
+            .filter(TestDistributedTracing::isRootSpan)
             .collect(Collectors.toList())
             .get(0)
-            .context()
-            .spanId();
-    for (MockSpan span : finishedSpans) {
-      if (span.parentId() != 0 && parentId != span.parentId()) {
-        fail("All spans must belong to single span, but:" + finishedSpans);
+            .getSpanContext()
+            .getTraceId();
+    for (var span : finishedSpans) {
+      if (isRootSpan(span)) {
+        continue;
       }
+      assertEquals(span.getParentSpanContext().getTraceId(), parentTraceId);
+      assertEquals(span.getTraceId(), parentTraceId);
     }
-    assertEquals("get:/{core}/select", finishedSpans.get(0).operationName());
-    assertDbInstanceCore(finishedSpans.get(0));
+    assertEquals("get:/{core}/select", finishedSpans.get(0).getName());
+    assertCoreName(finishedSpans.get(0));
   }
 
   @Test
   public void testAdminApi() throws Exception {
+    getAndClearSpans(); // reset
     CloudSolrClient cloudClient = cluster.getSolrClient();
-    List<MockSpan> finishedSpans;
 
-    // Admin API call
     cloudClient.request(new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/metrics"));
-    finishedSpans = getAndClearSpans();
-    assertEquals("get:/admin/metrics", finishedSpans.get(0).operationName());
+    var finishedSpans = getAndClearSpans();
+    assertEquals("get:/admin/metrics", finishedSpans.get(0).getName());
 
     CollectionAdminRequest.listCollections(cloudClient);
     finishedSpans = getAndClearSpans();
-    assertEquals("list:/admin/collections", finishedSpans.get(0).operationName());
+    assertEquals("list:/admin/collections", finishedSpans.get(0).getName());
   }
 
   @Test
   public void testV2Api() throws Exception {
+    getAndClearSpans(); // reset
     CloudSolrClient cloudClient = cluster.getSolrClient();
-    List<MockSpan> finishedSpans;
 
     new V2Request.Builder("/collections/" + COLLECTION + "/reload")
         .withMethod(SolrRequest.METHOD.POST)
         .withPayload("{}")
         .build()
         .process(cloudClient);
-    finishedSpans = getAndClearSpans();
-    assertEquals("post:/collections/{collection}/reload", finishedSpans.get(0).operationName());
-    assertDbInstanceColl(finishedSpans.get(0));
+    var finishedSpans = getAndClearSpans();
+    assertEquals("post:/collections/{collection}/reload", finishedSpans.get(0).getName());
+    assertCollectionName(finishedSpans.get(0));
 
     new V2Request.Builder("/c/" + COLLECTION + "/update/json")
         .withMethod(SolrRequest.METHOD.POST)
@@ -150,8 +161,8 @@ public void testV2Api() throws Exception {
         .build()
         .process(cloudClient);
     finishedSpans = getAndClearSpans();
-    assertEquals("post:/c/{collection}/update/json", finishedSpans.get(0).operationName());
-    assertDbInstanceColl(finishedSpans.get(0));
+    assertEquals("post:/c/{collection}/update/json", finishedSpans.get(0).getName());
+    assertCollectionName(finishedSpans.get(0));
 
     final V2Response v2Response =
         new V2Request.Builder("/c/" + COLLECTION + "/select")
@@ -160,36 +171,40 @@ public void testV2Api() throws Exception {
             .build()
             .process(cloudClient);
     finishedSpans = getAndClearSpans();
-    assertEquals("get:/c/{collection}/select", finishedSpans.get(0).operationName());
-    assertDbInstanceColl(finishedSpans.get(0));
+    assertEquals("get:/c/{collection}/select", finishedSpans.get(0).getName());
+    assertCollectionName(finishedSpans.get(0));
     assertEquals(1, ((SolrDocumentList) v2Response.getResponse().get("response")).getNumFound());
   }
 
-  private void assertDbInstanceColl(MockSpan mockSpan) {
-    MatcherAssert.assertThat(mockSpan.tags().get("db.instance"), Matchers.equalTo("collection1"));
+  private static boolean isRootSpan(SpanData span) {
+    return span.getParentSpanContext() == SpanContext.getInvalid();
   }
 
-  private void assertDbInstanceCore(MockSpan mockSpan) {
-    MatcherAssert.assertThat(
-        (String) mockSpan.tags().get("db.instance"), Matchers.startsWith("collection1_"));
+  private static void assertCollectionName(SpanData span) {
+    assertEquals(COLLECTION, span.getAttributes().get(TraceUtils.TAG_DB));
   }
 
-  private void assertOneSpanIsChildOfAnother(List<MockSpan> finishedSpans) {
-    MockSpan child = finishedSpans.get(0);
-    MockSpan parent = finishedSpans.get(1);
-    if (child.parentId() == 0) {
-      MockSpan temp = parent;
+  private static void assertCoreName(SpanData span) {
+    assertTrue(span.getAttributes().get(TraceUtils.TAG_DB).startsWith(COLLECTION + "_"));
+  }
+
+  private void assertOneSpanIsChildOfAnother(List<SpanData> finishedSpans) {
+    SpanData child = finishedSpans.get(0);
+    SpanData parent = finishedSpans.get(1);
+    if (isRootSpan(child)) {
+      var temp = parent;
       parent = child;
       child = temp;
     }
-
-    assertEquals(child.parentId(), parent.context().spanId());
+    assertEquals(child.getParentSpanContext().getTraceId(), parent.getTraceId());
+    assertEquals(child.getTraceId(), parent.getTraceId());
   }
 
-  private List<MockSpan> getAndClearSpans() {
-    List<MockSpan> result = tracer.finishedSpans(); // returns a mutable copy
+  private List<SpanData> getAndClearSpans() {
+    InMemorySpanExporter exporter = CustomTestOtelTracerConfigurator.getInMemorySpanExporter();
+    List<SpanData> result = new ArrayList<>(exporter.getFinishedSpanItems());
     Collections.reverse(result); // nicer to see spans chronologically
-    tracer.reset();
+    exporter.reset();
     return result;
   }
 }
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
index 33e386b6b46..fed3ed14110 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
@@ -34,6 +34,8 @@ Starting in 10, the Maven POM for SolrJ does not refer to SolrJ modules like Zoo
 
 * The `jaegertracer-configurator` module, which was deprecated in 9.2, is removed. Users should migrate to the `opentelemetry` module.
 
+* `OpenTracing` libraries were removed and replaced with `OpenTelemetry` libraries. Any Java agents providing `OpenTracing` tracers will no longer work. Telemetry tags `http.status_code` and `http.method` have been deprecated, newer version of the tags have been added to the span data: `http.response.status_code`, `http.request.method`.
+
 * The `analytics` module, which was deprecated in 9.2, is removed.
 
 * The sysProp `-Dsolr.redaction.system.pattern`, which allows users to provide a pattern to match sysProps that should be redacted for sensitive information,
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index c6589155072..6c772aac512 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -52,8 +52,6 @@ dependencies {
   implementation 'org.slf4j:slf4j-api'
   implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'io.opentracing:opentracing-noop'
-  implementation 'io.opentracing:opentracing-util'
   implementation 'io.dropwizard.metrics:metrics-core'
   implementation 'io.dropwizard.metrics:metrics-jetty10'
   implementation 'commons-cli:commons-cli'
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 ba96e729562..fc4a6ac27fb 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -20,15 +20,12 @@
 import static org.apache.solr.cloud.SolrZkServer.ZK_WHITELIST_PROPERTY;
 import static org.apache.solr.common.cloud.ZkStateReader.HTTPS;
 import static org.apache.solr.common.cloud.ZkStateReader.URL_SCHEME;
-import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
 import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
 import static org.hamcrest.core.StringContains.containsString;
 
 import com.carrotsearch.randomizedtesting.RandomizedContext;
 import com.carrotsearch.randomizedtesting.RandomizedTest;
 import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-import io.opentracing.noop.NoopTracerFactory;
-import io.opentracing.util.GlobalTracer;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -43,7 +40,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -52,8 +48,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.SecureRandom;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -138,6 +132,7 @@
 import org.apache.solr.security.AllowListUrlChecker;
 import org.apache.solr.servlet.DirectSolrConnection;
 import org.apache.solr.update.processor.DistributedUpdateProcessor;
+import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
 import org.apache.solr.update.processor.DistributedZkUpdateProcessor;
 import org.apache.solr.update.processor.UpdateRequestProcessor;
 import org.apache.solr.util.BaseTestHarness;
@@ -313,38 +308,9 @@ public static void setupTestCases() {
       System.setProperty(URL_SCHEME, HTTPS);
     }
 
-    resetGlobalTracer();
     ExecutorUtil.resetThreadLocalProviders();
   }
 
-  /**
-   * GlobalTracer is initialized by org.apache.solr.core.TracerConfigurator by
-   * org.apache.solr.core.CoreContainer. Tests may need to reset it in the beginning of a test if it
-   * might have differing configuration from other tests in the same suite. It's also important to
-   * call {@link ExecutorUtil#resetThreadLocalProviders()}.
-   */
-  @SuppressForbidden(reason = "Hack to reset internal state of GlobalTracer")
-  public static void resetGlobalTracer() {
-    AccessController.doPrivileged(
-        (PrivilegedAction<Void>)
-            () -> {
-              try {
-                final Class<GlobalTracer> globalTracerClass = GlobalTracer.class;
-                final Field isRegistered = globalTracerClass.getDeclaredField("isRegistered");
-                isRegistered.setAccessible(true);
-                isRegistered.setBoolean(null, false);
-                final Field tracer = globalTracerClass.getDeclaredField("tracer");
-                tracer.setAccessible(true);
-                tracer.set(null, NoopTracerFactory.create());
-              } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-              }
-              return null;
-            });
-
-    assert GlobalTracer.isRegistered() == false;
-  }
-
   @AfterClass
   public static void teardownTestCases() throws Exception {
     TestInjection.notifyPauseForeverDone();
diff --git a/versions.lock b/versions.lock
index c78c403b7d4..f79f9dba576 100644
--- a/versions.lock
+++ b/versions.lock
@@ -124,7 +124,7 @@ io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d199
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
-io.opentelemetry:opentelemetry-api:1.29.0 (11 constraints: ceca6768)
+io.opentelemetry:opentelemetry-api:1.29.0 (11 constraints: c3c8daff)
 io.opentelemetry:opentelemetry-api-events:1.29.0-alpha (2 constraints: 332f2380)
 io.opentelemetry:opentelemetry-bom:1.29.0 (1 constraints: 3e05483b)
 io.opentelemetry:opentelemetry-context:1.29.0 (2 constraints: 2d1f62b5)
@@ -133,18 +133,14 @@ io.opentelemetry:opentelemetry-exporter-otlp:1.29.0 (1 constraints: 990ff983)
 io.opentelemetry:opentelemetry-exporter-otlp-common:1.29.0 (2 constraints: 5823eb1c)
 io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.29.0 (2 constraints: 5823eb1c)
 io.opentelemetry:opentelemetry-extension-incubator:1.29.0-alpha (1 constraints: f414ee96)
-io.opentelemetry:opentelemetry-opentracing-shim:1.29.0 (1 constraints: 990ff983)
-io.opentelemetry:opentelemetry-sdk:1.29.0 (3 constraints: ae4376e7)
+io.opentelemetry:opentelemetry-sdk:1.29.0 (4 constraints: 755634c7)
 io.opentelemetry:opentelemetry-sdk-common:1.29.0 (6 constraints: 936c396e)
 io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.29.0 (1 constraints: 990ff983)
 io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.29.0 (3 constraints: a63c5427)
 io.opentelemetry:opentelemetry-sdk-logs:1.29.0 (3 constraints: f43275b4)
 io.opentelemetry:opentelemetry-sdk-metrics:1.29.0 (3 constraints: f43275b4)
 io.opentelemetry:opentelemetry-sdk-trace:1.29.0 (3 constraints: f43275b4)
-io.opentelemetry:opentelemetry-semconv:1.29.0-alpha (4 constraints: 175b2583)
-io.opentracing:opentracing-api:0.33.0 (5 constraints: 7244331d)
-io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
-io.opentracing:opentracing-util:0.33.0 (2 constraints: 5013be5a)
+io.opentelemetry:opentelemetry-semconv:1.29.0-alpha (4 constraints: 0c5920ad)
 io.perfmark:perfmark-api:0.26.0 (3 constraints: 21212b16)
 io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
 io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
@@ -403,7 +399,7 @@ com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)
 io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
 io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
 io.micrometer:micrometer-core:1.9.11 (1 constraints: fd162819)
-io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
+io.opentelemetry:opentelemetry-sdk-testing:1.29.0 (1 constraints: 990ff983)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
 javax.inject:javax.inject:1 (1 constraints: 7a0df617)
diff --git a/versions.props b/versions.props
index 45ffbbad5d4..41be40abeeb 100644
--- a/versions.props
+++ b/versions.props
@@ -24,7 +24,6 @@ io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.96.Final
 io.opentelemetry:opentelemetry-bom=1.29.0
-io.opentracing:*=0.33.0
 io.prometheus:*=0.16.0
 io.swagger.core.v3:*=2.2.12
 jakarta.ws.rs:jakarta.ws.rs-api=2.1.6

From ac2beb340ac6efc300ff699f6313519710135223 Mon Sep 17 00:00:00 2001
From: Noble Paul <noblepaul@users.noreply.github.com>
Date: Fri, 18 Aug 2023 00:14:21 +1000
Subject: [PATCH 013/160] SOLR-16939: CBOR format should support nested
 documents (#1845)

---
 .../solr/handler/loader/CborLoader.java       |  5 ++
 .../cloud-managed/conf/managed-schema.xml     |  2 +
 .../apache/solr/util/TestCborDataFormat.java  | 50 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CborLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/CborLoader.java
index ab6dfaf8fa0..3f0f6067625 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/CborLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/CborLoader.java
@@ -123,6 +123,11 @@ private Object readVal(JsonToken t, CBORParser p) throws IOException {
     if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
       return p.getNumberValue();
     }
+    if (t == JsonToken.START_OBJECT) {
+      Object[] returnVal = new Object[1];
+      new CborLoader(cborFactory, d -> returnVal[0] = d).handleDoc(p);
+      return returnVal[0];
+    }
     throw new RuntimeException("Unknown type :" + t);
   }
 
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml
index 14e5b94fb67..a3176d2d412 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml
@@ -39,6 +39,8 @@
 
     <!-- needed for splitByPrefix -->
   <field name="id_prefix" type="composite_id_prefix" indexed="true" stored="false"/>
+  <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
+  <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
   <copyField source="id" dest="id_prefix"/>
   <fieldtype name="composite_id_prefix" class="solr.TextField">
     <analyzer>
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 90b61853bfb..b24e649ce28 100644
--- a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java
+++ b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java
@@ -27,6 +27,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -42,6 +43,7 @@
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.cloud.MiniSolrCloudCluster;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.params.MapSolrParams;
@@ -95,6 +97,15 @@ public void testRoundTrip() throws Exception {
       Object o = objectMapper.readValue(b, Object.class);
       List<Object> l = (List<Object>) Utils.getObjectByPath(o, false, "response/docs");
       assertEquals(1100, l.size());
+      client.deleteByQuery(testCollection, "*:*").getStatus();
+      index(
+          testCollection,
+          client,
+          createCborReq(getNestedDocs().getBytes(StandardCharsets.UTF_8)),
+          false);
+      SolrQuery q = new SolrQuery("*:*").setRows(100);
+      QueryResponse result = new QueryRequest(q).process(client, testCollection);
+      assertEquals(6, result.getResults().size());
     } finally {
       System.clearProperty("managed.schema.mutable");
       cluster.shutdown();
@@ -227,4 +238,43 @@ private byte[] serializeToCbor(byte[] is) throws IOException {
     jsonGenerator.close();
     return baos.toByteArray();
   }
+
+  private String getNestedDocs() throws IOException {
+    return "[{ \"id\": \"P11!prod\",\n"
+        + "   \"name_s\": \"Swingline Stapler\",\n"
+        + "   \"type_s\": \"PRODUCT\",\n"
+        + "   \"description_s\": \"The Cadillac of office staplers ...\",\n"
+        + "   \"skus\": [\n"
+        + "       { \"id\": \"P11!S21\",\n"
+        + "         \"type_s\": \"SKU\",\n"
+        + "         \"color_s\": \"RED\",\n"
+        + "         \"price_i\": 42,\n"
+        + "         \"manuals\": [\n"
+        + "             { \"id\": \"P11!D41\",\n"
+        + "               \"type_s\": \"MANUAL\",\n"
+        + "               \"name_s\": \"Red Swingline Brochure\",\n"
+        + "               \"pages_i\":1,\n"
+        + "               \"content_s\": \"...\"\n"
+        + "             } ]\n"
+        + "       },\n"
+        + "       { \"id\": \"P11!S31\",\n"
+        + "         \"type_s\": \"SKU\",\n"
+        + "         \"color_s\": \"BLACK\",\n"
+        + "         \"price_i\": 3\n"
+        + "       },\n"
+        + "       { \"id\": \"P11!D51\",\n"
+        + "         \"type_s\": \"MANUAL\",\n"
+        + "         \"name_s\": \"Quick Reference Guide\",\n"
+        + "         \"pages_i\":1,\n"
+        + "         \"content_s\": \"How to use your stapler ...\"\n"
+        + "       },\n"
+        + "       { \"id\": \"P11!D61\",\n"
+        + "         \"type_s\": \"MANUAL\",\n"
+        + "         \"name_s\": \"Warranty Details\",\n"
+        + "         \"pages_i\":42,\n"
+        + "         \"content_s\": \"... lifetime guarantee ...\"\n"
+        + "       }\n"
+        + "    ]\n"
+        + "} ]";
+  }
 }

From 61d6a1347749c9a09ce22668af7ab0148ed6cbb4 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 18 Aug 2023 09:46:34 +0200
Subject: [PATCH 014/160] Update dependency commons-codec:commons-codec to
 v1.16.0 (#1719)

---
 solr/licenses/commons-codec-1.15.jar.sha1   | 1 -
 solr/licenses/commons-codec-1.16.0.jar.sha1 | 1 +
 versions.lock                               | 2 +-
 versions.props                              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/commons-codec-1.15.jar.sha1
 create mode 100644 solr/licenses/commons-codec-1.16.0.jar.sha1

diff --git a/solr/licenses/commons-codec-1.15.jar.sha1 b/solr/licenses/commons-codec-1.15.jar.sha1
deleted file mode 100644
index 00ebbbf2720..00000000000
--- a/solr/licenses/commons-codec-1.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d
diff --git a/solr/licenses/commons-codec-1.16.0.jar.sha1 b/solr/licenses/commons-codec-1.16.0.jar.sha1
new file mode 100644
index 00000000000..23acaadb432
--- /dev/null
+++ b/solr/licenses/commons-codec-1.16.0.jar.sha1
@@ -0,0 +1 @@
+4e3eb3d79888d76b54e28b350915b5dc3919c9de
diff --git a/versions.lock b/versions.lock
index f79f9dba576..f6cfd5ecc34 100644
--- a/versions.lock
+++ b/versions.lock
@@ -77,7 +77,7 @@ com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
 com.tdunning:t-digest:3.1 (1 constraints: a804212c)
 com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
 commons-cli:commons-cli:1.5.0 (1 constraints: 0805ff35)
-commons-codec:commons-codec:1.15 (11 constraints: 43972235)
+commons-codec:commons-codec:1.16.0 (11 constraints: a297a2db)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
 commons-io:commons-io:2.11.0 (9 constraints: 9d65151d)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
diff --git a/versions.props b/versions.props
index 41be40abeeb..f96ebda77ca 100644
--- a/versions.props
+++ b/versions.props
@@ -17,7 +17,7 @@ com.jayway.jsonpath:json-path=2.8.0
 com.lmax:disruptor=3.4.4
 com.tdunning:t-digest=3.1
 commons-cli:commons-cli=1.5.0
-commons-codec:commons-codec=1.15
+commons-codec:commons-codec=1.16.0
 commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.2.19

From 560f93a67d3eb04dc1dae5eb3afd29da6a897e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:54:40 +0200
Subject: [PATCH 015/160] Update solr/README (#1850)

---
 solr/README.adoc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/solr/README.adoc b/solr/README.adoc
index d1387439cd8..61d0b8d96e6 100644
--- a/solr/README.adoc
+++ b/solr/README.adoc
@@ -17,11 +17,14 @@
 
 == Solr Source Directories
 
+link:api/[]::
+Root package for interfaces and POJOs used to describe Solr's v2 APIs.
+
 link:benchmark/[]::
 Benchmarking module for Solr.
 
 link:bin/[]::
-Scripts to startup, manage and interact with Solr instances.
+Scripts to start up, manage and interact with Solr instances.
 
 link:core/[]::
 Base Solr code.
@@ -40,7 +43,7 @@ link:example/[]::
 Contains example documents and an alternative Solr home
 directory containing various examples.
 
-link:license/[]::
+link:licenses/[]::
 Licenses, notice files and signatures for Solr dependencies.
 
 link:modules/[]::
@@ -59,7 +62,13 @@ link:solr-ref-guide/[]::
 The Solr Reference Guide source files including Java examples.
 
 link:solrj/[]::
-Solr client code for Java applications.
+Solr client code for Java applications - common.
+
+link:solrj-streaming/[]::
+SolrJ additional API for Streaming Aggregation.
+
+link:solrj-zookeeper/[]::
+SolrJ additional API for pulling cluster state from Zookeeper.
 
 link:test-framework/[]::
 Solr test framework for internal tests and external tests integrating Solr.

From fc01a3d5f88a81125ae746759323cac021a2eb34 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:01:40 +0200
Subject: [PATCH 016/160] Update org.apache.zookeeper:* to v3.9.0 (#1807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update org.apache.zookeeper:* to v3.9.0
   Uses shared LICENSE and NOTICE files for all netty-* jars
   Fix OverseerTest that broke due to 3.9 changes

Co-authored-by: Jan Høydahl <janhoy@users.noreply.github.com>
---
 .../org/apache/solr/cloud/OverseerTest.java   |   9 +-
 ...-LICENSE-ASL.txt => netty-LICENSE-ASL.txt} |   0
 ...tty-buffer-NOTICE.txt => netty-NOTICE.txt} |   0
 solr/licenses/netty-codec-LICENSE-ASL.txt     | 202 ----------------
 solr/licenses/netty-codec-NOTICE.txt          | 223 ------------------
 solr/licenses/netty-common-LICENSE-ASL.txt    | 202 ----------------
 solr/licenses/netty-common-NOTICE.txt         | 223 ------------------
 solr/licenses/netty-handler-LICENSE-ASL.txt   | 202 ----------------
 solr/licenses/netty-handler-NOTICE.txt        | 223 ------------------
 solr/licenses/netty-resolver-LICENSE-ASL.txt  | 202 ----------------
 solr/licenses/netty-resolver-NOTICE.txt       | 223 ------------------
 ...ive-boringssl-static-2.0.61.Final.jar.sha1 |   1 +
 ...tty-tcnative-classes-2.0.61.Final.jar.sha1 |   1 +
 solr/licenses/netty-transport-LICENSE-ASL.txt | 202 ----------------
 solr/licenses/netty-transport-NOTICE.txt      | 223 ------------------
 ...e-epoll-4.1.96.Final-linux-x86_64.jar.sha1 |   1 +
 ...ansport-native-epoll-4.1.96.Final.jar.sha1 |   1 -
 solr/licenses/zookeeper-3.8.1-tests.jar.sha1  |   1 -
 solr/licenses/zookeeper-3.8.1.jar.sha1        |   1 -
 solr/licenses/zookeeper-3.9.0-tests.jar.sha1  |   1 +
 solr/licenses/zookeeper-3.9.0.jar.sha1        |   1 +
 solr/licenses/zookeeper-jute-3.8.1.jar.sha1   |   1 -
 solr/licenses/zookeeper-jute-3.9.0.jar.sha1   |   1 +
 versions.lock                                 |  10 +-
 versions.props                                |   2 +-
 25 files changed, 19 insertions(+), 2137 deletions(-)
 rename solr/licenses/{netty-buffer-LICENSE-ASL.txt => netty-LICENSE-ASL.txt} (100%)
 rename solr/licenses/{netty-buffer-NOTICE.txt => netty-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/netty-codec-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-codec-NOTICE.txt
 delete mode 100644 solr/licenses/netty-common-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-common-NOTICE.txt
 delete mode 100644 solr/licenses/netty-handler-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-handler-NOTICE.txt
 delete mode 100644 solr/licenses/netty-resolver-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-resolver-NOTICE.txt
 create mode 100644 solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1
 create mode 100644 solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-transport-NOTICE.txt
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-3.8.1-tests.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-3.8.1.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.9.0-tests.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.9.0.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-jute-3.8.1.jar.sha1
 create mode 100644 solr/licenses/zookeeper-jute-3.9.0.jar.sha1

diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index 1e7c8de5124..f6e108e0bf5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -17,6 +17,7 @@
 package org.apache.solr.cloud;
 
 import static org.apache.solr.cloud.AbstractDistribZkTestBase.verifyReplicaStatus;
+import static org.apache.zookeeper.WatchedEvent.NO_ZXID;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -2129,7 +2130,7 @@ public void testLatchWatcher() throws InterruptedException {
     assertTrue(TimeUnit.NANOSECONDS.toMillis(after - before) > 50);
     // Mostly to make sure the millis->nanos->millis is not broken
     assertTrue(TimeUnit.NANOSECONDS.toMillis(after - before) < 500);
-    latch1.process(new WatchedEvent(new WatcherEvent(1, 1, "/foo/bar")));
+    latch1.process(new WatchedEvent(new WatcherEvent(1, 1, "/foo/bar"), NO_ZXID));
     before = System.nanoTime();
     latch1.await(10000); // Expecting no wait
     after = System.nanoTime();
@@ -2145,14 +2146,16 @@ public void testLatchWatcher() throws InterruptedException {
               // Process an event of a different type first, this shouldn't release the latch
               latch2.process(
                   new WatchedEvent(
-                      new WatcherEvent(Event.EventType.NodeDeleted.getIntValue(), 1, "/foo/bar")));
+                      new WatcherEvent(Event.EventType.NodeDeleted.getIntValue(), 1, "/foo/bar"),
+                      NO_ZXID));
 
               assertFalse("Latch shouldn't have been released", doneWaiting.get());
               // Now process the correct type of event
               expectedEventProcessed.set(true);
               latch2.process(
                   new WatchedEvent(
-                      new WatcherEvent(Event.EventType.NodeCreated.getIntValue(), 1, "/foo/bar")));
+                      new WatcherEvent(Event.EventType.NodeCreated.getIntValue(), 1, "/foo/bar"),
+                      NO_ZXID));
             });
     t.start();
     before = System.nanoTime();
diff --git a/solr/licenses/netty-buffer-LICENSE-ASL.txt b/solr/licenses/netty-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/netty-buffer-LICENSE-ASL.txt
rename to solr/licenses/netty-LICENSE-ASL.txt
diff --git a/solr/licenses/netty-buffer-NOTICE.txt b/solr/licenses/netty-NOTICE.txt
similarity index 100%
rename from solr/licenses/netty-buffer-NOTICE.txt
rename to solr/licenses/netty-NOTICE.txt
diff --git a/solr/licenses/netty-codec-LICENSE-ASL.txt b/solr/licenses/netty-codec-LICENSE-ASL.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/solr/licenses/netty-codec-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/netty-codec-NOTICE.txt b/solr/licenses/netty-codec-NOTICE.txt
deleted file mode 100644
index f973663670b..00000000000
--- a/solr/licenses/netty-codec-NOTICE.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
-  * NOTICE:
-    * license/NOTICE.harmony.txt
-  * LICENSE:
-    * license/LICENSE.harmony.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jbzip2.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.libdivsufsort.txt (MIT License)
-  * HOMEPAGE:
-    * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lz4.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lzma-java.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jponge/lzma-java
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jfastlz.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.hpack.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/twitter/hpack
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-lang.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
-  * LICENSE:
-    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/takari/maven-wrapper
diff --git a/solr/licenses/netty-common-LICENSE-ASL.txt b/solr/licenses/netty-common-LICENSE-ASL.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/solr/licenses/netty-common-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/netty-common-NOTICE.txt b/solr/licenses/netty-common-NOTICE.txt
deleted file mode 100644
index f973663670b..00000000000
--- a/solr/licenses/netty-common-NOTICE.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
-  * NOTICE:
-    * license/NOTICE.harmony.txt
-  * LICENSE:
-    * license/LICENSE.harmony.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jbzip2.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.libdivsufsort.txt (MIT License)
-  * HOMEPAGE:
-    * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lz4.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lzma-java.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jponge/lzma-java
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jfastlz.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.hpack.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/twitter/hpack
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-lang.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
-  * LICENSE:
-    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/takari/maven-wrapper
diff --git a/solr/licenses/netty-handler-LICENSE-ASL.txt b/solr/licenses/netty-handler-LICENSE-ASL.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/solr/licenses/netty-handler-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/netty-handler-NOTICE.txt b/solr/licenses/netty-handler-NOTICE.txt
deleted file mode 100644
index f973663670b..00000000000
--- a/solr/licenses/netty-handler-NOTICE.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
-  * NOTICE:
-    * license/NOTICE.harmony.txt
-  * LICENSE:
-    * license/LICENSE.harmony.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jbzip2.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.libdivsufsort.txt (MIT License)
-  * HOMEPAGE:
-    * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lz4.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lzma-java.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jponge/lzma-java
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jfastlz.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.hpack.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/twitter/hpack
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-lang.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
-  * LICENSE:
-    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/takari/maven-wrapper
diff --git a/solr/licenses/netty-resolver-LICENSE-ASL.txt b/solr/licenses/netty-resolver-LICENSE-ASL.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/solr/licenses/netty-resolver-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/netty-resolver-NOTICE.txt b/solr/licenses/netty-resolver-NOTICE.txt
deleted file mode 100644
index f973663670b..00000000000
--- a/solr/licenses/netty-resolver-NOTICE.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
-  * NOTICE:
-    * license/NOTICE.harmony.txt
-  * LICENSE:
-    * license/LICENSE.harmony.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jbzip2.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.libdivsufsort.txt (MIT License)
-  * HOMEPAGE:
-    * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lz4.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lzma-java.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jponge/lzma-java
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jfastlz.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.hpack.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/twitter/hpack
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-lang.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
-  * LICENSE:
-    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/takari/maven-wrapper
diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1
new file mode 100644
index 00000000000..1c3e5f7d66f
--- /dev/null
+++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1
@@ -0,0 +1 @@
+944722ba2883fe5825a0c6b38dc727d7151a9371
diff --git a/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1
new file mode 100644
index 00000000000..ca1be9444d7
--- /dev/null
+++ b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1
@@ -0,0 +1 @@
+4c6ae851ed97921bc6c6b64e019c2b039f49131a
diff --git a/solr/licenses/netty-transport-LICENSE-ASL.txt b/solr/licenses/netty-transport-LICENSE-ASL.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/solr/licenses/netty-transport-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/solr/licenses/netty-transport-NOTICE.txt b/solr/licenses/netty-transport-NOTICE.txt
deleted file mode 100644
index f973663670b..00000000000
--- a/solr/licenses/netty-transport-NOTICE.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
-  * NOTICE:
-    * license/NOTICE.harmony.txt
-  * LICENSE:
-    * license/LICENSE.harmony.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jbzip2.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.libdivsufsort.txt (MIT License)
-  * HOMEPAGE:
-    * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lz4.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.lzma-java.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/jponge/lzma-java
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jfastlz.txt (MIT License)
-  * HOMEPAGE:
-    * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.hpack.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/twitter/hpack
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-lang.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
-  * LICENSE:
-    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * https://github.com/takari/maven-wrapper
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
new file mode 100644
index 00000000000..04eae401ac3
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+3f8904e072cfc9a8d67c6fe567c39bcbce5c9c55
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
deleted file mode 100644
index 21a85fa4799..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9faf365396c933f1b39b60d129391c6c6c43fb86
diff --git a/solr/licenses/zookeeper-3.8.1-tests.jar.sha1 b/solr/licenses/zookeeper-3.8.1-tests.jar.sha1
deleted file mode 100644
index 9f92a4f13fb..00000000000
--- a/solr/licenses/zookeeper-3.8.1-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-15d43384e216f03166439f06584c78d35355a10c
diff --git a/solr/licenses/zookeeper-3.8.1.jar.sha1 b/solr/licenses/zookeeper-3.8.1.jar.sha1
deleted file mode 100644
index 02c7bc328f6..00000000000
--- a/solr/licenses/zookeeper-3.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-edb7d70db4390b9f54a92994577a9e344ade5c9d
diff --git a/solr/licenses/zookeeper-3.9.0-tests.jar.sha1 b/solr/licenses/zookeeper-3.9.0-tests.jar.sha1
new file mode 100644
index 00000000000..09eb33247b7
--- /dev/null
+++ b/solr/licenses/zookeeper-3.9.0-tests.jar.sha1
@@ -0,0 +1 @@
+71c696e7390a443e4cfd9c2c5b7f25c8a0ab1852
diff --git a/solr/licenses/zookeeper-3.9.0.jar.sha1 b/solr/licenses/zookeeper-3.9.0.jar.sha1
new file mode 100644
index 00000000000..b88faa06754
--- /dev/null
+++ b/solr/licenses/zookeeper-3.9.0.jar.sha1
@@ -0,0 +1 @@
+d8c7c5450c91e272aaac3b908fff96262fd52694
diff --git a/solr/licenses/zookeeper-jute-3.8.1.jar.sha1 b/solr/licenses/zookeeper-jute-3.8.1.jar.sha1
deleted file mode 100644
index 087f7233f08..00000000000
--- a/solr/licenses/zookeeper-jute-3.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aeb9b21ed9d2b99da9e0e3d1fd24d54f85fbf840
diff --git a/solr/licenses/zookeeper-jute-3.9.0.jar.sha1 b/solr/licenses/zookeeper-jute-3.9.0.jar.sha1
new file mode 100644
index 00000000000..15b498ddfaa
--- /dev/null
+++ b/solr/licenses/zookeeper-jute-3.9.0.jar.sha1
@@ -0,0 +1 @@
+224f476a950054a6c84b2476a1b5216b32ea7140
diff --git a/versions.lock b/versions.lock
index f6cfd5ecc34..adb9555b9d5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -114,12 +114,14 @@ io.netty:netty-codec-http:4.1.96.Final (3 constraints: 582436ee)
 io.netty:netty-codec-http2:4.1.96.Final (1 constraints: ed0a94cb)
 io.netty:netty-codec-socks:4.1.96.Final (1 constraints: 160fb96c)
 io.netty:netty-common:4.1.96.Final (12 constraints: 3cb3817d)
-io.netty:netty-handler:4.1.96.Final (3 constraints: 732b553d)
+io.netty:netty-handler:4.1.96.Final (3 constraints: 722b4f3d)
 io.netty:netty-handler-proxy:4.1.96.Final (1 constraints: ed0a94cb)
 io.netty:netty-resolver:4.1.96.Final (2 constraints: 5c1a8332)
+io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)
+io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)
 io.netty:netty-transport:4.1.96.Final (9 constraints: 0b8c6f3f)
 io.netty:netty-transport-classes-epoll:4.1.96.Final (1 constraints: b312061f)
-io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: db0f188f)
+io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: da0f128f)
 io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d1997)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
@@ -253,8 +255,8 @@ org.apache.tika:tika-core:1.28.5 (2 constraints: d8118f11)
 org.apache.tika:tika-parsers:1.28.5 (1 constraints: 42054a3b)
 org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)
 org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
-org.apache.zookeeper:zookeeper:3.8.1 (2 constraints: a0134c5f)
-org.apache.zookeeper:zookeeper-jute:3.8.1 (2 constraints: 99125b23)
+org.apache.zookeeper:zookeeper:3.9.0 (2 constraints: a0134e5f)
+org.apache.zookeeper:zookeeper-jute:3.9.0 (2 constraints: 99125f23)
 org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
 org.bitbucket.b_c:jose4j:0.9.3 (1 constraints: 0e050936)
 org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
diff --git a/versions.props b/versions.props
index f96ebda77ca..17af2f9c60c 100644
--- a/versions.props
+++ b/versions.props
@@ -50,7 +50,7 @@ org.apache.logging.log4j:*=2.20.0
 org.apache.lucene:*=9.7.0
 org.apache.tika:*=1.28.5
 org.apache.tomcat:annotations-api=6.0.53
-org.apache.zookeeper:*=3.8.1
+org.apache.zookeeper:*=3.9.0
 org.bitbucket.b_c:jose4j=0.9.3
 org.carrot2:carrot2-core=4.5.1
 org.codehaus.woodstox:stax2-api=4.2.1

From 4f550d324e4a912ad5668123ae3d44554574f416 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Fri, 18 Aug 2023 11:20:15 -0400
Subject: [PATCH 017/160] SOLR-16733: Fail 'test' tasks using JDK20 on Mac
 (#1832)

Java 20 has a JDK bug that triggers on Mac systems and crashes Solr on
startup.  This affects deployments running on Mac as well as test runs,
which obviously need to start and stop Solr frequently.

This commit adds some gradle logic to detect this combination (JDK20 w/
Mac) and fail the 'test' task when present.
---
 build.gradle                                  |  1 +
 gradle/testing/fail-on-unsupported-jdk.gradle | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 gradle/testing/fail-on-unsupported-jdk.gradle

diff --git a/build.gradle b/build.gradle
index ebd9b85786a..b612fe2bf58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,7 @@ apply from: file('gradle/java/javac.gradle')
 apply from: file('gradle/testing/defaults-tests.gradle')
 apply from: file('gradle/testing/randomization.gradle')
 apply from: file('gradle/testing/fail-on-no-tests.gradle')
+apply from: file('gradle/testing/fail-on-unsupported-jdk.gradle')
 apply from: file('gradle/testing/alternative-jdk-support.gradle')
 apply from: file('gradle/java/jar-manifest.gradle')
 
diff --git a/gradle/testing/fail-on-unsupported-jdk.gradle b/gradle/testing/fail-on-unsupported-jdk.gradle
new file mode 100644
index 00000000000..7d94b709764
--- /dev/null
+++ b/gradle/testing/fail-on-unsupported-jdk.gradle
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+configure(rootProject) {
+  task ensureJdkSupported() {
+    doFirst {
+      if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac") && rootProject.runtimeJavaVersion == JavaVersion.VERSION_20) {
+        throw new GradleException("Tests cannot be run with JDK20 on Mac; see SOLR-16733 for more details.")
+      }
+    }
+  }
+
+  allprojects {
+    tasks.withType(Test) {
+        dependsOn ":ensureJdkSupported"
+    }
+  }
+}

From 7f2f6dc6f2d38cde3211a89f8859add791d74060 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 18 Aug 2023 16:21:00 -0400
Subject: [PATCH 018/160] SOLR-16941: Use smarter default Solr URL in CLI
 (#1849)

---
 solr/CHANGES.txt                              |  2 ++
 solr/bin/solr                                 | 22 +++++++++-----
 .../java/org/apache/solr/cli/CreateTool.java  |  4 +--
 .../src/java/org/apache/solr/cli/SolrCLI.java | 30 ++++++++++++++-----
 solr/packaging/test/test_ssl.bats             |  4 +--
 5 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 098080ed7c2..90544c4c05a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -97,6 +97,8 @@ Improvements
   This is useful when using the ZkCli on a remote Solr using the embedded ZK, or Solr running in a Docker container.
   The SOLR_ZK_EMBEDDED_HOST envVar or -Dsolr.zk.embedded.host sysProp control this bind address. (Houston Putman)
 
+* SOLR-16941: The SolrCLI now uses a smarter default for the Solr URL if none is provided, using the same envVars used when running Solr. (Houston Putman)
+
 Optimizations
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index bae4b722432..7ee0fa3c50f 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -147,6 +147,11 @@ fi
 : "${SOLR_STOP_WAIT:=180}"
 : "${SOLR_START_WAIT:=$SOLR_STOP_WAIT}" # defaulting to $SOLR_STOP_WAIT for backwards compatibility reasons
 
+# Store whether a solr port was explicitly provided, for the "solr stop" command.
+PROVIDED_SOLR_PORT="${SOLR_PORT:-}"
+: "${SOLR_PORT:=8983}"
+export SOLR_PORT
+
 # test that Java exists, is executable and correct version
 JAVA_VER=$("$JAVA" -version 2>&1)
 # shellcheck disable=SC2181
@@ -278,6 +283,7 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
 else
   SOLR_JETTY_CONFIG+=("--module=http")
 fi
+export SOLR_URL_SCHEME
 
 # Requestlog options
 if [ "${SOLR_REQUESTLOG_ENABLED:-true}" == "true" ]; then
@@ -330,6 +336,7 @@ AUTHC_OPTS="${AUTHC_OPTS:-}${SOLR_AUTHENTICATION_OPTS:+ $SOLR_AUTHENTICATION_OPT
 
 # Set the SOLR_TOOL_HOST variable for use when connecting to a running Solr instance
 SOLR_TOOL_HOST="${SOLR_HOST:-localhost}"
+export SOLR_TOOL_HOST
 
 function print_usage() {
   CMD="${1:-}"
@@ -547,7 +554,7 @@ function print_usage() {
     echo ""
   elif [ "$CMD" == "package" ]; then
     echo ""
-    run_tool package -solrUrl "http://fake.to.allow.help.to.run" "help"
+    run_tool package "help"
   fi
 } # end print_usage
 
@@ -1436,8 +1443,8 @@ fi
 
 : "${STOP_KEY:=solrrocks}"
 
-# stop all if no port specified
-if [[ "$SCRIPT_CMD" == "stop" && -z "${SOLR_PORT:-}" ]]; then
+# stop all if no port specified or "all" is used
+if [[ "$SCRIPT_CMD" == "stop" ]]; then
   if $stop_all; then
     none_stopped=true
     find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | while read PIDF
@@ -1455,8 +1462,9 @@ if [[ "$SCRIPT_CMD" == "stop" && -z "${SOLR_PORT:-}" ]]; then
     # if $none_stopped; then
     #   echo -e "\nNo Solr nodes found to stop.\n"
     # fi
-  else
-    # not stopping all and don't have a port, but if we can find the pid file for the default port 8983, then use that
+    exit
+  elif [[ -z "${PROVIDED_SOLR_PORT:-}" ]]; then
+    # not stopping all and don't have a port, but if we can find a single pid file for Solr, then use that
     none_stopped=true
     numSolrs=$(find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | wc -l | tr -d ' ')
     if [ "$numSolrs" -eq 1 ]; then
@@ -1480,12 +1488,10 @@ if [[ "$SCRIPT_CMD" == "stop" && -z "${SOLR_PORT:-}" ]]; then
       fi
       exit 1
     fi
+    exit
   fi
-  exit
 fi
 
-: "${SOLR_PORT:=8983}"
-
 if [ -n "${SOLR_PORT_ADVERTISE:-}" ]; then
   SOLR_OPTS+=("-Dsolr.port.advertise=$SOLR_PORT_ADVERTISE")
 fi
diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index 9d2f6315469..91a2214eeb4 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -130,7 +130,7 @@ public void runImpl(CommandLine cli) throws Exception {
 
   protected void createCore(CommandLine cli, SolrClient solrClient) throws Exception {
     String coreName = cli.getOptionValue("name");
-    String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.DEFAULT_SOLR_URL);
+    String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.getDefaultSolrUrl());
 
     final String solrInstallDir = System.getProperty("solr.install.dir");
     final String confDirName = cli.getOptionValue("confdir", SolrCLI.DEFAULT_CONFIG_SET);
@@ -343,7 +343,7 @@ private void printDefaultConfigsetWarningIfNecessary(CommandLine cli) {
     if (confDirectoryName.equals("_default")
         && (confName.equals("") || confName.equals("_default"))) {
       final String collectionName = cli.getOptionValue("collection");
-      final String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.DEFAULT_SOLR_URL);
+      final String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.getDefaultSolrUrl());
       final String curlCommand =
           String.format(
               Locale.ROOT,
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index c3ddd46b85b..0459892eeea 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -75,7 +75,7 @@ public class SolrCLI implements CLIO {
       TimeUnit.NANOSECONDS.convert(1, TimeUnit.MINUTES);
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  public static final String DEFAULT_SOLR_URL = "http://localhost:8983";
+
   public static final String ZK_HOST = "localhost:9983";
 
   public static final Option OPTION_ZKHOST =
@@ -97,13 +97,13 @@ public class SolrCLI implements CLIO {
           .required(false)
           .desc(
               "Base Solr URL, which can be used to determine the zkHost if that's not known; defaults to: "
-                  + DEFAULT_SOLR_URL
+                  + getDefaultSolrUrl()
                   + '.')
           .build();
   public static final Option OPTION_VERBOSE =
       Option.builder("verbose").required(false).desc("Enable more verbose command output.").build();
 
-  // should this be boolean or just a otption?
+  // should this be boolean or just an option?
   public static final Option OPTION_RECURSE =
       Option.builder("r")
           .longOpt("recurse")
@@ -187,6 +187,22 @@ public static CommandLine parseCmdLine(String toolName, String[] args, List<Opti
     return cli;
   }
 
+  public static String getDefaultSolrUrl() {
+    String scheme = System.getenv("SOLR_URL_SCHEME");
+    if (scheme == null) {
+      scheme = "http";
+    }
+    String host = System.getenv("SOLR_TOOL_HOST");
+    if (host == null) {
+      host = "localhost";
+    }
+    String port = System.getenv("SOLR_PORT");
+    if (port == null) {
+      port = "8983";
+    }
+    return String.format(Locale.ROOT, "%s://%s:%s", scheme.toLowerCase(Locale.ROOT), host, port);
+  }
+
   protected static void checkSslStoreSysProp(String solrInstallDir, String key) {
     String sysProp = "javax.net.ssl." + key;
     String keyStore = System.getProperty(sysProp);
@@ -488,11 +504,11 @@ public static String normalizeSolrUrl(CommandLine cli) throws Exception {
     if (solrUrl == null) {
       String zkHost = cli.getOptionValue("zkHost");
       if (zkHost == null) {
-        solrUrl = DEFAULT_SOLR_URL;
+        solrUrl = SolrCLI.getDefaultSolrUrl();
         CLIO.getOutStream()
             .println(
                 "Neither -zkHost or -solrUrl parameters provided so assuming solrUrl is "
-                    + DEFAULT_SOLR_URL
+                    + solrUrl
                     + ".");
       } else {
 
@@ -526,11 +542,11 @@ public static String getZkHost(CommandLine cli) throws Exception {
 
     String solrUrl = cli.getOptionValue("solrUrl");
     if (solrUrl == null) {
-      solrUrl = DEFAULT_SOLR_URL;
+      solrUrl = getDefaultSolrUrl();
       CLIO.getOutStream()
           .println(
               "Neither -zkHost or -solrUrl parameters provided so assuming solrUrl is "
-                  + DEFAULT_SOLR_URL
+                  + solrUrl
                   + ".");
     }
     solrUrl = normalizeSolrUrl(solrUrl);
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 3e53a7c6b29..9f3fdfe806c 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -54,8 +54,8 @@ teardown() {
   solr start -c
   solr assert --started https://localhost:8983/solr --timeout 5000
 
-  run curl --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json'
-  assert_output --partial '"status":0'
+  run solr create -c test -s 2
+  assert_output --partial "Created collection 'test'"
 
   run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
   assert_output --partial '"numFound":0'

From 117046b47c58cf6e2a019dfd55a7200430b67220 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 18 Aug 2023 18:15:31 -0400
Subject: [PATCH 019/160] SOLR-16940: Add SOLR_TOOL_OPTS var for custom SolrCLI
 options (#1848)

---
 solr/CHANGES.txt                              |  4 ++-
 solr/bin/solr                                 |  4 +--
 solr/bin/solr.cmd                             | 26 +++++++++----------
 .../pages/solr-control-script-reference.adoc  |  5 ++++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 90544c4c05a..c3985d65a8b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -91,7 +91,7 @@ Improvements
   circumstances as they are generated and more likely to remain up-to-date with future API changes.
   (Jason Gerlowski, David Smiley, Houston Putman)
 
-* SOLR-14667: Make zkClientTimeout consistent and based on a system property. The defauls values are stored in a single place referenced everywhere and they are based on system properties (Alex Deparvu)
+* SOLR-14667: Make zkClientTimeout consistent and based on a system property. The default values are stored in a single place referenced everywhere and they are based on system properties (Alex Deparvu)
 
 * SOLR-16926: The embedded Zookeeper's bind host can now be overridden, but still defaults to "127.0.0.1".
   This is useful when using the ZkCli on a remote Solr using the embedded ZK, or Solr running in a Docker container.
@@ -99,6 +99,8 @@ Improvements
 
 * SOLR-16941: The SolrCLI now uses a smarter default for the Solr URL if none is provided, using the same envVars used when running Solr. (Houston Putman)
 
+* SOLR-16940: Users can pass Java system properties to the SolrCLI via the SOLR_TOOL_OPTS environment variable. (Houston Putman)
+
 Optimizations
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index 7ee0fa3c50f..8a6d0560757 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -628,7 +628,7 @@ function jetty_port() {
 function run_tool() {
 
   # shellcheck disable=SC2086
-  "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} -Dsolr.install.dir="$SOLR_TIP" \
+  "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} -Dsolr.install.dir="$SOLR_TIP" \
     -Dlog4j.configurationFile="$DEFAULT_SERVER_DIR/resources/log4j2-console.xml" \
     -classpath "$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*:$DEFAULT_SERVER_DIR/lib/ext/*:$DEFAULT_SERVER_DIR/lib/*" \
     org.apache.solr.cli.SolrCLI "$@"
@@ -742,7 +742,7 @@ function stop_solr() {
   if [ -n "$SOLR_PID"  ]; then
     echo -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting up to $SOLR_STOP_WAIT seconds to allow Jetty process $SOLR_PID to stop gracefully."
     # shellcheck disable=SC2086
-    "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
+    "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
       (loops=0
       while true
       do
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 4055bad6d00..ce37a20d20e 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -923,7 +923,7 @@ IF "%SCRIPT_CMD%"=="stop" (
           set found_it=1
           @echo Stopping Solr process %%N running on port %SOLR_PORT%
           IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000
-          "%JAVA%" %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
+          "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
           del "%SOLR_TIP%"\bin\solr-%SOLR_PORT%.port
           REM wait for the process to terminate
           CALL :wait_for_process_exit %%N !SOLR_STOP_WAIT!
@@ -1272,7 +1272,7 @@ IF "%FG%"=="1" (
     set SOLR_START_WAIT=30
   )
   REM now wait to see Solr come online ...
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
     -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
     -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
     org.apache.solr.cli.SolrCLI status -maxWaitSecs !SOLR_START_WAIT! -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:%SOLR_PORT%/solr
@@ -1287,7 +1287,7 @@ goto done
 :run_example
 REM Run the requested example
 
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -Dsolr.install.symDir="%SOLR_TIP%" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
@@ -1311,7 +1311,7 @@ for /f "usebackq" %%i in (`dir /b "%SOLR_TIP%\bin" ^| findstr /i "^solr-.*\.port
           set has_info=1
           echo Found Solr process %%k running on port !SOME_SOLR_PORT!
           REM Passing in %2 (-h or -help) directly is captured by a custom help path for usage output
-          "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+          "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
             -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
             -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
             org.apache.solr.cli.SolrCLI status -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!SOME_SOLR_PORT!/solr %2
@@ -1326,7 +1326,7 @@ set has_info=
 goto done
 
 :run_solrcli
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI %*
@@ -1475,7 +1475,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="The -d option must be set for upconfig."
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%^
@@ -1489,7 +1489,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="The -d option must be set for downconfig."
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%
@@ -1508,7 +1508,7 @@ IF "!ZK_OP!"=="upconfig" (
       goto zk_short_usage
   )
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1521,7 +1521,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="<dest> must be specified for 'mv' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! %ZK_VERBOSE%
@@ -1530,7 +1530,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to remove must be specified when using the 'rm' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1539,7 +1539,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to remove must be specified when using the 'ls' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1548,7 +1548,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to create must be specified when using the 'mkroot' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%SOLR_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! %ZK_VERBOSE%
@@ -1609,7 +1609,7 @@ if "!AUTH_PORT!"=="" (
     )
   )
 )
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
     -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
     -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
     org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
index 4897a1a2c34..7d2a164ea28 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
@@ -301,6 +301,11 @@ For example, to set the auto soft-commit frequency to 3 seconds, you can do:
 
 `bin/solr start -Dsolr.autoSoftCommit.maxTime=3000`
 
+The `SOLR_OPTS` environment variable is also available to set additional System Properties for Solr.
+
+In order to set custom System Properties when running any Solr utility other than `start` (e.g. `stop`, `create`, `auth`, `status`, `api`),
+the `SOLR_TOOL_OPTS` environment variable should be used.
+
 ==== SolrCloud Mode
 
 The `-c` and `-cloud` options are equivalent:

From e0462e75a5cf848b1a3ae83ed6c95243785e21d6 Mon Sep 17 00:00:00 2001
From: Lamine <104593675+laminelam@users.noreply.github.com>
Date: Mon, 21 Aug 2023 06:33:50 -0500
Subject: [PATCH 020/160] Add/fix wrong/missing "solr.home" to zkcli scripts
 (#1798)

---------

Co-authored-by: Lamine Idjeraoui <lidjeraoui@apple.com>
---
 .../src/java/org/apache/solr/cloud/ZkCLI.java  |  9 ++++++++-
 solr/packaging/test/test_zk.bats               | 18 ++++++++++++++++++
 solr/server/scripts/cloud-scripts/zkcli.bat    |  6 ++++--
 solr/server/scripts/cloud-scripts/zkcli.sh     |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
index c1f9b826529..07c66805068 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
@@ -86,6 +86,7 @@ public class ZkCLI implements CLIO {
   private static final String CMD = "cmd";
   private static final String CLUSTERPROP = "clusterprop";
   private static final String UPDATEACLS = "updateacls";
+  private static final String VERBOSE = "verbose";
 
   @VisibleForTesting
   public static void setStdout(PrintStream stdout) {
@@ -174,12 +175,14 @@ public static void main(String[] args)
     options.addOption("h", HELP, false, "bring up this help page");
     options.addOption(NAME, true, "name of the cluster property to set");
     options.addOption(VALUE_LONG, true, "value of the cluster to set");
+    options.addOption("v", VERBOSE, false, "enable verbose mode");
 
     try {
       // parse the command line arguments
       CommandLine line = parser.parse(options, args);
 
-      if (line.hasOption(HELP) || !line.hasOption(ZKHOST) || !line.hasOption(CMD)) {
+      if ((line.hasOption(HELP) || !line.hasOption(ZKHOST) || !line.hasOption(CMD))
+          && !line.hasOption(VERBOSE)) {
         // automatically generate the help statement
         HelpFormatter formatter = new HelpFormatter();
         formatter.printHelp(ZK_CLI_NAME, options);
@@ -243,6 +246,10 @@ public static void main(String[] args)
       if (StrUtils.isNullOrEmpty(solrHome)) {
         solrHome = System.getProperty("solr.home");
       }
+      if (line.hasOption(VERBOSE)) {
+        stdout.println("Using " + SOLRHOME + "=" + solrHome);
+        return;
+      }
 
       String solrPort = null;
       if (line.hasOption(RUNZK)) {
diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.bats
index 4e9a8bdd047..686437d914e 100644
--- a/solr/packaging/test/test_zk.bats
+++ b/solr/packaging/test/test_zk.bats
@@ -75,3 +75,21 @@ teardown() {
   assert_output --partial '"configSets":["_default","techproducts2"]'
 
 }
+
+@test "zkcli.sh gets 'solrhome' from 'solr.home' system property" {
+  sleep 1
+  run "${SOLR_TIP}/server/scripts/cloud-scripts/zkcli.sh" -v
+  local extracted_solrhome=$(echo "$output" | grep -oE "solrhome=[^ ]+")
+  # remove 'solrhome='
+  local path_value=${extracted_solrhome#*=}
+  [[ $path_value == *"/server/scripts/cloud-scripts/../../solr" ]] || [[ $path_value == *"/server/solr" ]]
+}
+
+@test "zkcli.sh gets 'solrhome' from 'solrhome' command line option" {
+  sleep 1
+  run "${SOLR_TIP}/server/scripts/cloud-scripts/zkcli.sh" -v -s /path/to/solr/home
+  local extracted_solrhome=$(echo "$output" | grep -oE "solrhome=[^ ]+")
+  # remove 'solrhome='
+  local path_value=${extracted_solrhome#*=}
+  [[ $path_value == "/path/to/solr/home" ]]
+}
diff --git a/solr/server/scripts/cloud-scripts/zkcli.bat b/solr/server/scripts/cloud-scripts/zkcli.bat
index 63c0eb108e7..0eb40faa8ea 100644
--- a/solr/server/scripts/cloud-scripts/zkcli.bat
+++ b/solr/server/scripts/cloud-scripts/zkcli.bat
@@ -1,6 +1,6 @@
 @echo off
 REM You can override pass the following parameters to this script:
-REM 
+REM
 
 set JVM=java
 
@@ -8,6 +8,8 @@ REM  Find location of this script
 
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
+set SOLR_INSTALL_DIR=%SDIR%\..\..\..
+set SOLR_HOME=%SOLR_INSTALL_DIR%\server\solr
 
 set "LOG4J_CONFIG=file:///%SDIR%\..\..\resources\log4j2-console.xml"
 
@@ -21,5 +23,5 @@ REM optionally, you can use using a a Java properties file 'zkDigestCredentialsF
 REM ...
 REM   -DzkDigestCredentialsFile=/path/to/zkDigestCredentialsFile.properties
 REM ...
-"%JVM%" %SOLR_ZK_CREDS_AND_ACLS% %ZKCLI_JVM_FLAGS% -Dlog4j.configurationFile="%LOG4J_CONFIG%" ^
+"%JVM%" %SOLR_ZK_CREDS_AND_ACLS% %ZKCLI_JVM_FLAGS% -Dlog4j.configurationFile="%LOG4J_CONFIG%" -Dsolr.home=%SOLR_HOME% ^
 -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*;%SDIR%\..\..\lib\*" org.apache.solr.cloud.ZkCLI %*
diff --git a/solr/server/scripts/cloud-scripts/zkcli.sh b/solr/server/scripts/cloud-scripts/zkcli.sh
index 4477df48634..4986d21c029 100755
--- a/solr/server/scripts/cloud-scripts/zkcli.sh
+++ b/solr/server/scripts/cloud-scripts/zkcli.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # You can override pass the following parameters to this script:
-# 
+#
 
 JVM="java"
 
@@ -23,6 +23,6 @@ solr_home="$sdir/../../solr"
 #...
 #   -DzkDigestCredentialsFile=/path/to/zkDigestCredentialsFile.properties
 #...
-PATH=$JAVA_HOME/bin:$PATH $JVM $SOLR_ZK_CREDS_AND_ACLS $ZKCLI_JVM_FLAGS -Dlog4j.configurationFile=$log4j_config -DsolrHome=$solr_home \
+PATH=$JAVA_HOME/bin:$PATH $JVM $SOLR_ZK_CREDS_AND_ACLS $ZKCLI_JVM_FLAGS -Dlog4j.configurationFile=$log4j_config -Dsolr.home=$solr_home \
 -classpath "$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*:$sdir/../../lib/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}
 

From f6ef54a757cab2e3f4ee9785e234bff0bc5a22b0 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Mon, 21 Aug 2023 05:45:24 -0700
Subject: [PATCH 021/160] SOLR-16927 Allow SolrClientCache clients to use Jetty
 HTTP2 clients (#1835)

---
 solr/CHANGES.txt                              |   2 +
 solr/benchmark/build.gradle                   |   3 +-
 .../apache/solr/bench/MiniClusterState.java   |   3 +
 .../solr/bench/search/StreamingSearch.java    | 154 ++++++++++++++++++
 .../solr/client/solrj/io/SolrClientCache.java | 153 ++++++++++-------
 .../solrj/io/stream/CloudSolrStream.java      |   1 -
 .../client/solrj/io/stream/CommitStream.java  |  12 +-
 .../solrj/io/stream/DeepRandomStream.java     |   2 -
 .../client/solrj/io/stream/DeleteStream.java  |   3 +-
 .../client/solrj/io/stream/Facet2DStream.java |  30 ++--
 .../client/solrj/io/stream/FacetStream.java   |  29 ++--
 .../io/stream/FeaturesSelectionStream.java    |  63 ++++---
 .../client/solrj/io/stream/HavingStream.java  |   4 +-
 .../client/solrj/io/stream/KnnStream.java     |  23 ++-
 .../client/solrj/io/stream/LetStream.java     |   2 +-
 .../client/solrj/io/stream/ModelStream.java   |   3 -
 .../client/solrj/io/stream/RandomStream.java  |  29 ++--
 .../solrj/io/stream/ScoreNodesStream.java     |  14 +-
 .../client/solrj/io/stream/SearchStream.java  |  24 ++-
 .../io/stream/SignificantTermsStream.java     |  54 +++---
 .../client/solrj/io/stream/SolrStream.java    |  42 +++--
 .../client/solrj/io/stream/SqlStream.java     |   2 -
 .../client/solrj/io/stream/StatsStream.java   |  28 +++-
 .../client/solrj/io/stream/StreamContext.java |   3 +-
 .../solrj/io/stream/TextLogitStream.java      |  44 +++--
 .../solrj/io/stream/TimeSeriesStream.java     |  23 ++-
 .../client/solrj/io/stream/TopicStream.java   | 103 ++++++------
 .../client/solrj/io/stream/UpdateStream.java  |  41 ++---
 .../solrj/impl/CloudHttp2SolrClient.java      |   8 +
 .../client/solrj/impl/Http2SolrClient.java    |  25 ++-
 .../client/solrj/impl/HttpSolrClient.java     |   1 +
 .../client/solrj/impl/SolrClientBuilder.java  |   8 +
 32 files changed, 596 insertions(+), 340 deletions(-)
 create mode 100644 solr/benchmark/src/java/org/apache/solr/bench/search/StreamingSearch.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c3985d65a8b..e09b1849394 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -101,6 +101,8 @@ Improvements
 
 * SOLR-16940: Users can pass Java system properties to the SolrCLI via the SOLR_TOOL_OPTS environment variable. (Houston Putman)
 
+* SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
+
 Optimizations
 ---------------------
 
diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradle
index be99ea3ee03..63cea7af01f 100644
--- a/solr/benchmark/build.gradle
+++ b/solr/benchmark/build.gradle
@@ -46,9 +46,10 @@ task echoCp {
 dependencies {
   implementation project(':solr:test-framework')
   implementation project(':solr:solrj')
+  implementation project(':solr:solrj-streaming')
 
   implementation 'org.apache.lucene:lucene-core'
-
+  implementation 'org.apache.httpcomponents:httpclient'
   implementation 'commons-io:commons-io'
   implementation 'io.dropwizard.metrics:metrics-core'
   implementation 'org.apache.commons:commons-math3'
diff --git a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
index a35dd07bbcc..dd1c0afe639 100755
--- a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
+++ b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
@@ -86,6 +86,8 @@ public static class MiniClusterBenchState {
     /** The Nodes. */
     public List<String> nodes;
 
+    public String zkHost;
+
     /** The Cluster. */
     MiniSolrCloudCluster cluster;
 
@@ -277,6 +279,7 @@ public void startMiniCluster(int nodeCount) {
       for (JettySolrRunner runner : jetties) {
         nodes.add(runner.getBaseUrl().toString());
       }
+      zkHost = cluster.getZkServer().getZkAddress();
 
       client = new Http2SolrClient.Builder().useHttp1_1(useHttp1).build();
 
diff --git a/solr/benchmark/src/java/org/apache/solr/bench/search/StreamingSearch.java b/solr/benchmark/src/java/org/apache/solr/bench/search/StreamingSearch.java
new file mode 100644
index 00000000000..14046644c46
--- /dev/null
+++ b/solr/benchmark/src/java/org/apache/solr/bench/search/StreamingSearch.java
@@ -0,0 +1,154 @@
+/*
+ * 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.bench.search;
+
+import static org.apache.solr.bench.Docs.docs;
+import static org.apache.solr.bench.generators.SourceDSL.integers;
+import static org.apache.solr.bench.generators.SourceDSL.strings;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.solr.bench.Docs;
+import org.apache.solr.bench.MiniClusterState;
+import org.apache.solr.bench.MiniClusterState.MiniClusterBenchState;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.client.solrj.io.SolrClientCache;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.stream.CloudSolrStream;
+import org.apache.solr.client.solrj.io.stream.StreamContext;
+import org.apache.solr.client.solrj.io.stream.TupleStream;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+@Fork(value = 1)
+@BenchmarkMode(Mode.Throughput)
+@Warmup(time = 5, iterations = 1)
+@Measurement(time = 30, iterations = 4)
+@Threads(value = 1)
+public class StreamingSearch {
+
+  private static final String collection = "benchStreamingSearch";
+
+  @State(Scope.Benchmark)
+  public static class BenchState {
+
+    @Param({"false", "true"})
+    boolean useHttp1;
+
+    private int docs = 1000;
+    private String zkHost;
+    private ModifiableSolrParams params;
+    private StreamContext streamContext;
+    private Http2SolrClient http2SolrClient;
+
+    @Setup(Level.Trial)
+    public void setup(MiniClusterBenchState miniClusterState) throws Exception {
+
+      miniClusterState.startMiniCluster(3);
+      miniClusterState.createCollection(collection, 3, 1);
+      Docs docGen =
+          docs()
+              .field("id", integers().incrementing())
+              .field("text2_ts", strings().basicLatinAlphabet().multi(312).ofLengthBetween(30, 64))
+              .field("text3_ts", strings().basicLatinAlphabet().multi(312).ofLengthBetween(30, 64))
+              .field("int1_i_dv", integers().all());
+      miniClusterState.index(collection, docGen, docs);
+      miniClusterState.waitForMerges(collection);
+
+      zkHost = miniClusterState.zkHost;
+
+      params = new ModifiableSolrParams();
+      params.set(CommonParams.Q, "*:*");
+      params.set(CommonParams.FL, "id,text2_ts,text3_ts,int1_i_dv");
+      params.set(CommonParams.SORT, "id asc,int1_i_dv asc");
+      params.set(CommonParams.ROWS, docs);
+    }
+
+    @Setup(Level.Iteration)
+    public void setupIteration(MiniClusterState.MiniClusterBenchState miniClusterState)
+        throws SolrServerException, IOException {
+      SolrClientCache solrClientCache;
+      if (useHttp1) {
+        var httpClient = HttpClientUtil.createClient(null); // TODO tune params?
+        solrClientCache = new SolrClientCache(httpClient);
+      } else {
+        http2SolrClient = newHttp2SolrClient();
+        solrClientCache = new SolrClientCache(http2SolrClient);
+      }
+
+      streamContext = new StreamContext();
+      streamContext.setSolrClientCache(solrClientCache);
+    }
+
+    @TearDown(Level.Iteration)
+    public void teardownIt() {
+      streamContext.getSolrClientCache().close();
+      if (http2SolrClient != null) {
+        http2SolrClient.close();
+      }
+    }
+  }
+
+  @Benchmark
+  public Object stream(
+      BenchState benchState, MiniClusterState.MiniClusterBenchState miniClusterState)
+      throws SolrServerException, IOException {
+    CloudSolrStream stream = new CloudSolrStream(benchState.zkHost, collection, benchState.params);
+    stream.setStreamContext(benchState.streamContext);
+    return getTuples(stream);
+  }
+
+  private static List<Tuple> getTuples(TupleStream tupleStream) throws IOException {
+    List<Tuple> tuples = new ArrayList<>();
+    try {
+      tupleStream.open();
+      while (true) {
+        Tuple t = tupleStream.read();
+        if (t.EOF) {
+          break;
+        } else {
+          tuples.add(t);
+        }
+      }
+      return tuples;
+    } finally {
+      tupleStream.close();
+    }
+  }
+
+  public static Http2SolrClient newHttp2SolrClient() {
+    // TODO tune params?
+    var builder = new Http2SolrClient.Builder();
+    return builder.build();
+  }
+}
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 ff2963c89fb..02621784d00 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
@@ -16,10 +16,9 @@
  */
 package org.apache.solr.client.solrj.io;
 
+import java.io.Closeable;
 import java.io.IOException;
-import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,97 +27,137 @@
 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.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.SolrClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * The SolrClientCache caches SolrClients so they can be reused by different TupleStreams.
- *
- * <p>TODO: Cut this over to using Solr's new Http2 clients
- */
-public class SolrClientCache implements Serializable {
+/** The SolrClientCache caches SolrClients so they can be reused by different TupleStreams. */
+public class SolrClientCache implements Closeable {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  private final Map<String, SolrClient> solrClients = new HashMap<>();
-  private final HttpClient httpClient;
   // Set the floor for timeouts to 60 seconds.
   // Timeouts cans be increased by setting the system properties defined below.
-  private static final int conTimeout =
+  private static final int MIN_TIMEOUT = 60000;
+  private static final int minConnTimeout =
       Math.max(
-          Integer.parseInt(System.getProperty(HttpClientUtil.PROP_CONNECTION_TIMEOUT, "60000")),
-          60000);
-  private static final int socketTimeout =
-      Math.max(
-          Integer.parseInt(System.getProperty(HttpClientUtil.PROP_SO_TIMEOUT, "60000")), 60000);
+          Integer.getInteger(HttpClientUtil.PROP_CONNECTION_TIMEOUT, MIN_TIMEOUT), MIN_TIMEOUT);
+  private static final int minSocketTimeout =
+      Math.max(Integer.getInteger(HttpClientUtil.PROP_SO_TIMEOUT, MIN_TIMEOUT), MIN_TIMEOUT);
+
+  private final Map<String, SolrClient> solrClients = new HashMap<>();
+  private final HttpClient apacheHttpClient;
+  private final Http2SolrClient http2SolrClient;
 
   public SolrClientCache() {
-    httpClient = null;
+    this.apacheHttpClient = null;
+    this.http2SolrClient = null;
   }
 
   @Deprecated(since = "9.0")
-  public SolrClientCache(HttpClient httpClient) {
-    this.httpClient = httpClient;
+  public SolrClientCache(HttpClient apacheHttpClient) {
+    this.apacheHttpClient = apacheHttpClient;
+    this.http2SolrClient = null;
   }
 
-  @Deprecated(since = "9.0")
-  public synchronized CloudSolrClient getCloudSolrClient(String zkHost) {
-
-    // Timeouts should never be lower then 60000 but they can be set higher
-    assert (conTimeout >= 60000);
-    assert (socketTimeout >= 60000);
-
-    if (log.isDebugEnabled()) {
-      log.debug("SolrClientCache.conTimeout: {}", conTimeout);
-      log.debug("SolrClientCache.socketTimeout: {}", socketTimeout);
-    }
+  public SolrClientCache(Http2SolrClient http2SolrClient) {
+    this.apacheHttpClient = null;
+    this.http2SolrClient = http2SolrClient;
+  }
 
+  public synchronized CloudSolrClient getCloudSolrClient(String zkHost) {
     Objects.requireNonNull(zkHost, "ZooKeeper host cannot be null!");
-    CloudSolrClient client;
     if (solrClients.containsKey(zkHost)) {
-      client = (CloudSolrClient) solrClients.get(zkHost);
+      return (CloudSolrClient) solrClients.get(zkHost);
+    }
+    final CloudSolrClient client;
+    if (apacheHttpClient != null) {
+      client = newCloudLegacySolrClient(zkHost, apacheHttpClient);
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      var builder =
-          new CloudLegacySolrClient.Builder(hosts, Optional.empty())
-              .withSocketTimeout(socketTimeout, TimeUnit.MILLISECONDS)
-              .withConnectionTimeout(conTimeout, TimeUnit.MILLISECONDS);
-      if (httpClient != null) {
-        builder = builder.withHttpClient(httpClient);
-      }
-
-      client = builder.build();
-      client.connect();
-      solrClients.put(zkHost, client);
+      client = newCloudHttp2SolrClient(zkHost, http2SolrClient);
     }
+    solrClients.put(zkHost, client);
+    return client;
+  }
 
+  @Deprecated
+  private static CloudSolrClient newCloudLegacySolrClient(String zkHost, HttpClient httpClient) {
+    final List<String> hosts = List.of(zkHost);
+    var builder = new CloudLegacySolrClient.Builder(hosts, Optional.empty());
+    adjustTimeouts(builder, httpClient);
+    var client = builder.build();
+    client.connect();
+    return client;
+  }
+
+  private static CloudHttp2SolrClient newCloudHttp2SolrClient(
+      String zkHost, Http2SolrClient http2SolrClient) {
+    final List<String> hosts = List.of(zkHost);
+    var builder = new CloudHttp2SolrClient.Builder(hosts, Optional.empty());
+    // using internal builder to ensure the internal client gets closed
+    builder = builder.withInternalClientBuilder(newHttp2SolrClientBuilder(null, http2SolrClient));
+    var client = builder.build();
+    client.connect();
     return client;
   }
 
-  @Deprecated(since = "9.0")
   public synchronized SolrClient getHttpSolrClient(String baseUrl) {
-    SolrClient client;
+    Objects.requireNonNull(baseUrl, "Url cannot be null!");
     if (solrClients.containsKey(baseUrl)) {
-      client = solrClients.get(baseUrl);
+      return solrClients.get(baseUrl);
+    }
+    final SolrClient client;
+    if (apacheHttpClient != null) {
+      client = newHttpSolrClient(baseUrl, apacheHttpClient);
     } else {
-      HttpSolrClient.Builder builder =
-          new HttpSolrClient.Builder(baseUrl)
-              .withSocketTimeout(socketTimeout, TimeUnit.MILLISECONDS)
-              .withConnectionTimeout(conTimeout, TimeUnit.MILLISECONDS);
-      if (httpClient != null) {
-        builder = builder.withHttpClient(httpClient);
-      }
-      client = builder.build();
-      solrClients.put(baseUrl, client);
+      client = newHttp2SolrClientBuilder(baseUrl, http2SolrClient).build();
     }
+    solrClients.put(baseUrl, client);
     return client;
   }
 
+  @Deprecated
+  private static SolrClient newHttpSolrClient(String baseUrl, HttpClient httpClient) {
+    HttpSolrClient.Builder builder = new HttpSolrClient.Builder(baseUrl);
+    adjustTimeouts(builder, httpClient);
+    return builder.build();
+  }
+
+  @Deprecated
+  private static void adjustTimeouts(SolrClientBuilder<?> builder, HttpClient httpClient) {
+    builder.withHttpClient(httpClient);
+    int socketTimeout = Math.max(minSocketTimeout, builder.getSocketTimeoutMillis());
+    builder.withSocketTimeout(socketTimeout, TimeUnit.MILLISECONDS);
+    int connTimeout = Math.max(minConnTimeout, builder.getConnectionTimeoutMillis());
+    builder.withConnectionTimeout(connTimeout, TimeUnit.MILLISECONDS);
+  }
+
+  private static Http2SolrClient.Builder newHttp2SolrClientBuilder(
+      String baseUrl, Http2SolrClient http2SolrClient) {
+    var builder = new Http2SolrClient.Builder(baseUrl);
+    if (http2SolrClient != null) {
+      builder = builder.withHttpClient(http2SolrClient);
+    }
+    long idleTimeout = minSocketTimeout;
+    if (builder.getIdleTimeoutMillis() != null) {
+      idleTimeout = Math.max(idleTimeout, builder.getIdleTimeoutMillis());
+    }
+    builder.withIdleTimeout(idleTimeout, TimeUnit.MILLISECONDS);
+    long connTimeout = minConnTimeout;
+    if (builder.getConnectionTimeout() != null) {
+      connTimeout = Math.max(idleTimeout, builder.getConnectionTimeout());
+    }
+    builder.withConnectionTimeout(connTimeout, TimeUnit.MILLISECONDS);
+    return builder;
+  }
+
+  @Override
   public synchronized void close() {
     for (Map.Entry<String, SolrClient> entry : solrClients.entrySet()) {
       try {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
index 6cef1b2c9b6..8b2bd54aef7 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
@@ -75,7 +75,6 @@ public class CloudSolrStream extends TupleStream implements Expressible {
   protected StreamComparator comp;
   private boolean trace;
   protected transient Map<String, Tuple> eofTuples;
-  protected transient CloudSolrClient cloudSolrClient;
   protected transient List<TupleStream> solrStreams;
   protected transient TreeSet<TupleWrapper> tuples;
   protected transient StreamContext streamContext;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
index 1121ab12421..79f8abfab23 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
@@ -55,6 +55,7 @@ public class CommitStream extends TupleStream implements Expressible {
   private TupleStream tupleSource;
 
   private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
   private long docsSinceCommit;
 
   public CommitStream(StreamExpression expression, StreamFactory factory) throws IOException {
@@ -150,7 +151,12 @@ private void init(
   @Override
   public void open() throws IOException {
     tupleSource.open();
-    clientCache = new SolrClientCache();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
     docsSinceCommit = 0;
   }
 
@@ -193,7 +199,9 @@ private boolean isInteger(String string) {
 
   @Override
   public void close() throws IOException {
-    clientCache.close();
+    if (doCloseCache) {
+      clientCache.close();
+    }
     tupleSource.close();
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
index 02bb701d5d3..2e32dc26f09 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
@@ -37,7 +37,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
 import org.apache.solr.client.solrj.io.stream.expr.Explanation;
@@ -71,7 +70,6 @@ public class DeepRandomStream extends TupleStream implements Expressible {
   protected StreamComparator comp;
   private boolean trace;
   protected transient Map<String, Tuple> eofTuples;
-  protected transient CloudSolrClient cloudSolrClient;
   protected transient List<TupleStream> solrStreams;
   protected transient Deque<TupleWrapper> tuples;
   protected transient StreamContext streamContext;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
index e78941c80a8..d00908792ed 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
@@ -79,7 +79,8 @@ protected void uploadBatchToCollection(List<SolrInputDocument> documentBatch) th
         final Long version = getVersion(doc);
         req.deleteById(id, version);
       }
-      req.process(getCloudSolrClient(), getCollectionName());
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
+      req.process(cloudSolrClient, getCollectionName());
     } catch (SolrServerException | NumberFormatException | IOException e) {
       log.warn("Unable to delete documents from collection due to unexpected error.", e);
       String className = e.getClass().getName();
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
index c362257387c..878dee75af4 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
@@ -24,12 +24,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
@@ -68,8 +64,8 @@ public class Facet2DStream extends TupleStream implements Expressible {
   private int dimensionY;
   private FieldComparator bucketSort;
 
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
+  protected transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
 
   public Facet2DStream(
       String zkHost,
@@ -312,7 +308,7 @@ public StreamExpressionParameter toExpression(StreamFactory factory) throws IOEx
 
   @Override
   public void setStreamContext(StreamContext context) {
-    cache = context.getSolrClientCache();
+    clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -322,16 +318,11 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    if (cache != null) {
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient =
-          new CloudLegacySolrClient.Builder(hosts, Optional.empty())
-              .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-              .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-              .build();
+      doCloseCache = false;
     }
     FieldComparator[] adjustedSorts = adjustSorts(x, y, bucketSort);
 
@@ -344,6 +335,7 @@ public void open() throws IOException {
 
     QueryRequest request = new QueryRequest(paramsLoc, SolrRequest.METHOD.POST);
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       NamedList<Object> response = cloudSolrClient.request(request, collection);
       getTuples(response, x, y, metric);
       this.out = tuples.iterator();
@@ -366,10 +358,8 @@ public Tuple read() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cache == null) {
-      if (cloudSolrClient != null) {
-        cloudSolrClient.close();
-      }
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
index 3b0b785cbc9..759c038d7a0 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
@@ -24,11 +24,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
@@ -88,8 +85,8 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMet
   private boolean resortNeeded;
   private boolean serializeBucketSizeLimit;
 
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
+  protected transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
   protected transient TupleStream parallelizedStream;
   protected transient StreamContext context;
 
@@ -647,7 +644,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
   @Override
   public void setStreamContext(StreamContext context) {
     this.context = context;
-    cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -657,17 +654,13 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    if (cache != null) {
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient =
-          new CloudLegacySolrClient.Builder(hosts, Optional.empty())
-              .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-              .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-              .build();
+      doCloseCache = false;
     }
+    var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
 
     // Parallelize the facet expression across multiple collections for an alias using plist if
     // possible
@@ -761,10 +754,8 @@ private boolean expectedJson(String json) {
 
   @Override
   public void close() throws IOException {
-    if (cache == null) {
-      if (cloudSolrClient != null) {
-        cloudSolrClient.close();
-      }
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
index d4990800cd4..3a761ceaee4 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
@@ -37,7 +37,6 @@
 import java.util.concurrent.Future;
 import java.util.stream.Stream;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -76,12 +75,9 @@ public class FeaturesSelectionStream extends TupleStream implements Expressible
   protected int positiveLabel;
   protected int numTerms;
 
-  protected transient SolrClientCache cache;
-  protected transient boolean isCloseCache;
-  protected transient CloudSolrClient cloudSolrClient;
-
-  protected transient StreamContext streamContext;
-  protected ExecutorService executorService;
+  protected transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+  protected transient ExecutorService executorService;
 
   public FeaturesSelectionStream(
       String zkHost,
@@ -254,21 +250,19 @@ private void init(
 
   @Override
   public void setStreamContext(StreamContext context) {
-    this.cache = context.getSolrClientCache();
-    this.streamContext = context;
+    this.clientCache = context.getSolrClientCache();
   }
 
   /** Opens the CloudSolrStream */
   @Override
   public void open() throws IOException {
-    if (cache == null) {
-      isCloseCache = true;
-      cache = new SolrClientCache();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      isCloseCache = false;
+      doCloseCache = false;
     }
 
-    this.cloudSolrClient = this.cache.getCloudSolrClient(zkHost);
     this.executorService =
         ExecutorUtil.newMDCAwareCachedThreadPool(
             new SolrNamedThreadFactory("FeaturesSelectionStream"));
@@ -281,6 +275,7 @@ public List<TupleStream> children() {
 
   private List<String> getShardUrls() throws IOException {
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       Slice[] slices = CloudSolrStream.getSlices(this.collection, cloudSolrClient, false);
       Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
 
@@ -314,7 +309,14 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
     List<Future<NamedList<?>>> futures = new ArrayList<>();
     for (String baseUrl : baseUrls) {
       FeaturesSelectionCall lc =
-          new FeaturesSelectionCall(baseUrl, this.params, this.field, this.outcome);
+          new FeaturesSelectionCall(
+              baseUrl,
+              this.params,
+              this.field,
+              this.outcome,
+              this.positiveLabel,
+              this.numTerms,
+              this.clientCache);
 
       Future<NamedList<?>> future = executorService.submit(lc);
       futures.add(future);
@@ -325,8 +327,8 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
 
   @Override
   public void close() throws IOException {
-    if (isCloseCache && cache != null) {
-      cache.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
 
     if (executorService != null) {
@@ -417,26 +419,37 @@ private <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map
     return result;
   }
 
-  protected class FeaturesSelectionCall implements Callable<NamedList<?>> {
+  protected static class FeaturesSelectionCall implements Callable<NamedList<?>> {
 
-    private String baseUrl;
-    private String outcome;
-    private String field;
-    private Map<String, String> paramsMap;
+    private final String baseUrl;
+    private final String outcome;
+    private final String field;
+    private final Map<String, String> paramsMap;
+    private final int positiveLabel;
+    private final int numTerms;
+    private final SolrClientCache clientCache;
 
     public FeaturesSelectionCall(
-        String baseUrl, Map<String, String> paramsMap, String field, String outcome) {
-
+        String baseUrl,
+        Map<String, String> paramsMap,
+        String field,
+        String outcome,
+        int positiveLabel,
+        int numTerms,
+        SolrClientCache clientCache) {
       this.baseUrl = baseUrl;
       this.outcome = outcome;
       this.field = field;
       this.paramsMap = paramsMap;
+      this.positiveLabel = positiveLabel;
+      this.numTerms = numTerms;
+      this.clientCache = clientCache;
     }
 
     @Override
     public NamedList<?> call() throws Exception {
       ModifiableSolrParams params = new ModifiableSolrParams();
-      SolrClient solrClient = cache.getHttpSolrClient(baseUrl);
+      SolrClient solrClient = clientCache.getHttpSolrClient(baseUrl);
 
       params.add(DISTRIB, "false");
       params.add("fq", "{!igain}");
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
index e151aaa19f7..988a3dbc73e 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
@@ -44,9 +44,7 @@ public class HavingStream extends TupleStream implements Expressible {
 
   private TupleStream stream;
   private RecursiveBooleanEvaluator evaluator;
-  private StreamContext streamContext;
-
-  private transient Tuple currentGroupHead;
+  private transient StreamContext streamContext;
 
   public HavingStream(TupleStream stream, RecursiveBooleanEvaluator evaluator) throws IOException {
     init(stream, evaluator);
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
index fb1d2ba6e63..41cd08d18bf 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -60,8 +59,8 @@ public class KnnStream extends TupleStream implements Expressible {
   private String zkHost;
   private Map<String, String> props;
   private String collection;
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
   private Iterator<SolrDocument> documentIterator;
   private String id;
 
@@ -193,7 +192,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
 
   @Override
   public void setStreamContext(StreamContext context) {
-    cache = context.getSolrClientCache();
+    clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -204,7 +203,13 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
+
     ModifiableSolrParams params = getParams(this.props);
 
     StringBuilder builder = new StringBuilder();
@@ -227,7 +232,7 @@ public void open() throws IOException {
 
     QueryRequest request = new QueryRequest(params);
     try {
-      QueryResponse response = request.process(cloudSolrClient, collection);
+      QueryResponse response = request.process(clientCache.getCloudSolrClient(zkHost), collection);
       SolrDocumentList docs = response.getResults();
       documentIterator = docs.iterator();
     } catch (Exception e) {
@@ -236,7 +241,11 @@ public void open() throws IOException {
   }
 
   @Override
-  public void close() throws IOException {}
+  public void close() throws IOException {
+    if (doCloseCache) {
+      clientCache.close();
+    }
+  }
 
   @Override
   public Tuple read() throws IOException {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
index e5a6c4113ab..9576cf9658e 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
@@ -44,7 +44,7 @@ public class LetStream extends TupleStream implements Expressible {
 
   private static final long serialVersionUID = 1;
   private TupleStream stream;
-  private StreamContext streamContext;
+  private transient StreamContext streamContext;
   private Map<String, Object> letParams = new LinkedHashMap<>();
 
   public LetStream(StreamExpression expression, StreamFactory factory) throws IOException {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
index 727df5560a5..096f4a55e9c 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
@@ -26,7 +26,6 @@
 import java.util.Locale;
 import java.util.Map;
 import org.apache.solr.client.solrj.io.ModelCache;
-import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
 import org.apache.solr.client.solrj.io.stream.expr.Explanation;
@@ -53,7 +52,6 @@ public class ModelStream extends TupleStream implements Expressible {
   protected String collection;
   protected String modelID;
   protected ModelCache modelCache;
-  protected SolrClientCache solrClientCache;
   protected Tuple model;
   protected long cacheMillis;
 
@@ -162,7 +160,6 @@ private void init(String collectionName, String zkHost, String modelID, long cac
 
   @Override
   public void setStreamContext(StreamContext context) {
-    this.solrClientCache = context.getSolrClientCache();
     this.modelCache = context.getModelCache();
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
index aa0087bf8b0..c802fd870ee 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
@@ -27,13 +27,9 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Random;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -64,12 +60,13 @@ public class RandomStream extends TupleStream implements Expressible {
   private String zkHost;
   private Map<String, String> props;
   private String collection;
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
   private Iterator<SolrDocument> documentIterator;
   private int x;
   private boolean outputX;
 
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   public RandomStream() {
     // Used by the RandomFacade
   }
@@ -200,7 +197,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
 
   @Override
   public void setStreamContext(StreamContext context) {
-    cache = context.getSolrClientCache();
+    clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -211,16 +208,11 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    if (cache != null) {
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient =
-          new CloudLegacySolrClient.Builder(hosts, Optional.empty())
-              .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-              .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-              .build();
+      doCloseCache = false;
     }
 
     ModifiableSolrParams params = getParams(this.props);
@@ -235,6 +227,7 @@ public void open() throws IOException {
 
     QueryRequest request = new QueryRequest(params, SolrRequest.METHOD.POST);
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       QueryResponse response = request.process(cloudSolrClient, collection);
       SolrDocumentList docs = response.getResults();
       documentIterator = docs.iterator();
@@ -245,8 +238,8 @@ public void open() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cache == null) {
-      cloudSolrClient.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
index ea10185f730..01be8e309c4 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
@@ -59,7 +59,6 @@ public class ScoreNodesStream extends TupleStream implements Expressible {
 
   protected String zkHost;
   private TupleStream stream;
-  private transient SolrClientCache clientCache;
   private Map<String, Tuple> nodes = new HashMap<>();
   private Iterator<Tuple> tuples;
   private String termFreq;
@@ -68,6 +67,9 @@ public class ScoreNodesStream extends TupleStream implements Expressible {
   private String bucket;
   private String facetCollection;
 
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   public ScoreNodesStream(TupleStream tupleStream, String nodeFreqField) throws IOException {
     init(tupleStream, nodeFreqField);
   }
@@ -176,6 +178,13 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
+
     stream.open();
     Tuple node = null;
     StringBuilder builder = new StringBuilder();
@@ -261,6 +270,9 @@ public void open() throws IOException {
 
   @Override
   public void close() throws IOException {
+    if (doCloseCache) {
+      clientCache.close();
+    }
     stream.close();
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
index 1e6226b7536..f1e6c33c2fb 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
@@ -24,10 +24,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.Optional;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
@@ -55,11 +52,12 @@ public class SearchStream extends TupleStream implements Expressible {
   private String zkHost;
   private ModifiableSolrParams params;
   private String collection;
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
   private Iterator<SolrDocument> documentIterator;
   protected StreamComparator comp;
 
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   public SearchStream() {}
 
   public SearchStream(StreamExpression expression, StreamFactory factory) throws IOException {
@@ -184,7 +182,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
 
   @Override
   public void setStreamContext(StreamContext context) {
-    cache = context.getSolrClientCache();
+    clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -195,16 +193,16 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    if (cache != null) {
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient = new CloudLegacySolrClient.Builder(hosts, Optional.empty()).build();
+      doCloseCache = false;
     }
 
     QueryRequest request = new QueryRequest(params, SolrRequest.METHOD.POST);
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       QueryResponse response = request.process(cloudSolrClient, collection);
       SolrDocumentList docs = response.getResults();
       documentIterator = docs.iterator();
@@ -215,8 +213,8 @@ public void open() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cache == null) {
-      cloudSolrClient.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 7e47003fa63..22d7c8bc73c 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -68,10 +68,10 @@ public class SignificantTermsStream extends TupleStream implements Expressible {
   protected float maxDocFreq;
   protected int minTermLength;
 
-  protected transient SolrClientCache cache;
-  protected transient boolean isCloseCache;
-  protected transient StreamContext streamContext;
-  protected ExecutorService executorService;
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+  private transient StreamContext streamContext;
+  private transient ExecutorService executorService;
 
   public SignificantTermsStream(
       String zkHost,
@@ -239,17 +239,17 @@ private void init(
 
   @Override
   public void setStreamContext(StreamContext context) {
-    this.cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
     this.streamContext = context;
   }
 
   @Override
   public void open() throws IOException {
-    if (cache == null) {
-      isCloseCache = true;
-      cache = new SolrClientCache();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      isCloseCache = false;
+      doCloseCache = false;
     }
 
     this.executorService =
@@ -274,7 +274,9 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
               this.minDocFreq,
               this.maxDocFreq,
               this.minTermLength,
-              this.numTerms);
+              this.numTerms,
+              streamContext.isLocal(),
+              clientCache);
 
       Future<NamedList<?>> future = executorService.submit(lc);
       futures.add(future);
@@ -285,8 +287,8 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
 
   @Override
   public void close() throws IOException {
-    if (isCloseCache) {
-      cache.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
 
     executorService.shutdown();
@@ -387,15 +389,17 @@ public int compare(Map<String, ?> a, Map<String, ?> b) {
     }
   }
 
-  protected class SignificantTermsCall implements Callable<NamedList<?>> {
+  protected static class SignificantTermsCall implements Callable<NamedList<?>> {
 
-    private String baseUrl;
-    private String field;
-    private float minDocFreq;
-    private float maxDocFreq;
-    private int numTerms;
-    private int minTermLength;
-    private Map<String, String> paramsMap;
+    private final String baseUrl;
+    private final String field;
+    private final float minDocFreq;
+    private final float maxDocFreq;
+    private final int numTerms;
+    private final int minTermLength;
+    private final Map<String, String> paramsMap;
+    private final boolean isLocal;
+    private final SolrClientCache clientCache;
 
     public SignificantTermsCall(
         String baseUrl,
@@ -404,7 +408,9 @@ public SignificantTermsCall(
         float minDocFreq,
         float maxDocFreq,
         int minTermLength,
-        int numTerms) {
+        int numTerms,
+        boolean isLocal,
+        SolrClientCache clientCache) {
 
       this.baseUrl = baseUrl;
       this.field = field;
@@ -413,12 +419,14 @@ public SignificantTermsCall(
       this.paramsMap = paramsMap;
       this.numTerms = numTerms;
       this.minTermLength = minTermLength;
+      this.isLocal = isLocal;
+      this.clientCache = clientCache;
     }
 
     @Override
     public NamedList<?> call() throws Exception {
       ModifiableSolrParams params = new ModifiableSolrParams();
-      SolrClient solrClient = cache.getHttpSolrClient(baseUrl);
+      SolrClient solrClient = clientCache.getHttpSolrClient(baseUrl);
 
       params.add(DISTRIB, "false");
       params.add("fq", "{!significantTerms}");
@@ -432,7 +440,7 @@ public NamedList<?> call() throws Exception {
       params.add("minTermLength", Integer.toString(minTermLength));
       params.add("field", field);
       params.add("numTerms", String.valueOf(numTerms * 5));
-      if (streamContext.isLocal()) {
+      if (isLocal) {
         params.add("distrib", "false");
       }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
index 8f019c36e61..f58546cb432 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.client.solrj.io.stream;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -25,10 +26,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
@@ -47,8 +46,6 @@
 /**
  * Queries a single Solr instance and maps SolrDocs to a Stream of Tuples.
  *
- * <p>TODO: Move this to Http2SolrClient
- *
  * @since 5.1.0
  */
 public class SolrStream extends TupleStream {
@@ -62,16 +59,17 @@ public class SolrStream extends TupleStream {
   private boolean trace;
   private Map<String, String> fieldMappings;
   private transient TupleStreamParser tupleStreamParser;
-  private transient SolrClient client;
-  private transient SolrClientCache cache;
   private String slice;
   private long checkpoint = -1;
-  private CloseableHttpResponse closeableHttpResponse;
+  private Closeable closeableHttpResponse;
   private boolean distrib = true;
   private String user;
   private String password;
   private String core;
 
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   /**
    * @param baseUrl Base URL of the stream.
    * @param params Map&lt;String, String&gt; of parameters
@@ -104,7 +102,7 @@ public void setStreamContext(StreamContext context) {
     this.distrib = !context.isLocal();
     this.numWorkers = context.numWorkers;
     this.workerID = context.workerID;
-    this.cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
   }
 
   public void setCredentials(String user, String password) {
@@ -115,12 +113,11 @@ public void setCredentials(String user, String password) {
   /** Opens the stream to a single Solr instance. */
   @Override
   public void open() throws IOException {
-
-    // Reuse the same client per node vs. having one per replica
-    if (cache == null) {
-      client = new HttpSolrClient.Builder(baseUrl).build();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      client = cache.getHttpSolrClient(baseUrl);
+      doCloseCache = false;
     }
 
     try {
@@ -193,8 +190,8 @@ public void close() throws IOException {
     if (closeableHttpResponse != null) {
       closeableHttpResponse.close();
     }
-    if (cache == null && client != null) {
-      client.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
@@ -303,15 +300,26 @@ private TupleStreamParser constructParser(SolrParams requestParams)
       query.setBasicAuthCredentials(user, password);
     }
 
+    var client = clientCache.getHttpSolrClient(baseUrl);
     NamedList<Object> genericResponse = client.request(query);
     InputStream stream = (InputStream) genericResponse.get("stream");
+
     CloseableHttpResponse httpResponse =
         (CloseableHttpResponse) genericResponse.get("closeableResponse");
+    // still attempting to read http status from http response for backwards compatibility reasons
+    // since 9.4 the updated format will have a dedicated status field
+    final int statusCode;
+    if (httpResponse != null) {
+      statusCode = httpResponse.getStatusLine().getStatusCode();
+    } else {
+      statusCode = (int) genericResponse.get("responseStatus");
+    }
 
-    final int statusCode = httpResponse.getStatusLine().getStatusCode();
     if (statusCode != 200) {
       String errMsg = consumeStreamAsErrorMessage(stream);
-      httpResponse.close();
+      if (httpResponse != null) {
+        httpResponse.close();
+      }
       throw new IOException(
           "Query to '"
               + query.getPath()
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
index a0419567d1d..b39ab1dbdc1 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
@@ -24,7 +24,6 @@
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
 import org.apache.solr.client.solrj.io.stream.expr.Explanation;
@@ -49,7 +48,6 @@ public class SqlStream extends TupleStream implements Expressible {
   protected String zkHost;
   protected String collection;
   protected SolrParams params;
-  protected transient CloudSolrClient cloudSolrClient;
   protected transient TupleStream tupleStream;
   protected transient StreamContext streamContext;
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
index fb7696c8ac9..507dc3820fd 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
@@ -30,7 +30,6 @@
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
@@ -69,9 +68,10 @@ public class StatsStream extends TupleStream implements Expressible, ParallelMet
   private String zkHost;
   private SolrParams params;
   private String collection;
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
-  private StreamContext context;
+
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+  private transient StreamContext context;
   protected transient TupleStream parallelizedStream;
 
   public StatsStream(String zkHost, String collection, SolrParams params, Metric[] metrics)
@@ -216,7 +216,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
   @Override
   public void setStreamContext(StreamContext context) {
     this.context = context;
-    cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -226,6 +226,12 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
 
     @SuppressWarnings({"unchecked"})
     Map<String, List<String>> shardsMap = (Map<String, List<String>>) context.get("shards");
@@ -233,7 +239,7 @@ public void open() throws IOException {
     // Parallelize the stats stream across multiple collections for an alias using plist if possible
     if (shardsMap == null && params.getBool(TIERED_PARAM, defaultTieredEnabled)) {
       ClusterStateProvider clusterStateProvider =
-          cache.getCloudSolrClient(zkHost).getClusterStateProvider();
+          clientCache.getCloudSolrClient(zkHost).getClusterStateProvider();
       final List<String> resolved =
           clusterStateProvider != null ? clusterStateProvider.resolveAlias(collection) : null;
       if (resolved != null && resolved.size() > 1) {
@@ -255,7 +261,7 @@ public void open() throws IOException {
 
     if (shardsMap == null) {
       QueryRequest request = new QueryRequest(paramsLoc, SolrRequest.METHOD.POST);
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       try {
         NamedList<?> response = cloudSolrClient.request(request, collection);
         getTuples(response, metrics);
@@ -264,7 +270,7 @@ public void open() throws IOException {
       }
     } else {
       List<String> shards = shardsMap.get(collection);
-      SolrClient client = cache.getHttpSolrClient(shards.get(0));
+      SolrClient client = clientCache.getHttpSolrClient(shards.get(0));
 
       if (shards.size() > 1) {
         String shardsParam = getShardString(shards);
@@ -294,7 +300,11 @@ private String getShardString(List<String> shards) {
   }
 
   @Override
-  public void close() throws IOException {}
+  public void close() throws IOException {
+    if (doCloseCache) {
+      clientCache.close();
+    }
+  }
 
   @Override
   public Tuple read() throws IOException {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
index 5feb15e46fa..2301b3d2136 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.client.solrj.io.stream;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
@@ -33,7 +32,7 @@
  * <p>Note: The StreamContext contains the SolrClientCache which is used to cache SolrClients for
  * reuse across multiple TupleStreams.
  */
-public class StreamContext implements Serializable {
+public class StreamContext {
 
   private Map<String, Object> entries = new HashMap<>();
   private Map<String, String> tupleContext = new HashMap<>();
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
index 1f746ef35f8..e3ff627232a 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
@@ -37,7 +37,6 @@
 import java.util.concurrent.Future;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.ClassificationEvaluation;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
@@ -82,12 +81,11 @@ public class TextLogitStream extends TupleStream implements Expressible {
   protected List<Double> idfs;
   protected ClassificationEvaluation evaluation;
 
-  protected transient SolrClientCache cache;
-  protected transient boolean isCloseCache;
-  protected transient CloudSolrClient cloudSolrClient;
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
 
   protected transient StreamContext streamContext;
-  protected ExecutorService executorService;
+  protected transient ExecutorService executorService;
   protected TupleStream termsStream;
   private List<String> terms;
 
@@ -355,7 +353,7 @@ private void init(
 
   @Override
   public void setStreamContext(StreamContext context) {
-    this.cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
     this.streamContext = context;
     this.termsStream.setStreamContext(context);
   }
@@ -363,14 +361,13 @@ public void setStreamContext(StreamContext context) {
   /** Opens the CloudSolrStream */
   @Override
   public void open() throws IOException {
-    if (cache == null) {
-      isCloseCache = true;
-      cache = new SolrClientCache();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      isCloseCache = false;
+      doCloseCache = false;
     }
 
-    this.cloudSolrClient = this.cache.getCloudSolrClient(zkHost);
     this.executorService =
         ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TextLogitSolrStream"));
   }
@@ -384,6 +381,7 @@ public List<TupleStream> children() {
 
   protected List<String> getShardUrls() throws IOException {
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       Slice[] slices = CloudSolrStream.getSlices(this.collection, cloudSolrClient, false);
 
       Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
@@ -426,7 +424,10 @@ private List<Future<Tuple>> callShards(List<String> baseUrls) throws IOException
               this.outcome,
               this.positiveLabel,
               this.learningRate,
-              this.iteration);
+              this.iteration,
+              this.threshold,
+              this.idfs,
+              this.clientCache);
 
       Future<Tuple> future = executorService.submit(lc);
       futures.add(future);
@@ -437,8 +438,8 @@ private List<Future<Tuple>> callShards(List<String> baseUrls) throws IOException
 
   @Override
   public void close() throws IOException {
-    if (isCloseCache && cache != null) {
-      cache.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
 
     if (executorService != null) {
@@ -642,7 +643,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
     }
   }
 
-  protected class LogitCall implements Callable<Tuple> {
+  protected static class LogitCall implements Callable<Tuple> {
 
     private String baseUrl;
     private String feature;
@@ -653,6 +654,9 @@ protected class LogitCall implements Callable<Tuple> {
     private int positiveLabel;
     private double learningRate;
     private Map<String, String> paramsMap;
+    private double threshold;
+    private List<Double> idfs;
+    private SolrClientCache clientCache;
 
     public LogitCall(
         String baseUrl,
@@ -663,7 +667,10 @@ public LogitCall(
         String outcome,
         int positiveLabel,
         double learningRate,
-        int iteration) {
+        int iteration,
+        double threshold,
+        List<Double> idfs,
+        SolrClientCache clientCache) {
 
       this.baseUrl = baseUrl;
       this.feature = feature;
@@ -674,12 +681,15 @@ public LogitCall(
       this.positiveLabel = positiveLabel;
       this.learningRate = learningRate;
       this.paramsMap = paramsMap;
+      this.threshold = threshold;
+      this.idfs = idfs;
+      this.clientCache = clientCache;
     }
 
     @Override
     public Tuple call() throws Exception {
       ModifiableSolrParams params = new ModifiableSolrParams();
-      SolrClient solrClient = cache.getHttpSolrClient(baseUrl);
+      SolrClient solrClient = clientCache.getHttpSolrClient(baseUrl);
 
       params.add(DISTRIB, "false");
       params.add("fq", "{!tlogit}");
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
index 683cc35119c..383389d2551 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
@@ -25,11 +25,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -71,8 +68,8 @@ public class TimeSeriesStream extends TupleStream implements Expressible {
   private String zkHost;
   private SolrParams params;
   private String collection;
-  protected transient SolrClientCache cache;
-  protected transient CloudSolrClient cloudSolrClient;
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
 
   public TimeSeriesStream(
       String zkHost,
@@ -338,7 +335,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
 
   @Override
   public void setStreamContext(StreamContext context) {
-    cache = context.getSolrClientCache();
+    clientCache = context.getSolrClientCache();
   }
 
   @Override
@@ -348,12 +345,11 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    if (cache != null) {
-      cloudSolrClient = cache.getCloudSolrClient(zkHost);
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
     } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient = new CloudLegacySolrClient.Builder(hosts, Optional.empty()).build();
+      doCloseCache = false;
     }
 
     String json = getJsonFacetString(field, metrics, start, end, gap);
@@ -364,6 +360,7 @@ public void open() throws IOException {
 
     QueryRequest request = new QueryRequest(paramsLoc, SolrRequest.METHOD.POST);
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       NamedList<?> response = cloudSolrClient.request(request, collection);
       getTuples(response, field, metrics);
     } catch (Exception e) {
@@ -373,8 +370,8 @@ public void open() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cache == null) {
-      cloudSolrClient.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
index 54dc364fcf3..e343d56e35c 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
@@ -32,7 +32,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
@@ -40,7 +39,7 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
+import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
 import org.apache.solr.client.solrj.io.comp.FieldComparator;
@@ -79,6 +78,9 @@ public class TopicStream extends CloudSolrStream implements Expressible {
   private String checkpointCollection;
   private long initialCheckpoint = -1;
 
+  private transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   public TopicStream(
       String zkHost,
       String checkpointCollection,
@@ -310,6 +312,12 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
     this.tuples = new TreeSet<>();
     this.solrStreams = new ArrayList<>();
     this.eofTuples = Collections.synchronizedMap(new HashMap<>());
@@ -318,16 +326,6 @@ public void open() throws IOException {
       // Each worker must maintain its own checkpoints
       this.id = this.id + "_" + streamContext.workerID;
     }
-
-    if (streamContext.getSolrClientCache() != null) {
-      cloudSolrClient = streamContext.getSolrClientCache().getCloudSolrClient(zkHost);
-    } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      cloudSolrClient = new CloudLegacySolrClient.Builder(hosts, Optional.empty()).build();
-      this.cloudSolrClient.connect();
-    }
-
     if (checkpoints.size() == 0) {
       getPersistedCheckpoints();
       if (checkpoints.size() == 0) {
@@ -384,8 +382,8 @@ public void close() throws IOException {
         }
       }
 
-      if (streamContext != null && streamContext.getSolrClientCache() == null) {
-        cloudSolrClient.close();
+      if (doCloseCache) {
+        clientCache.close();
       }
     }
   }
@@ -426,6 +424,7 @@ public int getCost() {
   }
 
   private void getCheckpoints() throws IOException {
+    var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
     this.checkpoints = new HashMap<>();
     Slice[] slices = CloudSolrStream.getSlices(this.collection, cloudSolrClient, false);
     Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
@@ -483,9 +482,11 @@ private long getCheckpoint(Slice slice, Set<String> liveNodes) throws IOExceptio
 
   private void persistCheckpoints() throws IOException {
 
-    if (cloudSolrClient == null) {
+    if (clientCache == null) {
       return;
     }
+
+    var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
     UpdateRequest request = new UpdateRequest();
     request.setParam("collection", checkpointCollection);
     SolrInputDocument doc = new SolrInputDocument();
@@ -504,6 +505,7 @@ private void persistCheckpoints() throws IOException {
   }
 
   private void getPersistedCheckpoints() throws IOException {
+    var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
     Slice[] slices = CloudSolrStream.getSlices(checkpointCollection, cloudSolrClient, false);
 
     Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
@@ -537,47 +539,50 @@ private void getPersistedCheckpoints() throws IOException {
 
   @Override
   protected void constructStreams() throws IOException {
-    try {
-      Slice[] slices = CloudSolrStream.getSlices(this.collection, cloudSolrClient, false);
+    var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
+    Slice[] slices = CloudSolrStream.getSlices(this.collection, cloudSolrClient, false);
 
-      ModifiableSolrParams mParams = new ModifiableSolrParams(params);
-      mParams.set(DISTRIB, "false"); // We are the aggregator.
-      String fl = mParams.get("fl");
-      mParams.set(SORT, "_version_ asc");
-      if (!fl.contains(VERSION_FIELD)) {
-        fl += ",_version_";
-      }
-      mParams.set("fl", fl);
+    ModifiableSolrParams mParams = new ModifiableSolrParams(params);
+    mParams.set(DISTRIB, "false"); // We are the aggregator.
+    String fl = mParams.get("fl");
+    mParams.set(SORT, "_version_ asc");
+    if (!fl.contains(VERSION_FIELD)) {
+      fl += ",_version_";
+    }
+    mParams.set("fl", fl);
 
-      Random random = new Random();
+    Random random = new Random();
 
-      Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
+    Set<String> liveNodes = cloudSolrClient.getClusterState().getLiveNodes();
 
-      for (Slice slice : slices) {
-        ModifiableSolrParams localParams = new ModifiableSolrParams(mParams);
-        long checkpoint = checkpoints.get(slice.getName());
+    for (Slice slice : slices) {
+      ModifiableSolrParams localParams = new ModifiableSolrParams(mParams);
+      long checkpoint = checkpoints.get(slice.getName());
 
-        Collection<Replica> replicas = slice.getReplicas();
-        List<Replica> shuffler = new ArrayList<>();
-        for (Replica replica : replicas) {
-          if (replica.getState() == Replica.State.ACTIVE
-              && liveNodes.contains(replica.getNodeName())) shuffler.add(replica);
-        }
+      Collection<Replica> replicas = slice.getReplicas();
+      List<Replica> shuffler = new ArrayList<>();
+      for (Replica replica : replicas) {
+        if (replica.getState() == Replica.State.ACTIVE && liveNodes.contains(replica.getNodeName()))
+          shuffler.add(replica);
+      }
 
-        Replica rep = shuffler.get(random.nextInt(shuffler.size()));
-        ZkCoreNodeProps zkProps = new ZkCoreNodeProps(rep);
-        String url = zkProps.getCoreUrl();
-        SolrStream solrStream = new SolrStream(url, localParams);
-        solrStream.setSlice(slice.getName());
-        solrStream.setCheckpoint(checkpoint);
-        solrStream.setTrace(true);
-        if (streamContext != null) {
-          solrStream.setStreamContext(streamContext);
-        }
-        solrStreams.add(solrStream);
+      Replica rep = shuffler.get(random.nextInt(shuffler.size()));
+      ZkCoreNodeProps zkProps = new ZkCoreNodeProps(rep);
+      String url = zkProps.getCoreUrl();
+      SolrStream solrStream = new SolrStream(url, localParams);
+      solrStream.setSlice(slice.getName());
+      solrStream.setCheckpoint(checkpoint);
+      solrStream.setTrace(true);
+      if (streamContext != null) {
+        solrStream.setStreamContext(streamContext);
       }
-    } catch (Exception e) {
-      throw new IOException(e);
+      solrStreams.add(solrStream);
     }
   }
+
+  @Override
+  public void setStreamContext(StreamContext context) {
+    super.setStreamContext(context);
+    this.clientCache = context.getSolrClientCache();
+  }
 }
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
index 03188e24005..adf1640f671 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
@@ -21,10 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -52,7 +49,7 @@ public class UpdateStream extends TupleStream implements Expressible {
   // field name in summary tuple for #docs updated in batch
   public static String BATCH_INDEXED_FIELD_NAME = "batchIndexed";
   private String collection;
-  private String zkHost;
+  protected String zkHost;
   private int updateBatchSize;
   /**
    * Indicates if the {@link CommonParams#VERSION_FIELD} should be removed from tuples when
@@ -64,11 +61,12 @@ public class UpdateStream extends TupleStream implements Expressible {
   private int batchNumber;
   private long totalDocsIndex;
   private PushBackStream tupleSource;
-  private transient SolrClientCache cache;
-  private transient CloudSolrClient cloudSolrClient;
   private List<SolrInputDocument> documentBatch = new ArrayList<>();
   private String coreName;
 
+  protected transient SolrClientCache clientCache;
+  private transient boolean doCloseCache;
+
   public UpdateStream(StreamExpression expression, StreamFactory factory) throws IOException {
     String collectionName = factory.getValueOperand(expression, 0);
     verifyCollectionName(collectionName, expression);
@@ -122,7 +120,12 @@ protected String getCollectionName() {
 
   @Override
   public void open() throws IOException {
-    setCloudSolrClient();
+    if (clientCache == null) {
+      doCloseCache = true;
+      clientCache = new SolrClientCache();
+    } else {
+      doCloseCache = false;
+    }
     tupleSource.open();
   }
 
@@ -153,8 +156,8 @@ public Tuple read() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cache == null && cloudSolrClient != null) {
-      cloudSolrClient.close();
+    if (doCloseCache) {
+      clientCache.close();
     }
     tupleSource.close();
   }
@@ -226,7 +229,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
 
   @Override
   public void setStreamContext(StreamContext context) {
-    this.cache = context.getSolrClientCache();
+    this.clientCache = context.getSolrClientCache();
     this.coreName = (String) context.get("core");
     this.tupleSource.setStreamContext(context);
   }
@@ -314,23 +317,6 @@ protected boolean defaultPruneVersionField() {
     return true;
   }
 
-  /** Only viable after calling {@link #open} */
-  protected CloudSolrClient getCloudSolrClient() {
-    assert null != this.cloudSolrClient;
-    return this.cloudSolrClient;
-  }
-
-  private void setCloudSolrClient() {
-    if (this.cache != null) {
-      this.cloudSolrClient = this.cache.getCloudSolrClient(zkHost);
-    } else {
-      final List<String> hosts = new ArrayList<>();
-      hosts.add(zkHost);
-      this.cloudSolrClient = new CloudLegacySolrClient.Builder(hosts, Optional.empty()).build();
-      this.cloudSolrClient.connect();
-    }
-  }
-
   private SolrInputDocument convertTupleToSolrDocument(Tuple tuple) {
     SolrInputDocument doc = new SolrInputDocument();
     for (String field : tuple.getFields().keySet()) {
@@ -365,6 +351,7 @@ protected void uploadBatchToCollection(List<SolrInputDocument> documentBatch) th
     }
 
     try {
+      var cloudSolrClient = clientCache.getCloudSolrClient(zkHost);
       cloudSolrClient.add(collection, documentBatch);
     } catch (SolrServerException | IOException e) {
       // TODO: it would be nice if there was an option to "skipFailedBatches"
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 6311acf1b29..260d9a059c4 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
@@ -342,6 +342,14 @@ public Builder withCollectionCacheTtl(long timeToLive, TimeUnit unit) {
       return this;
     }
 
+    /**
+     * Set the internal http client.
+     *
+     * <p>Note: closing the httpClient instance is at the responsibility of the caller.
+     *
+     * @param httpClient http client
+     * @return this
+     */
     public Builder withHttpClient(Http2SolrClient httpClient) {
       if (this.internalClientBuilder != null) {
         throw new IllegalStateException(
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 25513a74dd4..63fc96f2b77 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -170,11 +170,7 @@ protected Http2SolrClient(String serverBaseUrl, Builder builder) {
       this.serverBaseUrl = null;
     }
 
-    if (builder.idleTimeoutMillis != null && builder.idleTimeoutMillis > 0) {
-      this.idleTimeoutMillis = builder.idleTimeoutMillis;
-    } else {
-      this.idleTimeoutMillis = HttpClientUtil.DEFAULT_SO_TIMEOUT;
-    }
+    this.idleTimeoutMillis = builder.idleTimeoutMillis;
 
     if (builder.httpClient != null) {
       this.httpClient = builder.httpClient;
@@ -283,8 +279,7 @@ private HttpClient createHttpClient(Builder builder) {
     this.authenticationStore = new AuthenticationStoreHolder();
     httpClient.setAuthenticationStore(this.authenticationStore);
 
-    if (builder.connectionTimeoutMillis != null)
-      httpClient.setConnectTimeout(builder.connectionTimeoutMillis);
+    httpClient.setConnectTimeout(builder.connectionTimeoutMillis);
 
     setupProxy(builder, httpClient);
 
@@ -859,6 +854,7 @@ private NamedList<Object> processErrorsAndResponse(
         // no processor specified, return raw stream
         NamedList<Object> rsp = new NamedList<>();
         rsp.add("stream", is);
+        rsp.add("responseStatus", httpStatus);
         // Only case where stream should not be closed
         shouldClose = false;
         return rsp;
@@ -1060,6 +1056,13 @@ public Builder(String baseSolrUrl) {
     }
 
     public Http2SolrClient build() {
+      if (idleTimeoutMillis == null || idleTimeoutMillis <= 0) {
+        idleTimeoutMillis = (long) HttpClientUtil.DEFAULT_SO_TIMEOUT;
+      }
+      if (connectionTimeoutMillis == null) {
+        connectionTimeoutMillis = (long) HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
+      }
+
       Http2SolrClient client = new Http2SolrClient(baseSolrUrl, this);
       try {
         httpClientBuilderSetup(client);
@@ -1222,6 +1225,10 @@ public Builder withIdleTimeout(long idleConnectionTimeout, TimeUnit unit) {
       return this;
     }
 
+    public Long getIdleTimeoutMillis() {
+      return idleTimeoutMillis;
+    }
+
     public Builder useHttp1_1(boolean useHttp1_1) {
       this.useHttp1_1 = useHttp1_1;
       return this;
@@ -1241,6 +1248,10 @@ public Builder withConnectionTimeout(long connectionTimeout, TimeUnit unit) {
       return this;
     }
 
+    public Long getConnectionTimeout() {
+      return connectionTimeoutMillis;
+    }
+
     /**
      * Set a timeout in milliseconds for requests issued by this client.
      *
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 5f7b8a17ee8..c03fbc9f3f9 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
@@ -643,6 +643,7 @@ protected NamedList<Object> executeMethod(
         NamedList<Object> rsp = new NamedList<>();
         rsp.add("stream", respBody);
         rsp.add("closeableResponse", response);
+        rsp.add("responseStatus", response.getStatusLine().getStatusCode());
         // Only case where stream should not be closed
         shouldClose = false;
         return rsp;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java
index 645a19040de..d0c97f8ed22 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java
@@ -127,6 +127,10 @@ public B withConnectionTimeout(int connectionTimeout, TimeUnit unit) {
     return getThis();
   }
 
+  public int getConnectionTimeoutMillis() {
+    return this.connectionTimeoutMillis;
+  }
+
   /**
    * Tells {@link Builder} that created clients should set the following read timeout on all
    * sockets.
@@ -155,4 +159,8 @@ public B withSocketTimeout(int socketTimeout, TimeUnit unit) {
     socketTimeoutMillisUpdate = true;
     return getThis();
   }
+
+  public int getSocketTimeoutMillis() {
+    return this.socketTimeoutMillis;
+  }
 }

From 579e24bc54d4ea19510afa364a063fe6cea57fa9 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:46:19 +0200
Subject: [PATCH 022/160] Update software.amazon.awssdk:* to v2.20.128 (#1820)

---
 solr/licenses/annotations-2.20.128.jar.sha1   |  1 +
 solr/licenses/annotations-2.20.97.jar.sha1    |  1 -
 solr/licenses/apache-client-2.20.128.jar.sha1 |  1 +
 solr/licenses/apache-client-2.20.97.jar.sha1  |  1 -
 solr/licenses/arns-2.20.128.jar.sha1          |  1 +
 solr/licenses/arns-2.20.97.jar.sha1           |  1 -
 solr/licenses/auth-2.20.128.jar.sha1          |  1 +
 solr/licenses/auth-2.20.97.jar.sha1           |  1 -
 solr/licenses/aws-core-2.20.128.jar.sha1      |  1 +
 solr/licenses/aws-core-2.20.97.jar.sha1       |  1 -
 .../aws-query-protocol-2.20.128.jar.sha1      |  1 +
 .../aws-query-protocol-2.20.97.jar.sha1       |  1 -
 .../aws-xml-protocol-2.20.128.jar.sha1        |  1 +
 .../aws-xml-protocol-2.20.97.jar.sha1         |  1 -
 solr/licenses/crt-core-2.20.128.jar.sha1      |  1 +
 solr/licenses/crt-core-2.20.97.jar.sha1       |  1 -
 solr/licenses/endpoints-spi-2.20.128.jar.sha1 |  1 +
 solr/licenses/endpoints-spi-2.20.97.jar.sha1  |  1 -
 .../http-client-spi-2.20.128.jar.sha1         |  1 +
 .../licenses/http-client-spi-2.20.97.jar.sha1 |  1 -
 solr/licenses/json-utils-2.20.128.jar.sha1    |  1 +
 solr/licenses/json-utils-2.20.97.jar.sha1     |  1 -
 solr/licenses/metrics-spi-2.20.128.jar.sha1   |  1 +
 solr/licenses/metrics-spi-2.20.97.jar.sha1    |  1 -
 solr/licenses/profiles-2.20.128.jar.sha1      |  1 +
 solr/licenses/profiles-2.20.97.jar.sha1       |  1 -
 solr/licenses/protocol-core-2.20.128.jar.sha1 |  1 +
 solr/licenses/protocol-core-2.20.97.jar.sha1  |  1 -
 solr/licenses/regions-2.20.128.jar.sha1       |  1 +
 solr/licenses/regions-2.20.97.jar.sha1        |  1 -
 solr/licenses/s3-2.20.128.jar.sha1            |  1 +
 solr/licenses/s3-2.20.97.jar.sha1             |  1 -
 solr/licenses/sdk-core-2.20.128.jar.sha1      |  1 +
 solr/licenses/sdk-core-2.20.97.jar.sha1       |  1 -
 solr/licenses/sts-2.20.128.jar.sha1           |  1 +
 solr/licenses/sts-2.20.97.jar.sha1            |  1 -
 ...third-party-jackson-core-2.20.128.jar.sha1 |  1 +
 .../third-party-jackson-core-2.20.97.jar.sha1 |  1 -
 .../url-connection-client-2.20.128.jar.sha1   |  1 +
 .../url-connection-client-2.20.97.jar.sha1    |  1 -
 solr/licenses/utils-2.20.128.jar.sha1         |  1 +
 solr/licenses/utils-2.20.97.jar.sha1          |  1 -
 versions.lock                                 | 44 +++++++++----------
 versions.props                                |  2 +-
 44 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 solr/licenses/annotations-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/annotations-2.20.97.jar.sha1
 create mode 100644 solr/licenses/apache-client-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/apache-client-2.20.97.jar.sha1
 create mode 100644 solr/licenses/arns-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/arns-2.20.97.jar.sha1
 create mode 100644 solr/licenses/auth-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/auth-2.20.97.jar.sha1
 create mode 100644 solr/licenses/aws-core-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/aws-core-2.20.97.jar.sha1
 create mode 100644 solr/licenses/aws-query-protocol-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/aws-query-protocol-2.20.97.jar.sha1
 create mode 100644 solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/aws-xml-protocol-2.20.97.jar.sha1
 create mode 100644 solr/licenses/crt-core-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/crt-core-2.20.97.jar.sha1
 create mode 100644 solr/licenses/endpoints-spi-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/endpoints-spi-2.20.97.jar.sha1
 create mode 100644 solr/licenses/http-client-spi-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/http-client-spi-2.20.97.jar.sha1
 create mode 100644 solr/licenses/json-utils-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/json-utils-2.20.97.jar.sha1
 create mode 100644 solr/licenses/metrics-spi-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/metrics-spi-2.20.97.jar.sha1
 create mode 100644 solr/licenses/profiles-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/profiles-2.20.97.jar.sha1
 create mode 100644 solr/licenses/protocol-core-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/protocol-core-2.20.97.jar.sha1
 create mode 100644 solr/licenses/regions-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/regions-2.20.97.jar.sha1
 create mode 100644 solr/licenses/s3-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/s3-2.20.97.jar.sha1
 create mode 100644 solr/licenses/sdk-core-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/sdk-core-2.20.97.jar.sha1
 create mode 100644 solr/licenses/sts-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/sts-2.20.97.jar.sha1
 create mode 100644 solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/third-party-jackson-core-2.20.97.jar.sha1
 create mode 100644 solr/licenses/url-connection-client-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/url-connection-client-2.20.97.jar.sha1
 create mode 100644 solr/licenses/utils-2.20.128.jar.sha1
 delete mode 100644 solr/licenses/utils-2.20.97.jar.sha1

diff --git a/solr/licenses/annotations-2.20.128.jar.sha1 b/solr/licenses/annotations-2.20.128.jar.sha1
new file mode 100644
index 00000000000..f669d174c70
--- /dev/null
+++ b/solr/licenses/annotations-2.20.128.jar.sha1
@@ -0,0 +1 @@
+4eba3312fad5b1b621fde4cfbf1b9780591589d5
diff --git a/solr/licenses/annotations-2.20.97.jar.sha1 b/solr/licenses/annotations-2.20.97.jar.sha1
deleted file mode 100644
index 074e5ee3d44..00000000000
--- a/solr/licenses/annotations-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41037256f5c45c951ce61e96370b1e59ed571e17
diff --git a/solr/licenses/apache-client-2.20.128.jar.sha1 b/solr/licenses/apache-client-2.20.128.jar.sha1
new file mode 100644
index 00000000000..0ef9ff55ec0
--- /dev/null
+++ b/solr/licenses/apache-client-2.20.128.jar.sha1
@@ -0,0 +1 @@
+5b82f09fd66fbd3c0b27ff88f7eb2e9a78e9a080
diff --git a/solr/licenses/apache-client-2.20.97.jar.sha1 b/solr/licenses/apache-client-2.20.97.jar.sha1
deleted file mode 100644
index e96404f979c..00000000000
--- a/solr/licenses/apache-client-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-366e2a5a9824eb750ea77ea1c7581055dafd6dac
diff --git a/solr/licenses/arns-2.20.128.jar.sha1 b/solr/licenses/arns-2.20.128.jar.sha1
new file mode 100644
index 00000000000..395694a27e7
--- /dev/null
+++ b/solr/licenses/arns-2.20.128.jar.sha1
@@ -0,0 +1 @@
+5e809b3b87e6f2806e0b67a390d3fe07fcaf7c5e
diff --git a/solr/licenses/arns-2.20.97.jar.sha1 b/solr/licenses/arns-2.20.97.jar.sha1
deleted file mode 100644
index aa4c743d9b7..00000000000
--- a/solr/licenses/arns-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e187cb36e2ba023823f839cb6a1e2eb175b02e6
diff --git a/solr/licenses/auth-2.20.128.jar.sha1 b/solr/licenses/auth-2.20.128.jar.sha1
new file mode 100644
index 00000000000..a7481505d04
--- /dev/null
+++ b/solr/licenses/auth-2.20.128.jar.sha1
@@ -0,0 +1 @@
+a27499eb27835bb21f0a8f6d6df9b7dcd2725529
diff --git a/solr/licenses/auth-2.20.97.jar.sha1 b/solr/licenses/auth-2.20.97.jar.sha1
deleted file mode 100644
index 97b18333ff8..00000000000
--- a/solr/licenses/auth-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e04a9881737fdaf84e1d11e27de64e78eb2d0f25
diff --git a/solr/licenses/aws-core-2.20.128.jar.sha1 b/solr/licenses/aws-core-2.20.128.jar.sha1
new file mode 100644
index 00000000000..7d0e6e344c4
--- /dev/null
+++ b/solr/licenses/aws-core-2.20.128.jar.sha1
@@ -0,0 +1 @@
+ca2c9d71fe86609a6e69c7b770cb282f365ca054
diff --git a/solr/licenses/aws-core-2.20.97.jar.sha1 b/solr/licenses/aws-core-2.20.97.jar.sha1
deleted file mode 100644
index 8459bca4d97..00000000000
--- a/solr/licenses/aws-core-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-378334b0a5f20cce0cca4d85f5855de1e0b072cf
diff --git a/solr/licenses/aws-query-protocol-2.20.128.jar.sha1 b/solr/licenses/aws-query-protocol-2.20.128.jar.sha1
new file mode 100644
index 00000000000..6c657e007e0
--- /dev/null
+++ b/solr/licenses/aws-query-protocol-2.20.128.jar.sha1
@@ -0,0 +1 @@
+ab36db110c976df57e6bf81b95a24b7736ddac43
diff --git a/solr/licenses/aws-query-protocol-2.20.97.jar.sha1 b/solr/licenses/aws-query-protocol-2.20.97.jar.sha1
deleted file mode 100644
index de87d5585fb..00000000000
--- a/solr/licenses/aws-query-protocol-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0fef3e8eadb282ff3b4de1ee1fdc9dd6624fd975
diff --git a/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1 b/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
new file mode 100644
index 00000000000..4c0615d9097
--- /dev/null
+++ b/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
@@ -0,0 +1 @@
+ca6a04c0b1d5b492612e5b8816aedfc5895733cf
diff --git a/solr/licenses/aws-xml-protocol-2.20.97.jar.sha1 b/solr/licenses/aws-xml-protocol-2.20.97.jar.sha1
deleted file mode 100644
index e68e59378aa..00000000000
--- a/solr/licenses/aws-xml-protocol-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d441f5ee009122b7294923933492aede55acaad0
diff --git a/solr/licenses/crt-core-2.20.128.jar.sha1 b/solr/licenses/crt-core-2.20.128.jar.sha1
new file mode 100644
index 00000000000..8fd66294823
--- /dev/null
+++ b/solr/licenses/crt-core-2.20.128.jar.sha1
@@ -0,0 +1 @@
+fa7c6f4f1037479c021d90d14ec58c55c72f7c4f
diff --git a/solr/licenses/crt-core-2.20.97.jar.sha1 b/solr/licenses/crt-core-2.20.97.jar.sha1
deleted file mode 100644
index 37b54404abf..00000000000
--- a/solr/licenses/crt-core-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4cdd43cda3bbcf3e36162853cfa60acb5bf844e6
diff --git a/solr/licenses/endpoints-spi-2.20.128.jar.sha1 b/solr/licenses/endpoints-spi-2.20.128.jar.sha1
new file mode 100644
index 00000000000..04050c7defd
--- /dev/null
+++ b/solr/licenses/endpoints-spi-2.20.128.jar.sha1
@@ -0,0 +1 @@
+2761b9d660eb3db814d4078eb1e7ee53515effd0
diff --git a/solr/licenses/endpoints-spi-2.20.97.jar.sha1 b/solr/licenses/endpoints-spi-2.20.97.jar.sha1
deleted file mode 100644
index 5126f671412..00000000000
--- a/solr/licenses/endpoints-spi-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a2763c7ae68ddaaee0513af4bfda4cab936033c
diff --git a/solr/licenses/http-client-spi-2.20.128.jar.sha1 b/solr/licenses/http-client-spi-2.20.128.jar.sha1
new file mode 100644
index 00000000000..b7986560ff0
--- /dev/null
+++ b/solr/licenses/http-client-spi-2.20.128.jar.sha1
@@ -0,0 +1 @@
+d614e5750362fabb312ccb4f2db440d22ed95c72
diff --git a/solr/licenses/http-client-spi-2.20.97.jar.sha1 b/solr/licenses/http-client-spi-2.20.97.jar.sha1
deleted file mode 100644
index bbd40cf57cb..00000000000
--- a/solr/licenses/http-client-spi-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2835a2c7c10225d563ade9c15bce3bff5809b7b8
diff --git a/solr/licenses/json-utils-2.20.128.jar.sha1 b/solr/licenses/json-utils-2.20.128.jar.sha1
new file mode 100644
index 00000000000..3eb1f4fc2e3
--- /dev/null
+++ b/solr/licenses/json-utils-2.20.128.jar.sha1
@@ -0,0 +1 @@
+0f00a80b03dde32f1d7aca472516b6e45e4a8959
diff --git a/solr/licenses/json-utils-2.20.97.jar.sha1 b/solr/licenses/json-utils-2.20.97.jar.sha1
deleted file mode 100644
index db43070cb42..00000000000
--- a/solr/licenses/json-utils-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3cdc0572c1db2ac78c5feede45a5e266ec13084
diff --git a/solr/licenses/metrics-spi-2.20.128.jar.sha1 b/solr/licenses/metrics-spi-2.20.128.jar.sha1
new file mode 100644
index 00000000000..83880b2a032
--- /dev/null
+++ b/solr/licenses/metrics-spi-2.20.128.jar.sha1
@@ -0,0 +1 @@
+d59e5e2264e03fe27cd1ab1843ccc2984636bc3c
diff --git a/solr/licenses/metrics-spi-2.20.97.jar.sha1 b/solr/licenses/metrics-spi-2.20.97.jar.sha1
deleted file mode 100644
index 820a98fc66a..00000000000
--- a/solr/licenses/metrics-spi-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3845268eaaf2269cb83fb0b420ecfaec0736639a
diff --git a/solr/licenses/profiles-2.20.128.jar.sha1 b/solr/licenses/profiles-2.20.128.jar.sha1
new file mode 100644
index 00000000000..1d15205ac83
--- /dev/null
+++ b/solr/licenses/profiles-2.20.128.jar.sha1
@@ -0,0 +1 @@
+cbc0b7b6e98b9e168b96ef92c41f3d274b3d403b
diff --git a/solr/licenses/profiles-2.20.97.jar.sha1 b/solr/licenses/profiles-2.20.97.jar.sha1
deleted file mode 100644
index 21bcd31d075..00000000000
--- a/solr/licenses/profiles-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a26bb7ce18958e71040c3bf9cf6371ab022771c6
diff --git a/solr/licenses/protocol-core-2.20.128.jar.sha1 b/solr/licenses/protocol-core-2.20.128.jar.sha1
new file mode 100644
index 00000000000..42e13ee9ab0
--- /dev/null
+++ b/solr/licenses/protocol-core-2.20.128.jar.sha1
@@ -0,0 +1 @@
+a79cb2c8d2d4399ccbc1f432d23d2b6413c09396
diff --git a/solr/licenses/protocol-core-2.20.97.jar.sha1 b/solr/licenses/protocol-core-2.20.97.jar.sha1
deleted file mode 100644
index ef95d4ef40a..00000000000
--- a/solr/licenses/protocol-core-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0df4613072a99b366974e3f67be0aa955624655e
diff --git a/solr/licenses/regions-2.20.128.jar.sha1 b/solr/licenses/regions-2.20.128.jar.sha1
new file mode 100644
index 00000000000..ea8ed851217
--- /dev/null
+++ b/solr/licenses/regions-2.20.128.jar.sha1
@@ -0,0 +1 @@
+f9cdaff8fc49e3b3473fb741d70f6458bdd1d108
diff --git a/solr/licenses/regions-2.20.97.jar.sha1 b/solr/licenses/regions-2.20.97.jar.sha1
deleted file mode 100644
index 54e30673925..00000000000
--- a/solr/licenses/regions-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d5e815ff83afb34666277cf1c40a1a77ee88763
diff --git a/solr/licenses/s3-2.20.128.jar.sha1 b/solr/licenses/s3-2.20.128.jar.sha1
new file mode 100644
index 00000000000..c233b710661
--- /dev/null
+++ b/solr/licenses/s3-2.20.128.jar.sha1
@@ -0,0 +1 @@
+0eae09026984386b3b657c76952f1c33980cc60b
diff --git a/solr/licenses/s3-2.20.97.jar.sha1 b/solr/licenses/s3-2.20.97.jar.sha1
deleted file mode 100644
index 89367f80a09..00000000000
--- a/solr/licenses/s3-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a9f0859a8a22b4a0a77bd929746bde6d222884d
diff --git a/solr/licenses/sdk-core-2.20.128.jar.sha1 b/solr/licenses/sdk-core-2.20.128.jar.sha1
new file mode 100644
index 00000000000..a7feb66351b
--- /dev/null
+++ b/solr/licenses/sdk-core-2.20.128.jar.sha1
@@ -0,0 +1 @@
+4d2681298b8364b10e8e448c7cfb38a0c57ea137
diff --git a/solr/licenses/sdk-core-2.20.97.jar.sha1 b/solr/licenses/sdk-core-2.20.97.jar.sha1
deleted file mode 100644
index 0a9f23dd634..00000000000
--- a/solr/licenses/sdk-core-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d2a5ab879bd75d84a582212bf04fc06474064810
diff --git a/solr/licenses/sts-2.20.128.jar.sha1 b/solr/licenses/sts-2.20.128.jar.sha1
new file mode 100644
index 00000000000..e42ac3530a8
--- /dev/null
+++ b/solr/licenses/sts-2.20.128.jar.sha1
@@ -0,0 +1 @@
+5091ddfe486a878fbca7f7068e4d781109129d47
diff --git a/solr/licenses/sts-2.20.97.jar.sha1 b/solr/licenses/sts-2.20.97.jar.sha1
deleted file mode 100644
index 8675ad9c4f8..00000000000
--- a/solr/licenses/sts-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-717eb0636175d4274758390b306f7344974ddfc6
diff --git a/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1 b/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
new file mode 100644
index 00000000000..886d413afca
--- /dev/null
+++ b/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
@@ -0,0 +1 @@
+9714093f164eac041f3f3af506a32ad61fc26e3f
diff --git a/solr/licenses/third-party-jackson-core-2.20.97.jar.sha1 b/solr/licenses/third-party-jackson-core-2.20.97.jar.sha1
deleted file mode 100644
index 7af03a3d0a4..00000000000
--- a/solr/licenses/third-party-jackson-core-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b5d4cb0064b567d65f82d867ea209b2638674d34
diff --git a/solr/licenses/url-connection-client-2.20.128.jar.sha1 b/solr/licenses/url-connection-client-2.20.128.jar.sha1
new file mode 100644
index 00000000000..89ad177e745
--- /dev/null
+++ b/solr/licenses/url-connection-client-2.20.128.jar.sha1
@@ -0,0 +1 @@
+f6fb7d2001efce42580c16b4ce4e55ebe556ab0b
diff --git a/solr/licenses/url-connection-client-2.20.97.jar.sha1 b/solr/licenses/url-connection-client-2.20.97.jar.sha1
deleted file mode 100644
index 11f2b2b3775..00000000000
--- a/solr/licenses/url-connection-client-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37955fd70059ebbc23673d6e66e2e0c015ea94d7
diff --git a/solr/licenses/utils-2.20.128.jar.sha1 b/solr/licenses/utils-2.20.128.jar.sha1
new file mode 100644
index 00000000000..70c3f94382d
--- /dev/null
+++ b/solr/licenses/utils-2.20.128.jar.sha1
@@ -0,0 +1 @@
+a63a7b5cefd69dc24fddc200d31d2f6ec613b513
diff --git a/solr/licenses/utils-2.20.97.jar.sha1 b/solr/licenses/utils-2.20.97.jar.sha1
deleted file mode 100644
index eddd78f9dec..00000000000
--- a/solr/licenses/utils-2.20.97.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a84bf8c7dbf73700740f2f0d8e4babb7bbbdf0b
diff --git a/versions.lock b/versions.lock
index adb9555b9d5..25d922b05a8 100644
--- a/versions.lock
+++ b/versions.lock
@@ -354,27 +354,27 @@ org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
 org.threeten:threetenbp:1.6.8 (4 constraints: 2433e267)
 org.tukaani:xz:1.9 (1 constraints: 030c5be9)
 org.xerial.snappy:snappy-java:1.1.10.1 (4 constraints: b1385afd)
-software.amazon.awssdk:annotations:2.20.97 (20 constraints: 252b9ae9)
-software.amazon.awssdk:apache-client:2.20.97 (4 constraints: 112ab2e3)
-software.amazon.awssdk:arns:2.20.97 (2 constraints: 231864c1)
-software.amazon.awssdk:auth:2.20.97 (5 constraints: 51382e41)
-software.amazon.awssdk:aws-core:2.20.97 (6 constraints: 044ef720)
-software.amazon.awssdk:aws-query-protocol:2.20.97 (3 constraints: 5e2af9dd)
-software.amazon.awssdk:aws-xml-protocol:2.20.97 (2 constraints: 231864c1)
-software.amazon.awssdk:bom:2.20.97 (1 constraints: 7605b240)
-software.amazon.awssdk:crt-core:2.20.97 (1 constraints: c60b97f9)
-software.amazon.awssdk:endpoints-spi:2.20.97 (4 constraints: b63406cd)
-software.amazon.awssdk:http-client-spi:2.20.97 (11 constraints: e6a5bb82)
-software.amazon.awssdk:json-utils:2.20.97 (5 constraints: 833f7e3f)
-software.amazon.awssdk:metrics-spi:2.20.97 (7 constraints: 4462e915)
-software.amazon.awssdk:profiles:2.20.97 (8 constraints: 6f61ca49)
-software.amazon.awssdk:protocol-core:2.20.97 (5 constraints: 8f48165b)
-software.amazon.awssdk:regions:2.20.97 (7 constraints: 495063af)
-software.amazon.awssdk:s3:2.20.97 (3 constraints: ba240128)
-software.amazon.awssdk:sdk-core:2.20.97 (10 constraints: 9287b9ec)
-software.amazon.awssdk:sts:2.20.97 (2 constraints: d3114515)
-software.amazon.awssdk:third-party-jackson-core:2.20.97 (2 constraints: 951b26a8)
-software.amazon.awssdk:utils:2.20.97 (19 constraints: 901873a5)
+software.amazon.awssdk:annotations:2.20.128 (20 constraints: 812e7fc3)
+software.amazon.awssdk:apache-client:2.20.128 (4 constraints: bd2a0169)
+software.amazon.awssdk:arns:2.20.128 (2 constraints: 791848ec)
+software.amazon.awssdk:auth:2.20.128 (5 constraints: 28393d1f)
+software.amazon.awssdk:aws-core:2.20.128 (6 constraints: 064f9593)
+software.amazon.awssdk:aws-query-protocol:2.20.128 (3 constraints: df2a3b4b)
+software.amazon.awssdk:aws-xml-protocol:2.20.128 (2 constraints: 791848ec)
+software.amazon.awssdk:bom:2.20.128 (1 constraints: a1053e46)
+software.amazon.awssdk:crt-core:2.20.128 (1 constraints: f10b8205)
+software.amazon.awssdk:endpoints-spi:2.20.128 (4 constraints: 6235767a)
+software.amazon.awssdk:http-client-spi:2.20.128 (11 constraints: bfa7e005)
+software.amazon.awssdk:json-utils:2.20.128 (5 constraints: 5a407940)
+software.amazon.awssdk:metrics-spi:2.20.128 (7 constraints: 7163ee3b)
+software.amazon.awssdk:profiles:2.20.128 (8 constraints: c76252a3)
+software.amazon.awssdk:protocol-core:2.20.128 (5 constraints: 66496c88)
+software.amazon.awssdk:regions:2.20.128 (7 constraints: 4b518731)
+software.amazon.awssdk:s3:2.20.128 (3 constraints: 1025d161)
+software.amazon.awssdk:sdk-core:2.20.128 (10 constraints: 40897300)
+software.amazon.awssdk:sts:2.20.128 (2 constraints: 29121c33)
+software.amazon.awssdk:third-party-jackson-core:2.20.128 (2 constraints: eb1bd4d7)
+software.amazon.awssdk:utils:2.20.128 (19 constraints: 961bfbe5)
 software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
 xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
@@ -457,5 +457,5 @@ org.springframework.boot:spring-boot-starter-json:2.7.12 (1 constraints: d814669
 org.springframework.boot:spring-boot-starter-logging:2.7.12 (1 constraints: 6d138b46)
 org.springframework.boot:spring-boot-starter-web:2.7.12 (1 constraints: f20a38d6)
 org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f)
-software.amazon.awssdk:url-connection-client:2.20.97 (2 constraints: 451f8bf6)
+software.amazon.awssdk:url-connection-client:2.20.128 (2 constraints: 701ff515)
 software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index 17af2f9c60c..3e61cbe6326 100644
--- a/versions.props
+++ b/versions.props
@@ -69,4 +69,4 @@ org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=4.3.0
 org.slf4j:*=2.0.7
 org.xerial.snappy:snappy-java=1.1.10.1
-software.amazon.awssdk:*=2.20.97
+software.amazon.awssdk:*=2.20.128

From c7b58302d334795e1c820f2a28903b64bce91e59 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Tue, 22 Aug 2023 09:27:21 -0700
Subject: [PATCH 023/160] SOLR-16929 SolrStream propagates undecoded error
 message (#1852)

---
 solr/CHANGES.txt                              |  2 +
 .../io/stream/JavabinTupleStreamParser.java   | 24 ++++++++++-
 .../client/solrj/io/stream/SolrStream.java    |  3 +-
 .../client/solrj/io/stream/StreamingTest.java | 40 ++++++++++++++++---
 4 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e09b1849394..66e12ec7384 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -130,6 +130,8 @@ Bug Fixes
 
 * SOLR-16859: Missing Proxy support for Http2SolrClient (Alex Deparvu)
 
+* SOLR-16929: SolrStream propagates undecoded error message (Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
index 751d833168f..5209d29e4be 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
@@ -24,6 +24,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.apache.solr.common.util.DataInputInputStream;
 import org.apache.solr.common.util.FastInputStream;
 import org.apache.solr.common.util.JavaBinCodec;
@@ -34,12 +35,12 @@ public class JavabinTupleStreamParser extends JavaBinCodec implements TupleStrea
   private int arraySize = Integer.MAX_VALUE;
   private boolean onlyJsonTypes = false;
   int objectSize;
+  private boolean atDocs;
 
   public JavabinTupleStreamParser(InputStream is, boolean onlyJsonTypes) throws IOException {
     this.onlyJsonTypes = onlyJsonTypes;
     this.is = is;
     this.fis = initRead(is);
-    if (!readTillDocs()) arraySize = 0;
   }
 
   private boolean readTillDocs() throws IOException {
@@ -61,6 +62,9 @@ private boolean readTillDocs() throws IOException {
             return true;
           }
           return false;
+        } else if ("error".equals(k)) {
+          handleError();
+          return true;
         } else {
           if (readTillDocs()) return true;
         }
@@ -91,7 +95,7 @@ private boolean isObjectType(DataInputInputStream dis) throws IOException {
     return tagByte == SOLRDOCLST;
   }
 
-  private Map<?, ?> readAsMap(DataInputInputStream dis) throws IOException {
+  private Map<String, ?> readAsMap(DataInputInputStream dis) throws IOException {
     int sz = readSize(dis);
     Map<String, Object> m = new LinkedHashMap<>();
     for (int i = 0; i < sz; i++) {
@@ -175,6 +179,14 @@ protected Object readObject(DataInputInputStream dis) throws IOException {
   @Override
   @SuppressWarnings({"unchecked"})
   public Map<String, Object> next() throws IOException {
+    if (!atDocs) {
+      atDocs = true;
+      if (!readTillDocs()) {
+        arraySize = 0;
+        return null;
+      }
+    }
+
     if (arraySize == 0) return null;
     Object o = readVal(fis);
     arraySize--;
@@ -186,4 +198,12 @@ public Map<String, Object> next() throws IOException {
   public void close() throws IOException {
     is.close();
   }
+
+  private void handleError() throws IOException {
+    tagByte = fis.readByte();
+    var error = readAsMap(fis);
+    var msg =
+        Optional.ofNullable(error.get("msg")).map(String::valueOf).orElse("Unknown Exception");
+    throw new SolrStream.HandledException(msg);
+  }
 }
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
index f58546cb432..ce4d31babaa 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
@@ -315,7 +315,8 @@ private TupleStreamParser constructParser(SolrParams requestParams)
       statusCode = (int) genericResponse.get("responseStatus");
     }
 
-    if (statusCode != 200) {
+    if (statusCode == 401
+        || statusCode == 403) { // auth response comes as html, so propagate as string
       String errMsg = consumeStreamAsErrorMessage(stream);
       if (httpResponse != null) {
         httpResponse.close();
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index 295fca76f9f..d8770711876 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -627,7 +627,6 @@ public void testParallelReducerStream() throws Exception {
   }
 
   @Test
-  @Ignore
   public void testExceptionStream() throws Exception {
 
     helloDocsUpdateRequest.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
@@ -635,8 +634,8 @@ public void testExceptionStream() throws Exception {
     StreamContext streamContext = new StreamContext();
     SolrClientCache solrClientCache = new SolrClientCache();
     streamContext.setSolrClientCache(solrClientCache);
-    // Test an error that comes originates from the /select handler
     try {
+      // Test an error that originates from the /select handler
       SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort", "blah asc");
       CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
       ExceptionStream estream = new ExceptionStream(stream);
@@ -646,16 +645,45 @@ public void testExceptionStream() throws Exception {
       assertTrue(t.EXCEPTION);
       assertTrue(t.getException().contains("sort param field can't be found: blah"));
 
-      // Test an error that comes originates from the /export handler
-      sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,score", "sort", "a_s asc", "qt", "/export");
+      sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort", "blah asc", "wt", "javabin");
       stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
       estream = new ExceptionStream(stream);
       estream.setStreamContext(streamContext);
       t = getTuple(estream);
       assertTrue(t.EOF);
       assertTrue(t.EXCEPTION);
-      // The /export handler will pass through a real exception.
-      assertTrue(t.getException().contains("undefined field:"));
+      assertTrue(t.getException().contains("sort param field can't be found: blah"));
+
+      // Test an error that originates from the /export handler
+      sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort", "blah asc", "qt", "/export");
+      stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
+      estream = new ExceptionStream(stream);
+      estream.setStreamContext(streamContext);
+      t = getTuple(estream);
+      assertTrue(t.EOF);
+      assertTrue(t.EXCEPTION);
+      assertTrue(t.getException().contains("sort param field can't be found: blah"));
+
+      // Test an error that originates from the /export handler
+      sParamsA =
+          params(
+              "q",
+              "*:*",
+              "fl",
+              "a_s,a_i,a_f,blah",
+              "sort",
+              "blah asc",
+              "qt",
+              "/export",
+              "wt",
+              "javabin");
+      stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
+      estream = new ExceptionStream(stream);
+      estream.setStreamContext(streamContext);
+      t = getTuple(estream);
+      assertTrue(t.EOF);
+      assertTrue(t.EXCEPTION);
+      assertTrue(t.getException().contains("sort param field can't be found: blah"));
     } finally {
       solrClientCache.close();
     }

From 59f70172167795e7e2bdb2da66b1f45c6fc8250c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Tue, 22 Aug 2023 20:04:55 +0200
Subject: [PATCH 024/160] SOLR-16944 V2 API /api/node/health should be governed
 by "health" permission, not "config-read" (#1858)

---
 solr/CHANGES.txt                                              | 2 ++
 .../java/org/apache/solr/handler/admin/api/NodeHealthAPI.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 66e12ec7384..14bd442a9c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -128,6 +128,8 @@ Bug Fixes
 
 * PR#1826: Allow looking up Solr Package repo when that URL references a raw repository.json hosted on Github when the file is JSON but the mimetype used is text/plain. (Eric Pugh)
 
+* SOLR-16944: V2 API /api/node/health should be governed by "health" permission, not "config-read" (janhoy)
+
 * SOLR-16859: Missing Proxy support for Http2SolrClient (Alex Deparvu)
 
 * SOLR-16929: SolrStream propagates undecoded error message (Alex Deparvu)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java
index db5e97039b2..df5f64900f0 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java
@@ -18,7 +18,7 @@
 package org.apache.solr.handler.admin.api;
 
 import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
-import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM;
+import static org.apache.solr.security.PermissionNameProvider.Name.HEALTH_PERM;
 
 import org.apache.solr.api.EndPoint;
 import org.apache.solr.handler.admin.HealthCheckHandler;
@@ -41,7 +41,7 @@ public NodeHealthAPI(HealthCheckHandler handler) {
   @EndPoint(
       path = {"/node/health"},
       method = GET,
-      permission = CONFIG_READ_PERM)
+      permission = HEALTH_PERM)
   public void getSystemInformation(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
     handler.handleRequestBody(req, rsp);
   }

From 0e4e169c0ed083a1d082f26d2b66986169243358 Mon Sep 17 00:00:00 2001
From: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
Date: Tue, 22 Aug 2023 22:36:44 +0300
Subject: [PATCH 025/160] Update v2-api.adoc: remove mention of /api/c (#1790)

---
 .../modules/configuration-guide/pages/v2-api.adoc               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adoc
index a3a9e980d06..79882093a6d 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adoc
@@ -39,7 +39,7 @@ Following are some v2 API URL paths and path prefixes, along with some of the op
 [width="100%",options="header",]
 |===
 |Path prefix |Some Supported Operations
-|`/api/collections` or equivalently: `/api/c` |Create, alias, backup, and restore a collection.
+|`/api/collections` |Create, alias, backup, and restore a collection.
 |`/api/c/_collection-name_/update` |Update requests.
 |`/api/c/_collection-name_/config` |Configuration requests.
 |`/api/c/_collection-name_/schema` |Schema requests.

From 6e508802ab8ede9809b9e76a507b064d8af7ae76 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Tue, 22 Aug 2023 15:57:01 -0400
Subject: [PATCH 026/160] SOLR-16934: Give securityManager permission for
 client TLS (#1857)

---
 solr/CHANGES.txt                  |  2 ++
 solr/packaging/test/test_ssl.bats | 58 +++++++++++++++++++++++++++++++
 solr/server/etc/security.policy   | 10 +++---
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 14bd442a9c1..f3f715df647 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -134,6 +134,8 @@ Bug Fixes
 
 * SOLR-16929: SolrStream propagates undecoded error message (Alex Deparvu)
 
+* SOLR-16934: Allow Solr to read client (javax.net.ssl.*) trustStores and keyStores via SecurityManager. (Houston Putman)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 9f3fdfe806c..a40d3232a13 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -97,3 +97,61 @@ teardown() {
   run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
   assert_output --partial '401 require authentication'
 }
+
+@test "start solr with client truststore and security manager" {
+  # Make a test tmp dir, as the security policy includes TMP, so that might already contain the BATS_TEST_TMPDIR
+  test_tmp_dir="${BATS_TEST_TMPDIR}/tmp"
+  mkdir -p "${test_tmp_dir}"
+  test_tmp_dir="$(cd -P "${test_tmp_dir}" && pwd)"
+
+  export SOLR_SECURITY_MANAGER_ENABLED=true
+  export SOLR_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"
+  export SOLR_TOOL_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"
+
+  # Create a keystore
+  export ssl_dir="${BATS_TEST_TMPDIR}/ssl"
+  export client_ssl_dir="${ssl_dir}-client"
+  mkdir -p "$ssl_dir"
+  (
+    cd "$ssl_dir"
+    rm -f solr-ssl.keystore.p12
+    keytool -genkeypair -alias solr-ssl -keyalg RSA -keysize 2048 -keypass secret -storepass secret -validity 9999 -keystore solr-ssl.keystore.p12 -storetype PKCS12 -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country"
+  )
+  mkdir -p "$client_ssl_dir"
+  (
+    cd "$client_ssl_dir"
+    rm -f *
+    keytool -export -alias solr-ssl -file solr-ssl.crt -keystore "$ssl_dir/solr-ssl.keystore.p12" -keypass secret -storepass secret
+    keytool -import -v -trustcacerts -alias solr-ssl -file solr-ssl.crt -storetype PKCS12 -keystore solr-ssl.truststore.p12 -keypass secret -storepass secret  -noprompt
+  )
+  cp -R "$ssl_dir" "$client_ssl_dir"
+
+  # Set ENV_VARs so that Solr uses this keystore
+  export SOLR_SSL_ENABLED=true
+  export SOLR_SSL_KEY_STORE=$ssl_dir/solr-ssl.keystore.p12
+  export SOLR_SSL_KEY_STORE_PASSWORD=secret
+  export SOLR_SSL_TRUST_STORE=$ssl_dir/solr-ssl.keystore.p12
+  export SOLR_SSL_TRUST_STORE_PASSWORD=secret
+  export SOLR_SSL_CLIENT_TRUST_STORE=$client_ssl_dir/solr-ssl.truststore.p12
+  export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=secret
+  export SOLR_SSL_NEED_CLIENT_AUTH=false
+  export SOLR_SSL_WANT_CLIENT_AUTH=true
+  export SOLR_SSL_CHECK_PEER_NAME=true
+  export SOLR_HOST=localhost
+  export SOLR_SECURITY_MANAGER_ENABLED=true
+
+  run solr start -c
+
+  export SOLR_SSL_KEY_STORE=
+  export SOLR_SSL_KEY_STORE_PASSWORD=
+  export SOLR_SSL_TRUST_STORE=
+  export SOLR_SSL_TRUST_STORE_PASSWORD=
+
+  solr assert --started https://localhost:8983/solr --timeout 5000
+
+  run solr create -c test -s 2
+  assert_output --partial "Created collection 'test'"
+
+  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+  assert_output --partial '"urlScheme":"https"'
+}
diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy
index 77ac99704c5..aec2e2ddcfe 100644
--- a/solr/server/etc/security.policy
+++ b/solr/server/etc/security.policy
@@ -185,11 +185,13 @@ grant {
   permission java.io.FilePermission "${hadoop.security.credential.provider.path}", "read,write,delete,readlink";
   permission java.io.FilePermission "${hadoop.security.credential.provider.path}${/}-", "read,write,delete,readlink";
 
-  permission java.io.FilePermission "${solr.jetty.keystore}", "read,write,delete,readlink";
-  permission java.io.FilePermission "${solr.jetty.keystore}${/}-", "read,write,delete,readlink";
+  permission java.io.FilePermission "${solr.jetty.keystore}", "read,readlink";
 
-  permission java.io.FilePermission "${solr.jetty.truststore}", "read,write,delete,readlink";
-  permission java.io.FilePermission "${solr.jetty.truststore}${/}-", "read,write,delete,readlink";
+  permission java.io.FilePermission "${solr.jetty.truststore}", "read,readlink";
+
+  permission java.io.FilePermission "${javax.net.ssl.keyStore}", "read,readlink";
+
+  permission java.io.FilePermission "${javax.net.ssl.trustStore}", "read,readlink";
 
   permission java.io.FilePermission "${solr.install.dir}", "read,write,delete,readlink";
   permission java.io.FilePermission "${solr.install.dir}${/}-", "read,write,delete,readlink";

From c79c8994b5e29f69bcb5db12fcd42d332e3bba37 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Tue, 22 Aug 2023 17:28:44 -0400
Subject: [PATCH 027/160] SOLR-16265: Fix NPE for req in Http2SolrClient
 (#1860)

---
 .../solr/client/solrj/impl/Http2SolrClient.java       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 63fc96f2b77..867b5edc85d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -528,34 +528,35 @@ public NamedList<Object> request(SolrRequest<?> solrRequest, String collection)
       InputStreamResponseListener listener = new InputStreamResponseListener();
       req = makeRequestAndSend(solrRequest, url, listener, false);
       Response response = listener.get(idleTimeoutMillis, TimeUnit.MILLISECONDS);
+      url = req.getURI().toString();
       InputStream is = listener.getInputStream();
       assert ObjectReleaseTracker.track(is);
-      return processErrorsAndResponse(solrRequest, response, is, req.getURI().toString());
+      return processErrorsAndResponse(solrRequest, response, is, url);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       abortCause = e;
       throw new RuntimeException(e);
     } catch (TimeoutException e) {
       throw new SolrServerException(
-          "Timeout occurred while waiting response from server at: " + req.getURI(), e);
+          "Timeout occurred while waiting response from server at: " + url, e);
     } catch (ExecutionException e) {
       Throwable cause = e.getCause();
       abortCause = cause;
       if (cause instanceof ConnectException) {
-        throw new SolrServerException("Server refused connection at: " + req.getURI(), cause);
+        throw new SolrServerException("Server refused connection at: " + url, cause);
       }
       if (cause instanceof SolrServerException) {
         throw (SolrServerException) cause;
       } else if (cause instanceof IOException) {
         throw new SolrServerException(
-            "IOException occurred when talking to server at: " + req.getURI(), cause);
+            "IOException occurred when talking to server at: " + url, cause);
       }
       throw new SolrServerException(cause.getMessage(), cause);
     } catch (SolrServerException | RuntimeException sse) {
       abortCause = sse;
       throw sse;
     } finally {
-      if (abortCause != null) {
+      if (abortCause != null && req != null) {
         req.abort(abortCause);
       }
     }

From 0619f7873cfcb2f19539d6b2a69225d76e17ca66 Mon Sep 17 00:00:00 2001
From: pjmcarthur <92818583+pjmcarthur@users.noreply.github.com>
Date: Wed, 23 Aug 2023 01:18:13 -0700
Subject: [PATCH 028/160] SOLR-16946: Updated Cluster Singleton plugins are
 stopped correctly when the Overseer is closed (#1862)

---
 solr/CHANGES.txt                               |  2 ++
 .../apache/solr/core/ClusterSingletons.java    |  2 +-
 .../solr/handler/TestContainerPlugin.java      | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f3f715df647..e5e59103585 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -136,6 +136,8 @@ Bug Fixes
 
 * SOLR-16934: Allow Solr to read client (javax.net.ssl.*) trustStores and keyStores via SecurityManager. (Houston Putman)
 
+* SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed. (Paul McArthur)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
index 6e2c0417818..0c71c853400 100644
--- a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
+++ b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
@@ -99,8 +99,8 @@ public void deleted(ContainerPluginsRegistry.ApiInfo plugin) {
           @Override
           public void modified(
               ContainerPluginsRegistry.ApiInfo old, ContainerPluginsRegistry.ApiInfo replacement) {
-            added(replacement);
             deleted(old);
+            added(replacement);
           }
         };
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
index 9fdb0936e88..27daaab4d9a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
@@ -220,8 +220,11 @@ public void testApi() throws Exception {
     MatcherAssert.assertThat(msg, containsString("Cannot find API for the path"));
 
     // test ClusterSingleton plugin
+    CConfig c6Cfg = new CConfig();
+    c6Cfg.strVal = "added";
     plugin.name = "clusterSingleton";
     plugin.klass = C6.class.getName();
+    plugin.config = c6Cfg;
     addPlugin.process(cluster.getSolrClient());
     version = phaser.awaitAdvanceInterruptibly(version, 10, TimeUnit.SECONDS);
 
@@ -233,6 +236,16 @@ public void testApi() throws Exception {
     assertTrue("startCalled", C6.startCalled);
     assertFalse("stopCalled", C6.stopCalled);
 
+    // update the clusterSingleton config
+    c6Cfg.strVal = "updated";
+    postPlugin(singletonMap("update", plugin)).process(cluster.getSolrClient());
+    version = phaser.awaitAdvanceInterruptibly(version, 10, TimeUnit.SECONDS);
+
+    assertTrue("stopCalled", C6.stopCalled);
+
+    // Clear stopCalled, it will be verified again when the Overseer Jetty is killed
+    C6.stopCalled = false;
+
     assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC()));
     assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC1()));
     assertEquals(CConfig.class, ContainerPluginsRegistry.getConfigClass(new CC2()));
@@ -394,7 +407,7 @@ public static class CConfig implements ReflectMapWriter {
     @JsonProperty public Boolean boolVal;
   }
 
-  public static class C6 implements ClusterSingleton {
+  public static class C6 implements ClusterSingleton, ConfigurablePlugin<CConfig> {
     static boolean startCalled = false;
     static boolean stopCalled = false;
     static boolean ccProvided = false;
@@ -430,6 +443,9 @@ public void stop() {
       stopCalled = true;
       state = State.STOPPED;
     }
+
+    @Override
+    public void configure(CConfig cfg) {}
   }
 
   public static class C5 implements ResourceLoaderAware {

From 473cea28b55dcf03fb2338399af321f425c90002 Mon Sep 17 00:00:00 2001
From: Renato Haeberli <renato@onnet.ch>
Date: Wed, 23 Aug 2023 13:48:27 +0200
Subject: [PATCH 029/160] Cleaning up old code to prevent warnings (#1834)

---------

Co-authored-by: Renato Haeberli <>
Co-authored-by: Eric Pugh <epugh@opensourceconnections.com>
---
 .../java/org/apache/solr/cli/AssertTool.java  |  3 --
 .../org/apache/solr/cli/SimplePostTool.java   | 31 +++++++++----------
 .../src/java/org/apache/solr/cli/SolrCLI.java | 11 ++-----
 .../java/org/apache/solr/cli/StatusTool.java  |  5 +--
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index 9ece33ccb8d..44b4dce1250 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -30,7 +30,6 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.request.HealthCheckRequest;
-import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -231,8 +230,6 @@ public static int assertSolrNotRunning(String url) throws Exception {
       NamedList<Object> response = solrClient.request(new HealthCheckRequest());
       Integer statusCode = (Integer) response.findRecursive("responseHeader", "status");
       SolrCLI.checkCodeForAuthError(statusCode);
-    } catch (SolrException se) {
-      throw se;
     } catch (IOException | SolrServerException e) {
       log.debug("Opening connection to {} failed, Solr does not seem to be running", url, e);
       return 0;
diff --git a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
index d15650e1636..6def73ad789 100644
--- a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
@@ -519,14 +519,7 @@ public int postFiles(String[] args, int startIndexInArgs, OutputStream out, Stri
     int filesPosted = 0;
     for (int j = startIndexInArgs; j < args.length; j++) {
       File srcFile = new File(args[j]);
-      boolean isValidPath = checkIsValidPath(srcFile);
-      if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
-        filesPosted += postDirectory(srcFile, out, type);
-      } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
-        filesPosted += postFiles(new File[] {srcFile}, out, type);
-      } else {
-        filesPosted += handleGlob(srcFile, out, type);
-      }
+      filesPosted = getFilesPosted(out, type, srcFile);
     }
     return filesPosted;
   }
@@ -544,14 +537,20 @@ public int postFiles(File[] files, int startIndexInArgs, OutputStream out, Strin
     reset();
     int filesPosted = 0;
     for (File srcFile : files) {
-      boolean isValidPath = checkIsValidPath(srcFile);
-      if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
-        filesPosted += postDirectory(srcFile, out, type);
-      } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
-        filesPosted += postFiles(new File[] {srcFile}, out, type);
-      } else {
-        filesPosted += handleGlob(srcFile, out, type);
-      }
+      filesPosted = getFilesPosted(out, type, srcFile);
+    }
+    return filesPosted;
+  }
+
+  private int getFilesPosted(final OutputStream out, final String type, final File srcFile) {
+    int filesPosted = 0;
+    boolean isValidPath = checkIsValidPath(srcFile);
+    if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
+      filesPosted += postDirectory(srcFile, out, type);
+    } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
+      filesPosted += postFiles(new File[] {srcFile}, out, type);
+    } else {
+      filesPosted += handleGlob(srcFile, out, type);
     }
     return filesPosted;
   }
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 0459892eeea..d7a424f6215 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -27,7 +27,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import java.net.ConnectException;
 import java.net.SocketException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -378,11 +377,7 @@ private static Set<String> findClasses(String path, String packageName) throws E
    */
   public static boolean checkCommunicationError(Exception exc) {
     Throwable rootCause = SolrException.getRootCause(exc);
-    boolean wasCommError =
-        (rootCause instanceof ConnectException
-            || rootCause instanceof SolrServerException
-            || rootCause instanceof SocketException);
-    return wasCommError;
+    return (rootCause instanceof SolrServerException || rootCause instanceof SocketException);
   }
 
   public static void checkCodeForAuthError(int code) {
@@ -600,8 +595,8 @@ public static boolean safeCheckCoreExists(String solrUrl, String coreName) {
         }
         NamedList<Object> existsCheckResult =
             CoreAdminRequest.getStatus(coreName, solrClient).getResponse();
-        NamedList<Object> status = (NamedList) existsCheckResult.get("status");
-        NamedList<Object> coreStatus = (NamedList) status.get(coreName);
+        NamedList<Object> status = (NamedList<Object>) existsCheckResult.get("status");
+        NamedList<Object> coreStatus = (NamedList<Object>) status.get(coreName);
         Map<String, Object> failureStatus =
             (Map<String, Object>) existsCheckResult.get("initFailures");
         String errorMsg = (String) failureStatus.get(coreName);
diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
index 546dc742f3d..3758a60b3fe 100644
--- a/solr/core/src/java/org/apache/solr/cli/StatusTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -24,7 +24,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.net.ssl.SSLPeerUnverifiedException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
@@ -130,8 +129,6 @@ public Map<String, Object> waitToSeeSolrUp(String solrUrl, long maxWait, TimeUni
     while (System.nanoTime() < timeout) {
       try {
         return getStatus(solrUrl);
-      } catch (SSLPeerUnverifiedException exc) {
-        throw exc;
       } catch (Exception exc) {
         if (SolrCLI.exceptionIsAuthRelated(exc)) {
           throw exc;
@@ -204,7 +201,7 @@ protected Map<String, String> getCloudStatus(SolrClient solrClient, String zkHos
     cloudStatus.put("liveNodes", String.valueOf(liveNodes.size()));
 
     Map<String, Object> collections =
-        ((NamedList) json.findRecursive("cluster", "collections")).asMap();
+        ((NamedList<Object>) json.findRecursive("cluster", "collections")).asMap();
     cloudStatus.put("collections", String.valueOf(collections.size()));
 
     return cloudStatus;

From f5b0d22f06363a06db25368f70e0d429a0e3b192 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Wed, 23 Aug 2023 15:40:27 -0400
Subject: [PATCH 030/160] SOLR-16933: Include full query response in API tool
 (#1863)

---
 solr/CHANGES.txt                              |  2 +
 .../src/java/org/apache/solr/cli/ApiTool.java | 53 ++++++++-------
 .../java/org/apache/solr/cli/CreateTool.java  | 16 ++---
 .../java/org/apache/solr/cli/DeleteTool.java  | 16 ++---
 .../test/org/apache/solr/cli/ApiToolTest.java | 64 ++++++++++++++++++-
 .../client/solrj/impl/NodeValueFetcher.java   |  2 +-
 .../impl/SolrClientNodeStateProvider.java     |  5 +-
 .../apache/solr/common/IteratorWriter.java    |  2 +-
 .../apache/solr/common/SolrDocumentList.java  | 21 +++++-
 .../org/apache/solr/common/util/Utils.java    | 10 ++-
 .../solrj/src/java/org/noggit/JSONWriter.java | 21 +++++-
 11 files changed, 160 insertions(+), 52 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e5e59103585..009f9bc2d44 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -138,6 +138,8 @@ Bug Fixes
 
 * SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed. (Paul McArthur)
 
+* SOLR-16933: Include the full query response when using the API tool, and fix serialization issues for SolrDocumentList. (Houston Putman) 
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/cli/ApiTool.java b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
index 6122000211b..82980ea5257 100644
--- a/solr/core/src/java/org/apache/solr/cli/ApiTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
@@ -23,11 +23,10 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
-import org.noggit.CharArr;
-import org.noggit.JSONWriter;
 
 /**
  * Supports api command in the bin/solr script.
@@ -61,29 +60,39 @@ public List<Option> getOptions() {
 
   @Override
   public void runImpl(CommandLine cli) throws Exception {
+    String response = null;
     String getUrl = cli.getOptionValue("get");
     if (getUrl != null) {
-      getUrl = getUrl.replace("+", "%20");
-      URI uri = new URI(getUrl);
-      String solrUrl = getSolrUrlFromUri(uri);
-      String path = uri.getPath();
-      try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
-        NamedList<Object> response =
-            solrClient.request(
-                // For path parameter we need the path without the root so from the second / char
-                // (because root can be configured)
-                // E.g URL is http://localhost:8983/solr/admin/info/system path is
-                // /solr/admin/info/system and the path without root is /admin/info/system
-                new GenericSolrRequest(
-                    SolrRequest.METHOD.GET,
-                    path.substring(path.indexOf("/", path.indexOf("/") + 1)),
-                    getSolrParamsFromUri(uri)));
+      response = callGet(getUrl);
+    }
+    if (response != null) {
+      // pretty-print the response to stdout
+      echo(response);
+    }
+  }
 
-        // pretty-print the response to stdout
-        CharArr arr = new CharArr();
-        new JSONWriter(arr, 2).write(response.asMap());
-        echo(arr.toString());
-      }
+  protected String callGet(String url) throws Exception {
+    URI uri = new URI(url.replace("+", "%20"));
+    String solrUrl = getSolrUrlFromUri(uri);
+    String path = uri.getPath();
+    try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
+      // For path parameter we need the path without the root so from the second / char
+      // (because root can be configured)
+      // E.g URL is http://localhost:8983/solr/admin/info/system path is
+      // /solr/admin/info/system and the path without root is /admin/info/system
+      var req =
+          new GenericSolrRequest(
+              SolrRequest.METHOD.GET,
+              path.substring(path.indexOf("/", path.indexOf("/") + 1)),
+              getSolrParamsFromUri(uri) // .add("indent", "true")
+              );
+      // Using the "smart" solr parsers won't work, because they decode into Solr objects.
+      // When trying to re-write into JSON, the JSONWriter doesn't have the right info to print it
+      // correctly.
+      // All we want to do is pass the JSON response to the user, so do that.
+      req.setResponseParser(new NoOpResponseParser("json"));
+      NamedList<Object> response = solrClient.request(req);
+      return (String) response.get("response");
     }
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index 91a2214eeb4..cd7aaddb1f1 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -38,6 +38,7 @@
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -48,8 +49,6 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.ConfigSetService;
-import org.noggit.CharArr;
-import org.noggit.JSONWriter;
 
 /** Supports create command in the bin/solr script. */
 public class CreateTool extends ToolBase {
@@ -287,19 +286,18 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
 
     NamedList<Object> response;
     try {
-      response =
-          cloudSolrClient.request(
-              CollectionAdminRequest.createCollection(
-                  collectionName, confName, numShards, replicationFactor));
+      var req =
+          CollectionAdminRequest.createCollection(
+              collectionName, confName, numShards, replicationFactor);
+      req.setResponseParser(new NoOpResponseParser("json"));
+      response = cloudSolrClient.request(req);
     } catch (SolrServerException sse) {
       throw new Exception(
           "Failed to create collection '" + collectionName + "' due to: " + sse.getMessage());
     }
 
     if (cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())) {
-      CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
-      echo(arr.toString());
+      echo((String) response.get("response"));
     } else {
       String endMessage =
           String.format(
diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
index 5e556f02017..1b8eec4e7bf 100644
--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
@@ -32,12 +32,11 @@
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.util.NamedList;
-import org.noggit.CharArr;
-import org.noggit.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,7 +172,9 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
 
     NamedList<Object> response;
     try {
-      response = cloudSolrClient.request(CollectionAdminRequest.deleteCollection(collectionName));
+      var req = CollectionAdminRequest.deleteCollection(collectionName);
+      req.setResponseParser(new NoOpResponseParser("json"));
+      response = cloudSolrClient.request(req);
     } catch (SolrServerException sse) {
       throw new Exception(
           "Failed to delete collection '" + collectionName + "' due to: " + sse.getMessage());
@@ -194,9 +195,7 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     }
 
     if (response != null) {
-      CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
-      echo(arr.toString());
+      echo((String) response.get("response"));
       echo("\n");
     }
 
@@ -215,15 +214,14 @@ protected void deleteCore(CommandLine cli, SolrClient solrClient) throws Excepti
       unloadRequest.setDeleteDataDir(true);
       unloadRequest.setDeleteInstanceDir(true);
       unloadRequest.setCoreName(coreName);
+      unloadRequest.setResponseParser(new NoOpResponseParser("json"));
       response = solrClient.request(unloadRequest);
     } catch (SolrServerException sse) {
       throw new Exception("Failed to delete core '" + coreName + "' due to: " + sse.getMessage());
     }
 
     if (response != null) {
-      CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
-      echoIfVerbose(arr.toString(), cli);
+      echoIfVerbose((String) response.get("response"), cli);
       echoIfVerbose("\n", cli);
     }
   }
diff --git a/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java b/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
index 82e9b99a473..d817845854a 100644
--- a/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
@@ -16,14 +16,30 @@
  */
 package org.apache.solr.cli;
 
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
-import org.apache.solr.SolrTestCase;
+import java.util.Locale;
+import org.apache.lucene.tests.util.TestUtil;
+import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.params.ModifiableSolrParams;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class ApiToolTest extends SolrTestCase {
+public class ApiToolTest extends SolrCloudTestCase {
+  static String COLLECTION_NAME = "globalLoaderColl";
+
+  @BeforeClass
+  public static void setupCluster() throws Exception {
+    configureCluster(1)
+        .addConfig(
+            "config", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
+        .configure();
+  }
 
   @Test
   public void testParsingGetUrl() throws URISyntaxException {
@@ -42,4 +58,48 @@ public void testParsingGetUrl() throws URISyntaxException {
       assertEquals("select id from COLL_NAME limit 10", params.get("stmt"));
     }
   }
+
+  @Test
+  public void testQueryResponse() throws Exception {
+    int docCount = 1000;
+    CollectionAdminRequest.createCollection(COLLECTION_NAME, "config", 2, 1)
+        .process(cluster.getSolrClient());
+    cluster.waitForActiveCollection(COLLECTION_NAME, 2, 2);
+
+    String tmpFileLoc =
+        new File(cluster.getBaseDir().toFile().getAbsolutePath() + File.separator).getPath();
+
+    UpdateRequest ur = new UpdateRequest();
+    ur.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
+
+    for (int i = 0; i < docCount; i++) {
+      ur.add(
+          "id",
+          String.valueOf(i),
+          "desc_s",
+          TestUtil.randomSimpleString(random(), 10, 50),
+          "a_dt",
+          "2019-09-30T05:58:03Z");
+    }
+    cluster.getSolrClient().request(ur, COLLECTION_NAME);
+
+    ApiTool tool = new ApiTool();
+
+    String response =
+        tool.callGet(
+            cluster.getJettySolrRunner(0).getBaseUrl()
+                + "/"
+                + COLLECTION_NAME
+                + "/select?q=*:*&rows=1&fl=id&sort=id+asc");
+    // Fields that could be missed because of serialization
+    assertFindInJson(response, "\"numFound\":1000,");
+    // Correct formatting
+    assertFindInJson(response, "\"docs\":[{");
+  }
+
+  private void assertFindInJson(String json, String find) {
+    assertTrue(
+        String.format(Locale.ROOT, "Could not find string %s in response: \n%s", find, json),
+        json.contains(find));
+  }
 }
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java
index c5832aa1432..c6e122aae50 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java
@@ -139,7 +139,7 @@ private void getRemoteInfo(
 
     try {
       SimpleSolrResponse rsp = ctx.invokeWithRetry(solrNode, CommonParams.METRICS_PATH, params);
-      NamedList<?> metrics = (NamedList<?>) rsp.nl.get("metrics");
+      NamedList<?> metrics = (NamedList<?>) rsp.getResponse().get("metrics");
       if (metrics != null) {
         for (Tags t : Tags.values()) {
           ctx.tags.put(t.tagName, t.extractResult(metrics));
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 1bc2aed24bc..4d7f087426a 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
@@ -194,7 +194,8 @@ static void fetchReplicaMetrics(
       SimpleSolrResponse rsp = ctx.invokeWithRetry(solrNode, CommonParams.METRICS_PATH, params);
       metricsKeyVsTag.forEach(
           (key, tags) -> {
-            Object v = Utils.getObjectByPath(rsp.nl, true, Arrays.asList("metrics", key));
+            Object v =
+                Utils.getObjectByPath(rsp.getResponse(), true, Arrays.asList("metrics", key));
             for (Object tag : tags) {
               if (tag instanceof Function) {
                 @SuppressWarnings({"unchecked"})
@@ -296,7 +297,7 @@ public SimpleSolrResponse invoke(String solrNode, String path, SolrParams params
               .withResponseParser(new BinaryResponseParser())
               .build()) {
         NamedList<Object> rsp = client.request(request);
-        request.response.nl = rsp;
+        request.response.setResponse(rsp);
         return request.response;
       }
     }
diff --git a/solr/solrj/src/java/org/apache/solr/common/IteratorWriter.java b/solr/solrj/src/java/org/apache/solr/common/IteratorWriter.java
index f321646a5c6..1c2274b7c0f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/IteratorWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/IteratorWriter.java
@@ -104,7 +104,7 @@ public IteratorWriter.ItemWriter add(Object o) {
                 writer.writeValueSeparator();
               }
               writer.indent();
-              write(writer);
+              writer.write(o);
               return this;
             }
           });
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java
index 4204fc2e61b..cbc7f8dd2b5 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java
@@ -16,7 +16,9 @@
  */
 package org.apache.solr.common;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * Represent a list of SolrDocuments returned from a search. This includes position and offset
@@ -24,7 +26,24 @@
  *
  * @since solr 1.3
  */
-public class SolrDocumentList extends ArrayList<SolrDocument> {
+public class SolrDocumentList extends ArrayList<SolrDocument> implements MapWriter {
+
+  @Override
+  public void writeMap(EntryWriter ew) throws IOException {
+    ew.put("numFound", numFound);
+    ew.put("start", start);
+
+    if (maxScore != null) {
+      ew.put("maxScore", maxScore);
+    }
+
+    if (numFoundExact != null) {
+      ew.put("numFoundExact", numFoundExact);
+    }
+    final Iterator<SolrDocument> docs = iterator();
+    ew.put("docs", (IteratorWriter) iw -> docs.forEachRemaining(iw::addNoEx));
+  }
+
   private long numFound = 0;
   private long start = 0;
   private Float maxScore = null;
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index 391ad2eaed2..31d6e736a2e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -479,15 +479,19 @@ public static Object getObjectByPath(Object root, boolean onlyPrimitive, List<St
         Object o = getVal(obj, s, -1);
         if (o == null) return null;
         if (idx > -1) {
-          if (o instanceof MapWriter) {
+          if (o instanceof List) {
+            List<?> l = (List<?>) o;
+            o = idx < l.size() ? l.get(idx) : null;
+          } else if (o instanceof IteratorWriter) {
+            o = getValueAt((IteratorWriter) o, idx);
+          } else if (o instanceof MapWriter) {
             o = getVal(o, null, idx);
           } else if (o instanceof Map) {
             @SuppressWarnings("unchecked")
             Map<String, Object> map = (Map<String, Object>) o;
             o = getVal(new MapWriterMap(map), null, idx);
           } else {
-            List<?> l = (List<?>) o;
-            o = idx < l.size() ? l.get(idx) : null;
+            return null;
           }
         }
         if (!isMapLike(o)) return null;
diff --git a/solr/solrj/src/java/org/noggit/JSONWriter.java b/solr/solrj/src/java/org/noggit/JSONWriter.java
index 0782717b8ae..349c1fecf02 100644
--- a/solr/solrj/src/java/org/noggit/JSONWriter.java
+++ b/solr/solrj/src/java/org/noggit/JSONWriter.java
@@ -21,6 +21,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.Map;
 
 public class JSONWriter {
@@ -70,6 +71,8 @@ public void write(Object o) {
     // perfect hashing.
     if (o == null) {
       writeNull();
+    } else if (o instanceof Writable) {
+      ((Writable) o).write(this);
     } else if (o instanceof String) {
       writeString((String) o);
     } else if (o instanceof Number) {
@@ -86,12 +89,12 @@ public void write(Object o) {
       write((Map<?, ?>) o);
     } else if (o instanceof Collection) {
       write((Collection<?>) o);
+    } else if (o instanceof Iterator) {
+      write((Iterator<?>) o);
     } else if (o instanceof Boolean) {
       write(((Boolean) o).booleanValue());
     } else if (o instanceof CharSequence) {
       writeString((CharSequence) o);
-    } else if (o instanceof Writable) {
-      ((Writable) o).write(this);
     } else if (o instanceof Object[]) {
       write(Arrays.asList((Object[]) o));
     } else if (o instanceof int[]) {
@@ -156,6 +159,20 @@ public void write(Collection<?> val) {
     endArray();
   }
 
+  public void write(Iterator<?> val) {
+    startArray();
+    boolean first = true;
+    while (val.hasNext()) {
+      if (first) {
+        first = false;
+      } else {
+        writeValueSeparator();
+      }
+      write(val.next());
+    }
+    endArray();
+  }
+
   /**
    * A byte[] may be either a single logical value, or a list of small integers. It's up to the
    * implementation to decide.

From 57acde3752bec704442cd08d54fc516f93ee4169 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Wed, 23 Aug 2023 16:49:01 -0400
Subject: [PATCH 031/160] SOLR-16933: Use JSONMapResponseWriter for CLI errors

Related to #1863
---
 solr/core/src/java/org/apache/solr/cli/ApiTool.java   | 11 ++++++++---
 .../core/src/java/org/apache/solr/cli/CreateTool.java | 11 ++++++++---
 .../core/src/java/org/apache/solr/cli/DeleteTool.java | 10 ++++++++--
 .../solr/client/solrj/impl/Http2SolrClient.java       |  8 +++++++-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ApiTool.java b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
index 82980ea5257..8ecfcd36a40 100644
--- a/solr/core/src/java/org/apache/solr/cli/ApiTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
@@ -23,10 +23,12 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.NoOpResponseParser;
+import org.apache.solr.client.solrj.impl.JsonMapResponseParser;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
+import org.noggit.CharArr;
+import org.noggit.JSONWriter;
 
 /**
  * Supports api command in the bin/solr script.
@@ -90,9 +92,12 @@ protected String callGet(String url) throws Exception {
       // When trying to re-write into JSON, the JSONWriter doesn't have the right info to print it
       // correctly.
       // All we want to do is pass the JSON response to the user, so do that.
-      req.setResponseParser(new NoOpResponseParser("json"));
+      req.setResponseParser(new JsonMapResponseParser());
       NamedList<Object> response = solrClient.request(req);
-      return (String) response.get("response");
+      // pretty-print the response to stdout
+      CharArr arr = new CharArr();
+      new JSONWriter(arr, 2).write(response.asMap());
+      return arr.toString();
     }
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index cd7aaddb1f1..e62c42d185a 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -38,7 +38,7 @@
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.NoOpResponseParser;
+import org.apache.solr.client.solrj.impl.JsonMapResponseParser;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -49,6 +49,8 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.ConfigSetService;
+import org.noggit.CharArr;
+import org.noggit.JSONWriter;
 
 /** Supports create command in the bin/solr script. */
 public class CreateTool extends ToolBase {
@@ -289,7 +291,7 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
       var req =
           CollectionAdminRequest.createCollection(
               collectionName, confName, numShards, replicationFactor);
-      req.setResponseParser(new NoOpResponseParser("json"));
+      req.setResponseParser(new JsonMapResponseParser());
       response = cloudSolrClient.request(req);
     } catch (SolrServerException sse) {
       throw new Exception(
@@ -297,7 +299,10 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     }
 
     if (cli.hasOption(SolrCLI.OPTION_VERBOSE.getOpt())) {
-      echo((String) response.get("response"));
+      // pretty-print the response to stdout
+      CharArr arr = new CharArr();
+      new JSONWriter(arr, 2).write(response.asMap());
+      echo(arr.toString());
     } else {
       String endMessage =
           String.format(
diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
index 1b8eec4e7bf..bae371226ae 100644
--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
@@ -32,11 +32,14 @@
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.JsonMapResponseParser;
 import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.util.NamedList;
+import org.noggit.CharArr;
+import org.noggit.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,7 +176,7 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     NamedList<Object> response;
     try {
       var req = CollectionAdminRequest.deleteCollection(collectionName);
-      req.setResponseParser(new NoOpResponseParser("json"));
+      req.setResponseParser(new JsonMapResponseParser());
       response = cloudSolrClient.request(req);
     } catch (SolrServerException sse) {
       throw new Exception(
@@ -195,7 +198,10 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     }
 
     if (response != null) {
-      echo((String) response.get("response"));
+      // pretty-print the response to stdout
+      CharArr arr = new CharArr();
+      new JSONWriter(arr, 2).write(response.asMap());
+      echo(arr.toString());
       echo("\n");
     }
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 867b5edc85d..73001f7685f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -871,6 +871,9 @@ private NamedList<Object> processErrorsAndResponse(
       }
 
       Object error = rsp == null ? null : rsp.get("error");
+      if (rsp != null && error == null && processor instanceof NoOpResponseParser) {
+        error = rsp.get("response");
+      }
       if (error != null
           && (String.valueOf(getObjectByPath(error, true, errPath))
               .endsWith("ExceptionWithErrObject"))) {
@@ -907,9 +910,12 @@ private NamedList<Object> processErrorsAndResponse(
         if (reason == null) {
           StringBuilder msg = new StringBuilder();
           msg.append(response.getReason())
-              .append("\n\n")
+              .append("\n")
               .append("request: ")
               .append(response.getRequest().getMethod());
+          if (error != null) {
+            msg.append("\n\nError returned:\n").append(error);
+          }
           reason = java.net.URLDecoder.decode(msg.toString(), FALLBACK_CHARSET);
         }
         RemoteSolrException rss =

From 0a47cf8ac8420feb623600ff736aed6503b53b20 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Thu, 24 Aug 2023 07:59:08 -0400
Subject: [PATCH 032/160] SOLR-16825: Migrate v2 definitions to 'api' module
 (#1859)

Since Solr's OAS (OpenApi Spec) is now generated prior to compiling
SolrJ, it can only contain those APIs defined in our new 'api'
module.

This commit moves a number of v2 API definitions to this new module,
including:
  - delete replica property
  - delete replica
  - delete (i.e. "clear") node
  - delete collection snapshot
  - delete collection backup

Moving these APIs also means that a v2 SolrRequest implementation is
generated for each.
---
 .../api/endpoint/AddReplicaPropertyApi.java   |   2 +-
 .../endpoint/DeleteCollectionBackupApi.java   |  83 ++++++++++++++
 .../endpoint/DeleteCollectionSnapshotApi.java |  50 ++++++++
 .../client/api/endpoint/DeleteNodeApi.java    |  50 ++++++++
 .../client/api/endpoint/DeleteReplicaApi.java |  94 +++++++++++++++
 .../endpoint/DeleteReplicaPropertyApi.java    |  59 ++++++++++
 .../client/api/model/BackupDeletionData.java  |  27 +++++
 .../api/model/BackupDeletionResponseBody.java |  26 +++++
 .../solr/client/api/model/Constants.java      |  51 +++++++++
 .../DeleteCollectionSnapshotResponse.java     |  42 +++++++
 .../api/model/DeleteNodeRequestBody.java      |  27 +++++
 .../model/PurgeUnusedFilesRequestBody.java    |  42 +++++++
 .../client/api/model/PurgeUnusedResponse.java |  30 +++++
 .../api/model/ScaleCollectionRequestBody.java |  41 +++++++
 .../handler/admin/CollectionsHandler.java     |  38 +++----
 .../admin/api/CreateCollectionBackupAPI.java  |   8 +-
 ...upAPI.java => DeleteCollectionBackup.java} | 103 +++++------------
 ...API.java => DeleteCollectionSnapshot.java} |  59 ++--------
 .../{DeleteNodeAPI.java => DeleteNode.java}   |  48 ++------
 ...leteReplicaAPI.java => DeleteReplica.java} | 107 +++++++-----------
 ...rtyAPI.java => DeleteReplicaProperty.java} |  35 ++----
 .../api/DeleteCollectionBackupAPITest.java    |  21 ++--
 .../api/DeleteCollectionSnapshotAPITest.java  |   5 +-
 .../handler/admin/api/DeleteNodeAPITest.java  |  15 +--
 .../admin/api/DeleteReplicaAPITest.java       |  12 +-
 .../api/DeleteReplicaPropertyAPITest.java     |  22 ++--
 .../src/resources/java-template/api.mustache  |  16 ++-
 27 files changed, 790 insertions(+), 323 deletions(-)
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionData.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionResponseBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/Constants.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/DeleteCollectionSnapshotResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/DeleteNodeRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedFilesRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ScaleCollectionRequestBody.java
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{DeleteCollectionBackupAPI.java => DeleteCollectionBackup.java} (73%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{DeleteCollectionSnapshotAPI.java => DeleteCollectionSnapshot.java} (62%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{DeleteNodeAPI.java => DeleteNode.java} (70%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{DeleteReplicaAPI.java => DeleteReplica.java} (73%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{DeleteReplicaPropertyAPI.java => DeleteReplicaProperty.java} (77%)

diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
index d29ee057502..9403358770a 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
@@ -36,7 +36,7 @@ public interface AddReplicaPropertyApi {
   @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Adds a property to the specified replica",
-      tags = {"replicas"})
+      tags = {"replica-properties"})
   public SolrJerseyResponse addReplicaProperty(
       @Parameter(
               description = "The name of the collection the replica belongs to.",
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
new file mode 100644
index 00000000000..1135e4d89d7
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
@@ -0,0 +1,83 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+import static org.apache.solr.client.api.model.Constants.BACKUP_LOCATION;
+import static org.apache.solr.client.api.model.Constants.BACKUP_REPOSITORY;
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.model.BackupDeletionResponseBody;
+import org.apache.solr.client.api.model.PurgeUnusedFilesRequestBody;
+import org.apache.solr.client.api.model.PurgeUnusedResponse;
+
+@Path("/backups/{backupName}")
+public interface DeleteCollectionBackupApi {
+
+  @Path("/versions/{backupId}")
+  @DELETE
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete incremental backup point by ID",
+      tags = {"collection-backups"})
+  BackupDeletionResponseBody deleteSingleBackupById(
+      @PathParam("backupName") String backupName,
+      @PathParam("backupId") String backupId,
+      // Optional parameters below
+      @QueryParam(BACKUP_LOCATION) String location,
+      @QueryParam(BACKUP_REPOSITORY) String repositoryName,
+      @QueryParam(ASYNC) String asyncId)
+      throws Exception;
+
+  @Path("/versions")
+  @DELETE
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete all incremental backup points older than the most recent N",
+      tags = {"collection-backups"})
+  BackupDeletionResponseBody deleteMultipleBackupsByRecency(
+      @PathParam("backupName") String backupName,
+      @QueryParam("retainLatest") Integer versionsToRetain,
+      // Optional parameters below
+      @QueryParam(BACKUP_LOCATION) String location,
+      @QueryParam(BACKUP_REPOSITORY) String repositoryName,
+      @QueryParam(ASYNC) String asyncId)
+      throws Exception;
+
+  @Path("/purgeUnused")
+  @PUT
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Garbage collect orphaned incremental backup files",
+      tags = {"collection-backups"})
+  PurgeUnusedResponse garbageCollectUnusedBackupFiles(
+      @PathParam("backupName") String backupName,
+      @RequestBody(
+              description = "Request body parameters for the orphaned file cleanup",
+              required = false)
+          PurgeUnusedFilesRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
new file mode 100644
index 00000000000..f9d1afc8387
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Parameter;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.model.DeleteCollectionSnapshotResponse;
+
+public interface DeleteCollectionSnapshotApi {
+
+  /** This API is analogous to V1's (POST /solr/admin/collections?action=DELETESNAPSHOT) */
+  @DELETE
+  @Path("/collections/{collName}/snapshots/{snapshotName}")
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  DeleteCollectionSnapshotResponse deleteSnapshot(
+      @Parameter(description = "The name of the collection.", required = true)
+          @PathParam("collName")
+          String collName,
+      @Parameter(description = "The name of the snapshot to be deleted.", required = true)
+          @PathParam("snapshotName")
+          String snapshotName,
+      @Parameter(description = "A flag that treats the collName parameter as a collection alias.")
+          @DefaultValue("false")
+          @QueryParam("followAliases")
+          boolean followAliases,
+      @QueryParam("async") String asyncId)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
new file mode 100644
index 00000000000..323b70dbabb
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.DeleteNodeRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+@Path("cluster/nodes/{nodeName}/clear/")
+public interface DeleteNodeApi {
+
+  @POST
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete all replicas off of the specified SolrCloud node",
+      tags = {"node"})
+  SolrJerseyResponse deleteNode(
+      @Parameter(
+              description =
+                  "The name of the node to be cleared.  Usually of the form 'host:1234_solr'.",
+              required = true)
+          @PathParam("nodeName")
+          String nodeName,
+      @RequestBody(description = "Contains user provided parameters", required = true)
+          DeleteNodeRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
new file mode 100644
index 00000000000..a728c12aadc
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
@@ -0,0 +1,94 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+import static org.apache.solr.client.api.model.Constants.COUNT_PROP;
+import static org.apache.solr.client.api.model.Constants.DELETE_DATA_DIR;
+import static org.apache.solr.client.api.model.Constants.DELETE_INDEX;
+import static org.apache.solr.client.api.model.Constants.DELETE_INSTANCE_DIR;
+import static org.apache.solr.client.api.model.Constants.FOLLOW_ALIASES;
+import static org.apache.solr.client.api.model.Constants.ONLY_IF_DOWN;
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.model.ScaleCollectionRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/**
+ * V2 API definition for deleting one or more existing replicas from one or more shards.
+ *
+ * <p>These APIs are analogous to the v1 /admin/collections?action=DELETEREPLICA command.
+ */
+@Path("/collections/{collectionName}")
+public interface DeleteReplicaApi {
+
+  @DELETE
+  @Path("/shards/{shardName}/replicas/{replicaName}")
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete an single replica by name",
+      tags = {"replicas"})
+  SubResponseAccumulatingJerseyResponse deleteReplicaByName(
+      @PathParam("collectionName") String collectionName,
+      @PathParam("shardName") String shardName,
+      @PathParam("replicaName") String replicaName,
+      // Optional params below
+      @QueryParam(FOLLOW_ALIASES) Boolean followAliases,
+      @QueryParam(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir,
+      @QueryParam(DELETE_DATA_DIR) Boolean deleteDataDir,
+      @QueryParam(DELETE_INDEX) Boolean deleteIndex,
+      @QueryParam(ONLY_IF_DOWN) Boolean onlyIfDown,
+      @QueryParam(ASYNC) String async)
+      throws Exception;
+
+  @DELETE
+  @Path("/shards/{shardName}/replicas")
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete one or more replicas from the specified collection and shard",
+      tags = {"replicas"})
+  SubResponseAccumulatingJerseyResponse deleteReplicasByCount(
+      @PathParam("collectionName") String collectionName,
+      @PathParam("shardName") String shardName,
+      @QueryParam(COUNT_PROP) Integer numToDelete,
+      // Optional params below
+      @QueryParam(FOLLOW_ALIASES) Boolean followAliases,
+      @QueryParam(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir,
+      @QueryParam(DELETE_DATA_DIR) Boolean deleteDataDir,
+      @QueryParam(DELETE_INDEX) Boolean deleteIndex,
+      @QueryParam(ONLY_IF_DOWN) Boolean onlyIfDown,
+      @QueryParam(ASYNC) String async)
+      throws Exception;
+
+  @PUT
+  @Path("/scale")
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Scale the replica count for all shards in the specified collection",
+      tags = {"replicas"})
+  SubResponseAccumulatingJerseyResponse deleteReplicasByCountAllShards(
+      @PathParam("collectionName") String collectionName, ScaleCollectionRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
new file mode 100644
index 00000000000..15d98564ffe
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
@@ -0,0 +1,59 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/**
+ * V2 API definition for removing a property from a collection replica
+ *
+ * <p>This API is analogous to the v1 /admin/collections?action=DELETEREPLICAPROP command.
+ */
+@Path("/collections/{collName}/shards/{shardName}/replicas/{replicaName}/properties/{propName}")
+public interface DeleteReplicaPropertyApi {
+
+  @DELETE
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete an existing replica property",
+      tags = {"replica-properties"})
+  SolrJerseyResponse deleteReplicaProperty(
+      @Parameter(
+              description = "The name of the collection the replica belongs to.",
+              required = true)
+          @PathParam("collName")
+          String collName,
+      @Parameter(description = "The name of the shard the replica belongs to.", required = true)
+          @PathParam("shardName")
+          String shardName,
+      @Parameter(description = "The replica, e.g., `core_node1`.", required = true)
+          @PathParam("replicaName")
+          String replicaName,
+      @Parameter(description = "The name of the property to delete.", required = true)
+          @PathParam("propName")
+          String propertyName)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionData.java b/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionData.java
new file mode 100644
index 00000000000..b27ce790c89
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionData.java
@@ -0,0 +1,27 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class BackupDeletionData {
+  @JsonProperty public String startTime;
+  @JsonProperty public Integer backupId;
+  @JsonProperty public Long size;
+  @JsonProperty public Integer numFiles;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionResponseBody.java b/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionResponseBody.java
new file mode 100644
index 00000000000..29563599ab2
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/BackupDeletionResponseBody.java
@@ -0,0 +1,26 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public class BackupDeletionResponseBody extends SubResponseAccumulatingJerseyResponse {
+  @JsonProperty public String collection;
+  @JsonProperty public List<BackupDeletionData> deleted;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/Constants.java b/solr/api/src/java/org/apache/solr/client/api/model/Constants.java
new file mode 100644
index 00000000000..e6ad827756f
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/Constants.java
@@ -0,0 +1,51 @@
+/*
+ * 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.api.model;
+
+public class Constants {
+
+  private Constants() {
+    /* Private ctor prevents instantiation */
+  }
+
+  /** A parameter to specify the name of the backup repository to be used. */
+  public static final String BACKUP_REPOSITORY = "repository";
+
+  /** A parameter to specify the location where the backup should be stored. */
+  public static final String BACKUP_LOCATION = "location";
+
+  /** Async or not? * */
+  public static final String ASYNC = "async";
+
+  /** The name of a collection referenced by an API call */
+  public static final String COLLECTION = "collection";
+
+  public static final String COUNT_PROP = "count";
+
+  /** Option to follow aliases when deciding the target of a collection admin command. */
+  public static final String FOLLOW_ALIASES = "followAliases";
+
+  /** If you unload a core, delete the index too */
+  public static final String DELETE_INDEX = "deleteIndex";
+
+  public static final String DELETE_DATA_DIR = "deleteDataDir";
+
+  public static final String DELETE_INSTANCE_DIR = "deleteInstanceDir";
+
+  public static final String ONLY_IF_DOWN = "onlyIfDown";
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/DeleteCollectionSnapshotResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/DeleteCollectionSnapshotResponse.java
new file mode 100644
index 00000000000..2b134a2877c
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/DeleteCollectionSnapshotResponse.java
@@ -0,0 +1,42 @@
+/*
+ * 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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.COLLECTION;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.apache.solr.client.api.endpoint.DeleteCollectionSnapshotApi;
+
+/**
+ * The Response for {@link DeleteCollectionSnapshotApi#deleteSnapshot(String, String, boolean,
+ * String)}
+ */
+public class DeleteCollectionSnapshotResponse extends AsyncJerseyResponse {
+  @Schema(description = "The name of the collection.")
+  @JsonProperty(COLLECTION)
+  public String collection;
+
+  @Schema(description = "The name of the snapshot to be deleted.")
+  @JsonProperty("snapshot")
+  public String snapshotName;
+
+  @Schema(description = "A flag that treats the collName parameter as a collection alias.")
+  @JsonProperty("followAliases")
+  public boolean followAliases;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/DeleteNodeRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/DeleteNodeRequestBody.java
new file mode 100644
index 00000000000..4b05f2f04e9
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/DeleteNodeRequestBody.java
@@ -0,0 +1,27 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class DeleteNodeRequestBody {
+  @Schema(description = "Request ID to track this action which will be processed asynchronously.")
+  @JsonProperty("async")
+  public String async;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedFilesRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedFilesRequestBody.java
new file mode 100644
index 00000000000..1e3c6a26324
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedFilesRequestBody.java
@@ -0,0 +1,42 @@
+/*
+ * 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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+import static org.apache.solr.client.api.model.Constants.BACKUP_LOCATION;
+import static org.apache.solr.client.api.model.Constants.BACKUP_REPOSITORY;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.apache.solr.client.api.endpoint.DeleteCollectionBackupApi;
+
+/**
+ * Request body for the {@link DeleteCollectionBackupApi#garbageCollectUnusedBackupFiles(String,
+ * PurgeUnusedFilesRequestBody)} API.
+ */
+public class PurgeUnusedFilesRequestBody {
+  @JsonProperty(BACKUP_LOCATION)
+  public String location;
+
+  @Schema(name = "repositoryName")
+  @JsonProperty(BACKUP_REPOSITORY)
+  public String repositoryName;
+
+  @JsonProperty(ASYNC)
+  public String async;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedResponse.java
new file mode 100644
index 00000000000..5415060149c
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/PurgeUnusedResponse.java
@@ -0,0 +1,30 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class PurgeUnusedResponse extends SubResponseAccumulatingJerseyResponse {
+  @JsonProperty public PurgeUnusedStats deleted;
+
+  public static class PurgeUnusedStats {
+    @JsonProperty public Integer numBackupIds;
+    @JsonProperty public Integer numShardBackupIds;
+    @JsonProperty public Integer numIndexFiles;
+  }
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ScaleCollectionRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/ScaleCollectionRequestBody.java
new file mode 100644
index 00000000000..c1c84ca22e1
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ScaleCollectionRequestBody.java
@@ -0,0 +1,41 @@
+/*
+ * 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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+import static org.apache.solr.client.api.model.Constants.COUNT_PROP;
+import static org.apache.solr.client.api.model.Constants.DELETE_DATA_DIR;
+import static org.apache.solr.client.api.model.Constants.DELETE_INDEX;
+import static org.apache.solr.client.api.model.Constants.DELETE_INSTANCE_DIR;
+import static org.apache.solr.client.api.model.Constants.FOLLOW_ALIASES;
+import static org.apache.solr.client.api.model.Constants.ONLY_IF_DOWN;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/** Request body used by {@link org.apache.solr.client.api.endpoint.DeleteReplicaApi} */
+public class ScaleCollectionRequestBody {
+  public @JsonProperty(value = COUNT_PROP, required = true) @Schema(name = "numToDelete") Integer
+      numToDelete;
+  public @JsonProperty(FOLLOW_ALIASES) Boolean followAliases;
+  public @JsonProperty(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir;
+  public @JsonProperty(DELETE_DATA_DIR) Boolean deleteDataDir;
+  public @JsonProperty(DELETE_INDEX) Boolean deleteIndex;
+  public @JsonProperty(ONLY_IF_DOWN) Boolean onlyIfDown;
+  public @JsonProperty(ASYNC) String async;
+}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 4b63e0c5138..732d7eb03c2 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -177,11 +177,11 @@
 import org.apache.solr.handler.admin.api.CreateShardAPI;
 import org.apache.solr.handler.admin.api.DeleteAlias;
 import org.apache.solr.handler.admin.api.DeleteCollection;
-import org.apache.solr.handler.admin.api.DeleteCollectionBackupAPI;
-import org.apache.solr.handler.admin.api.DeleteCollectionSnapshotAPI;
-import org.apache.solr.handler.admin.api.DeleteNodeAPI;
-import org.apache.solr.handler.admin.api.DeleteReplicaAPI;
-import org.apache.solr.handler.admin.api.DeleteReplicaPropertyAPI;
+import org.apache.solr.handler.admin.api.DeleteCollectionBackup;
+import org.apache.solr.handler.admin.api.DeleteCollectionSnapshot;
+import org.apache.solr.handler.admin.api.DeleteNode;
+import org.apache.solr.handler.admin.api.DeleteReplica;
+import org.apache.solr.handler.admin.api.DeleteReplicaProperty;
 import org.apache.solr.handler.admin.api.DeleteShardAPI;
 import org.apache.solr.handler.admin.api.ForceLeaderAPI;
 import org.apache.solr.handler.admin.api.InstallShardDataAPI;
@@ -734,7 +734,7 @@ public enum CollectionOperation implements CollectionOp {
     DELETEREPLICA_OP(
         DELETEREPLICA,
         (req, rsp, h) -> {
-          DeleteReplicaAPI.invokeWithV1Params(h.coreContainer, req, rsp);
+          DeleteReplica.invokeWithV1Params(h.coreContainer, req, rsp);
           return null;
         }),
     MIGRATE_OP(
@@ -1013,9 +1013,9 @@ public Map<String, Object> execute(
     DELETEREPLICAPROP_OP(
         DELETEREPLICAPROP,
         (req, rsp, h) -> {
-          final var api = new DeleteReplicaPropertyAPI(h.coreContainer, req, rsp);
+          final var api = new DeleteReplicaProperty(h.coreContainer, req, rsp);
           final var deleteReplicaPropResponse =
-              DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, req.getParams());
+              DeleteReplicaProperty.invokeUsingV1Inputs(api, req.getParams());
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, deleteReplicaPropResponse);
           return null;
         }),
@@ -1096,7 +1096,7 @@ public Map<String, Object> execute(
     DELETEBACKUP_OP(
         DELETEBACKUP,
         (req, rsp, h) -> {
-          DeleteCollectionBackupAPI.invokeFromV1Params(h.coreContainer, req, rsp);
+          DeleteCollectionBackup.invokeFromV1Params(h.coreContainer, req, rsp);
           return null;
         }),
     LISTBACKUP_OP(
@@ -1142,10 +1142,10 @@ public Map<String, Object> execute(
           final boolean followAliases = req.getParams().getBool(FOLLOW_ALIASES, false);
           final String asyncId = req.getParams().get(ASYNC);
 
-          final DeleteCollectionSnapshotAPI deleteCollectionSnapshotAPI =
-              new DeleteCollectionSnapshotAPI(h.coreContainer, req, rsp);
+          final DeleteCollectionSnapshot deleteCollectionSnapshotAPI =
+              new DeleteCollectionSnapshot(h.coreContainer, req, rsp);
 
-          final DeleteCollectionSnapshotAPI.DeleteSnapshotResponse deleteSnapshotResponse =
+          final var deleteSnapshotResponse =
               deleteCollectionSnapshotAPI.deleteSnapshot(
                   extCollectionName, commitName, followAliases, asyncId);
 
@@ -1207,9 +1207,9 @@ public Map<String, Object> execute(
     DELETENODE_OP(
         DELETENODE,
         (req, rsp, h) -> {
-          final DeleteNodeAPI deleteNodeAPI = new DeleteNodeAPI(h.coreContainer, req, rsp);
+          final DeleteNode deleteNodeAPI = new DeleteNode(h.coreContainer, req, rsp);
           final SolrJerseyResponse deleteNodeResponse =
-              DeleteNodeAPI.invokeUsingV1Inputs(deleteNodeAPI, req.getParams());
+              DeleteNode.invokeUsingV1Inputs(deleteNodeAPI, req.getParams());
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, deleteNodeResponse);
           return null;
         }),
@@ -1371,10 +1371,10 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         CreateCollectionBackupAPI.class,
         CreateShardAPI.class,
         DeleteAlias.class,
-        DeleteCollectionBackupAPI.class,
+        DeleteCollectionBackup.class,
         DeleteCollection.class,
-        DeleteReplicaAPI.class,
-        DeleteReplicaPropertyAPI.class,
+        DeleteReplica.class,
+        DeleteReplicaProperty.class,
         DeleteShardAPI.class,
         ForceLeaderAPI.class,
         InstallShardDataAPI.class,
@@ -1388,12 +1388,12 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         RestoreCollectionAPI.class,
         SyncShardAPI.class,
         CollectionPropertyAPI.class,
-        DeleteNodeAPI.class,
+        DeleteNode.class,
         ListAliasesAPI.class,
         AliasPropertyAPI.class,
         ListCollectionSnapshotsAPI.class,
         CreateCollectionSnapshotAPI.class,
-        DeleteCollectionSnapshotAPI.class);
+        DeleteCollectionSnapshot.class);
   }
 
   @Override
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
index 5dd9fd96e09..0339b29a887 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
@@ -43,6 +43,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.BackupDeletionData;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
@@ -220,11 +221,4 @@ public static class CollectionBackupDetails implements JacksonReflectMapWriter {
 
     @JsonProperty public List<String> shardBackupIds;
   }
-
-  public static class BackupDeletionData implements JacksonReflectMapWriter {
-    @JsonProperty public String startTime;
-    @JsonProperty public Integer backupId;
-    @JsonProperty public Long size;
-    @JsonProperty public Integer numFiles;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java
similarity index 73%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java
index 48a482dce3e..88afdc1eb50 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.SolrException.ErrorCode.BAD_REQUEST;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
@@ -30,7 +29,6 @@
 import static org.apache.solr.common.params.CoreAdminParams.NAME;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,14 +36,12 @@
 import java.util.Locale;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.endpoint.DeleteCollectionBackupApi;
+import org.apache.solr.client.api.model.BackupDeletionData;
+import org.apache.solr.client.api.model.BackupDeletionResponseBody;
+import org.apache.solr.client.api.model.PurgeUnusedFilesRequestBody;
+import org.apache.solr.client.api.model.PurgeUnusedResponse;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
-import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -54,7 +50,6 @@
 import org.apache.solr.common.util.SimpleOrderedMap;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.jersey.SolrJacksonMapper;
 import org.apache.solr.request.SolrQueryRequest;
@@ -65,12 +60,12 @@
  *
  * <p>These APIs are equivalent to the v1 '/admin/collections?action=DELETEBACKUP' command.
  */
-public class DeleteCollectionBackupAPI extends BackupAPIBase {
+public class DeleteCollectionBackup extends BackupAPIBase implements DeleteCollectionBackupApi {
 
   private final ObjectMapper objectMapper;
 
   @Inject
-  public DeleteCollectionBackupAPI(
+  public DeleteCollectionBackup(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
@@ -79,17 +74,10 @@ public DeleteCollectionBackupAPI(
     this.objectMapper = SolrJacksonMapper.getObjectMapper();
   }
 
-  @Path("/backups/{backupName}/versions/{backupId}")
-  @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public BackupDeletionResponseBody deleteSingleBackupById(
-      @PathParam("backupName") String backupName,
-      @PathParam(BACKUP_ID) String backupId,
-      // Optional parameters below
-      @QueryParam(BACKUP_LOCATION) String location,
-      @QueryParam(BACKUP_REPOSITORY) String repositoryName,
-      @QueryParam(ASYNC) String asyncId)
+      String backupName, String backupId, String location, String repositoryName, String asyncId)
       throws Exception {
     final var response = instantiateJerseyResponse(BackupDeletionResponseBody.class);
     recordCollectionForLogAndTracing(null, solrQueryRequest);
@@ -108,17 +96,14 @@ public BackupDeletionResponseBody deleteSingleBackupById(
     return response;
   }
 
-  @Path("/backups/{backupName}/versions")
-  @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public BackupDeletionResponseBody deleteMultipleBackupsByRecency(
-      @PathParam("backupName") String backupName,
-      @QueryParam("retainLatest") Integer versionsToRetain,
-      // Optional parameters below
-      @QueryParam(BACKUP_LOCATION) String location,
-      @QueryParam(BACKUP_REPOSITORY) String repositoryName,
-      @QueryParam(ASYNC) String asyncId)
+      String backupName,
+      Integer versionsToRetain,
+      String location,
+      String repositoryName,
+      String asyncId)
       throws Exception {
     final var response = instantiateJerseyResponse(BackupDeletionResponseBody.class);
     recordCollectionForLogAndTracing(null, solrQueryRequest);
@@ -138,13 +123,10 @@ public BackupDeletionResponseBody deleteMultipleBackupsByRecency(
     return response;
   }
 
-  @Path("/backups/{backupName}/purgeUnused")
-  @PUT
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public PurgeUnusedResponse garbageCollectUnusedBackupFiles(
-      @PathParam("backupName") String backupName, PurgeUnusedFilesRequestBody requestBody)
-      throws Exception {
+      String backupName, PurgeUnusedFilesRequestBody requestBody) throws Exception {
     final var response = instantiateJerseyResponse(PurgeUnusedResponse.class);
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
@@ -163,31 +145,22 @@ public PurgeUnusedResponse garbageCollectUnusedBackupFiles(
             Boolean.TRUE,
             requestBody.location,
             requestBody.repositoryName,
-            requestBody.asyncId);
+            requestBody.async);
     final var remoteResponse =
         submitRemoteMessageAndHandleResponse(
             response,
             CollectionParams.CollectionAction.DELETEBACKUP,
             remoteMessage,
-            requestBody.asyncId);
+            requestBody.async);
 
     final Object remoteDeleted = remoteResponse.getResponse().get("deleted");
     if (remoteDeleted != null) {
-      response.deleted = objectMapper.convertValue(remoteDeleted, PurgeUnusedStats.class);
+      response.deleted =
+          objectMapper.convertValue(remoteDeleted, PurgeUnusedResponse.PurgeUnusedStats.class);
     }
     return response;
   }
 
-  public static class PurgeUnusedResponse extends SubResponseAccumulatingJerseyResponse {
-    @JsonProperty public PurgeUnusedStats deleted;
-  }
-
-  public static class PurgeUnusedStats implements JacksonReflectMapWriter {
-    @JsonProperty public Integer numBackupIds;
-    @JsonProperty public Integer numShardBackupIds;
-    @JsonProperty public Integer numIndexFiles;
-  }
-
   public static ZkNodeProps createRemoteMessage(
       String backupName,
       String backupId,
@@ -231,48 +204,26 @@ public static void invokeFromV1Params(
               BACKUP_ID));
     }
 
-    final var deleteApi = new DeleteCollectionBackupAPI(coreContainer, req, rsp);
+    final var deleteApi = new DeleteCollectionBackup(coreContainer, req, rsp);
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, invokeApi(deleteApi, req.getParams()));
   }
 
-  public static class BackupDeletionResponseBody extends SubResponseAccumulatingJerseyResponse {
-    @JsonProperty public String collection;
-    @JsonProperty public List<CreateCollectionBackupAPI.BackupDeletionData> deleted;
-  }
-
   @SuppressWarnings("unchecked")
-  public static List<CreateCollectionBackupAPI.BackupDeletionData> fromRemoteResponse(
+  public static List<BackupDeletionData> fromRemoteResponse(
       ObjectMapper objectMapper, SolrResponse response) {
     final var deleted = (List<SimpleOrderedMap<Object>>) response.getResponse().get("deleted");
     if (deleted == null) {
       return null;
     }
 
-    final List<CreateCollectionBackupAPI.BackupDeletionData> statList = new ArrayList<>();
+    final List<BackupDeletionData> statList = new ArrayList<>();
     for (SimpleOrderedMap<Object> remoteStat : deleted) {
-      statList.add(
-          objectMapper.convertValue(
-              remoteStat, CreateCollectionBackupAPI.BackupDeletionData.class));
+      statList.add(objectMapper.convertValue(remoteStat, BackupDeletionData.class));
     }
     return statList;
   }
 
-  /**
-   * Request body for the {@link DeleteCollectionBackupAPI#garbageCollectUnusedBackupFiles(String,
-   * PurgeUnusedFilesRequestBody)} API.
-   */
-  public static class PurgeUnusedFilesRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(BACKUP_LOCATION)
-    public String location;
-
-    @JsonProperty(BACKUP_REPOSITORY)
-    public String repositoryName;
-
-    @JsonProperty(ASYNC)
-    public String asyncId;
-  }
-
-  private static SolrJerseyResponse invokeApi(DeleteCollectionBackupAPI api, SolrParams params)
+  private static SolrJerseyResponse invokeApi(DeleteCollectionBackup api, SolrParams params)
       throws Exception {
     if (params.get(MAX_NUM_BACKUP_POINTS) != null) {
       return api.deleteMultipleBackupsByRecency(
@@ -285,7 +236,7 @@ private static SolrJerseyResponse invokeApi(DeleteCollectionBackupAPI api, SolrP
       final var requestBody = new PurgeUnusedFilesRequestBody();
       requestBody.location = params.get(BACKUP_LOCATION);
       requestBody.repositoryName = params.get(BACKUP_REPOSITORY);
-      requestBody.asyncId = params.get(ASYNC);
+      requestBody.async = params.get(ASYNC);
       return api.garbageCollectUnusedBackupFiles(params.get(NAME), requestBody);
     } else { // BACKUP_ID != null
       return api.deleteSingleBackupById(
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java
similarity index 62%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java
index d77a91cafca..e591f85db6f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;
@@ -24,19 +23,11 @@
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import org.apache.solr.client.api.model.AsyncJerseyResponse;
+import org.apache.solr.client.api.endpoint.DeleteCollectionSnapshotApi;
+import org.apache.solr.client.api.model.DeleteCollectionSnapshotResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.params.CollectionParams;
@@ -47,37 +38,23 @@
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
-/** V2 API for Deleting Collection Snapshots. */
-@Path("/collections/{collName}/snapshots")
-public class DeleteCollectionSnapshotAPI extends AdminAPIBase {
+/** V2 API impl for Deleting Collection Snapshots. */
+public class DeleteCollectionSnapshot extends AdminAPIBase implements DeleteCollectionSnapshotApi {
 
   @Inject
-  public DeleteCollectionSnapshotAPI(
+  public DeleteCollectionSnapshot(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  /** This API is analogous to V1's (POST /solr/admin/collections?action=DELETESNAPSHOT) */
-  @DELETE
-  @Path("/{snapshotName}")
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  public DeleteSnapshotResponse deleteSnapshot(
-      @Parameter(description = "The name of the collection.", required = true)
-          @PathParam("collName")
-          String collName,
-      @Parameter(description = "The name of the snapshot to be deleted.", required = true)
-          @PathParam("snapshotName")
-          String snapshotName,
-      @Parameter(description = "A flag that treats the collName parameter as a collection alias.")
-          @DefaultValue("false")
-          @QueryParam("followAliases")
-          boolean followAliases,
-      @QueryParam("async") String asyncId)
+  public DeleteCollectionSnapshotResponse deleteSnapshot(
+      String collName, String snapshotName, boolean followAliases, String asyncId)
       throws Exception {
-    final DeleteSnapshotResponse response = instantiateJerseyResponse(DeleteSnapshotResponse.class);
+    final var response = instantiateJerseyResponse(DeleteCollectionSnapshotResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
     recordCollectionForLogAndTracing(collName, solrQueryRequest);
 
@@ -105,24 +82,6 @@ public DeleteSnapshotResponse deleteSnapshot(
     return response;
   }
 
-  /**
-   * The Response for {@link DeleteCollectionSnapshotAPI}'s {@link #deleteSnapshot(String, String,
-   * boolean, String)}
-   */
-  public static class DeleteSnapshotResponse extends AsyncJerseyResponse {
-    @Schema(description = "The name of the collection.")
-    @JsonProperty(COLLECTION_PROP)
-    String collection;
-
-    @Schema(description = "The name of the snapshot to be deleted.")
-    @JsonProperty("snapshot")
-    String snapshotName;
-
-    @Schema(description = "A flag that treats the collName parameter as a collection alias.")
-    @JsonProperty("followAliases")
-    boolean followAliases;
-  }
-
   public static ZkNodeProps createRemoteMessage(
       String collectionName, boolean followAliases, String snapshotName, String asyncId) {
     final Map<String, Object> remoteMessage = new HashMap<>();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNodeAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java
similarity index 70%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNodeAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java
index 5416793ddba..76ace8384aa 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNodeAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java
@@ -16,24 +16,17 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CoreAdminParams.NODE;
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.DeleteNodeApi;
+import org.apache.solr.client.api.model.DeleteNodeRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -42,7 +35,6 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -53,29 +45,19 @@
  *
  * <p>This API is analogous to the V1 /admin/collections?action=DELETENODE
  */
-@Path("cluster/nodes/{nodeName}/clear/")
-public class DeleteNodeAPI extends AdminAPIBase {
+public class DeleteNode extends AdminAPIBase implements DeleteNodeApi {
 
   @Inject
-  public DeleteNodeAPI(
+  public DeleteNode(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  public SolrJerseyResponse deleteNode(
-      @Parameter(
-              description =
-                  "The name of the node to be cleared.  Usually of the form 'host:1234_solr'.",
-              required = true)
-          @PathParam("nodeName")
-          String nodeName,
-      @RequestBody(description = "Contains user provided parameters", required = true)
-          DeleteNodeRequestBody requestBody)
+  public SolrJerseyResponse deleteNode(String nodeName, DeleteNodeRequestBody requestBody)
       throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
@@ -94,10 +76,11 @@ public SolrJerseyResponse deleteNode(
     return response;
   }
 
-  public static SolrJerseyResponse invokeUsingV1Inputs(DeleteNodeAPI apiInstance, SolrParams params)
+  public static SolrJerseyResponse invokeUsingV1Inputs(DeleteNode apiInstance, SolrParams params)
       throws Exception {
     final RequiredSolrParams requiredParams = params.required();
-    final DeleteNodeRequestBody requestBody = new DeleteNodeRequestBody(params.get(ASYNC));
+    final var requestBody = new DeleteNodeRequestBody();
+    requestBody.async = params.get(ASYNC);
     return apiInstance.deleteNode(requiredParams.get(NODE), requestBody);
   }
 
@@ -114,17 +97,4 @@ public static ZkNodeProps createRemoteMessage(
 
     return new ZkNodeProps(remoteMessage);
   }
-
-  public static class DeleteNodeRequestBody implements JacksonReflectMapWriter {
-
-    public DeleteNodeRequestBody() {}
-
-    public DeleteNodeRequestBody(String async) {
-      this.async = async;
-    }
-
-    @Schema(description = "Request ID to track this action which will be processed asynchronously.")
-    @JsonProperty("async")
-    public String async;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java
similarity index 73%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java
index 143acf95134..3f3f9d44b27 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java
@@ -31,15 +31,11 @@
 import static org.apache.solr.common.params.CoreAdminParams.REPLICA;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.endpoint.DeleteReplicaApi;
+import org.apache.solr.client.api.model.ScaleCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -47,7 +43,6 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -57,30 +52,28 @@
  *
  * <p>These APIs are analogous to the v1 /admin/collections?action=DELETEREPLICA command.
  */
-public class DeleteReplicaAPI extends AdminAPIBase {
+public class DeleteReplica extends AdminAPIBase implements DeleteReplicaApi {
 
   @Inject
-  public DeleteReplicaAPI(
+  public DeleteReplica(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @DELETE
-  @Path("/collections/{collectionName}/shards/{shardName}/replicas/{replicaName}")
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse deleteReplicaByName(
-      @PathParam("collectionName") String collectionName,
-      @PathParam("shardName") String shardName,
-      @PathParam("replicaName") String replicaName,
-      // Optional params below
-      @QueryParam(FOLLOW_ALIASES) Boolean followAliases,
-      @QueryParam(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir,
-      @QueryParam(DELETE_DATA_DIR) Boolean deleteDataDir,
-      @QueryParam(DELETE_INDEX) Boolean deleteIndex,
-      @QueryParam(ONLY_IF_DOWN) Boolean onlyIfDown,
-      @QueryParam(ASYNC) String asyncId)
+      String collectionName,
+      String shardName,
+      String replicaName, /* Optional params below */
+      Boolean followAliases,
+      Boolean deleteInstanceDir,
+      Boolean deleteDataDir,
+      Boolean deleteIndex,
+      Boolean onlyIfDown,
+      String async)
       throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     ensureRequiredParameterProvided(COLLECTION_PROP, collectionName);
@@ -100,26 +93,24 @@ public SubResponseAccumulatingJerseyResponse deleteReplicaByName(
             deleteDataDir,
             deleteIndex,
             onlyIfDown,
-            asyncId);
+            async);
     submitRemoteMessageAndHandleResponse(
-        response, CollectionParams.CollectionAction.DELETEREPLICA, remoteMessage, asyncId);
+        response, CollectionParams.CollectionAction.DELETEREPLICA, remoteMessage, async);
     return response;
   }
 
-  @DELETE
-  @Path("/collections/{collectionName}/shards/{shardName}/replicas")
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse deleteReplicasByCount(
-      @PathParam("collectionName") String collectionName,
-      @PathParam("shardName") String shardName,
-      @QueryParam(COUNT_PROP) Integer numToDelete,
-      // Optional params below
-      @QueryParam(FOLLOW_ALIASES) Boolean followAliases,
-      @QueryParam(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir,
-      @QueryParam(DELETE_DATA_DIR) Boolean deleteDataDir,
-      @QueryParam(DELETE_INDEX) Boolean deleteIndex,
-      @QueryParam(ONLY_IF_DOWN) Boolean onlyIfDown,
-      @QueryParam(ASYNC) String asyncId)
+      String collectionName,
+      String shardName,
+      Integer numToDelete,
+      Boolean followAliases,
+      Boolean deleteInstanceDir,
+      Boolean deleteDataDir,
+      Boolean deleteIndex,
+      Boolean onlyIfDown,
+      String asyncId)
       throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     ensureRequiredParameterProvided(COLLECTION_PROP, collectionName);
@@ -145,35 +136,23 @@ public SubResponseAccumulatingJerseyResponse deleteReplicasByCount(
     return response;
   }
 
-  public static class ScaleCollectionRequestBody implements JacksonReflectMapWriter {
-    public @JsonProperty(value = COUNT_PROP, required = true) Integer numToDelete;
-    public @JsonProperty(FOLLOW_ALIASES) Boolean followAliases;
-    public @JsonProperty(DELETE_INSTANCE_DIR) Boolean deleteInstanceDir;
-    public @JsonProperty(DELETE_DATA_DIR) Boolean deleteDataDir;
-    public @JsonProperty(DELETE_INDEX) Boolean deleteIndex;
-    public @JsonProperty(ONLY_IF_DOWN) Boolean onlyIfDown;
-    public @JsonProperty(ASYNC) String asyncId;
-
-    public static ScaleCollectionRequestBody fromV1Params(SolrParams v1Params) {
-      final var requestBody = new ScaleCollectionRequestBody();
-      requestBody.numToDelete = v1Params.getInt(COUNT_PROP);
-      requestBody.followAliases = v1Params.getBool(FOLLOW_ALIASES);
-      requestBody.deleteInstanceDir = v1Params.getBool(DELETE_INSTANCE_DIR);
-      requestBody.deleteDataDir = v1Params.getBool(DELETE_DATA_DIR);
-      requestBody.deleteIndex = v1Params.getBool(DELETE_INDEX);
-      requestBody.onlyIfDown = v1Params.getBool(ONLY_IF_DOWN);
-      requestBody.asyncId = v1Params.get(ASYNC);
+  public static ScaleCollectionRequestBody createScaleRequestBodyFromV1Params(SolrParams v1Params) {
+    final var requestBody = new ScaleCollectionRequestBody();
+    requestBody.numToDelete = v1Params.getInt(COUNT_PROP);
+    requestBody.followAliases = v1Params.getBool(FOLLOW_ALIASES);
+    requestBody.deleteInstanceDir = v1Params.getBool(DELETE_INSTANCE_DIR);
+    requestBody.deleteDataDir = v1Params.getBool(DELETE_DATA_DIR);
+    requestBody.deleteIndex = v1Params.getBool(DELETE_INDEX);
+    requestBody.onlyIfDown = v1Params.getBool(ONLY_IF_DOWN);
+    requestBody.async = v1Params.get(ASYNC);
 
-      return requestBody;
-    }
+    return requestBody;
   }
 
-  @PUT
-  @Path("/collections/{collectionName}/scale")
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse deleteReplicasByCountAllShards(
-      @PathParam("collectionName") String collectionName, ScaleCollectionRequestBody requestBody)
-      throws Exception {
+      String collectionName, ScaleCollectionRequestBody requestBody) throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     if (requestBody == null) {
       throw new SolrException(BAD_REQUEST, "Request body is required but missing");
@@ -194,12 +173,12 @@ public SubResponseAccumulatingJerseyResponse deleteReplicasByCountAllShards(
             requestBody.deleteDataDir,
             requestBody.deleteIndex,
             requestBody.onlyIfDown,
-            requestBody.asyncId);
+            requestBody.async);
     submitRemoteMessageAndHandleResponse(
         response,
         CollectionParams.CollectionAction.DELETEREPLICA,
         remoteMessage,
-        requestBody.asyncId);
+        requestBody.async);
     return response;
   }
 
@@ -239,13 +218,13 @@ public static void invokeWithV1Params(
     v1Params.required().check(COLLECTION_PROP);
 
     final var deleteReplicaApi =
-        new DeleteReplicaAPI(coreContainer, solrQueryRequest, solrQueryResponse);
+        new DeleteReplica(coreContainer, solrQueryRequest, solrQueryResponse);
     final var v2Response = invokeApiMethod(deleteReplicaApi, v1Params);
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(solrQueryResponse, v2Response);
   }
 
   private static SubResponseAccumulatingJerseyResponse invokeApiMethod(
-      DeleteReplicaAPI deleteReplicaApi, SolrParams v1Params) throws Exception {
+      DeleteReplica deleteReplicaApi, SolrParams v1Params) throws Exception {
     if (v1Params.get(REPLICA) != null && v1Params.get(SHARD_ID_PROP) != null) {
       return deleteReplicaApi.deleteReplicaByName(
           v1Params.get(COLLECTION_PROP),
@@ -271,7 +250,7 @@ private static SubResponseAccumulatingJerseyResponse invokeApiMethod(
           v1Params.get(ASYNC));
     } else if (v1Params.get(COUNT_PROP) != null) {
       return deleteReplicaApi.deleteReplicasByCountAllShards(
-          v1Params.get(COLLECTION_PROP), ScaleCollectionRequestBody.fromV1Params(v1Params));
+          v1Params.get(COLLECTION_PROP), createScaleRequestBodyFromV1Params(v1Params));
     } else {
       throw new SolrException(
           BAD_REQUEST,
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java
similarity index 77%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java
index bce721ce087..30651f83b6c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java
@@ -25,11 +25,9 @@
 import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 
-import io.swagger.v3.oas.annotations.Parameter;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.endpoint.DeleteReplicaPropertyApi;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -38,41 +36,30 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
+import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.security.PermissionNameProvider;
 
 /**
- * V2 API for removing a property from a collection replica
+ * V2 API implementation for removing a property from a collection replica
  *
- * <p>This API is analogous to the v1 /admin/collections?action=DELETEREPLICAPROP command.
+ * @see DeleteReplicaPropertyApi
  */
-@Path("/collections/{collName}/shards/{shardName}/replicas/{replicaName}/properties/{propName}")
-public class DeleteReplicaPropertyAPI extends AdminAPIBase {
+public class DeleteReplicaProperty extends AdminAPIBase implements DeleteReplicaPropertyApi {
 
   @Inject
-  public DeleteReplicaPropertyAPI(
+  public DeleteReplicaProperty(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
+  @Override
+  @PermissionName(PermissionNameProvider.Name.COLL_EDIT_PERM)
   public SolrJerseyResponse deleteReplicaProperty(
-      @Parameter(
-              description = "The name of the collection the replica belongs to.",
-              required = true)
-          @PathParam("collName")
-          String collName,
-      @Parameter(description = "The name of the shard the replica belongs to.", required = true)
-          @PathParam("shardName")
-          String shardName,
-      @Parameter(description = "The replica, e.g., `core_node1`.", required = true)
-          @PathParam("replicaName")
-          String replicaName,
-      @Parameter(description = "The name of the property to delete.", required = true)
-          @PathParam("propName")
-          String propertyName)
-      throws Exception {
+      String collName, String shardName, String replicaName, String propertyName) throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
     recordCollectionForLogAndTracing(collName, solrQueryRequest);
@@ -94,7 +81,7 @@ public SolrJerseyResponse deleteReplicaProperty(
   }
 
   public static SolrJerseyResponse invokeUsingV1Inputs(
-      DeleteReplicaPropertyAPI apiInstance, SolrParams solrParams) throws Exception {
+      DeleteReplicaProperty apiInstance, SolrParams solrParams) throws Exception {
     final RequiredSolrParams requiredParams = solrParams.required();
     final String propNameToDelete = requiredParams.get(PROPERTY_PROP);
     final String trimmedPropNameToDelete =
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPITest.java
index 02b90ba8384..7d083d1c0cf 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionBackupAPITest.java
@@ -27,10 +27,11 @@
 import static org.apache.solr.common.params.CoreAdminParams.MAX_NUM_BACKUP_POINTS;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.PurgeUnusedFilesRequestBody;
 import org.apache.solr.common.SolrException;
 import org.junit.Test;
 
-/** Unit tests for {@link DeleteCollectionBackupAPI} */
+/** Unit tests for {@link DeleteCollectionBackup} */
 public class DeleteCollectionBackupAPITest extends SolrTestCaseJ4 {
   @Test
   public void testReportsErrorIfBackupNameMissing() {
@@ -40,7 +41,7 @@ public void testReportsErrorIfBackupNameMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                final var api = new DeleteCollectionBackupAPI(null, null, null);
+                final var api = new DeleteCollectionBackup(null, null, null);
                 api.deleteSingleBackupById(
                     null, "someBackupId", "someLocation", "someRepository", "someAsyncId");
               });
@@ -55,7 +56,7 @@ public void testReportsErrorIfBackupNameMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                final var api = new DeleteCollectionBackupAPI(null, null, null);
+                final var api = new DeleteCollectionBackup(null, null, null);
                 api.deleteMultipleBackupsByRecency(
                     null, 123, "someLocation", "someRepository", "someAsyncId");
               });
@@ -66,15 +67,15 @@ public void testReportsErrorIfBackupNameMissing() {
 
     // Garbage collect unused files
     {
-      final var requestBody = new DeleteCollectionBackupAPI.PurgeUnusedFilesRequestBody();
+      final var requestBody = new PurgeUnusedFilesRequestBody();
       requestBody.location = "someLocation";
       requestBody.repositoryName = "someRepository";
-      requestBody.asyncId = "someAsyncId";
+      requestBody.async = "someAsyncId";
       final SolrException thrown =
           expectThrows(
               SolrException.class,
               () -> {
-                final var api = new DeleteCollectionBackupAPI(null, null, null);
+                final var api = new DeleteCollectionBackup(null, null, null);
                 api.garbageCollectUnusedBackupFiles(null, requestBody);
               });
 
@@ -89,7 +90,7 @@ public void testDeletionByIdReportsErrorIfIdMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new DeleteCollectionBackupAPI(null, null, null);
+              final var api = new DeleteCollectionBackup(null, null, null);
               api.deleteSingleBackupById(
                   "someBackupName", null, "someLocation", "someRepository", "someAsyncId");
             });
@@ -104,7 +105,7 @@ public void testMultiVersionDeletionReportsErrorIfRetainParamMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new DeleteCollectionBackupAPI(null, null, null);
+              final var api = new DeleteCollectionBackup(null, null, null);
               api.deleteMultipleBackupsByRecency(
                   "someBackupName", null, "someLocation", "someRepository", "someAsyncId");
             });
@@ -118,7 +119,7 @@ public void testMultiVersionDeletionReportsErrorIfRetainParamMissing() {
   @Test
   public void testCreateRemoteMessageAllParams() {
     final var remoteMessage =
-        DeleteCollectionBackupAPI.createRemoteMessage(
+        DeleteCollectionBackup.createRemoteMessage(
                 "someBackupName",
                 "someBackupId",
                 123,
@@ -142,7 +143,7 @@ public void testCreateRemoteMessageAllParams() {
   @Test
   public void testCreateRemoteMessageOnlyRequiredParams() {
     final var remoteMessage =
-        DeleteCollectionBackupAPI.createRemoteMessage(
+        DeleteCollectionBackup.createRemoteMessage(
                 "someBackupName", "someBackupId", null, null, null, null, null)
             .getProperties();
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPITest.java
index ac363a02bae..d6e1769e09c 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteCollectionSnapshotAPITest.java
@@ -34,8 +34,7 @@ public class DeleteCollectionSnapshotAPITest extends SolrTestCaseJ4 {
   @Test
   public void testConstructsValidOverseerMessage() {
     final ZkNodeProps messageOne =
-        DeleteCollectionSnapshotAPI.createRemoteMessage(
-            "myCollName", false, "mySnapshotName", null);
+        DeleteCollectionSnapshot.createRemoteMessage("myCollName", false, "mySnapshotName", null);
     final Map<String, Object> rawMessageOne = messageOne.getProperties();
     assertEquals(4, rawMessageOne.size());
     MatcherAssert.assertThat(
@@ -48,7 +47,7 @@ public void testConstructsValidOverseerMessage() {
     assertEquals(false, rawMessageOne.get(FOLLOW_ALIASES));
 
     final ZkNodeProps messageTwo =
-        DeleteCollectionSnapshotAPI.createRemoteMessage(
+        DeleteCollectionSnapshot.createRemoteMessage(
             "myCollName", true, "mySnapshotName", "myAsyncId");
     final Map<String, Object> rawMessageTwo = messageTwo.getProperties();
     assertEquals(5, rawMessageTwo.size());
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteNodeAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteNodeAPITest.java
index f306881bf41..74b6b3e927b 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteNodeAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteNodeAPITest.java
@@ -20,13 +20,14 @@
 
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.DeleteNodeRequestBody;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/** Unit tests for {@link DeleteNodeAPI} */
+/** Unit tests for {@link DeleteNode} */
 public class DeleteNodeAPITest extends SolrTestCaseJ4 {
 
   @BeforeClass
@@ -36,22 +37,22 @@ public static void ensureWorkingMockito() {
 
   @Test
   public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
-    final var api = mock(DeleteNodeAPI.class);
+    final var api = mock(DeleteNode.class);
     final SolrException e =
         expectThrows(
             SolrException.class,
             () -> {
-              DeleteNodeAPI.invokeUsingV1Inputs(api, new ModifiableSolrParams());
+              DeleteNode.invokeUsingV1Inputs(api, new ModifiableSolrParams());
             });
     assertEquals("Missing required parameter: node", e.getMessage());
   }
 
   @Test
   public void testValidOverseerMessageIsCreated() {
-    DeleteNodeAPI.DeleteNodeRequestBody requestBody =
-        new DeleteNodeAPI.DeleteNodeRequestBody("async");
+    final var requestBody = new DeleteNodeRequestBody();
+    requestBody.async = "async";
     final ZkNodeProps createdMessage =
-        DeleteNodeAPI.createRemoteMessage("nodeNameToDelete", requestBody);
+        DeleteNode.createRemoteMessage("nodeNameToDelete", requestBody);
     final Map<String, Object> createdMessageProps = createdMessage.getProperties();
     assertEquals(3, createdMessageProps.size());
     assertEquals("nodeNameToDelete", createdMessageProps.get("node"));
@@ -61,7 +62,7 @@ public void testValidOverseerMessageIsCreated() {
 
   @Test
   public void testRequestBodyCanBeOmitted() throws Exception {
-    final ZkNodeProps createdMessage = DeleteNodeAPI.createRemoteMessage("nodeNameToDelete", null);
+    final ZkNodeProps createdMessage = DeleteNode.createRemoteMessage("nodeNameToDelete", null);
     final Map<String, Object> createdMessageProps = createdMessage.getProperties();
     assertEquals(2, createdMessageProps.size());
     assertEquals("nodeNameToDelete", createdMessageProps.get("node"));
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaAPITest.java
index 3c56f7d189f..d0dca0bce8e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaAPITest.java
@@ -33,7 +33,7 @@
 import org.apache.solr.common.SolrException;
 import org.junit.Test;
 
-/** Unit tests for {@link DeleteReplicaAPI} */
+/** Unit tests for {@link DeleteReplica} */
 public class DeleteReplicaAPITest extends SolrTestCaseJ4 {
   @Test
   public void testReportsErrorIfCollectionNameMissing() {
@@ -41,7 +41,7 @@ public void testReportsErrorIfCollectionNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new DeleteReplicaAPI(null, null, null);
+              final var api = new DeleteReplica(null, null, null);
               api.deleteReplicaByName(
                   null, "someShard", "someReplica", null, null, null, null, null, null);
             });
@@ -56,7 +56,7 @@ public void testReportsErrorIfShardNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new DeleteReplicaAPI(null, null, null);
+              final var api = new DeleteReplica(null, null, null);
               api.deleteReplicaByName(
                   "someCollection", null, "someReplica", null, null, null, null, null, null);
             });
@@ -71,7 +71,7 @@ public void testReportsErrorIfReplicaNameMissingWhenDeletingByName() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new DeleteReplicaAPI(null, null, null);
+              final var api = new DeleteReplica(null, null, null);
               api.deleteReplicaByName(
                   "someCollection", "someShard", null, null, null, null, null, null, null);
             });
@@ -83,7 +83,7 @@ public void testReportsErrorIfReplicaNameMissingWhenDeletingByName() {
   @Test
   public void testCreateRemoteMessageAllProperties() {
     final var remoteMessage =
-        DeleteReplicaAPI.createRemoteMessage(
+        DeleteReplica.createRemoteMessage(
                 "someCollName",
                 "someShardName",
                 "someReplicaName",
@@ -113,7 +113,7 @@ public void testCreateRemoteMessageAllProperties() {
   @Test
   public void testMissingValuesExcludedFromRemoteMessage() {
     final var remoteMessage =
-        DeleteReplicaAPI.createRemoteMessage(
+        DeleteReplica.createRemoteMessage(
                 "someCollName",
                 "someShardName",
                 "someReplicaName",
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java
index d03193072e0..19c85b85481 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java
@@ -34,7 +34,7 @@
 import org.junit.Test;
 
 /**
- * Unit tests for {@link DeleteReplicaPropertyAPI}
+ * Unit tests for {@link DeleteReplicaProperty}
  *
  * <p>End-to-end functionality is tested implicitly through v1 integration tests, so the unit tests
  * here focus primarily on how the v1 code invokes the v2 API and how the v2 API crafts its
@@ -49,7 +49,7 @@ public static void ensureWorkingMockito() {
 
   @Test
   public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
-    final var api = mock(DeleteReplicaPropertyAPI.class);
+    final var api = mock(DeleteReplicaProperty.class);
     final var allParams = new ModifiableSolrParams();
     allParams.add(COLLECTION_PROP, "someColl");
     allParams.add(SHARD_ID_PROP, "someShard");
@@ -63,7 +63,7 @@ public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, noCollectionParams);
+                DeleteReplicaProperty.invokeUsingV1Inputs(api, noCollectionParams);
               });
       assertEquals("Missing required parameter: " + COLLECTION_PROP, e.getMessage());
     }
@@ -75,7 +75,7 @@ public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, noShardParams);
+                DeleteReplicaProperty.invokeUsingV1Inputs(api, noShardParams);
               });
       assertEquals("Missing required parameter: " + SHARD_ID_PROP, e.getMessage());
     }
@@ -87,7 +87,7 @@ public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, noReplicaParams);
+                DeleteReplicaProperty.invokeUsingV1Inputs(api, noReplicaParams);
               });
       assertEquals("Missing required parameter: " + REPLICA_PROP, e.getMessage());
     }
@@ -99,7 +99,7 @@ public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
           expectThrows(
               SolrException.class,
               () -> {
-                DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, noPropertyParams);
+                DeleteReplicaProperty.invokeUsingV1Inputs(api, noPropertyParams);
               });
       assertEquals("Missing required parameter: " + PROPERTY_PROP, e.getMessage());
     }
@@ -107,28 +107,28 @@ public void testV1InvocationThrowsErrorsIfRequiredParametersMissing() {
 
   @Test
   public void testV1InvocationPassesAllProvidedParameters() throws Exception {
-    final var api = mock(DeleteReplicaPropertyAPI.class);
+    final var api = mock(DeleteReplicaProperty.class);
     final var allParams = new ModifiableSolrParams();
     allParams.add(COLLECTION_PROP, "someColl");
     allParams.add(SHARD_ID_PROP, "someShard");
     allParams.add(REPLICA_PROP, "someReplica");
     allParams.add(PROPERTY_PROP, "somePropName");
 
-    DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, allParams);
+    DeleteReplicaProperty.invokeUsingV1Inputs(api, allParams);
 
     verify(api).deleteReplicaProperty("someColl", "someShard", "someReplica", "somePropName");
   }
 
   @Test
   public void testV1InvocationTrimsPropertyNamePrefixIfProvided() throws Exception {
-    final var api = mock(DeleteReplicaPropertyAPI.class);
+    final var api = mock(DeleteReplicaProperty.class);
     final var allParams = new ModifiableSolrParams();
     allParams.add(COLLECTION_PROP, "someColl");
     allParams.add(SHARD_ID_PROP, "someShard");
     allParams.add(REPLICA_PROP, "someReplica");
     allParams.add(PROPERTY_PROP, "property.somePropName"); // NOTE THE "property." prefix!
 
-    DeleteReplicaPropertyAPI.invokeUsingV1Inputs(api, allParams);
+    DeleteReplicaProperty.invokeUsingV1Inputs(api, allParams);
 
     verify(api).deleteReplicaProperty("someColl", "someShard", "someReplica", "somePropName");
   }
@@ -136,7 +136,7 @@ public void testV1InvocationTrimsPropertyNamePrefixIfProvided() throws Exception
   @Test
   public void testRPCMessageCreation() {
     final ZkNodeProps message =
-        DeleteReplicaPropertyAPI.createRemoteMessage(
+        DeleteReplicaProperty.createRemoteMessage(
             "someColl", "someShard", "someReplica", "somePropName");
     final Map<String, Object> props = message.getProperties();
 
diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustache
index 872e16f509d..bf53b49bdd5 100644
--- a/solr/solrj/src/resources/java-template/api.mustache
+++ b/solr/solrj/src/resources/java-template/api.mustache
@@ -53,16 +53,18 @@ public class {{classname}} {
         }
 
         public static class {{operationIdCamelCase}} extends SolrRequest<{{operationIdCamelCase}}Response> {
-            {{#requiredParams}}
-            {{#isBodyParam}}
+            {{#bodyParam}}
             private final {{{dataType}}} requestBody;
-            {{/isBodyParam}}
+            {{/bodyParam}}
+            {{#requiredParams}}
             {{^isBodyParam}}
             private final {{{dataType}}} {{paramName}};
             {{/isBodyParam}}
             {{/requiredParams}}
             {{#optionalParams}}
+            {{^isBodyParam}}
             private {{{dataType}}} {{paramName}};
+            {{/isBodyParam}}
             {{/optionalParams}}
 
             /**
@@ -82,14 +84,15 @@ public class {{classname}} {
                 {{^isBodyParam}}
                     this.{{paramName}} = {{paramName}};
                 {{/isBodyParam}}
-                {{#isBodyParam}}
+                {{/requiredParams}}
+                {{#bodyParam}}
                     this.requestBody = new {{baseName}}();
                     addHeader("Content-type", "application/json");
-                {{/isBodyParam}}
-                {{/requiredParams}}
+                {{/bodyParam}}
             }
 
             {{#optionalParams}}
+            {{^isBodyParam}}
             {{#description}}
             /**
              * @param {{paramName}} {{description}}
@@ -99,6 +102,7 @@ public class {{classname}} {
                 this.{{paramName}} = {{paramName}};
             }
 
+            {{/isBodyParam}}
             {{/optionalParams}}
 
             {{#bodyParam}}

From 04bfd236ad4703e34f5b263ba1b04257173fccb5 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbergja@users.noreply.github.com>
Date: Thu, 24 Aug 2023 09:16:52 -0400
Subject: [PATCH 033/160] SOLR-16916: JSON boolean queries when solrconfig
 defType is set to edismax (#1827)

SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
  (Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)


Co-authored-by: David Smiley <dsmiley@apache.org>
Co-authored-by: Jane Sandberg <sandbergja@users.noreply.github.com>
Co-authored-by: Ryan Laddusaw <rladdusaw@users.noreply.github.com>
Co-authored-by: Christina Chortaria <christinach@users.noreply.github.com>
Co-authored-by: Max Kadel <maxkadel@users.noreply.github.com>
---
 solr/CHANGES.txt                              |  5 +-
 .../apache/solr/request/json/RequestUtil.java |  3 +
 .../TestJsonRequestWithEdismaxDefType.java    | 74 +++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 solr/core/src/test/org/apache/solr/search/json/TestJsonRequestWithEdismaxDefType.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 009f9bc2d44..ce100a932d6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -138,7 +138,10 @@ Bug Fixes
 
 * SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed. (Paul McArthur)
 
-* SOLR-16933: Include the full query response when using the API tool, and fix serialization issues for SolrDocumentList. (Houston Putman) 
+* SOLR-16933: Include the full query response when using the API tool, and fix serialization issues for SolrDocumentList. (Houston Putman)
+
+* SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
+  (Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)
 
 Dependency Upgrades
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
index ace858667bc..d5c46bbb9a1 100644
--- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
+++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
@@ -33,6 +33,7 @@
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.request.SolrRequestHandler;
 import org.apache.solr.request.macro.MacroExpander;
+import org.apache.solr.search.QueryParsing;
 import org.noggit.JSONParser;
 import org.noggit.ObjectBuilder;
 
@@ -217,6 +218,8 @@ public static void processParams(
         if ("query".equals(key)) {
           out = "q";
           isQuery = true;
+          String[] queryParsers = {"lucene"};
+          newMap.put(QueryParsing.DEFTYPE, queryParsers);
         } else if ("filter".equals(key)) {
           out = "fq";
           arr = true;
diff --git a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequestWithEdismaxDefType.java b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequestWithEdismaxDefType.java
new file mode 100644
index 00000000000..3d3ec25a878
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequestWithEdismaxDefType.java
@@ -0,0 +1,74 @@
+/*
+ * 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.json;
+
+import java.nio.file.Path;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrRequest.METHOD;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.cloud.ConfigRequest;
+import org.apache.solr.util.EmbeddedSolrServerTestRule;
+import org.apache.solr.util.SolrClientTestRule;
+import org.junit.ClassRule;
+
+public class TestJsonRequestWithEdismaxDefType extends SolrTestCaseJ4 {
+
+  @ClassRule
+  public static final SolrClientTestRule solrClientTestRule = new EmbeddedSolrServerTestRule();
+
+  public void test() throws Exception {
+    solrClientTestRule.startSolr(LuceneTestCase.createTempDir());
+
+    Path configSet = LuceneTestCase.createTempDir();
+    SolrTestCaseJ4.copyMinConf(configSet.toFile());
+
+    solrClientTestRule.newCollection().withConfigSet(configSet.toString()).create();
+
+    SolrClient client = solrClientTestRule.getSolrClient();
+
+    client.request(
+        new ConfigRequest(
+            "{"
+                + "  'create-requesthandler':{"
+                + "    'name':'/query',"
+                + "    'class':'solr.SearchHandler',"
+                + "    'defaults' : {'defType':'edismax'}" // the critical part
+                + "  }"
+                + "}"));
+
+    addDocs(client);
+
+    doQuery(client);
+  }
+
+  private static void addDocs(SolrClient client) throws Exception {
+    client.add(sdoc("id", "1", "cat_s", "A", "where_s", "NY"));
+    client.add(sdoc("id", "2", "cat_s", "B", "where_s", "NJ"));
+    client.add(sdoc("id", "3"));
+    client.commit();
+  }
+
+  private static void doQuery(SolrClient client) throws Exception {
+    final var jsonQuery =
+        "{\"query\":{\"bool\":{\"should\":[{\"lucene\":{\"query\":\"id:1\"}}, \"id:2\"]}}}";
+    final var req = new QueryRequest(params("json", jsonQuery, "qt", "/query"), METHOD.POST);
+    final var rsp = req.process(client);
+    assertEquals(2, rsp.getResults().getNumFound());
+  }
+}

From ce6c13e41806233daaf25f1a7545c7aad34c169d Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 24 Aug 2023 06:21:27 -0700
Subject: [PATCH 034/160] SOLR-15367 Convert "rid" functionality into a default
 Tracer (#1854)

---
 solr/CHANGES.txt                              |   2 +
 .../apache/solr/core/TracerConfigurator.java  |   7 ++
 .../solr/util/tracing/SimplePropagator.java   | 111 +++++++++++++++++
 ...estSimplePropagatorDistributedTracing.java | 117 ++++++++++++++++++
 .../opentelemetry/TestDistributedTracing.java |   1 +
 .../solr/cloud/MiniSolrCloudCluster.java      |  13 ++
 6 files changed, 251 insertions(+)
 create mode 100644 solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
 create mode 100644 solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ce100a932d6..8c903cc364d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -19,6 +19,8 @@ Improvements
 
 * SOLR-16536: Replace OpenTracing instrumentation with OpenTelemetry (Alex Deparvu, janhoy)
 
+* SOLR-15367: Convert "rid" functionality into a default Tracer (Alex Deparvu, David Smiley)
+
 Optimizations
 ---------------------
 (No changes)
diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
index bc1798863f7..f9a6846ca91 100644
--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
@@ -19,17 +19,24 @@
 
 import io.opentelemetry.api.trace.Tracer;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
+import org.apache.solr.util.tracing.SimplePropagator;
 import org.apache.solr.util.tracing.TraceUtils;
 
 /** Produces a {@link Tracer} from configuration. */
 public abstract class TracerConfigurator implements NamedListInitializedPlugin {
 
+  public static final boolean TRACE_ID_GEN_ENABLED =
+      !Boolean.getBoolean("solr.disable.alwaysOnTraceId");
+
   public static Tracer loadTracer(SolrResourceLoader loader, PluginInfo info) {
     if (info != null && info.isEnabled()) {
       TracerConfigurator configurator =
           loader.newInstance(info.className, TracerConfigurator.class);
       configurator.init(info.initArgs);
       return configurator.getTracer();
+
+    } else if (TRACE_ID_GEN_ENABLED) {
+      return SimplePropagator.load();
     } else {
       return TraceUtils.noop();
     }
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
new file mode 100644
index 00000000000..01a72e0a1ff
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
@@ -0,0 +1,111 @@
+/*
+ * 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.util.tracing;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextKey;
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
+import java.lang.invoke.MethodHandles;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.solr.logging.MDCLoggingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Simple Http Header Propagator. When enabled, this will only propagate the trace id from the
+ * client to all internal requests. It is also in charge of generating a trace id if none exists.
+ *
+ * <p>Note: this is very similar in impl to
+ * io.opentelemetry.extension.incubator.propagation.PassThroughPropagator. we should consider
+ * replacing/upgrading once that becomes generally available
+ */
+public class SimplePropagator implements TextMapPropagator {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  private static final String TRACE_HOST_NAME =
+      System.getProperty("trace_host_name", System.getProperty("host"));
+  private static final TextMapPropagator INSTANCE = new SimplePropagator();
+  private static final ContextKey<String> TRACE_ID_KEY = ContextKey.named("trace_id");
+
+  static final String TRACE_ID = System.getProperty("TRACE_ID", "X-Trace-Id");
+  private static final List<String> FIELDS = List.of(TRACE_ID);
+
+  private static final AtomicLong traceCounter = new AtomicLong(0);
+
+  private static volatile boolean loaded = false;
+
+  public static synchronized Tracer load() {
+    if (!loaded) {
+      log.info("OpenTelemetry tracer enabled with simple propagation only.");
+      OpenTelemetry otel =
+          OpenTelemetry.propagating(ContextPropagators.create(SimplePropagator.getInstance()));
+      GlobalOpenTelemetry.set(otel);
+      loaded = true;
+    }
+    return GlobalOpenTelemetry.getTracer("solr");
+  }
+
+  public static TextMapPropagator getInstance() {
+    return INSTANCE;
+  }
+
+  private SimplePropagator() {}
+
+  @Override
+  public Collection<String> fields() {
+    return FIELDS;
+  }
+
+  @Override
+  public <C> void inject(Context context, C carrier, TextMapSetter<C> setter) {
+    if (setter == null) {
+      return;
+    }
+    String traceId = context.get(TRACE_ID_KEY);
+    if (traceId != null) {
+      setter.set(carrier, TRACE_ID, traceId);
+    }
+  }
+
+  @Override
+  public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter) {
+    String traceId = getter.get(carrier, TRACE_ID);
+    if (traceId == null) {
+      traceId = newTraceId();
+    }
+
+    MDCLoggingContext.setTracerId(traceId);
+    return context.with(TRACE_ID_KEY, traceId);
+  }
+
+  private static String newTraceId() {
+    return TRACE_HOST_NAME + "-" + traceCounter.incrementAndGet();
+  }
+
+  @Override
+  public String toString() {
+    return "SimplePropagator";
+  }
+}
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
new file mode 100644
index 00000000000..0213fce7b9a
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java
@@ -0,0 +1,117 @@
+/*
+ * 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.util.tracing;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.TracerProvider;
+import java.io.IOException;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.cloud.SolrCloudTestCase;
+import org.apache.solr.common.util.SuppressForbidden;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.logging.MDCLoggingContext;
+import org.apache.solr.update.processor.LogUpdateProcessorFactory;
+import org.apache.solr.util.LogListener;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@SuppressForbidden(reason = "We need to use log4J2 classes directly to test MDC impacts")
+public class TestSimplePropagatorDistributedTracing extends SolrCloudTestCase {
+
+  private static final String COLLECTION = "collection1";
+
+  @BeforeClass
+  public static void setupCluster() throws Exception {
+    configureCluster(4).addConfig("conf", configset("cloud-minimal")).configure();
+
+    // tracer should be disabled
+    assertEquals(
+        "Expecting noop otel (propagating only)",
+        TracerProvider.noop(),
+        GlobalOpenTelemetry.get().getTracerProvider());
+
+    CollectionAdminRequest.createCollection(COLLECTION, "conf", 2, 2)
+        .process(cluster.getSolrClient());
+    cluster.waitForActiveCollection(COLLECTION, 2, 4);
+  }
+
+  @Test
+  public void test() throws IOException, SolrServerException {
+    CloudSolrClient cloudClient = cluster.getSolrClient();
+
+    // Indexing has trace ids
+    try (LogListener reqLog = LogListener.info(LogUpdateProcessorFactory.class.getName())) {
+      // verify all indexing events have trace id present
+      cloudClient.add(COLLECTION, sdoc("id", "1"));
+      cloudClient.add(COLLECTION, sdoc("id", "2"));
+      cloudClient.add(COLLECTION, sdoc("id", "3"));
+      var queue = reqLog.getQueue();
+      assertFalse(queue.isEmpty());
+      while (!queue.isEmpty()) {
+        var reqEvent = queue.poll();
+        String evTraceId = reqEvent.getContextData().getValue(MDCLoggingContext.TRACE_ID);
+        assertNotNull(evTraceId);
+      }
+
+      // TODO this doesn't work due to solr client creating the UpdateRequest without headers
+      //      // verify all events have the same 'custom' traceid
+      //      String traceId = "tidTestSimplePropagatorDistributedTracing0";
+      //      var doc = sdoc("id", "4");
+      //      UpdateRequest u = new UpdateRequest();
+      //      u.add(doc);
+      //      u.addHeader(SimplePropagator.TRACE_ID, traceId);
+      //      var r1 = u.process(cloudClient, COLLECTION);
+      //      assertEquals(0, r1.getStatus());
+      //      assertSameTraceId(reqLog, traceId);
+    }
+
+    // Searching has trace ids
+    try (LogListener reqLog = LogListener.info(SolrCore.class.getName() + ".Request")) {
+      // verify all query events have the same auto-generated traceid
+      var r1 = cloudClient.query(COLLECTION, new SolrQuery("*:*"));
+      assertEquals(0, r1.getStatus());
+      assertSameTraceId(reqLog, null);
+
+      // verify all query events have the same 'custom' traceid
+      String traceId = "tidTestSimplePropagatorDistributedTracing1";
+      var q = new QueryRequest(new SolrQuery("*:*"));
+      q.addHeader(SimplePropagator.TRACE_ID, traceId);
+      var r2 = q.process(cloudClient, COLLECTION);
+      assertEquals(0, r2.getStatus());
+      assertSameTraceId(reqLog, traceId);
+    }
+  }
+
+  private void assertSameTraceId(LogListener reqLog, String traceId) {
+    var queue = reqLog.getQueue();
+    assertFalse(queue.isEmpty());
+    if (traceId == null) {
+      traceId = queue.poll().getContextData().getValue(MDCLoggingContext.TRACE_ID);
+      assertNotNull(traceId);
+    }
+    while (!queue.isEmpty()) {
+      var reqEvent = queue.poll();
+      String evTraceId = reqEvent.getContextData().getValue(MDCLoggingContext.TRACE_ID);
+      assertEquals(traceId, evTraceId);
+    }
+  }
+}
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 dea832e87f6..f6e088e5168 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
@@ -54,6 +54,7 @@ public static void setupCluster() throws Exception {
     configureCluster(4)
         .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
         .withSolrXml(TEST_PATH().resolve("solr.xml"))
+        .withTraceIdGenerationDisabled()
         .configure();
 
     assertNotEquals(
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 3a4d41d0420..fdc64237a80 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
@@ -78,9 +78,11 @@
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.TracerConfigurator;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.TimeOut;
+import org.apache.solr.util.tracing.SimplePropagator;
 import org.apache.zookeeper.KeeperException;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -1044,6 +1046,7 @@ public static class Builder {
     private boolean useDistributedCollectionConfigSetExecution;
     private boolean useDistributedClusterStateUpdate;
     private boolean formatZkServer = true;
+    private boolean disableTraceIdGeneration = false;
 
     /**
      * Create a builder
@@ -1237,6 +1240,11 @@ public MiniSolrCloudCluster build() throws Exception {
           "solr.distributedClusterStateUpdates",
           Boolean.toString(useDistributedClusterStateUpdate));
 
+      // eager init to prevent OTEL init races caused by test setup
+      if (!disableTraceIdGeneration && TracerConfigurator.TRACE_ID_GEN_ENABLED) {
+        SimplePropagator.load();
+      }
+
       JettyConfig jettyConfig = jettyConfigBuilder.build();
       MiniSolrCloudCluster cluster =
           new MiniSolrCloudCluster(
@@ -1279,5 +1287,10 @@ public Builder withDefaultClusterProperty(String key, String value) {
       cluster.put(key, value);
       return this;
     }
+
+    public Builder withTraceIdGenerationDisabled() {
+      this.disableTraceIdGeneration = true;
+      return this;
+    }
   }
 }

From bee3accb8a38b7420da0919ebacf05ef6060fc94 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 24 Aug 2023 11:05:27 -0700
Subject: [PATCH 035/160] SOLR-15367 Convert rid functionality into a default
 Tracer (#1865)

---
 .../src/java/org/apache/solr/core/TracerConfigurator.java   | 2 +-
 solr/server/resources/log4j2.xml                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
index f9a6846ca91..633201db82f 100644
--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
@@ -26,7 +26,7 @@
 public abstract class TracerConfigurator implements NamedListInitializedPlugin {
 
   public static final boolean TRACE_ID_GEN_ENABLED =
-      !Boolean.getBoolean("solr.disable.alwaysOnTraceId");
+      Boolean.parseBoolean(System.getProperty("solr.alwaysOnTraceId", "true"));
 
   public static Tracer loadTracer(SolrResourceLoader loader, PluginInfo info) {
     if (info != null && info.isEnabled()) {
diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xml
index 186e86bd8cc..752c740514a 100644
--- a/solr/server/resources/log4j2.xml
+++ b/solr/server/resources/log4j2.xml
@@ -23,7 +23,7 @@
     <Console name="STDOUT" target="SYSTEM_OUT">
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
     </Console>
@@ -34,7 +34,7 @@
         filePattern="${sys:solr.log.dir}/solr.log.%i" >
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
       <Policies>
@@ -50,7 +50,7 @@
         filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i" >
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
       <Policies>

From 7a88bd84c19b4b2bc0cd08827d7d4fad3ed15518 Mon Sep 17 00:00:00 2001
From: Joshua Ouma <joshuaoumag@gmail.com>
Date: Sun, 27 Aug 2023 06:29:01 +0300
Subject: [PATCH 036/160] SOLR-16623: new SolrJettyTestRule (#1374)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce SolrJettyTestRule, a new subclass of SolrClientTestRule for tests requiring Jetty or HTTP.
Perhaps most tests using JettySolrRunner could convert to this eventually.

Only converted SolrJettyTestBase, (thus the many tests using it) which should be considered a deprecated test utility now. Don’t need a base test class just to use Jetty; you simply need to use SolrJettyTestRule. Changed many of these subclasses in trivial ways like to reduce Jetty references.

Moved SolrJettyTestBase.legacyExampleCollection1SolrHome to SolrTestCaseJ4 because wasn’t Jetty related; was used by non-Jetty tests.


Co-authored-by: David Smiley <dsmiley@salesforce.com>
---
 solr/CHANGES.txt                              |   2 +
 .../apache/solr/TestSolrCoreProperties.java   |   7 +-
 .../org/apache/solr/TestTolerantSearch.java   |  10 +-
 .../test/org/apache/solr/cloud/ZkCLITest.java |   3 +-
 .../solr/core/TestConfigSetImmutable.java     |   7 +-
 .../solr/core/TestSolrConfigHandler.java      |  11 +-
 .../solr/handler/TestHttpRequestId.java       |   2 +-
 .../DistributedDebugComponentTest.java        |  10 +-
 .../apache/solr/metrics/JvmMetricsTest.java   |   4 +-
 .../solr/request/TestRemoteStreaming.java     |  25 +---
 .../apache/solr/request/TestStreamBody.java   |  12 +-
 .../apache/solr/rest/SolrRestletTestBase.java |   3 +
 .../solr/rest/schema/TestBulkSchemaAPI.java   |   9 +-
 .../TestManagedStopFilterFactory.java         |   5 +-
 .../TestManagedSynonymFilterFactory.java      |   5 +-
 .../TestManagedSynonymGraphFilterFactory.java |   5 +-
 .../schema/TestUseDocValuesAsStored2.java     |   7 +-
 .../solr/servlet/CacheHeaderTestBase.java     |   4 +-
 .../solr/servlet/ResponseHeaderTest.java      |   2 +-
 .../org/apache/solr/ltr/TestRerankBase.java   |   9 +-
 .../rest/TestModelManagerPersistence.java     |  12 +-
 .../handler/sql/TestSQLHandlerNonCloud.java   |   2 +-
 .../scraper/SolrStandaloneScraperTest.java    |   4 -
 .../common/cloud/TestZkConfigSetService.java  |   3 +-
 .../solrj/SolrExampleBinaryHttp2Test.java     |   2 +-
 .../client/solrj/SolrExampleBinaryTest.java   |   2 +-
 .../client/solrj/SolrExampleCborTest.java     |   2 +-
 .../solr/client/solrj/SolrExampleTests.java   |   4 +-
 .../client/solrj/SolrExampleTestsBase.java    |  32 +++++
 .../solr/client/solrj/SolrExampleXMLTest.java |   2 +-
 .../solrj/SolrSchemalessExampleTest.java      |   8 +-
 .../solr/client/solrj/TestBatchUpdate.java    |   6 +-
 .../client/solrj/TestSolrJErrorHandling.java  |   8 +-
 .../solrj/embedded/JettyWebappTest.java       |   3 +-
 .../solrj/embedded/SolrExampleJettyTest.java  |   4 +-
 .../SolrExampleStreamingBinaryHttp2Test.java  |   2 +-
 .../SolrExampleStreamingBinaryTest.java       |   2 +-
 .../SolrExampleStreamingHttp2Test.java        |   4 +-
 .../embedded/SolrExampleStreamingTest.java    |   4 +-
 .../embedded/SolrExampleXMLHttp2Test.java     |   2 +-
 .../solrj/impl/BasicHttpSolrClientTest.java   |  39 +++--
 ...rentUpdateHttp2SolrClientBadInputTest.java |   4 +-
 .../ConcurrentUpdateHttp2SolrClientTest.java  |  13 +-
 ...oncurrentUpdateSolrClientBadInputTest.java |   4 +-
 .../impl/ConcurrentUpdateSolrClientTest.java  |  10 +-
 .../Http2SolrClientCompatibilityTest.java     |  16 +--
 .../solrj/impl/Http2SolrClientProxyTest.java  |  51 +++----
 .../solrj/impl/Http2SolrClientTest.java       |  51 +++----
 .../impl/HttpSolrClientBadInputTest.java      |   5 +-
 .../solrj/impl/HttpSolrClientConPoolTest.java |  30 ++--
 .../HttpSolrClientSSLAuthConPoolTest.java     |   2 +-
 .../impl/LBHttpSolrClientBadInputTest.java    |   4 +-
 .../solr/client/solrj/request/SchemaTest.java |   5 +-
 .../response/NoOpResponseParserTest.java      |   2 +-
 .../solrj/response/TestSuggesterResponse.java |  14 +-
 .../org/apache/solr/SolrJettyTestBase.java    | 123 ++++------------
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  41 ++++++
 .../solr/util/EmbeddedSolrServerTestRule.java |   4 +-
 .../org/apache/solr/util/RestTestBase.java    |   3 +-
 .../apache/solr/util/SolrClientTestRule.java  |  16 ++-
 .../apache/solr/util/SolrJettyTestRule.java   | 134 ++++++++++++++++++
 61 files changed, 435 insertions(+), 386 deletions(-)
 create mode 100644 solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8c903cc364d..9f2ad6e9e46 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -163,6 +163,8 @@ Other Changes
 
 * SOLR-16915: Lower the AffinityPlacementPlugin's default minimalFreeDiskGB to 5 GB (Houston Putman)
 
+* SOLR-16623: new SolrJettyTestRule for tests needing HTTP or Jetty. (David Smiley, Joshua Ouma)
+
 ==================  9.3.0 ==================
 
 Upgrade Notes
diff --git a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
index b55b368cb3f..d469c532328 100644
--- a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
+++ b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
@@ -24,7 +24,6 @@
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.embedded.JettySolrRunner;
 import org.junit.BeforeClass;
 
 /**
@@ -73,12 +72,8 @@ public static void beforeTest() throws Exception {
     if (System.getProperty("solr.data.dir") == null) {
       nodeProperties.setProperty("solr.data.dir", createTempDir().toFile().getCanonicalPath());
     }
-    jetty =
-        new JettySolrRunner(
-            homeDir.toAbsolutePath().toString(), nodeProperties, buildJettyConfig());
 
-    jetty.start();
-    port = jetty.getLocalPort();
+    solrClientTestRule.startSolr(homeDir, nodeProperties, buildJettyConfig());
 
     // createJetty(homeDir.getAbsolutePath(), null, null);
   }
diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
index a28fc90ece1..29658475281 100644
--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
@@ -62,12 +62,12 @@ public static void createThings() throws Exception {
     systemSetPropertySolrDisableUrlAllowList("true");
     File solrHome = createSolrHome();
     createAndStartJetty(solrHome.getAbsolutePath());
-    String url = jetty.getBaseUrl().toString();
+    String url = getBaseUrl();
     collection1 = getHttpSolrClient(url + "/collection1");
     collection2 = getHttpSolrClient(url + "/collection2");
 
-    String urlCollection1 = jetty.getBaseUrl().toString() + "/" + "collection1";
-    String urlCollection2 = jetty.getBaseUrl().toString() + "/" + "collection2";
+    String urlCollection1 = getBaseUrl() + "/" + "collection1";
+    String urlCollection2 = getBaseUrl() + "/" + "collection2";
     shard1 = urlCollection1.replaceAll("https?://", "");
     shard2 = urlCollection2.replaceAll("https?://", "");
 
@@ -109,10 +109,6 @@ public static void destroyThings() throws Exception {
       collection2.close();
       collection2 = null;
     }
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
     resetExceptionIgnores();
     systemClearPropertySolrDisableUrlAllowList();
   }
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
index 90a0f1a4580..c84d180a6b9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
@@ -30,7 +30,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ClusterProperties;
@@ -83,7 +82,7 @@ public void setUp() throws Exception {
       log.info("####SETUP_START {}", getTestName());
     }
 
-    String exampleHome = SolrJettyTestBase.legacyExampleCollection1SolrHome();
+    String exampleHome = legacyExampleCollection1SolrHome();
 
     Path tmpDir = createTempDir();
     solrHome = exampleHome;
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
index 682469f85f3..a3282439ac3 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
@@ -66,11 +66,8 @@ public void before() throws Exception {
 
   @After
   public void after() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
-    client = null;
+    solrClientTestRule.reset();
+
     if (restTestHarness != null) {
       restTestHarness.close();
     }
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 44ad982c714..515f28c86eb 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -133,17 +133,14 @@ public void before() throws Exception {
     if (random().nextBoolean()) {
       log.info("These tests are run with V2 API");
       restTestHarness.setServerProvider(
-          () -> jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
+          () -> getBaseUrl() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
     }
   }
 
   @After
   public void after() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
-    client = null;
+    solrClientTestRule.reset();
+
     if (restTestHarness != null) {
       restTestHarness.close();
     }
@@ -973,7 +970,7 @@ public void testReqParams() throws Exception {
         TIMEOUT_S);
     RESTfulServerProvider oldProvider = restTestHarness.getServerProvider();
     restTestHarness.setServerProvider(
-        () -> jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
+        () -> getBaseUrl() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
 
     Map<?, ?> rsp =
         TestSolrConfigHandler.testForResponseElement(
diff --git a/solr/core/src/test/org/apache/solr/handler/TestHttpRequestId.java b/solr/core/src/test/org/apache/solr/handler/TestHttpRequestId.java
index 7e8a15004d7..b97b9f9a143 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestHttpRequestId.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestHttpRequestId.java
@@ -105,7 +105,7 @@ public void onFailure(Throwable throwable) {
               new SolrNamedThreadFactory("httpShardExecutor"),
               false);
       try (Http2SolrClient client =
-          new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + collection)
+          new Http2SolrClient.Builder(getBaseUrl() + collection)
               .withExecutor(commExecutor)
               .build()) {
         MDC.put(key, value);
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
index 58cbe43717d..374cee78888 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
@@ -61,13 +61,13 @@ public static void createThings() throws Exception {
     systemSetPropertySolrDisableUrlAllowList("true");
     File solrHome = createSolrHome();
     createAndStartJetty(solrHome.getAbsolutePath());
-    String url = jetty.getBaseUrl().toString();
+    String url = getBaseUrl();
 
     collection1 = getHttpSolrClient(url + "/collection1");
     collection2 = getHttpSolrClient(url + "/collection2");
 
-    String urlCollection1 = jetty.getBaseUrl().toString() + "/" + "collection1";
-    String urlCollection2 = jetty.getBaseUrl().toString() + "/" + "collection2";
+    String urlCollection1 = getBaseUrl() + "/" + "collection1";
+    String urlCollection2 = getBaseUrl() + "/" + "collection2";
     shard1 = urlCollection1.replaceAll("https?://", "");
     shard2 = urlCollection2.replaceAll("https?://", "");
 
@@ -101,10 +101,6 @@ public static void destroyThings() throws Exception {
       collection2.close();
       collection2 = null;
     }
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
     resetExceptionIgnores();
     systemClearPropertySolrDisableUrlAllowList();
   }
diff --git a/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java b/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
index 970818a27d4..b7dbd43a611 100644
--- a/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
@@ -89,7 +89,7 @@ public void testSystemProperties() {
       // make sure it's set
       System.setProperty("basicauth", "foo:bar");
     }
-    SolrMetricManager metricManager = jetty.getCoreContainer().getMetricManager();
+    SolrMetricManager metricManager = getJetty().getCoreContainer().getMetricManager();
     Map<String, Metric> metrics = metricManager.registry("solr.jvm").getMetrics();
     Metric metric = metrics.get("system.properties");
     assertNotNull(metrics.toString(), metric);
@@ -125,7 +125,7 @@ public void testHiddenSysProps() throws Exception {
 
   @Test
   public void testSetupJvmMetrics() {
-    SolrMetricManager metricManager = jetty.getCoreContainer().getMetricManager();
+    SolrMetricManager metricManager = getJetty().getCoreContainer().getMetricManager();
     Map<String, Metric> metrics = metricManager.registry("solr.jvm").getMetrics();
     assertTrue(metrics.size() > 0);
     assertTrue(
diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
index e36fbb1969c..486b3396afd 100644
--- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
+++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
@@ -34,7 +34,6 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.embedded.JettySolrRunner;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -43,8 +42,6 @@
 @SuppressSSL // does not yet work with ssl yet - uses raw java.net.URL API rather than HttpClient
 public class TestRemoteStreaming extends SolrJettyTestBase {
 
-  private static JettySolrRunner jettySolrRunner;
-
   @BeforeClass
   public static void beforeTest() throws Exception {
     System.setProperty("solr.enableRemoteStreaming", "true");
@@ -52,7 +49,7 @@ public static void beforeTest() throws Exception {
     // this one has handleSelect=true which a test here needs
     File solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();
     setupJettyTestHome(solrHomeDirectory, "collection1");
-    jettySolrRunner = createAndStartJetty(solrHomeDirectory.getAbsolutePath());
+    createAndStartJetty(solrHomeDirectory.getAbsolutePath());
   }
 
   @Before
@@ -75,16 +72,10 @@ public void testMakeDeleteAllUrl() throws Exception {
 
   @Test
   public void testStreamUrl() throws Exception {
-    String streamUrl =
-        jettySolrRunner.getBaseUrl().toString()
-            + "/"
-            + DEFAULT_TEST_COLLECTION_NAME
-            + "/select?q=*:*&fl=id&wt=csv";
+    String streamUrl = getCoreUrl() + "/select?q=*:*&fl=id&wt=csv";
 
     String getUrl =
-        jettySolrRunner.getBaseUrl().toString()
-            + "/"
-            + DEFAULT_TEST_COLLECTION_NAME
+        getCoreUrl()
             + "/debug/dump?wt=xml&stream.url="
             + URLEncoder.encode(streamUrl, StandardCharsets.UTF_8);
     String content = attemptHttpGet(getUrl);
@@ -109,18 +100,14 @@ public void testNoUrlAccess() throws Exception {
     SolrQuery query = new SolrQuery();
     query.setQuery("*:*"); // for anything
     query.add("stream.url", makeDeleteAllUrl());
-    try (SolrClient solrClient = createNewSolrClient()) {
-      SolrException se = expectThrows(SolrException.class, () -> solrClient.query(query));
-      assertSame(ErrorCode.BAD_REQUEST, ErrorCode.getErrorCode(se.code()));
-    }
+    SolrException se = expectThrows(SolrException.class, () -> getSolrClient().query(query));
+    assertSame(ErrorCode.BAD_REQUEST, ErrorCode.getErrorCode(se.code()));
   }
 
   /** Compose an HTTP GET url that will delete all the data. */
   private String makeDeleteAllUrl() {
     String deleteQuery = "<delete><query>*:*</query></delete>";
-    return jettySolrRunner.getBaseUrl().toString()
-        + "/"
-        + DEFAULT_TEST_COLLECTION_NAME
+    return getCoreUrl()
         + "/update?commit=true&stream.body="
         + URLEncoder.encode(deleteQuery, StandardCharsets.UTF_8);
   }
diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
index e495353b613..197fd2d5986 100644
--- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
+++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
@@ -56,20 +56,14 @@ public void startSolr() throws Exception {
     if (random().nextBoolean()) {
       log.info("These tests are run with V2 API");
       restTestHarness.setServerProvider(
-          () -> jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
+          () -> getBaseUrl() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
     }
   }
 
   @After
   public void after() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
-    if (client != null) {
-      client.close();
-      client = null;
-    }
+    solrClientTestRule.reset();
+
     if (restTestHarness != null) {
       restTestHarness.close();
       restTestHarness = null;
diff --git a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
index 480c2885708..59d2a35d88c 100644
--- a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
+++ b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
@@ -46,6 +46,9 @@ public static void init() throws Exception {
     System.setProperty("coreRootDirectory", coresDir.toString());
     System.setProperty("configSetBaseDir", TEST_HOME());
 
+    System.setProperty("solr.test.sys.prop1", "propone");
+    System.setProperty("solr.test.sys.prop2", "proptwo");
+
     final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
 
     Properties props = new Properties();
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
index e6db67578b0..98a65a3ebae 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
@@ -78,7 +78,7 @@ public void before() throws Exception {
           new RESTfulServerProvider() {
             @Override
             public String getBaseURL() {
-              return jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME;
+              return getBaseUrl() + "/____v2/cores/" + DEFAULT_TEST_CORENAME;
             }
           });
     }
@@ -86,10 +86,7 @@ public String getBaseURL() {
 
   @After
   public void after() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     if (restTestHarness != null) {
       restTestHarness.close();
     }
@@ -1459,7 +1456,7 @@ public static List getDestCopyFields(RestTestHarness harness, String dest) throw
   @SuppressWarnings({"unchecked", "varargs"})
   private static <T extends Similarity> void assertFieldSimilarity(
       String fieldname, Class<T> expected, Consumer<T>... validators) {
-    CoreContainer cc = jetty.getCoreContainer();
+    CoreContainer cc = solrClientTestRule.getCoreContainer();
     try (SolrCore core = cc.getCore("collection1")) {
       SimilarityFactory simfac = core.getLatestSchema().getSimilarityFactory();
       assertNotNull(simfac);
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
index fb6633e2848..a1fff16edc0 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
@@ -61,10 +61,7 @@ public void before() throws Exception {
 
   @After
   public void after() throws Exception {
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     System.clearProperty("managed.schema.mutable");
     System.clearProperty("enable.update.log");
 
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
index 87cba4ae404..4738196017c 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
@@ -59,10 +59,7 @@ public void before() throws Exception {
 
   @After
   public void after() throws Exception {
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     if (null != tmpSolrHome) {
       PathUtils.deleteDirectory(tmpSolrHome);
       tmpSolrHome = null;
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
index f93482a00d0..c5363c7f251 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
@@ -63,10 +63,7 @@ public void before() throws Exception {
 
   @After
   public void after() throws Exception {
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     if (null != tmpSolrHome) {
       PathUtils.deleteDirectory(tmpSolrHome.toPath());
     }
diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
index 1f05641a6d1..0a1c6d19dc8 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
@@ -50,11 +50,8 @@ public void before() throws Exception {
 
   @After
   public void after() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
-    client = null;
+    solrClientTestRule.reset();
+
     if (restTestHarness != null) {
       restTestHarness.close();
     }
diff --git a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java
index b372b4b3c8f..5f25e8140d8 100644
--- a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java
+++ b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java
@@ -46,7 +46,7 @@ protected HttpRequestBase getSelectMethod(String method, String... params) {
 
     URI uri =
         URI.create(
-            jetty.getBaseUrl().toString()
+            getBaseUrl()
                 + "/"
                 + DEFAULT_TEST_COLLECTION_NAME
                 + "/select?"
@@ -73,7 +73,7 @@ HttpRequestBase getUpdateMethod(String method, String... params) {
 
     URI uri =
         URI.create(
-            jetty.getBaseUrl()
+            getBaseUrl()
                 + "/"
                 + DEFAULT_TEST_COLLECTION_NAME
                 + "/update?"
diff --git a/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java
index b5d312eb021..b9e821c3acb 100644
--- a/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java
@@ -58,7 +58,7 @@ public static void afterTest() throws Exception {
 
   @Test
   public void testHttpResponse() throws IOException {
-    URI uri = URI.create(jetty.getBaseUrl() + "/collection1/withHeaders?q=*:*");
+    URI uri = URI.create(getBaseUrl() + "/collection1/withHeaders?q=*:*");
     HttpGet httpGet = new HttpGet(uri);
     HttpResponse response = getHttpClient().execute(httpGet);
     Header[] headers = response.getAllHeaders();
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 3089263c036..88a60efea59 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -121,13 +121,13 @@ protected static void setupPersistenttest(boolean bulkIndex) throws Exception {
   }
 
   public static ManagedFeatureStore getManagedFeatureStore() {
-    try (SolrCore core = jetty.getCoreContainer().getCore(DEFAULT_TEST_CORENAME)) {
+    try (SolrCore core = solrClientTestRule.getCoreContainer().getCore(DEFAULT_TEST_CORENAME)) {
       return ManagedFeatureStore.getManagedFeatureStore(core);
     }
   }
 
   public static ManagedModelStore getManagedModelStore() {
-    try (SolrCore core = jetty.getCoreContainer().getCore(DEFAULT_TEST_CORENAME)) {
+    try (SolrCore core = solrClientTestRule.getCoreContainer().getCore(DEFAULT_TEST_CORENAME)) {
       return ManagedModelStore.getManagedModelStore(core);
     }
   }
@@ -195,10 +195,7 @@ protected static void aftertest() throws Exception {
       restTestHarness.close();
       restTestHarness = null;
     }
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     if (null != tmpSolrHome) {
       PathUtils.deleteDirectory(tmpSolrHome);
       tmpSolrHome = null;
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
index d513cfd9dc7..2adcc1f19f8 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
@@ -170,8 +170,8 @@ public void testFilePersistence() throws Exception {
         "/features/[1]/name=='description'");
 
     // check persistence after restart
-    jetty.stop();
-    jetty.start();
+    getJetty().stop();
+    getJetty().start();
     assertJQ(ManagedModelStore.REST_END_POINT, "/models/[0]/name=='" + modelName + "'");
     assertJQ(
         ManagedFeatureStore.REST_END_POINT + "/" + FeatureStore.DEFAULT_FEATURE_STORE_NAME,
@@ -197,8 +197,8 @@ public void testFilePersistence() throws Exception {
         "/error/msg=='Missing feature store: " + FeatureStore.DEFAULT_FEATURE_STORE_NAME + "'");
 
     // check persistence after restart
-    jetty.stop();
-    jetty.start();
+    getJetty().stop();
+    getJetty().start();
     assertJQ(ManagedModelStore.REST_END_POINT, "/models/==[]");
     assertJQ(
         ManagedFeatureStore.REST_END_POINT + "/" + FeatureStore.DEFAULT_FEATURE_STORE_NAME,
@@ -269,8 +269,8 @@ public void testWrapperModelPersistence() throws Exception {
     doWrapperModelPersistenceChecks(modelName, FS_NAME, baseModelFile.getFileName().toString());
 
     // check persistence after restart
-    jetty.stop();
-    jetty.start();
+    getJetty().stop();
+    getJetty().start();
     doWrapperModelPersistenceChecks(modelName, FS_NAME, baseModelFile.getFileName().toString());
 
     // delete test settings
diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
index a0af9117b24..7dd50fcb5e7 100644
--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
@@ -49,7 +49,7 @@ public static void beforeClass() throws Exception {
   public void testSQLHandler() throws Exception {
     String sql = "select id, field_i, str_s from " + DEFAULT_TEST_COLLECTION_NAME + " limit 10";
     SolrParams sParams = params(CommonParams.QT, "/sql", "stmt", sql);
-    String url = jetty.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME;
+    String url = getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME;
 
     SolrStream solrStream = new SolrStream(url, sParams);
     IOException ex = expectThrows(IOException.class, () -> getTuples(solrStream));
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
index c254cc1e1e4..1db0142c2ea 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
@@ -81,10 +81,6 @@ public static void cleanUp() throws Exception {
       executor.shutdownNow();
       executor = null;
     }
-    if (null != jetty) {
-      jetty.stop();
-      jetty = null;
-    }
     solrScraper = null;
     solrClient = null;
   }
diff --git a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
index 058921cc8fb..16454d5dc3e 100644
--- a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
+++ b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
-import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.cloud.AbstractZkTestCase;
 import org.apache.solr.cloud.ZkConfigSetService;
@@ -240,7 +239,7 @@ protected Collection<ZkCredentials> createCredentials() {
   @Test
   public void testBootstrapConf() throws IOException, KeeperException, InterruptedException {
 
-    String solrHome = SolrJettyTestBase.legacyExampleCollection1SolrHome();
+    String solrHome = legacyExampleCollection1SolrHome();
 
     CoreContainer cc = new CoreContainer(Paths.get(solrHome), new Properties());
     System.setProperty("zkHost", zkServer.getZkAddress());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java
index ceae9494376..331104ca195 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java
@@ -38,7 +38,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new Http2SolrClient.Builder(getServerUrl())
+    return new Http2SolrClient.Builder(getCoreUrl())
         .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
         .withRequestWriter(new BinaryRequestWriter())
         // where the magic happens
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 e7c58b8ea4a..897e37c2ab0 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
@@ -35,7 +35,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getServerUrl())
+    return new HttpSolrClient.Builder(getCoreUrl())
         .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(new BinaryRequestWriter())
         .withResponseParser(new BinaryResponseParser())
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 c8b818094d2..9441eacfa1d 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
@@ -52,7 +52,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getServerUrl())
+    return new HttpSolrClient.Builder(getCoreUrl())
         .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(cborRequestWriter())
         .withResponseParser(cborResponseparser())
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 df55b78ab1e..06c0da66e05 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
@@ -435,9 +435,9 @@ public void testExampleConfig() throws Exception {
     assertEquals("price:[* TO 2]", values.get(0));
     assertEquals("price:[2 TO 4]", values.get(1));
 
-    if (jetty != null) {
+    if (getJetty() != null) {
       // check system wide system handler + "/admin/info/system"
-      String url = jetty.getBaseUrl().toString();
+      String url = getBaseUrl();
       try (SolrClient adminClient = getHttpSolrClient(url)) {
         SolrQuery q = new SolrQuery();
         q.set("qt", "/admin/info/system");
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
index 19c0c2407b4..88d454cfe52 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
@@ -31,9 +31,41 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.util.TimeOut;
+import org.junit.After;
 import org.junit.Test;
 
 public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
+  private SolrClient client;
+
+  @After
+  public void after() {
+    if (client != null) {
+      try {
+        client.close();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    client = null;
+  }
+
+  @Override
+  public SolrClient getSolrClient() {
+    if (client == null) {
+      client = createNewSolrClient();
+    }
+    return client;
+  }
+
+  /**
+   * Create a new solr client. If createJetty was called, a http implementation will be created,
+   * otherwise an embedded implementation will be created. Subclasses should override for other
+   * options.
+   */
+  @Override
+  public SolrClient createNewSolrClient() {
+    return getHttpSolrClient(getCoreUrl());
+  }
 
   /** query the example */
   @Test
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 de312169ba6..faa4c176526 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
@@ -35,7 +35,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    HttpSolrClient.Builder httpSolrClientBuilder = new HttpSolrClient.Builder(getServerUrl());
+    HttpSolrClient.Builder httpSolrClientBuilder = new HttpSolrClient.Builder(getCoreUrl());
     httpSolrClientBuilder.allowMultiPartPost(random().nextBoolean());
 
     httpSolrClientBuilder
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 0a365bdedc9..f188c66f299 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
@@ -83,8 +83,7 @@ public void testArbitraryJsonIndexing() throws Exception {
     // two docs, one with uniqueKey, another without it
     String json = "{\"id\":\"abc1\", \"name\": \"name1\"} {\"name\" : \"name2\"}";
     HttpClient httpClient = getHttpClient();
-    HttpPost post =
-        new HttpPost(jetty.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME + "/update/json/docs");
+    HttpPost post = new HttpPost(getCoreUrl() + "/update/json/docs");
     post.setHeader("Content-Type", "application/json");
     post.setEntity(
         new InputStreamEntity(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)), -1));
@@ -112,8 +111,7 @@ public void testFieldMutating() throws Exception {
             + "{\"p.q\" : \"name\"}"
             + "{\"a&b\" : \"name\"}";
     HttpClient httpClient = getHttpClient();
-    HttpPost post =
-        new HttpPost(jetty.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME + "/update/json/docs");
+    HttpPost post = new HttpPost(getCoreUrl() + "/update/json/docs");
     post.setHeader("Content-Type", "application/json");
     post.setEntity(
         new InputStreamEntity(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)), -1));
@@ -132,7 +130,7 @@ public void testFieldMutating() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    HttpSolrClient.Builder httpSolrClientBuilder = new HttpSolrClient.Builder(getServerUrl());
+    HttpSolrClient.Builder httpSolrClientBuilder = new HttpSolrClient.Builder(getCoreUrl());
     if (random().nextBoolean()) {
       httpSolrClientBuilder
           .withRequestWriter(new BinaryRequestWriter())
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 5dd599fcd45..68d70c8ca44 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
@@ -47,7 +47,7 @@ public static void beforeTest() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl()).withRequestWriter(new RequestWriter()).build()) {
+        new HttpSolrClient.Builder(getCoreUrl()).withRequestWriter(new RequestWriter()).build()) {
       client.deleteByQuery("*:*"); // delete everything!
       doIt(client);
     }
@@ -56,7 +56,7 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl())
+        new HttpSolrClient.Builder(getCoreUrl())
             .withRequestWriter(new BinaryRequestWriter())
             .build()) {
       client.deleteByQuery("*:*"); // delete everything!
@@ -67,7 +67,7 @@ public void testWithBinary() throws Exception {
   @Test
   public void testWithBinaryBean() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl())
+        new HttpSolrClient.Builder(getCoreUrl())
             .withRequestWriter(new BinaryRequestWriter())
             .build()) {
       client.deleteByQuery("*:*"); // delete everything!
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 a2feae3f5ab..789d39d516d 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
@@ -102,7 +102,7 @@ public void showExceptions() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl()).withRequestWriter(new RequestWriter()).build()) {
+        new HttpSolrClient.Builder(getCoreUrl()).withRequestWriter(new RequestWriter()).build()) {
 
       client.deleteByQuery("*:*"); // delete everything!
       doIt(client);
@@ -112,7 +112,7 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl())
+        new HttpSolrClient.Builder(getCoreUrl())
             .withRequestWriter(new BinaryRequestWriter())
             .build()) {
       client.deleteByQuery("*:*"); // delete everything!
@@ -274,7 +274,7 @@ public void testHttpURLConnection() throws Exception {
     // sometimes succeeds with this size, but larger can cause OOM from command line
     String bodyString = getJsonDocs(200000);
 
-    String urlString = jetty.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME + "/update";
+    String urlString = getCoreUrl() + "/update";
 
     HttpURLConnection conn = null;
     URL url = new URL(urlString);
@@ -327,7 +327,7 @@ public void testHttpURLConnection() throws Exception {
   public void testRawSocket() throws Exception {
 
     String hostName = "127.0.0.1";
-    int port = jetty.getLocalPort();
+    int port = getJetty().getLocalPort();
 
     try (Socket socket = new Socket(hostName, port);
         OutputStream out = new BufferedOutputStream(socket.getOutputStream());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index ec631da7081..61968db2e4d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -27,7 +27,6 @@
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.util.ExternalPaths;
@@ -49,7 +48,7 @@ public class JettyWebappTest extends SolrTestCaseJ4 {
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    System.setProperty("solr.solr.home", SolrJettyTestBase.legacyExampleCollection1SolrHome());
+    System.setProperty("solr.solr.home", legacyExampleCollection1SolrHome());
     System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
     System.setProperty("solr.tests.doContainerStreamCloseAssert", "false");
 
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 310054881c1..11a593d82c3 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
@@ -73,8 +73,8 @@ public void testArbitraryJsonIndexing() throws Exception {
 
       // two docs, one with uniqueKey, another without it
       String json = "{\"id\":\"abc1\", \"name\": \"name1\"} {\"name\" : \"name2\"}";
-      HttpClient httpClient = getHttpClient(getServerUrl());
-      HttpPost post = new HttpPost(getRandomizedUpdateUri(getServerUrl()));
+      HttpClient httpClient = getHttpClient(getCoreUrl());
+      HttpPost post = new HttpPost(getRandomizedUpdateUri(getCoreUrl()));
       post.setHeader("Content-Type", "application/json");
       post.setEntity(
           new InputStreamEntity(
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
index 32f49d2c69c..cbab498a9ac 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
@@ -37,7 +37,7 @@ public class SolrExampleStreamingBinaryHttp2Test extends SolrExampleStreamingHtt
 
   @Override
   public SolrClient createNewSolrClient() {
-    String url = jetty.getBaseUrl().toString() + "/collection1";
+    String url = getCoreUrl();
     // smaller queue size hits locks more often
     Http2SolrClient solrClient =
         new Http2SolrClient.Builder()
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 77310ff3055..ec326f61858 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
@@ -36,7 +36,7 @@ public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest {
   public SolrClient createNewSolrClient() {
 
     SolrClient client =
-        new ErrorTrackingConcurrentUpdateSolrClient.Builder(getServerUrl())
+        new ErrorTrackingConcurrentUpdateSolrClient.Builder(getCoreUrl())
             .withQueueSize(2)
             .withThreadCount(5)
             .withResponseParser(new BinaryResponseParser())
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
index f7ea0d83961..1584fc87cf1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
@@ -45,7 +45,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    String url = jetty.getBaseUrl().toString() + "/collection1";
+    String url = getCoreUrl();
     // smaller queue size hits locks more often
     Http2SolrClient solrClient =
         new Http2SolrClient.Builder()
@@ -63,7 +63,7 @@ public SolrClient createNewSolrClient() {
   public void testWaitOptions() throws Exception {
     // SOLR-3903
     final List<Throwable> failures = new ArrayList<>();
-    final String serverUrl = jetty.getBaseUrl().toString() + "/collection1";
+    final String serverUrl = getCoreUrl();
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         ConcurrentUpdateHttp2SolrClient concurrentClient =
             new FailureRecordingConcurrentUpdateSolrClient.Builder(serverUrl, http2Client)
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 2e06cdadfed..6aa438e0339 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
@@ -44,7 +44,7 @@ public static void beforeTest() throws Exception {
   @Override
   public SolrClient createNewSolrClient() {
     // smaller queue size hits locks more often
-    return new ErrorTrackingConcurrentUpdateSolrClient.Builder(getServerUrl())
+    return new ErrorTrackingConcurrentUpdateSolrClient.Builder(getCoreUrl())
         .withQueueSize(2)
         .withThreadCount(5)
         .withResponseParser(new XMLResponseParser())
@@ -56,7 +56,7 @@ public void testWaitOptions() throws Exception {
     // SOLR-3903
     // TODO these failures are not the same as recorded by the client
     final List<Throwable> failures = new ArrayList<>();
-    final String serverUrl = jetty.getBaseUrl().toString() + "/collection1";
+    final String serverUrl = getCoreUrl();
     try (ConcurrentUpdateSolrClient concurrentClient =
         new FailureRecordingConcurrentUpdateSolrClient.Builder(serverUrl)
             .withQueueSize(2)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
index d495b6b0a0b..77b2bd098a2 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
@@ -39,7 +39,7 @@ public static void beforeTest() throws Exception {
   public SolrClient createNewSolrClient() {
 
     Http2SolrClient client =
-        new Http2SolrClient.Builder(getServerUrl())
+        new Http2SolrClient.Builder(getCoreUrl())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withRequestWriter(new RequestWriter())
             .withResponseParser(new XMLResponseParser())
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 e153e29598f..8bd9a193eed 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
@@ -209,7 +209,7 @@ public static void beforeTest() throws Exception {
   public void testTimeout() throws Exception {
     SolrQuery q = new SolrQuery("*:*");
     try (SolrClient client =
-        new HttpSolrClient.Builder(jetty.getBaseUrl().toString() + "/slow/foo")
+        new HttpSolrClient.Builder(getBaseUrl() + "/slow/foo")
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(2000, TimeUnit.MILLISECONDS)
             .build()) {
@@ -231,7 +231,7 @@ public void testSolrExceptionCodeNotFromSolr() throws IOException, SolrServerExc
         ErrorCode.UNKNOWN,
         ErrorCode.getErrorCode(status));
 
-    try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
+    try (SolrClient client = getHttpSolrClient(getBaseUrl() + "/debug/foo")) {
       DebugServlet.setErrorCode(status);
       SolrQuery q = new SolrQuery("foo");
       SolrException e = expectThrows(SolrException.class, () -> client.query(q, METHOD.GET));
@@ -244,7 +244,7 @@ public void testSolrExceptionCodeNotFromSolr() throws IOException, SolrServerExc
   @Test
   public void testQuery() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
     SolrQuery q = new SolrQuery("foo");
     q.setParam("a", "\u1234");
     try (HttpSolrClient client = getHttpSolrClient(url)) {
@@ -398,7 +398,7 @@ public void testQuery() throws Exception {
   @Test
   public void testDelete() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
     try (HttpSolrClient client = getHttpSolrClient(url)) {
       expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.deleteById("id"));
 
@@ -447,7 +447,7 @@ public void testDelete() throws Exception {
   @Test
   public void testGetById() throws Exception {
     DebugServlet.clear();
-    try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
+    try (SolrClient client = getHttpSolrClient(getBaseUrl() + "/debug/foo")) {
       Collection<String> ids = Collections.singletonList("a");
       expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.getById("a"));
       expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.getById(ids, null));
@@ -460,7 +460,7 @@ public void testGetById() throws Exception {
   @Test
   public void testUpdate() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
 
     try (HttpSolrClient client = getHttpSolrClient(url)) {
       UpdateRequest req = new UpdateRequest();
@@ -543,7 +543,7 @@ public void testUpdate() throws Exception {
 
   @Test
   public void testRedirect() throws Exception {
-    final String clientUrl = jetty.getBaseUrl().toString() + "/redirect/foo";
+    final String clientUrl = getBaseUrl() + "/redirect/foo";
     SolrQuery q = new SolrQuery("*:*");
 
     // default for redirect is false.
@@ -570,7 +570,7 @@ public void testRedirect() throws Exception {
   public void testCompression() throws Exception {
     final SolrQuery q = new SolrQuery("*:*");
 
-    final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";
+    final String clientUrl = getBaseUrl() + "/debug/foo";
     try (SolrClient client = getHttpSolrClient(clientUrl)) {
       // verify request header gets set
       DebugServlet.clear();
@@ -596,8 +596,7 @@ public void testCompression() throws Exception {
     assertNull(DebugServlet.headers.get("Accept-Encoding"));
 
     // verify server compresses output
-    HttpGet get =
-        new HttpGet(jetty.getBaseUrl().toString() + "/collection1" + "/select?q=foo&wt=xml");
+    HttpGet get = new HttpGet(getCoreUrl() + "/select?q=foo&wt=xml");
     get.setHeader("Accept-Encoding", "gzip");
     ModifiableSolrParams params = new ModifiableSolrParams();
     params.set(HttpClientUtil.PROP_ALLOW_COMPRESSION, true);
@@ -622,7 +621,7 @@ public void testCompression() throws Exception {
     }
 
     // verify compressed response can be handled
-    try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/collection1")) {
+    try (SolrClient client = getHttpSolrClient(getCoreUrl())) {
       QueryResponse response = client.query(new SolrQuery("foo"));
       assertEquals(0, response.getStatus());
     }
@@ -631,7 +630,7 @@ public void testCompression() throws Exception {
   @Test
   public void testCollectionParameters() throws IOException, SolrServerException {
 
-    try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {
+    try (SolrClient client = getHttpSolrClient(getBaseUrl())) {
       SolrInputDocument doc = new SolrInputDocument();
       doc.addField("id", "collection");
       client.add("collection1", doc);
@@ -642,7 +641,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
           client.query("collection1", new SolrQuery("id:collection")).getResults().getNumFound());
     }
 
-    final String collection1Url = jetty.getBaseUrl().toString() + "/collection1";
+    final String collection1Url = getCoreUrl();
     try (SolrClient client = getHttpSolrClient(collection1Url)) {
       assertEquals(1, client.query(new SolrQuery("id:collection")).getResults().getNumFound());
     }
@@ -652,7 +651,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
   public void testGetRawStream() throws SolrServerException, IOException {
     CloseableHttpClient client = HttpClientUtil.createClient(null);
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(jetty.getBaseUrl().toString() + "/collection1")
+        new HttpSolrClient.Builder(getCoreUrl())
             .withHttpClient(client)
             .withResponseParser(null)
             .build(); ) {
@@ -697,7 +696,7 @@ public void process(HttpRequest request, HttpContext context)
           BasicClientCookie cookie = new BasicClientCookie(cookieName, cookieValue);
           cookie.setVersion(0);
           cookie.setPath("/");
-          cookie.setDomain(jetty.getBaseUrl().getHost());
+          cookie.setDomain(getJetty().getBaseUrl().getHost());
 
           CookieStore cookieStore = new BasicCookieStore();
           CookieSpec cookieSpec = new SolrPortAwareCookieSpecFactory().create(context);
@@ -721,7 +720,7 @@ public void testInterceptors() {
     HttpClientUtil.addRequestInterceptor(changeRequestInterceptor);
     HttpClientUtil.addRequestInterceptor(cookieSettingRequestInterceptor);
 
-    final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";
+    final String clientUrl = getBaseUrl() + "/debug/foo";
     try (SolrClient server = getHttpSolrClient(clientUrl)) {
 
       SolrQuery q = new SolrQuery("foo");
@@ -786,7 +785,7 @@ private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
   @Test
   public void testQueryString() throws Exception {
 
-    final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";
+    final String clientUrl = getBaseUrl() + "/debug/foo";
     HttpSolrClient.Builder builder = new HttpSolrClient.Builder(clientUrl);
     try (HttpSolrClient client =
         builder.withTheseParamNamesInTheUrl(Set.of("serverOnly")).build()) {
@@ -838,7 +837,7 @@ public void testQueryString() throws Exception {
   public void testInvariantParams() throws IOException {
     try (HttpSolrClient createdClient =
         new HttpSolrClient.Builder()
-            .withBaseSolrUrl(jetty.getBaseUrl().toString())
+            .withBaseSolrUrl(getBaseUrl())
             .withInvariantParams(SolrTestCaseJ4.params("param", "value"))
             .build()) {
       assertEquals("value", createdClient.getInvariantParams().get("param"));
@@ -846,7 +845,7 @@ public void testInvariantParams() throws IOException {
 
     try (HttpSolrClient createdClient =
         new HttpSolrClient.Builder()
-            .withBaseSolrUrl(jetty.getBaseUrl().toString())
+            .withBaseSolrUrl(getBaseUrl())
             .withInvariantParams(SolrTestCaseJ4.params("fq", "fq1", "fq", "fq2"))
             .build()) {
       assertEquals(2, createdClient.getInvariantParams().getParams("fq").length);
@@ -854,7 +853,7 @@ public void testInvariantParams() throws IOException {
 
     try (SolrClient createdClient =
         new HttpSolrClient.Builder()
-            .withBaseSolrUrl(jetty.getBaseUrl().toString())
+            .withBaseSolrUrl(getBaseUrl())
             .withKerberosDelegationToken("mydt")
             .withInvariantParams(
                 SolrTestCaseJ4.params(DelegationTokenHttpSolrClient.DELEGATION_TOKEN_PARAM, "mydt"))
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
index 0ded24475ab..552a48c379b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
@@ -46,7 +46,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         SolrClient client =
             new ConcurrentUpdateHttp2SolrClient.Builder(
-                    jetty.getBaseUrl().toString() + "/" + ANY_COLLECTION, http2Client)
+                    getBaseUrl() + "/" + ANY_COLLECTION, http2Client)
                 .withQueueSize(ANY_QUEUE_SIZE)
                 .withThreadCount(ANY_MAX_NUM_THREADS)
                 .build()) {
@@ -79,7 +79,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         SolrClient client =
             new ConcurrentUpdateHttp2SolrClient.Builder(
-                    jetty.getBaseUrl().toString() + "/" + ANY_COLLECTION, http2Client)
+                    getBaseUrl() + "/" + ANY_COLLECTION, http2Client)
                 .withQueueSize(ANY_QUEUE_SIZE)
                 .withThreadCount(ANY_MAX_NUM_THREADS)
                 .build()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
index b786ba7ed70..70804ff2654 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
@@ -51,7 +51,7 @@ public static void beforeTest() throws Exception {
   public void testConcurrentUpdate() throws Exception {
     ConcurrentUpdateSolrClientTest.TestServlet.clear();
 
-    String serverUrl = jetty.getBaseUrl().toString() + "/cuss/foo";
+    String serverUrl = getBaseUrl() + "/cuss/foo";
 
     int cussThreadCount = 2;
     int cussQueueSize = 100;
@@ -126,8 +126,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
 
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         ConcurrentUpdateHttp2SolrClient concurrentClient =
-            (new ConcurrentUpdateHttp2SolrClient.Builder(
-                    jetty.getBaseUrl().toString(), http2Client))
+            (new ConcurrentUpdateHttp2SolrClient.Builder(getBaseUrl(), http2Client))
                 .withQueueSize(cussQueueSize)
                 .withThreadCount(cussThreadCount)
                 .build()) {
@@ -147,8 +146,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
 
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         ConcurrentUpdateHttp2SolrClient concurrentClient =
-            new ConcurrentUpdateHttp2SolrClient.Builder(
-                    jetty.getBaseUrl().toString() + "/collection1", http2Client)
+            new ConcurrentUpdateHttp2SolrClient.Builder(getCoreUrl(), http2Client)
                 .withQueueSize(cussQueueSize)
                 .withThreadCount(cussThreadCount)
                 .build()) {
@@ -169,7 +167,7 @@ public void testConcurrentCollectionUpdate() throws Exception {
 
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         ConcurrentUpdateHttp2SolrClient concurrentClient =
-            new ConcurrentUpdateHttp2SolrClient.Builder(jetty.getBaseUrl().toString(), http2Client)
+            new ConcurrentUpdateHttp2SolrClient.Builder(getBaseUrl(), http2Client)
                 .withQueueSize(cussQueueSize)
                 .withThreadCount(cussThreadCount)
                 .setPollQueueTime(0, TimeUnit.MILLISECONDS)
@@ -207,8 +205,7 @@ public void testConcurrentCollectionUpdate() throws Exception {
 
     try (Http2SolrClient http2Client = new Http2SolrClient.Builder().build();
         ConcurrentUpdateHttp2SolrClient concurrentClient =
-            new ConcurrentUpdateHttp2SolrClient.Builder(
-                    jetty.getBaseUrl().toString() + "/collection1", http2Client)
+            new ConcurrentUpdateHttp2SolrClient.Builder(getCoreUrl(), http2Client)
                 .withQueueSize(cussQueueSize)
                 .withThreadCount(cussThreadCount)
                 .build()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
index 371ea543e99..17e74924a47 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
@@ -43,7 +43,7 @@ public static void beforeTest() throws Exception {
   @Test
   public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     try (SolrClient client =
-        new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString() + "/" + ANY_COLLECTION)
+        new ConcurrentUpdateSolrClient.Builder(getBaseUrl() + "/" + ANY_COLLECTION)
             .withQueueSize(ANY_QUEUE_SIZE)
             .withThreadCount(ANY_MAX_NUM_THREADS)
             .build()) {
@@ -74,7 +74,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     }
 
     try (SolrClient client =
-        new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString())
+        new ConcurrentUpdateSolrClient.Builder(getBaseUrl())
             .withQueueSize(ANY_QUEUE_SIZE)
             .withThreadCount(ANY_MAX_NUM_THREADS)
             .build()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
index ab7a3a7ef86..6cff2257f8d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
@@ -140,7 +140,7 @@ public static void beforeTest() throws Exception {
   public void testConcurrentUpdate() throws Exception {
     TestServlet.clear();
 
-    String serverUrl = jetty.getBaseUrl().toString() + "/cuss/foo";
+    String serverUrl = getBaseUrl() + "/cuss/foo";
 
     int cussThreadCount = 2;
     int cussQueueSize = 100;
@@ -208,7 +208,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
     int cussQueueSize = 10;
 
     try (ConcurrentUpdateSolrClient concurrentClient =
-        (new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString()))
+        (new ConcurrentUpdateSolrClient.Builder(getBaseUrl()))
             .withQueueSize(cussQueueSize)
             .withThreadCount(cussThreadCount)
             .build()) {
@@ -227,7 +227,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
     }
 
     try (ConcurrentUpdateSolrClient concurrentClient =
-        (new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString() + "/collection1"))
+        (new ConcurrentUpdateSolrClient.Builder(getCoreUrl()))
             .withQueueSize(cussQueueSize)
             .withThreadCount(cussThreadCount)
             .build()) {
@@ -247,7 +247,7 @@ public void testConcurrentCollectionUpdate() throws Exception {
     int expected = numDocs * numRunnables;
 
     try (ConcurrentUpdateSolrClient concurrentClient =
-        (new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString()))
+        (new ConcurrentUpdateSolrClient.Builder(getBaseUrl()))
             .withQueueSize(cussQueueSize)
             .withThreadCount(cussThreadCount)
             .withPollQueueTime(0)
@@ -283,7 +283,7 @@ public void testConcurrentCollectionUpdate() throws Exception {
     }
 
     try (ConcurrentUpdateSolrClient concurrentClient =
-        (new ConcurrentUpdateSolrClient.Builder(jetty.getBaseUrl().toString() + "/collection1"))
+        (new ConcurrentUpdateSolrClient.Builder(getCoreUrl()))
             .withQueueSize(cussQueueSize)
             .withThreadCount(cussThreadCount)
             .build()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
index 78ce61a3099..d881463cd10 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
@@ -53,16 +53,14 @@ public void testConnectToOldNodesUsingHttp1() throws Exception {
     createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
 
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo")
-            .useHttp1_1(true)
-            .build()) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").useHttp1_1(true).build()) {
       assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP);
       try {
         client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);
       } catch (BaseHttpSolrClient.RemoteSolrException ignored) {
       }
     } finally {
-      afterSolrJettyTestBase();
+      solrClientTestRule.reset();
     }
   }
 
@@ -76,16 +74,14 @@ public void testConnectToNewNodesUsingHttp1() throws Exception {
     createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
 
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo")
-            .useHttp1_1(true)
-            .build()) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").useHttp1_1(true).build()) {
       assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP);
       try {
         client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);
       } catch (BaseHttpSolrClient.RemoteSolrException ignored) {
       }
     } finally {
-      afterSolrJettyTestBase();
+      solrClientTestRule.reset();
     }
   }
 
@@ -102,7 +98,7 @@ public void testConnectToOldNodesUsingHttp2() throws Exception {
 
     System.clearProperty("solr.http1");
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build()) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build()) {
       assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP2);
       try {
         client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);
@@ -113,7 +109,7 @@ public void testConnectToOldNodesUsingHttp2() throws Exception {
         // expected
       }
     } finally {
-      afterSolrJettyTestBase();
+      solrClientTestRule.reset();
     }
   }
 }
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
index 09f3601c47b..9b398160193 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
@@ -17,17 +17,20 @@
 package org.apache.solr.client.solrj.impl;
 
 import com.carrotsearch.randomizedtesting.RandomizedTest;
-import java.nio.file.Path;
 import java.util.Properties;
-import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.embedded.JettyConfig;
-import org.apache.solr.embedded.JettySolrRunner;
+import org.apache.solr.util.ExternalPaths;
+import org.apache.solr.util.SolrJettyTestRule;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 
-public class Http2SolrClientProxyTest extends SolrJettyTestBase {
+public class Http2SolrClientProxyTest extends SolrTestCaseJ4 {
+
+  @ClassRule public static SolrJettyTestRule solrClientTestRule = new SolrJettyTestRule();
 
   // TODO add SSL test
 
@@ -35,40 +38,22 @@ public class Http2SolrClientProxyTest extends SolrJettyTestBase {
   public static void beforeTest() throws Exception {
     RandomizedTest.assumeFalse(sslConfig.isSSLMode());
 
-    JettyConfig jettyConfig =
-        JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
-    createAndStartJettyWithProxy(legacyExampleCollection1SolrHome(), new Properties(), jettyConfig);
-  }
-
-  public static JettySolrRunner createAndStartJettyWithProxy(
-      String solrHome, Properties nodeProperties, JettyConfig jettyConfig) throws Exception {
-
-    initCore(null, null, solrHome);
-
-    Path coresDir = createTempDir().resolve("cores");
-
-    Properties props = new Properties();
-    props.setProperty("name", DEFAULT_TEST_CORENAME);
-    props.setProperty("configSet", "collection1");
-    props.setProperty("config", "${solrconfig:solrconfig.xml}");
-    props.setProperty("schema", "${schema:schema.xml}");
-
-    writeCoreProperties(coresDir.resolve("core"), props, "RestTestBase");
-
-    Properties nodeProps = new Properties(nodeProperties);
-    nodeProps.setProperty("coreRootDirectory", coresDir.toString());
-    nodeProps.setProperty("configSetBaseDir", solrHome);
-
-    jetty = new JettySolrRunner(solrHome, nodeProps, jettyConfig, true);
-    jetty.start();
-    port = jetty.getLocalPort();
-    return jetty;
+    solrClientTestRule.enableProxy();
+    solrClientTestRule.startSolr(
+        createTempDir(),
+        new Properties(),
+        JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
+    // Actually only need extremely minimal configSet but just use the default
+    solrClientTestRule
+        .newCollection()
+        .withConfigSet(ExternalPaths.DEFAULT_CONFIGSET) // TODO should be default for empty home
+        .create();
   }
 
   /** Setup a simple http proxy and verify a request works */
   @Test
   public void testProxy() throws Exception {
-    var proxy = jetty.getProxy();
+    var proxy = solrClientTestRule.getJetty().getProxy();
     assertNotNull(proxy);
 
     String host = proxy.getUrl().getHost();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index c8aaf736544..263f9aa93e1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -36,6 +36,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -203,8 +204,7 @@ private Http2SolrClient.Builder getHttp2SolrClientBuilder(
   public void testTimeout() throws Exception {
     SolrQuery q = new SolrQuery("*:*");
     try (Http2SolrClient client =
-        getHttp2SolrClientBuilder(
-                jetty.getBaseUrl().toString() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 2000)
+        getHttp2SolrClientBuilder(getBaseUrl() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 2000)
             .build()) {
       client.query(q, SolrRequest.METHOD.GET);
       fail("No exception thrown.");
@@ -217,8 +217,7 @@ public void testTimeout() throws Exception {
   public void test0IdleTimeout() throws Exception {
     SolrQuery q = new SolrQuery("*:*");
     try (Http2SolrClient client =
-        getHttp2SolrClientBuilder(
-                jetty.getBaseUrl().toString() + "/debug/foo", DEFAULT_CONNECTION_TIMEOUT, 0)
+        getHttp2SolrClientBuilder(getBaseUrl() + "/debug/foo", DEFAULT_CONNECTION_TIMEOUT, 0)
             .build()) {
       try {
         client.query(q, SolrRequest.METHOD.GET);
@@ -231,8 +230,7 @@ public void test0IdleTimeout() throws Exception {
   public void testRequestTimeout() throws Exception {
     SolrQuery q = new SolrQuery("*:*");
     try (Http2SolrClient client =
-        getHttp2SolrClientBuilder(
-                jetty.getBaseUrl().toString() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 0)
+        getHttp2SolrClientBuilder(getBaseUrl() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 0)
             .withRequestTimeout(500, TimeUnit.MILLISECONDS)
             .build()) {
       client.query(q, SolrRequest.METHOD.GET);
@@ -256,7 +254,7 @@ public void testSolrExceptionCodeNotFromSolr() throws IOException, SolrServerExc
         SolrException.ErrorCode.getErrorCode(status));
 
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build()) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build()) {
       DebugServlet.setErrorCode(status);
       try {
         SolrQuery q = new SolrQuery("foo");
@@ -288,13 +286,13 @@ public void testSolrExceptionWithNullBaseurl() throws IOException, SolrServerExc
       try {
         // if client base url is null, request url will be used in exception message
         SolrPing ping = new SolrPing();
-        ping.setBasePath(jetty.getBaseUrl().toString() + "/debug/foo");
+        ping.setBasePath(getBaseUrl() + "/debug/foo");
         client.request(ping);
 
         fail("Didn't get excepted exception from oversided request");
       } catch (SolrException e) {
         assertEquals("Unexpected exception status code", status, e.code());
-        assertTrue(e.getMessage().contains(jetty.getBaseUrl().toString()));
+        assertTrue(e.getMessage().contains(getBaseUrl()));
       }
     } finally {
       DebugServlet.clear();
@@ -304,7 +302,7 @@ public void testSolrExceptionWithNullBaseurl() throws IOException, SolrServerExc
   @Test
   public void testQuery() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
     SolrQuery q = new SolrQuery("foo");
     q.setParam("a", "\u1234");
     try (Http2SolrClient client = new Http2SolrClient.Builder(url).build()) {
@@ -434,7 +432,7 @@ public void testQuery() throws Exception {
   @Test
   public void testDelete() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
     try (Http2SolrClient client = new Http2SolrClient.Builder(url).build()) {
       try {
         client.deleteById("id");
@@ -479,7 +477,7 @@ public void testDelete() throws Exception {
   public void testGetById() throws Exception {
     DebugServlet.clear();
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build()) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build()) {
       Collection<String> ids = Collections.singletonList("a");
       try {
         client.getById("a");
@@ -506,7 +504,7 @@ public void testGetById() throws Exception {
   @Test
   public void testUpdate() throws Exception {
     DebugServlet.clear();
-    String url = jetty.getBaseUrl().toString() + "/debug/foo";
+    String url = getBaseUrl() + "/debug/foo";
     UpdateRequest req = new UpdateRequest();
     req.add(new SolrInputDocument());
     req.setParam("a", "\u1234");
@@ -586,7 +584,7 @@ public void testUpdate() throws Exception {
 
   @Test
   public void testFollowRedirect() throws Exception {
-    final String clientUrl = jetty.getBaseUrl().toString() + "/redirect/foo";
+    final String clientUrl = getBaseUrl() + "/redirect/foo";
     try (Http2SolrClient client =
         new Http2SolrClient.Builder(clientUrl).withFollowRedirects(true).build()) {
       SolrQuery q = new SolrQuery("*:*");
@@ -596,7 +594,7 @@ public void testFollowRedirect() throws Exception {
 
   @Test
   public void testDoNotFollowRedirect() throws Exception {
-    final String clientUrl = jetty.getBaseUrl().toString() + "/redirect/foo";
+    final String clientUrl = getBaseUrl() + "/redirect/foo";
     try (Http2SolrClient client =
         new Http2SolrClient.Builder(clientUrl).withFollowRedirects(false).build()) {
       SolrQuery q = new SolrQuery("*:*");
@@ -608,7 +606,7 @@ public void testDoNotFollowRedirect() throws Exception {
 
   @Test
   public void testRedirectSwapping() throws Exception {
-    final String clientUrl = jetty.getBaseUrl().toString() + "/redirect/foo";
+    final String clientUrl = getBaseUrl() + "/redirect/foo";
     SolrQuery q = new SolrQuery("*:*");
 
     // default for follow redirects is false
@@ -636,8 +634,7 @@ public void testRedirectSwapping() throws Exception {
   @Test
   public void testCollectionParameters() throws IOException, SolrServerException {
 
-    try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString()).build()) {
+    try (Http2SolrClient client = new Http2SolrClient.Builder(getBaseUrl()).build()) {
       SolrInputDocument doc = new SolrInputDocument();
       doc.addField("id", "collection");
       client.add("collection1", doc);
@@ -648,7 +645,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
           client.query("collection1", new SolrQuery("id:collection")).getResults().getNumFound());
     }
 
-    final String collection1Url = jetty.getBaseUrl().toString() + "/collection1";
+    final String collection1Url = getCoreUrl();
     try (Http2SolrClient client = new Http2SolrClient.Builder(collection1Url).build()) {
       assertEquals(1, client.query(new SolrQuery("id:collection")).getResults().getNumFound());
     }
@@ -687,7 +684,7 @@ private void verifyServletState(Http2SolrClient client, SolrRequest<?> request)
   @Test
   public void testQueryString() throws Exception {
 
-    final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";
+    final String clientUrl = getBaseUrl() + "/debug/foo";
     UpdateRequest req = new UpdateRequest();
 
     try (Http2SolrClient client =
@@ -820,7 +817,7 @@ public void testBadExplicitCredentials() {
   @Test
   public void testSetCredentialsExplicitly() {
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo")
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo")
             .withBasicAuthCredentials("foo", "explicit")
             .build(); ) {
       QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
@@ -854,7 +851,7 @@ public void testSetCredentialsWithSysProps() throws IOException, SolrServerExcep
     PreemptiveBasicAuthClientBuilderFactory.setDefaultSolrParams(
         new PreemptiveBasicAuthClientBuilderFactory.CredentialsResolver().defaultParams);
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build(); ) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build(); ) {
       QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
       DebugServlet.addResponseHeader(
           WWWAuthenticationProtocolHandler.NAME, "Basic realm=\"Debug Servlet\"");
@@ -883,7 +880,7 @@ public void testSetCredentialsWithSysProps() throws IOException, SolrServerExcep
   @Test
   public void testPerRequestCredentialsWin() {
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo")
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo")
             .withBasicAuthCredentials("foo2", "explicit")
             .build(); ) {
       QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
@@ -913,7 +910,7 @@ public void testPerRequestCredentialsWin() {
   @Test
   public void testNoCredentials() {
     try (Http2SolrClient client =
-        new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build(); ) {
+        new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build(); ) {
       QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
       try {
         ignoreException("Error from server");
@@ -932,7 +929,7 @@ public void testNoCredentials() {
   public void testBadHttpFactory() {
     System.setProperty(HttpClientUtil.SYS_PROP_HTTP_CLIENT_BUILDER_FACTORY, "FakeClassName");
     try {
-      client = new Http2SolrClient.Builder(jetty.getBaseUrl().toString() + "/debug/foo").build();
+      SolrClient client = new Http2SolrClient.Builder(getBaseUrl() + "/debug/foo").build();
       fail("Expecting exception");
     } catch (RuntimeException e) {
       assertTrue(e.getMessage().contains("Unable to instantiate"));
@@ -944,9 +941,7 @@ public void testGetRawStream() throws Exception {
     DebugServlet.clear();
     try (Http2SolrClient client =
         getHttp2SolrClientBuilder(
-                jetty.getBaseUrl().toString() + "/debug/foo",
-                DEFAULT_CONNECTION_TIMEOUT,
-                DEFAULT_CONNECTION_TIMEOUT)
+                getBaseUrl() + "/debug/foo", DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT)
             .build()) {
       GenericSolrRequest req =
           new GenericSolrRequest(SolrRequest.METHOD.GET, "/select", params("q", "*:*"));
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 fc1fd5c05dc..e3e6d513beb 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
@@ -41,8 +41,7 @@ public static void beforeTest() throws Exception {
 
   @Test
   public void testDeleteByIdReportsInvalidIdLists() throws Exception {
-    try (SolrClient client =
-        getHttpSolrClient(jetty.getBaseUrl().toString() + "/" + ANY_COLLECTION)) {
+    try (SolrClient client = getHttpSolrClient(getBaseUrl() + "/" + ANY_COLLECTION)) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
           List.of("ids", "null"),
@@ -69,7 +68,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
           });
     }
 
-    try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {
+    try (SolrClient client = getHttpSolrClient(getBaseUrl())) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
           List.of("ids", "null"),
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
index 0c0812a1cf3..57b03eff90a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
@@ -17,6 +17,7 @@
 package org.apache.solr.client.solrj.impl;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,41 +35,28 @@
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
-import org.apache.solr.embedded.JettySolrRunner;
-import org.junit.AfterClass;
+import org.apache.solr.util.SolrJettyTestRule;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 
 public class HttpSolrClientConPoolTest extends SolrJettyTestBase {
 
-  protected static JettySolrRunner yetty;
-  private static String fooUrl;
-  private static String barUrl;
+  @ClassRule public static SolrJettyTestRule secondJetty = new SolrJettyTestRule();
+  private static String fooUrl; // first Jetty URL
+  private static String barUrl; // second Jetty URL
 
   @BeforeClass
   public static void beforeTest() throws Exception {
     createAndStartJetty(legacyExampleCollection1SolrHome());
-    // stealing the first made jetty
-    yetty = jetty;
-    barUrl = yetty.getBaseUrl().toString() + "/" + "collection1";
+    fooUrl = getBaseUrl() + "/" + "collection1";
 
-    createAndStartJetty(legacyExampleCollection1SolrHome());
-
-    fooUrl = jetty.getBaseUrl().toString() + "/" + "collection1";
-  }
-
-  @AfterClass
-  public static void stopYetty() throws Exception {
-    if (null != yetty) {
-      yetty.stop();
-      yetty = null;
-    }
+    secondJetty.startSolr(Path.of(legacyExampleCollection1SolrHome()));
+    barUrl = secondJetty.getBaseUrl() + "/" + "collection1";
   }
 
   public void testPoolSize() throws SolrServerException, IOException {
     PoolingHttpClientConnectionManager pool = HttpClientUtil.createPoolingConnectionManager();
 
-    final String fooUrl = jetty.getBaseUrl().toString() + "/" + "collection1";
-    final String barUrl = yetty.getBaseUrl().toString() + "/" + "collection1";
     CloseableHttpClient httpClient =
         HttpClientUtil.createClient(
             new ModifiableSolrParams(), pool, false /* let client shutdown it*/);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
index fda526b5298..ba78c0b4c7e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
@@ -26,7 +26,7 @@ public class HttpSolrClientSSLAuthConPoolTest extends HttpSolrClientConPoolTest
 
   @BeforeClass
   public static void checkUrls() throws Exception {
-    URL[] urls = new URL[] {jetty.getBaseUrl(), yetty.getBaseUrl()};
+    URL[] urls = new URL[] {getJetty().getBaseUrl(), secondJetty.getJetty().getBaseUrl()};
     for (URL u : urls) {
       assertEquals("expect https urls ", "https", u.getProtocol());
     }
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 d030b3e98b7..0432c26add5 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
@@ -42,7 +42,7 @@ public static void beforeTest() throws Exception {
   public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     try (SolrClient client =
         new LBHttpSolrClient.Builder()
-            .withBaseSolrUrls(jetty.getBaseUrl().toString() + "/" + ANY_COLLECTION)
+            .withBaseSolrUrls(getBaseUrl() + "/" + ANY_COLLECTION)
             .build()) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
@@ -71,7 +71,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     }
 
     try (SolrClient client =
-        new LBHttpSolrClient.Builder().withBaseSolrUrls(jetty.getBaseUrl().toString()).build()) {
+        new LBHttpSolrClient.Builder().withBaseSolrUrls(getBaseUrl()).build()) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
           List.of("ids", "null"),
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index 0b87c7d6ef5..2be715d469d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -131,10 +131,7 @@ public void init() throws Exception {
 
   @After
   public void cleanup() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
+    solrClientTestRule.reset();
     if (restTestHarness != null) {
       restTestHarness.close();
     }
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java
index 4cb7789e4ff..a97c36676f8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java
@@ -71,7 +71,7 @@ public void doBefore() throws IOException, SolrServerException {
   public void testQueryParse() throws Exception {
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(getServerUrl())
+        new HttpSolrClient.Builder(getCoreUrl())
             .withResponseParser(new NoOpResponseParser())
             .build()) {
       SolrQuery query = new SolrQuery("id:1234");
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 7be940eed2f..3f907622a58 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
@@ -119,8 +119,8 @@ public void testEmptySuggesterResponse() throws Exception {
   }
 
   private void addSampleDocs() throws SolrServerException, IOException {
-    client.deleteByQuery("*:*");
-    client.commit(true, true);
+    getSolrClient().deleteByQuery("*:*");
+    getSolrClient().commit(true, true);
     SolrInputDocument doc = new SolrInputDocument();
     doc.setField("id", "111");
     doc.setField(field, "Computer");
@@ -130,10 +130,10 @@ private void addSampleDocs() throws SolrServerException, IOException {
     SolrInputDocument doc3 = new SolrInputDocument();
     doc3.setField("id", "333");
     doc3.setField(field, "Laptop");
-    client.add(doc);
-    client.add(doc2);
-    client.add(doc3);
-    client.commit(true, true);
+    getSolrClient().add(doc);
+    getSolrClient().add(doc2);
+    getSolrClient().add(doc3);
+    getSolrClient().commit(true, true);
   }
 
   /*
@@ -143,7 +143,7 @@ private SolrClient createSuggestSolrClient() {
     final ResponseParser randomParser =
         random().nextBoolean() ? new BinaryResponseParser() : new XMLResponseParser();
     return new HttpSolrClient.Builder()
-        .withBaseSolrUrl(jetty.getBaseUrl().toString() + "/collection1")
+        .withBaseSolrUrl(getCoreUrl())
         .withResponseParser(randomParser)
         .build();
   }
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 2042b24a498..a4b08656fd7 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -17,44 +17,24 @@
 package org.apache.solr;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UncheckedIOException;
-import java.io.Writer;
-import java.lang.invoke.MethodHandles;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;
 import java.util.SortedMap;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.http.client.HttpClient;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
-import org.apache.solr.util.DirectoryUtil;
-import org.apache.solr.util.ExternalPaths;
+import org.apache.solr.util.SolrJettyTestRule;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.ClassRule;
 
+@Deprecated // just use SolrJettyTestRule
 public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  @ClassRule public static SolrJettyTestRule solrClientTestRule = new SolrJettyTestRule();
 
-  @BeforeClass
-  public static void beforeSolrJettyTestBase() throws Exception {}
-
-  public static JettySolrRunner jetty;
-  public static int port;
-  public static SolrClient client = null;
-  public static String context;
-
-  public static JettySolrRunner createAndStartJetty(
+  protected static JettySolrRunner createAndStartJetty(
       String solrHome,
       String configFile,
       String schemaFile,
@@ -64,8 +44,7 @@ public static JettySolrRunner createAndStartJetty(
       throws Exception {
     // creates the data dir
 
-    context = context == null ? "/solr" : context;
-    SolrJettyTestBase.context = context;
+    assert context == null || context.equals("/solr"); // deprecated
 
     JettyConfig jettyConfig =
         JettyConfig.builder()
@@ -85,28 +64,27 @@ public static JettySolrRunner createAndStartJetty(
     return createAndStartJetty(solrHome, nodeProps, jettyConfig);
   }
 
-  public static JettySolrRunner createAndStartJetty(
+  protected static JettySolrRunner createAndStartJetty(
       String solrHome, String configFile, String context) throws Exception {
     return createAndStartJetty(solrHome, configFile, null, context, true, null);
   }
 
-  public static JettySolrRunner createAndStartJetty(String solrHome, JettyConfig jettyConfig)
+  protected static JettySolrRunner createAndStartJetty(String solrHome, JettyConfig jettyConfig)
       throws Exception {
+
     return createAndStartJetty(solrHome, new Properties(), jettyConfig);
   }
 
-  public static JettySolrRunner createAndStartJetty(String solrHome) throws Exception {
+  protected static JettySolrRunner createAndStartJetty(String solrHome) throws Exception {
     return createAndStartJetty(
         solrHome,
         new Properties(),
         JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
   }
 
-  public static JettySolrRunner createAndStartJetty(
+  protected static JettySolrRunner createAndStartJetty(
       String solrHome, Properties nodeProperties, JettyConfig jettyConfig) throws Exception {
 
-    initCore(null, null, solrHome);
-
     Path coresDir = createTempDir().resolve("cores");
 
     Properties props = new Properties();
@@ -121,36 +99,26 @@ public static JettySolrRunner createAndStartJetty(
     nodeProps.setProperty("coreRootDirectory", coresDir.toString());
     nodeProps.setProperty("configSetBaseDir", solrHome);
 
-    jetty = new JettySolrRunner(solrHome, nodeProps, jettyConfig);
-    jetty.start();
-    port = jetty.getLocalPort();
-    log.info("Jetty Assigned Port#{}", port);
-    return jetty;
+    solrClientTestRule.startSolr(Path.of(solrHome), nodeProps, jettyConfig);
+    return getJetty();
   }
 
-  protected String getServerUrl() {
-    return jetty.getBaseUrl().toString() + "/" + DEFAULT_TEST_CORENAME;
+  protected static JettySolrRunner getJetty() {
+    return solrClientTestRule.getJetty();
   }
 
-  @After
-  public synchronized void afterClass() throws Exception {
-    if (client != null) client.close();
-    client = null;
+  /** URL to Solr */
+  protected static String getBaseUrl() {
+    return solrClientTestRule.getBaseUrl();
   }
 
-  @AfterClass
-  public static void afterSolrJettyTestBase() throws Exception {
-    if (jetty != null) {
-      jetty.stop();
-      jetty = null;
-    }
+  /** URL to the core */
+  protected static String getCoreUrl() {
+    return getBaseUrl() + "/" + DEFAULT_TEST_CORENAME;
   }
 
-  public synchronized SolrClient getSolrClient() {
-    if (client == null) {
-      client = createNewSolrClient();
-    }
-    return client;
+  protected SolrClient getSolrClient() {
+    return solrClientTestRule.getSolrClient();
   }
 
   /**
@@ -159,10 +127,10 @@ public synchronized SolrClient getSolrClient() {
    * options.
    */
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getServerUrl()).build();
+    return new HttpSolrClient.Builder(getCoreUrl()).build();
   }
 
-  public HttpClient getHttpClient() {
+  protected HttpClient getHttpClient() {
     HttpSolrClient client = (HttpSolrClient) getSolrClient();
     return client.getHttpClient();
   }
@@ -170,46 +138,17 @@ public HttpClient getHttpClient() {
   // Sets up the necessary config files for Jetty. At least some tests require that the solrconfig
   // from the test file directory are used, but some also require that the solr.xml file be
   // explicitly there as of SOLR-4817
-  public static void setupJettyTestHome(File solrHome, String collection) throws Exception {
+  @Deprecated // Instead use a basic config + whatever is needed or default config
+  protected static void setupJettyTestHome(File solrHome, String collection) throws Exception {
+    // TODO remove these sys props!
+    System.setProperty("solr.test.sys.prop1", "propone");
+    System.setProperty("solr.test.sys.prop2", "proptwo");
     copySolrHomeToTemp(solrHome, collection);
   }
 
-  public static void cleanUpJettyHome(File solrHome) throws Exception {
+  protected static void cleanUpJettyHome(File solrHome) throws Exception {
     if (solrHome.exists()) {
       PathUtils.deleteDirectory(solrHome.toPath());
     }
   }
-
-  public static String legacyExampleCollection1SolrHome() {
-    String sourceHome = ExternalPaths.SOURCE_HOME;
-    if (sourceHome == null)
-      throw new IllegalStateException(
-          "No source home! Cannot create the legacy example solr home directory.");
-
-    try {
-      Path tempSolrHome = LuceneTestCase.createTempDir();
-      Path serverSolr = tempSolrHome.getFileSystem().getPath(sourceHome, "server", "solr");
-      Files.copy(serverSolr.resolve("solr.xml"), tempSolrHome.resolve("solr.xml"));
-
-      Path sourceConfig = serverSolr.resolve("configsets").resolve("sample_techproducts_configs");
-      Path collection1Dir = tempSolrHome.resolve("collection1");
-
-      DirectoryUtil.copyDirectoryContents(
-          sourceConfig.resolve("conf"), collection1Dir.resolve("conf"));
-
-      Properties props = new Properties();
-      props.setProperty("name", "collection1");
-      try (Writer writer =
-          new OutputStreamWriter(
-              Files.newOutputStream(collection1Dir.resolve("core.properties")),
-              StandardCharsets.UTF_8)) {
-        props.store(writer, null);
-      }
-      return tempSolrHome.toString();
-    } catch (RuntimeException e) {
-      throw e;
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-  }
 }
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 fc4a6ac27fb..32a629824cc 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -32,6 +32,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -79,6 +80,7 @@
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.tests.analysis.MockAnalyzer;
 import org.apache.lucene.tests.analysis.MockTokenizer;
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.lucene.util.Constants;
@@ -136,7 +138,9 @@
 import org.apache.solr.update.processor.DistributedZkUpdateProcessor;
 import org.apache.solr.update.processor.UpdateRequestProcessor;
 import org.apache.solr.util.BaseTestHarness;
+import org.apache.solr.util.DirectoryUtil;
 import org.apache.solr.util.ErrorLogMuter;
+import org.apache.solr.util.ExternalPaths;
 import org.apache.solr.util.LogLevel;
 import org.apache.solr.util.RandomizeSSL;
 import org.apache.solr.util.RandomizeSSL.SSLRandomizer;
@@ -2285,6 +2289,8 @@ public static void copyXmlToHome(File dstRoot, String fromFile) throws IOExcepti
   // Creates a consistent configuration, _including_ solr.xml at dstRoot. Creates collection1/conf
   // and copies the stock files in there.
 
+  /** Copies the test collection1 config into {@code dstRoot}/{@code collection}/conf */
+  @Deprecated // Instead use a basic config + whatever is needed or default config
   public static void copySolrHomeToTemp(File dstRoot, String collection) throws IOException {
     Path subHome = dstRoot.toPath().resolve(collection).resolve("conf");
     Files.createDirectories(subHome);
@@ -2312,6 +2318,41 @@ public static void copySolrHomeToTemp(File dstRoot, String collection) throws IO
     Files.copy(top.resolve("synonyms.txt"), subHome.resolve("synonyms.txt"));
   }
 
+  /** Creates a temp solr home using sample_techproducts_configs. Returns the home path. */
+  @Deprecated // Instead use a basic config + whatever is needed or default config
+  public static String legacyExampleCollection1SolrHome() {
+    String sourceHome = ExternalPaths.SOURCE_HOME;
+    if (sourceHome == null)
+      throw new IllegalStateException(
+          "No source home! Cannot create the legacy example solr home directory.");
+
+    try {
+      Path tempSolrHome = LuceneTestCase.createTempDir();
+      Path serverSolr = tempSolrHome.getFileSystem().getPath(sourceHome, "server", "solr");
+      Files.copy(serverSolr.resolve("solr.xml"), tempSolrHome.resolve("solr.xml"));
+
+      Path sourceConfig = serverSolr.resolve("configsets").resolve("sample_techproducts_configs");
+      Path collection1Dir = tempSolrHome.resolve("collection1");
+
+      DirectoryUtil.copyDirectoryContents(
+          sourceConfig.resolve("conf"), collection1Dir.resolve("conf"));
+
+      Properties props = new Properties();
+      props.setProperty("name", "collection1");
+      try (Writer writer =
+          new OutputStreamWriter(
+              Files.newOutputStream(collection1Dir.resolve("core.properties")),
+              StandardCharsets.UTF_8)) {
+        props.store(writer, null);
+      }
+      return tempSolrHome.toString();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
   public boolean compareSolrDocument(Object expected, Object actual) {
 
     if (!(expected instanceof SolrDocument) || !(actual instanceof SolrDocument)) {
diff --git a/solr/test-framework/src/java/org/apache/solr/util/EmbeddedSolrServerTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/EmbeddedSolrServerTestRule.java
index 92efc3e9445..b7c1e3d003c 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/EmbeddedSolrServerTestRule.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/EmbeddedSolrServerTestRule.java
@@ -100,8 +100,8 @@ public EmbeddedSolrServer getAdminClient() {
   }
 
   @Override
-  public EmbeddedSolrServer getSolrClient(String name) {
-    return new EmbeddedSolrServer(getCoreContainer(), name);
+  public EmbeddedSolrServer getSolrClient(String collection) {
+    return new EmbeddedSolrServer(getCoreContainer(), collection);
   }
 
   public CoreContainer getCoreContainer() {
diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
index b3e8b3a7e4a..ce066c4e1eb 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
@@ -56,8 +56,7 @@ public static void createJettyAndHarness(
 
     createAndStartJetty(solrHome, configFile, schemaFile, context, stopAtShutdown, extraServlets);
 
-    restTestHarness =
-        new RestTestHarness(() -> jetty.getBaseUrl().toString() + "/" + DEFAULT_TEST_CORENAME);
+    restTestHarness = new RestTestHarness(() -> getCoreUrl());
   }
 
   /** Validates an update XML String is successful */
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
index 59d212f19cc..a0407093bb4 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
@@ -135,15 +135,23 @@ protected void create(NewCollectionBuilder b) throws SolrServerException, IOExce
     req.process(getAdminClient());
   }
 
-  /** Provides a SolrClient instance for administration actions */
-  public abstract SolrClient getAdminClient();
+  /**
+   * Provides a SolrClient instance for administration actions. The caller doesn't need to close it
+   */
+  public SolrClient getAdminClient() {
+    return getSolrClient(null);
+  }
 
-  /** Provides a SolrClient instance for collection1 */
+  /** Provides a SolrClient instance for collection1. The caller doesn't need to close it */
   public SolrClient getSolrClient() {
     return getSolrClient("collection1");
   }
 
-  public abstract SolrClient getSolrClient(String name);
+  /**
+   * Provides a SolrClient instance for caller defined collection name. The caller doesn't need to
+   * close it
+   */
+  public abstract SolrClient getSolrClient(String collection);
 
   public void clearIndex() throws SolrServerException, IOException {
     new UpdateRequest().deleteByQuery("*:*").commit(getSolrClient(), null);
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
new file mode 100644
index 00000000000..a7abba9c852
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java
@@ -0,0 +1,134 @@
+/*
+ * 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.util;
+
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.common.util.IOUtils;
+import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.embedded.JettyConfig;
+import org.apache.solr.embedded.JettySolrRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A {@link SolrClientTestRule} that provides a Solr instance running in Jetty, an HTTP server. It's
+ * based off of {@link JettySolrRunner}.
+ */
+public class SolrJettyTestRule extends SolrClientTestRule {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  private JettySolrRunner jetty;
+
+  private final ConcurrentHashMap<String, SolrClient> clients = new ConcurrentHashMap<>();
+  private boolean enableProxy;
+
+  @Override
+  protected void after() {
+    for (SolrClient solrClient : clients.values()) {
+      IOUtils.closeQuietly(solrClient);
+    }
+    clients.clear();
+
+    if (jetty != null) {
+      try {
+        jetty.stop();
+      } catch (RuntimeException e) {
+        throw e;
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+      jetty = null;
+      enableProxy = false;
+    }
+  }
+
+  /** Resets the state. DEPRECATED; please don't call! */
+  @Deprecated
+  public void reset() {
+    after();
+  }
+
+  @Override
+  public void startSolr(Path solrHome) {
+    startSolr(
+        solrHome,
+        new Properties(),
+        JettyConfig.builder()
+            .withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig())
+            .build());
+  }
+
+  /**
+   * Enables proxy feature to allow for failure injection testing at the inter-node communication
+   * level. Must be called prior to starting.
+   *
+   * @see JettySolrRunner#getProxy()
+   */
+  public void enableProxy() {
+    assert jetty == null;
+    this.enableProxy = true;
+  }
+
+  public void startSolr(Path solrHome, Properties nodeProperties, JettyConfig jettyConfig) {
+    if (jetty != null) throw new IllegalStateException("Jetty is already running");
+
+    jetty = new JettySolrRunner(solrHome.toString(), nodeProperties, jettyConfig, enableProxy);
+    try {
+      jetty.start();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    int port = jetty.getLocalPort();
+    log.info("Jetty Assigned Port#{}", port);
+  }
+
+  public JettySolrRunner getJetty() {
+    if (jetty == null) throw new IllegalStateException("Jetty has not started");
+    return jetty;
+  }
+
+  @Override
+  public SolrClient getSolrClient(String collection) {
+    if (collection == null) {
+      collection = "";
+    }
+    return clients.computeIfAbsent(collection, this::newSolrClient);
+  }
+
+  protected SolrClient newSolrClient(String collection) {
+    String url = getBaseUrl() + (StrUtils.isBlank(collection) ? "" : "/" + collection);
+    return new HttpSolrClient.Builder(url).build();
+  }
+
+  /** URL to Solr. */
+  public String getBaseUrl() {
+    return getJetty().getBaseUrl().toString();
+  }
+
+  public CoreContainer getCoreContainer() {
+    return getJetty().getCoreContainer();
+  }
+}

From 410004977703489e568c3663c29de53031e7bbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Tue, 29 Aug 2023 12:47:25 +0200
Subject: [PATCH 037/160] SOLR-15474 Make Circuit breakers pluggable (take 2)
 (#1725)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* SOLR-15474 Make Circuit breakers pluggable

Co-authored-by: Christine Poerschke <cpoerschke@apache.org>
Co-authored-by: Atri Sharma <atri.jiit@gmail.com>
Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
---
 solr/CHANGES.txt                              |   4 +-
 .../java/org/apache/solr/core/SolrConfig.java |   4 +-
 .../java/org/apache/solr/core/SolrCore.java   |  25 +-
 .../apache/solr/core/SolrResourceLoader.java  |   1 +
 .../solr/handler/component/SearchHandler.java |  12 +-
 .../circuitbreaker/CPUCircuitBreaker.java     |  19 +-
 .../util/circuitbreaker/CircuitBreaker.java   |  77 +----
 .../circuitbreaker/CircuitBreakerManager.java | 194 ++++-------
 .../CircuitBreakerRegistry.java               | 107 ++++++
 .../circuitbreaker/MemoryCircuitBreaker.java  |  21 +-
 ...l => solrconfig-legacy-circuitbreaker.xml} |   5 +-
 .../solrconfig-pluggable-circuitbreaker.xml   |  95 ++++++
 .../solr/util/BaseTestCircuitBreaker.java     | 314 ++++++++++++++++++
 .../apache/solr/util/TestCircuitBreaker.java  | 275 +--------------
 .../solr/util/TestLegacyCircuitBreaker.java   |  38 +++
 .../configsets/_default/conf/solrconfig.xml   |  46 ---
 .../conf/solrconfig.xml                       |  46 ---
 .../pages/circuit-breakers.adoc               |  53 +--
 18 files changed, 693 insertions(+), 643 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
 rename solr/core/src/test-files/solr/collection1/conf/{solrconfig-memory-circuitbreaker.xml => solrconfig-legacy-circuitbreaker.xml} (96%)
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
 create mode 100644 solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
 create mode 100644 solr/core/src/test/org/apache/solr/util/TestLegacyCircuitBreaker.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9f2ad6e9e46..6d503a3ebc4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -103,6 +103,8 @@ Improvements
 
 * SOLR-16940: Users can pass Java system properties to the SolrCLI via the SOLR_TOOL_OPTS environment variable. (Houston Putman)
 
+* SOLR-15474: Make Circuit breakers individually pluggable (Atri Sharma, Christine Poerschke, janhoy)
+
 * SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
 
 Optimizations
@@ -288,7 +290,7 @@ Improvements
 
 * SOLR-16687: Add support of SolrClassLoader to SolrZkClient (Lamine Idjeraoui via Jason Gerlowski & Houston Putman)
 
-* SOLR-9378: Internal shard requests no longer include the wasteful shard.url param.  [shard] transformer now defaults to returning 
+* SOLR-9378: Internal shard requests no longer include the wasteful shard.url param.  [shard] transformer now defaults to returning
   only the shard id (based on luceneMatchVersion), but can be configured to return the legacy list of replicas. (hossman)
 
 * SOLR-16816: Update node metrics while making affinityPlacement selections. Therefore selections can be made given the expected cluster
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index c976f1a8c7f..8ad87ff98f0 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -90,7 +90,7 @@
 import org.apache.solr.update.processor.UpdateRequestProcessorFactory;
 import org.apache.solr.util.DOMConfigNode;
 import org.apache.solr.util.DataConfigNode;
-import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
+import org.apache.solr.util.circuitbreaker.CircuitBreaker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -503,7 +503,7 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           new SolrPluginInfo(IndexSchemaFactory.class, "schemaFactory", REQUIRE_CLASS),
           new SolrPluginInfo(RestManager.class, "restManager"),
           new SolrPluginInfo(StatsCache.class, "statsCache", REQUIRE_CLASS),
-          new SolrPluginInfo(CircuitBreakerManager.class, "circuitBreaker"));
+          new SolrPluginInfo(CircuitBreaker.class, "circuitBreaker", REQUIRE_CLASS, MULTI_OK));
   public static final Map<String, SolrPluginInfo> classVsSolrPluginInfo;
 
   static {
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 661e9f1e29f..b0b1dd2e784 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -173,7 +173,8 @@
 import org.apache.solr.util.PropertiesOutputStream;
 import org.apache.solr.util.RefCounted;
 import org.apache.solr.util.TestInjection;
-import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
+import org.apache.solr.util.circuitbreaker.CircuitBreaker;
+import org.apache.solr.util.circuitbreaker.CircuitBreakerRegistry;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
 import org.apache.solr.util.plugin.PluginInfoInitialized;
 import org.apache.solr.util.plugin.SolrCoreAware;
@@ -245,7 +246,7 @@ public class SolrCore implements SolrInfoBean, Closeable {
   private final ConfigSet configSet;
   // singleton listener for all packages used in schema
 
-  private final CircuitBreakerManager circuitBreakerManager;
+  private final CircuitBreakerRegistry circuitBreakerRegistry = new CircuitBreakerRegistry();
 
   private final List<Runnable> confListeners = new CopyOnWriteArrayList<>();
 
@@ -1084,10 +1085,12 @@ private SolrCore(
       this.configSetProperties = configSet.getProperties();
       // Initialize the metrics manager
       this.coreMetricManager = initCoreMetricManager(solrConfig);
-      this.circuitBreakerManager = initCircuitBreakerManager();
       solrMetricsContext = coreMetricManager.getSolrMetricsContext();
       this.coreMetricManager.loadReporters();
 
+      // init pluggable circuit breakers
+      initPlugins(null, CircuitBreaker.class);
+
       if (updateHandler == null) {
         directoryFactory = initDirectoryFactory();
         recoveryStrategyBuilder = initRecoveryStrategyBuilder();
@@ -1324,13 +1327,6 @@ private SolrCoreMetricManager initCoreMetricManager(SolrConfig config) {
     return coreMetricManager;
   }
 
-  private CircuitBreakerManager initCircuitBreakerManager() {
-    final PluginInfo info = solrConfig.getPluginInfo(CircuitBreakerManager.class.getName());
-    CircuitBreakerManager circuitBreakerManager = CircuitBreakerManager.build(info);
-
-    return circuitBreakerManager;
-  }
-
   @Override
   public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
     newSearcherCounter = parentContext.counter("new", Category.SEARCHER.toString());
@@ -1710,8 +1706,8 @@ public PluginBag<UpdateRequestProcessorFactory> getUpdateProcessors() {
     return updateProcessors;
   }
 
-  public CircuitBreakerManager getCircuitBreakerManager() {
-    return circuitBreakerManager;
+  public CircuitBreakerRegistry getCircuitBreakerRegistry() {
+    return circuitBreakerRegistry;
   }
 
   // this core current usage count
@@ -3164,11 +3160,14 @@ public <T> T initPlugins(
     T def = null;
     for (PluginInfo info : pluginInfos) {
       T o = createInitInstance(info, type, type.getSimpleName(), defClassName);
-      registry.put(info.name, o);
+      if (registry != null) registry.put(info.name, o);
       if (o instanceof SolrMetricProducer) {
         coreMetricManager.registerMetricProducer(
             type.getSimpleName() + "." + info.name, (SolrMetricProducer) o);
       }
+      if (o instanceof CircuitBreaker) {
+        circuitBreakerRegistry.register((CircuitBreaker) o);
+      }
       if (info.isDefault()) {
         def = o;
       }
diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
index e82a05d66b2..ffe7da03481 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
@@ -97,6 +97,7 @@ public class SolrResourceLoader
     "request.",
     "update.processor.",
     "util.",
+    "util.circuitbreaker.",
     "spelling.",
     "handler.component.",
     "spelling.suggest.",
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 73cb880a7fc..5b5672faf8d 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -67,7 +67,7 @@
 import org.apache.solr.util.RTimerTree;
 import org.apache.solr.util.SolrPluginUtils;
 import org.apache.solr.util.circuitbreaker.CircuitBreaker;
-import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
+import org.apache.solr.util.circuitbreaker.CircuitBreakerRegistry;
 import org.apache.solr.util.plugin.PluginInfoInitialized;
 import org.apache.solr.util.plugin.SolrCoreAware;
 import org.slf4j.Logger;
@@ -354,23 +354,23 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
 
     final RTimerTree timer = rb.isDebug() ? req.getRequestTimer() : null;
 
-    final CircuitBreakerManager circuitBreakerManager = req.getCore().getCircuitBreakerManager();
-    if (circuitBreakerManager.isEnabled()) {
+    final CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
+    if (circuitBreakerRegistry.isEnabled()) {
       List<CircuitBreaker> trippedCircuitBreakers;
 
       if (timer != null) {
         RTimerTree subt = timer.sub("circuitbreaker");
         rb.setTimer(subt);
 
-        trippedCircuitBreakers = circuitBreakerManager.checkTripped();
+        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped();
 
         rb.getTimer().stop();
       } else {
-        trippedCircuitBreakers = circuitBreakerManager.checkTripped();
+        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped();
       }
 
       if (trippedCircuitBreakers != null) {
-        String errorMessage = CircuitBreakerManager.toErrorMessage(trippedCircuitBreakers);
+        String errorMessage = CircuitBreakerRegistry.toErrorMessage(trippedCircuitBreakers);
         rsp.add(STATUS, FAILURE);
         rsp.setException(
             new SolrException(
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 70c2fbda507..3e9cf47a2e5 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -38,8 +38,7 @@ public class CPUCircuitBreaker extends CircuitBreaker {
   private static final OperatingSystemMXBean operatingSystemMXBean =
       ManagementFactory.getOperatingSystemMXBean();
 
-  private final boolean enabled;
-  private final double cpuUsageThreshold;
+  private double cpuUsageThreshold;
 
   // Assumption -- the value of these parameters will be set correctly before invoking
   // getDebugInfo()
@@ -47,22 +46,16 @@ public class CPUCircuitBreaker extends CircuitBreaker {
 
   private static final ThreadLocal<Double> allowedCPUUsage = ThreadLocal.withInitial(() -> 0.0);
 
-  public CPUCircuitBreaker(CircuitBreakerConfig config) {
-    super(config);
+  public CPUCircuitBreaker() {
+    super();
+  }
 
-    this.enabled = config.getCpuCBEnabled();
-    this.cpuUsageThreshold = config.getCpuCBThreshold();
+  public void setThreshold(double threshold) {
+    this.cpuUsageThreshold = threshold;
   }
 
   @Override
   public boolean isTripped() {
-    if (!isEnabled()) {
-      return false;
-    }
-
-    if (!enabled) {
-      return false;
-    }
 
     double localAllowedCPUUsage = getCpuUsageThreshold();
     double localSeenCPUUsage = calculateLiveCPUUsage();
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
index 79c3bcf6abf..8959c35e7a8 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
@@ -17,32 +17,32 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.util.SolrPluginUtils;
+import org.apache.solr.util.plugin.NamedListInitializedPlugin;
+
 /**
- * Default class to define circuit breakers for Solr.
+ * Default base class to define circuit breaker plugins for Solr. <b>Still experimental, may
+ * change</b>
  *
- * <p>There are two (typical) ways to use circuit breakers: 1. Have them checked at admission
- * control by default (use CircuitBreakerManager for the same). 2. Use the circuit breaker in a
- * specific code path(s).
+ * <p>There are two (typical) ways to use circuit breakers:
  *
- * <p>TODO: This class should be grown as the scope of circuit breakers grow.
+ * <ol>
+ *   <li>Have them checked at admission control by default (use CircuitBreakerRegistry for the
+ *       same).
+ *   <li>Use the circuit breaker in a specific code path(s).
+ * </ol>
  *
- * <p>The class and its derivatives raise a standard exception when a circuit breaker is triggered.
- * We should make it into a dedicated exception (https://issues.apache.org/jira/browse/SOLR-14755)
+ * @lucene.experimental
  */
-public abstract class CircuitBreaker {
-  public static final String NAME = "circuitbreaker";
-
-  protected final CircuitBreakerConfig config;
+public abstract class CircuitBreaker implements NamedListInitializedPlugin {
 
-  public CircuitBreaker(CircuitBreakerConfig config) {
-    this.config = config;
+  @Override
+  public void init(NamedList<?> args) {
+    SolrPluginUtils.invokeSetters(this, args);
   }
 
-  // Global config for all circuit breakers. For specific circuit breaker configs, define
-  // your own config.
-  protected boolean isEnabled() {
-    return config.isEnabled();
-  }
+  public CircuitBreaker() {}
 
   /** Check if circuit breaker is tripped. */
   public abstract boolean isTripped();
@@ -52,45 +52,4 @@ protected boolean isEnabled() {
 
   /** Get error message when the circuit breaker triggers */
   public abstract String getErrorMessage();
-
-  public static class CircuitBreakerConfig {
-    private final boolean enabled;
-    private final boolean memCBEnabled;
-    private final int memCBThreshold;
-    private final boolean cpuCBEnabled;
-    private final int cpuCBThreshold;
-
-    public CircuitBreakerConfig(
-        final boolean enabled,
-        final boolean memCBEnabled,
-        final int memCBThreshold,
-        final boolean cpuCBEnabled,
-        final int cpuCBThreshold) {
-      this.enabled = enabled;
-      this.memCBEnabled = memCBEnabled;
-      this.memCBThreshold = memCBThreshold;
-      this.cpuCBEnabled = cpuCBEnabled;
-      this.cpuCBThreshold = cpuCBThreshold;
-    }
-
-    public boolean isEnabled() {
-      return enabled;
-    }
-
-    public boolean getMemCBEnabled() {
-      return memCBEnabled;
-    }
-
-    public int getMemCBThreshold() {
-      return memCBThreshold;
-    }
-
-    public boolean getCpuCBEnabled() {
-      return cpuCBEnabled;
-    }
-
-    public int getCpuCBThreshold() {
-      return cpuCBThreshold;
-    }
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index 3b81a0542e0..52a839ce7a6 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -17,163 +17,99 @@
 
 package org.apache.solr.util.circuitbreaker;
 
-import com.google.common.annotations.VisibleForTesting;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.invoke.MethodHandles;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.PluginInfo;
-import org.apache.solr.util.plugin.PluginInfoInitialized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Manages all registered circuit breaker instances. Responsible for a holistic view of whether a
- * circuit breaker has tripped or not.
+ * Single CircuitBreaker that registers both a Memory and a CPU CircuitBreaker. This is only for
+ * backward compatibility with the 9.x versions prior to 9.4.
  *
- * <p>There are two typical ways of using this class's instance: 1. Check if any circuit breaker has
- * triggered -- and know which circuit breaker has triggered. 2. Get an instance of a specific
- * circuit breaker and perform checks.
- *
- * <p>It is a good practice to register new circuit breakers here if you want them checked for every
- * request.
- *
- * <p>NOTE: The current way of registering new default circuit breakers is minimal and not a long
- * term solution. There will be a follow up with a SIP for a schema API design.
+ * @deprecated Use individual Circuit Breakers instead
  */
-public class CircuitBreakerManager implements PluginInfoInitialized {
-  // Class private to potentially allow "family" of circuit breakers to be enabled or disabled
-  private final boolean enableCircuitBreakerManager;
-
-  private final List<CircuitBreaker> circuitBreakerList = new ArrayList<>();
-
-  public CircuitBreakerManager(final boolean enableCircuitBreakerManager) {
-    this.enableCircuitBreakerManager = enableCircuitBreakerManager;
+@Deprecated(since = "9.4")
+public class CircuitBreakerManager extends CircuitBreaker {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private boolean cpuEnabled;
+  private boolean memEnabled;
+  private int memThreshold = 100;
+  private int cpuThreshold = 100;
+  private MemoryCircuitBreaker memCB;
+  private CPUCircuitBreaker cpuCB;
+
+  public CircuitBreakerManager() {
+    super();
   }
 
   @Override
-  public void init(PluginInfo pluginInfo) {
-    CircuitBreaker.CircuitBreakerConfig circuitBreakerConfig = buildCBConfig(pluginInfo);
-
-    // Install the default circuit breakers
-    CircuitBreaker memoryCircuitBreaker = new MemoryCircuitBreaker(circuitBreakerConfig);
-    CircuitBreaker cpuCircuitBreaker = new CPUCircuitBreaker(circuitBreakerConfig);
-
-    register(memoryCircuitBreaker);
-    register(cpuCircuitBreaker);
-  }
-
-  public void register(CircuitBreaker circuitBreaker) {
-    circuitBreakerList.add(circuitBreaker);
+  public boolean isTripped() {
+    return (memEnabled && memCB.isTripped()) || (cpuEnabled && cpuCB.isTripped());
   }
 
-  public void deregisterAll() {
-    circuitBreakerList.clear();
-  }
-  /**
-   * Check and return circuit breakers that have triggered
-   *
-   * @return CircuitBreakers which have triggered, null otherwise.
-   */
-  public List<CircuitBreaker> checkTripped() {
-    List<CircuitBreaker> triggeredCircuitBreakers = null;
-
-    if (enableCircuitBreakerManager) {
-      for (CircuitBreaker circuitBreaker : circuitBreakerList) {
-        if (circuitBreaker.isEnabled() && circuitBreaker.isTripped()) {
-          if (triggeredCircuitBreakers == null) {
-            triggeredCircuitBreakers = new ArrayList<>();
-          }
-
-          triggeredCircuitBreakers.add(circuitBreaker);
-        }
-      }
+  @Override
+  public String getDebugInfo() {
+    StringBuilder sb = new StringBuilder();
+    if (memEnabled) {
+      sb.append(memCB.getDebugInfo()).append("\n");
     }
-
-    return triggeredCircuitBreakers;
-  }
-
-  /**
-   * Returns true if *any* circuit breaker has triggered, false if none have triggered.
-   *
-   * <p>NOTE: This method short circuits the checking of circuit breakers -- the method will return
-   * as soon as it finds a circuit breaker that is enabled and has triggered.
-   */
-  public boolean checkAnyTripped() {
-    if (enableCircuitBreakerManager) {
-      for (CircuitBreaker circuitBreaker : circuitBreakerList) {
-        if (circuitBreaker.isEnabled() && circuitBreaker.isTripped()) {
-          return true;
-        }
-      }
+    if (cpuEnabled) {
+      sb.append(cpuCB.getDebugInfo());
     }
-
-    return false;
+    return sb.toString();
   }
 
-  /**
-   * Construct the final error message to be printed when circuit breakers trip.
-   *
-   * @param circuitBreakerList Input list for circuit breakers.
-   * @return Constructed error message.
-   */
-  public static String toErrorMessage(List<CircuitBreaker> circuitBreakerList) {
+  @Override
+  public String getErrorMessage() {
     StringBuilder sb = new StringBuilder();
-
-    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
-      sb.append(circuitBreaker.getErrorMessage());
+    if (memEnabled) {
+      sb.append(memCB.getErrorMessage());
+    }
+    if (memEnabled && cpuEnabled) {
       sb.append("\n");
     }
-
+    if (cpuEnabled) {
+      sb.append(cpuCB.getErrorMessage());
+    }
     return sb.toString();
   }
 
-  /**
-   * Register default circuit breakers and return a constructed CircuitBreakerManager instance which
-   * serves the given circuit breakers.
-   *
-   * <p>Any default circuit breakers should be registered here.
-   */
-  public static CircuitBreakerManager build(PluginInfo pluginInfo) {
-    boolean enabled =
-        pluginInfo == null
-            ? false
-            : Boolean.parseBoolean(pluginInfo.attributes.getOrDefault("enabled", "false"));
-    CircuitBreakerManager circuitBreakerManager = new CircuitBreakerManager(enabled);
-
-    circuitBreakerManager.init(pluginInfo);
-
-    return circuitBreakerManager;
+  @Override
+  public void init(NamedList<?> args) {
+    super.init(args);
+    log.warn("CircuitBreakerManager is deprecated. Use individual Circuit Breakers instead");
+    if (memEnabled) {
+      memCB = new MemoryCircuitBreaker();
+      memCB.setThreshold(memThreshold);
+    }
+    if (cpuEnabled) {
+      cpuCB = new CPUCircuitBreaker();
+      cpuCB.setThreshold(cpuThreshold);
+    }
   }
 
-  @VisibleForTesting
-  public static CircuitBreaker.CircuitBreakerConfig buildCBConfig(PluginInfo pluginInfo) {
-    boolean enabled = false;
-    boolean cpuCBEnabled = false;
-    boolean memCBEnabled = false;
-    int memCBThreshold = 100;
-    int cpuCBThreshold = 100;
-
-    if (pluginInfo != null) {
-      NamedList<?> args = pluginInfo.initArgs;
+  // The methods below will be called by super class during init
+  public void setMemEnabled(String enabled) {
+    this.memEnabled = Boolean.getBoolean(enabled);
+  }
 
-      enabled = Boolean.parseBoolean(pluginInfo.attributes.getOrDefault("enabled", "false"));
+  public void setMemThreshold(int threshold) {
+    this.memThreshold = threshold;
+  }
 
-      if (args != null) {
-        cpuCBEnabled = Boolean.parseBoolean(args._getStr("cpuEnabled", "false"));
-        memCBEnabled = Boolean.parseBoolean(args._getStr("memEnabled", "false"));
-        memCBThreshold = Integer.parseInt(args._getStr("memThreshold", "100"));
-        cpuCBThreshold = Integer.parseInt(args._getStr("cpuThreshold", "100"));
-      }
-    }
+  public void setMemThreshold(String threshold) {
+    this.memThreshold = Integer.parseInt(threshold);
+  }
 
-    return new CircuitBreaker.CircuitBreakerConfig(
-        enabled, memCBEnabled, memCBThreshold, cpuCBEnabled, cpuCBThreshold);
+  public void setCpuEnabled(String enabled) {
+    this.cpuEnabled = Boolean.getBoolean(enabled);
   }
 
-  public boolean isEnabled() {
-    return enableCircuitBreakerManager;
+  public void setCpuThreshold(int threshold) {
+    this.cpuThreshold = threshold;
   }
 
-  @VisibleForTesting
-  public List<CircuitBreaker> getRegisteredCircuitBreakers() {
-    return circuitBreakerList;
+  public void setCpuThreshold(String threshold) {
+    this.cpuThreshold = Integer.parseInt(threshold);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
new file mode 100644
index 00000000000..283203e0f9b
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
@@ -0,0 +1,107 @@
+/*
+ * 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.util.circuitbreaker;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Keeps track of all registered circuit breaker instances for various request types. Responsible
+ * for a holistic view of whether a circuit breaker has tripped or not.
+ *
+ * @lucene.experimental
+ * @since 9.4
+ */
+public class CircuitBreakerRegistry {
+
+  private final List<CircuitBreaker> circuitBreakerList = new ArrayList<>();
+
+  public CircuitBreakerRegistry() {}
+
+  public void register(CircuitBreaker circuitBreaker) {
+    circuitBreakerList.add(circuitBreaker);
+  }
+
+  @VisibleForTesting
+  public void deregisterAll() {
+    circuitBreakerList.clear();
+  }
+  /**
+   * Check and return circuit breakers that have triggered
+   *
+   * @return CircuitBreakers which have triggered, null otherwise.
+   */
+  public List<CircuitBreaker> checkTripped() {
+    List<CircuitBreaker> triggeredCircuitBreakers = null;
+
+    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
+      if (circuitBreaker.isTripped()) {
+        if (triggeredCircuitBreakers == null) {
+          triggeredCircuitBreakers = new ArrayList<>();
+        }
+
+        triggeredCircuitBreakers.add(circuitBreaker);
+      }
+    }
+
+    return triggeredCircuitBreakers;
+  }
+
+  /**
+   * Returns true if *any* circuit breaker has triggered, false if none have triggered.
+   *
+   * <p>NOTE: This method short circuits the checking of circuit breakers -- the method will return
+   * as soon as it finds a circuit breaker that has triggered.
+   */
+  public boolean checkAnyTripped() {
+    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
+      if (circuitBreaker.isTripped()) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Construct the final error message to be printed when circuit breakers trip.
+   *
+   * @param circuitBreakerList Input list for circuit breakers.
+   * @return Constructed error message.
+   */
+  public static String toErrorMessage(List<CircuitBreaker> circuitBreakerList) {
+    StringBuilder sb = new StringBuilder();
+
+    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
+      sb.append(circuitBreaker.getErrorMessage());
+      sb.append("\n");
+    }
+
+    return sb.toString();
+  }
+
+  public boolean isEnabled() {
+    return !circuitBreakerList.isEmpty();
+  }
+
+  @VisibleForTesting
+  public List<CircuitBreaker> getRegisteredCircuitBreakers() {
+    return circuitBreakerList;
+  }
+}
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
index 129ea94579f..49311ddc934 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
@@ -26,7 +26,7 @@
 /**
  * Tracks the current JVM heap usage and triggers if it exceeds the defined percentage of the
  * maximum heap size allocated to the JVM. This circuit breaker is a part of the default
- * CircuitBreakerManager so is checked for every request -- hence it is realtime. Once the memory
+ * CircuitBreakerRegistry so is checked for every request -- hence it is realtime. Once the memory
  * usage goes below the threshold, it will start allowing queries again.
  *
  * <p>The memory threshold is defined as a percentage of the maximum memory allocated -- see
@@ -36,26 +36,24 @@ public class MemoryCircuitBreaker extends CircuitBreaker {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final MemoryMXBean MEMORY_MX_BEAN = ManagementFactory.getMemoryMXBean();
 
-  private boolean enabled;
-  private final long heapMemoryThreshold;
+  private long heapMemoryThreshold;
 
   // Assumption -- the value of these parameters will be set correctly before invoking
   // getDebugInfo()
   private static final ThreadLocal<Long> seenMemory = ThreadLocal.withInitial(() -> 0L);
   private static final ThreadLocal<Long> allowedMemory = ThreadLocal.withInitial(() -> 0L);
 
-  public MemoryCircuitBreaker(CircuitBreakerConfig config) {
-    super(config);
-
-    this.enabled = config.getMemCBEnabled();
+  public MemoryCircuitBreaker() {
+    super();
+  }
 
+  public void setThreshold(double thresholdValueInPercentage) {
     long currentMaxHeap = MEMORY_MX_BEAN.getHeapMemoryUsage().getMax();
 
     if (currentMaxHeap <= 0) {
       throw new IllegalArgumentException("Invalid JVM state for the max heap usage");
     }
 
-    int thresholdValueInPercentage = config.getMemCBThreshold();
     double thresholdInFraction = thresholdValueInPercentage / (double) 100;
     heapMemoryThreshold = (long) (currentMaxHeap * thresholdInFraction);
 
@@ -69,13 +67,6 @@ public MemoryCircuitBreaker(CircuitBreakerConfig config) {
   // overhead of calculating the condition parameters but can result in false positives.
   @Override
   public boolean isTripped() {
-    if (!isEnabled()) {
-      return false;
-    }
-
-    if (!enabled) {
-      return false;
-    }
 
     long localAllowedMemory = getCurrentMemoryThreshold();
     long localSeenMemory = calculateLiveMemoryUsage();
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
similarity index 96%
rename from solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
rename to solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
index 6ab9f893022..fb00756b86c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
@@ -78,7 +78,10 @@
 
   </query>
 
-  <circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
+  <!-- Legacy config used in 9.x.
+   TODO: Remove this file in 10.0
+   -->
+  <circuitBreaker class="solr.CircuitBreakerManager">
     <str name="memEnabled">true</str>
     <str name="memThreshold">75</str>
     <str name="cpuEnabled">true</str>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
new file mode 100644
index 00000000000..8b27d4fd573
--- /dev/null
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+  <dataDir>${solr.data.dir:}</dataDir>
+  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+  <requestHandler name="/select" class="solr.SearchHandler" />
+
+  <query>
+    <!-- Maximum number of clauses in a boolean query... can affect
+        range or wildcard queries that expand to big boolean
+        queries.  An exception is thrown if exceeded.
+    -->
+    <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>
+
+    <!-- Cache specification for Filters or DocSets - unordered set of *all* documents
+         that match a particular query.
+      -->
+    <filterCache
+      enabled="${filterCache.enabled}"
+      size="512"
+      initialSize="512"
+      autowarmCount="2"/>
+
+    <queryResultCache
+      enabled="${queryResultCache.enabled}"
+      size="512"
+      initialSize="512"
+      autowarmCount="2"/>
+
+    <documentCache
+      enabled="${documentCache.enabled}"
+      size="512"
+      initialSize="512"
+      autowarmCount="0"/>
+
+    <cache
+      name="user_defined_cache_XXX"
+      enabled="${user_defined_cache_XXX.enabled:false}"
+      />
+    <cache
+      name="user_defined_cache_ZZZ"
+      enabled="${user_defined_cache_ZZZ.enabled:false}"
+      />
+
+
+
+    <!-- If true, stored fields that are not requested will be loaded lazily.
+    -->
+    <enableLazyFieldLoading>true</enableLazyFieldLoading>
+
+    <queryResultWindowSize>10</queryResultWindowSize>
+
+    <!-- boolToFilterOptimizer converts boolean clauses with zero boost
+         into cached filters if the number of docs selected by the clause exceeds
+         the threshold (represented as a fraction of the total index)
+    -->
+    <boolTofilterOptimizer enabled="false" cacheSize="32" threshold=".05"/>
+
+  </query>
+
+  <circuitBreaker class="solr.MemoryCircuitBreaker">
+    <int  name="threshold">75</int>
+  </circuitBreaker>
+
+  <circuitBreaker class="solr.CPUCircuitBreaker">
+    <double  name="threshold">75</double>
+  </circuitBreaker>
+
+  <initParams path="/select">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
+</config>
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
new file mode 100644
index 00000000000..8e3231f0341
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -0,0 +1,314 @@
+/*
+ * 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.util;
+
+import static org.hamcrest.CoreMatchers.containsString;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;
+import org.apache.solr.util.circuitbreaker.CircuitBreaker;
+import org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker;
+import org.hamcrest.MatcherAssert;
+import org.junit.After;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  protected static void indexDocs() {
+    for (int i = 0; i < 20; i++) {
+      assertU(adoc("name", "john smith", "id", "1"));
+      assertU(adoc("name", "johathon smith", "id", "2"));
+      assertU(adoc("name", "john percival smith", "id", "3"));
+      assertU(adoc("id", "1", "title", "this is a title.", "inStock_b1", "true"));
+      assertU(adoc("id", "2", "title", "this is another title.", "inStock_b1", "true"));
+      assertU(adoc("id", "3", "title", "Mary had a little lamb.", "inStock_b1", "false"));
+
+      // commit inside the loop to get multiple segments to make search as realistic as possible
+      assertU(commit());
+    }
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    super.tearDown();
+  }
+
+  @After
+  public void after() {
+    h.getCore().getCircuitBreakerRegistry().deregisterAll();
+  }
+
+  public void testCBAlwaysTrips() {
+    removeAllExistingCircuitBreakers();
+
+    CircuitBreaker circuitBreaker = new MockCircuitBreaker(true);
+
+    h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+
+    expectThrows(
+        SolrException.class,
+        () -> {
+          h.query(req("name:\"john smith\""));
+        });
+  }
+
+  public void testCBFakeMemoryPressure() {
+    removeAllExistingCircuitBreakers();
+
+    CircuitBreaker circuitBreaker = new FakeMemoryPressureCircuitBreaker();
+    MemoryCircuitBreaker memoryCircuitBreaker = (MemoryCircuitBreaker) circuitBreaker;
+
+    memoryCircuitBreaker.setThreshold(75);
+
+    h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+
+    expectThrows(
+        SolrException.class,
+        () -> {
+          h.query(req("name:\"john smith\""));
+        });
+  }
+
+  public void testBuildingMemoryPressure() {
+    ExecutorService executor =
+        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));
+
+    AtomicInteger failureCount = new AtomicInteger();
+
+    try {
+      removeAllExistingCircuitBreakers();
+
+      CircuitBreaker circuitBreaker = new BuildingUpMemoryPressureCircuitBreaker();
+      MemoryCircuitBreaker memoryCircuitBreaker = (MemoryCircuitBreaker) circuitBreaker;
+
+      memoryCircuitBreaker.setThreshold(75);
+
+      h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+
+      List<Future<?>> futures = new ArrayList<>();
+
+      for (int i = 0; i < 5; i++) {
+        Future<?> future =
+            executor.submit(
+                () -> {
+                  try {
+                    h.query(req("name:\"john smith\""));
+                  } catch (SolrException e) {
+                    MatcherAssert.assertThat(
+                        e.getMessage(), containsString("Circuit Breakers tripped"));
+                    failureCount.incrementAndGet();
+                  } catch (Exception e) {
+                    throw new RuntimeException(e.getMessage());
+                  }
+                });
+
+        futures.add(future);
+      }
+
+      for (Future<?> future : futures) {
+        try {
+          future.get();
+        } catch (Exception e) {
+          throw new RuntimeException(e.getMessage());
+        }
+      }
+    } finally {
+      ExecutorUtil.shutdownAndAwaitTermination(executor);
+      assertEquals("Number of failed queries is not correct", 1, failureCount.get());
+    }
+  }
+
+  public void testFakeCPUCircuitBreaker() {
+    removeAllExistingCircuitBreakers();
+
+    CircuitBreaker circuitBreaker = new FakeCPUCircuitBreaker();
+    CPUCircuitBreaker cpuCircuitBreaker = (CPUCircuitBreaker) circuitBreaker;
+
+    cpuCircuitBreaker.setThreshold(75);
+
+    h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+
+    AtomicInteger failureCount = new AtomicInteger();
+
+    ExecutorService executor =
+        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));
+    try {
+      List<Future<?>> futures = new ArrayList<>();
+
+      for (int i = 0; i < 5; i++) {
+        Future<?> future =
+            executor.submit(
+                () -> {
+                  try {
+                    h.query(req("name:\"john smith\""));
+                  } catch (SolrException e) {
+                    MatcherAssert.assertThat(
+                        e.getMessage(), containsString("Circuit Breakers tripped"));
+                    failureCount.incrementAndGet();
+                  } catch (Exception e) {
+                    throw new RuntimeException(e.getMessage());
+                  }
+                });
+
+        futures.add(future);
+      }
+
+      for (Future<?> future : futures) {
+        try {
+          future.get();
+        } catch (Exception e) {
+          throw new RuntimeException(e.getMessage());
+        }
+      }
+    } finally {
+      ExecutorUtil.shutdownAndAwaitTermination(executor);
+      assertEquals("Number of failed queries is not correct", 5, failureCount.get());
+    }
+  }
+
+  public void testResponseWithCBTiming() {
+    removeAllExistingCircuitBreakers();
+
+    assertQ(
+        req("q", "*:*", CommonParams.DEBUG_QUERY, "true"),
+        "//str[@name='rawquerystring']='*:*'",
+        "//str[@name='querystring']='*:*'",
+        "//str[@name='parsedquery']='MatchAllDocsQuery(*:*)'",
+        "//str[@name='parsedquery_toString']='*:*'",
+        "count(//lst[@name='explain']/*)=3",
+        "//lst[@name='explain']/str[@name='1']",
+        "//lst[@name='explain']/str[@name='2']",
+        "//lst[@name='explain']/str[@name='3']",
+        "//str[@name='QParser']",
+        "count(//lst[@name='timing']/*)=3",
+        "//lst[@name='timing']/double[@name='time']",
+        "count(//lst[@name='prepare']/*)>0",
+        "//lst[@name='prepare']/double[@name='time']",
+        "count(//lst[@name='process']/*)>0",
+        "//lst[@name='process']/double[@name='time']");
+
+    CircuitBreaker circuitBreaker = new MockCircuitBreaker(false);
+    h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+
+    assertQ(
+        req("q", "*:*", CommonParams.DEBUG_QUERY, "true"),
+        "//str[@name='rawquerystring']='*:*'",
+        "//str[@name='querystring']='*:*'",
+        "//str[@name='parsedquery']='MatchAllDocsQuery(*:*)'",
+        "//str[@name='parsedquery_toString']='*:*'",
+        "count(//lst[@name='explain']/*)=3",
+        "//lst[@name='explain']/str[@name='1']",
+        "//lst[@name='explain']/str[@name='2']",
+        "//lst[@name='explain']/str[@name='3']",
+        "//str[@name='QParser']",
+        "count(//lst[@name='timing']/*)=4",
+        "//lst[@name='timing']/double[@name='time']",
+        "count(//lst[@name='circuitbreaker']/*)>0",
+        "//lst[@name='circuitbreaker']/double[@name='time']",
+        "count(//lst[@name='prepare']/*)>0",
+        "//lst[@name='prepare']/double[@name='time']",
+        "count(//lst[@name='process']/*)>0",
+        "//lst[@name='process']/double[@name='time']");
+  }
+
+  private void removeAllExistingCircuitBreakers() {
+    List<CircuitBreaker> registeredCircuitBreakers =
+        h.getCore().getCircuitBreakerRegistry().getRegisteredCircuitBreakers();
+
+    registeredCircuitBreakers.clear();
+  }
+
+  private static class MockCircuitBreaker extends MemoryCircuitBreaker {
+
+    private final boolean tripped;
+
+    public MockCircuitBreaker(boolean tripped) {
+      this.tripped = tripped;
+    }
+
+    @Override
+    public boolean isTripped() {
+      return this.tripped;
+    }
+
+    @Override
+    public String getDebugInfo() {
+      return "MockCircuitBreaker";
+    }
+  }
+
+  private static class FakeMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {
+
+    @Override
+    protected long calculateLiveMemoryUsage() {
+      // Return a number large enough to trigger a pushback from the circuit breaker
+      return Long.MAX_VALUE;
+    }
+  }
+
+  private static class BuildingUpMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {
+    private AtomicInteger count;
+
+    public BuildingUpMemoryPressureCircuitBreaker() {
+      this.count = new AtomicInteger(0);
+    }
+
+    @Override
+    protected long calculateLiveMemoryUsage() {
+      int localCount = count.getAndIncrement();
+
+      if (localCount >= 4) {
+        // TODO: To be removed
+        if (log.isInfoEnabled()) {
+          String logMessage =
+              "Blocking query from BuildingUpMemoryPressureCircuitBreaker for count " + localCount;
+          log.info(logMessage);
+        }
+        return Long.MAX_VALUE;
+      }
+
+      // TODO: To be removed
+      if (log.isInfoEnabled()) {
+        String logMessage =
+            "BuildingUpMemoryPressureCircuitBreaker: Returning unblocking value for count "
+                + localCount;
+        log.info(logMessage);
+      }
+      return Long.MIN_VALUE; // Random number guaranteed to not trip the circuit breaker
+    }
+  }
+
+  private static class FakeCPUCircuitBreaker extends CPUCircuitBreaker {
+    @Override
+    protected double calculateLiveCPUUsage() {
+      return 92; // Return a value large enough to trigger the circuit breaker
+    }
+  }
+}
diff --git a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
index 47c8d417c07..37500b4126f 100644
--- a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
@@ -17,284 +17,17 @@
 
 package org.apache.solr.util;
 
-import static org.hamcrest.CoreMatchers.containsString;
-
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
-import org.apache.solr.core.PluginInfo;
-import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;
-import org.apache.solr.util.circuitbreaker.CircuitBreaker;
-import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
-import org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker;
-import org.hamcrest.MatcherAssert;
-import org.junit.After;
 import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestCircuitBreaker extends SolrTestCaseJ4 {
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private static final int NUM_DOCS = 20;
 
+/** Tests the pluggable circuit breaker implementation. The actual tests are in base class. */
+public class TestCircuitBreaker extends BaseTestCircuitBreaker {
   @BeforeClass
   public static void setUpClass() throws Exception {
     System.setProperty("filterCache.enabled", "false");
     System.setProperty("queryResultCache.enabled", "false");
     System.setProperty("documentCache.enabled", "true");
 
-    initCore("solrconfig-memory-circuitbreaker.xml", "schema.xml");
-    for (int i = 0; i < NUM_DOCS; i++) {
-      assertU(adoc("name", "john smith", "id", "1"));
-      assertU(adoc("name", "johathon smith", "id", "2"));
-      assertU(adoc("name", "john percival smith", "id", "3"));
-      assertU(adoc("id", "1", "title", "this is a title.", "inStock_b1", "true"));
-      assertU(adoc("id", "2", "title", "this is another title.", "inStock_b1", "true"));
-      assertU(adoc("id", "3", "title", "Mary had a little lamb.", "inStock_b1", "false"));
-
-      // commit inside the loop to get multiple segments to make search as realistic as possible
-      assertU(commit());
-    }
-  }
-
-  @Override
-  public void tearDown() throws Exception {
-    super.tearDown();
-  }
-
-  @After
-  public void after() {
-    h.getCore().getCircuitBreakerManager().deregisterAll();
-  }
-
-  public void testCBAlwaysTrips() {
-    removeAllExistingCircuitBreakers();
-
-    PluginInfo pluginInfo =
-        h.getCore().getSolrConfig().getPluginInfo(CircuitBreakerManager.class.getName());
-
-    CircuitBreaker.CircuitBreakerConfig circuitBreakerConfig =
-        CircuitBreakerManager.buildCBConfig(pluginInfo);
-
-    CircuitBreaker circuitBreaker = new MockCircuitBreaker(circuitBreakerConfig);
-
-    h.getCore().getCircuitBreakerManager().register(circuitBreaker);
-
-    expectThrows(
-        SolrException.class,
-        () -> {
-          h.query(req("name:\"john smith\""));
-        });
-  }
-
-  public void testCBFakeMemoryPressure() {
-    removeAllExistingCircuitBreakers();
-
-    PluginInfo pluginInfo =
-        h.getCore().getSolrConfig().getPluginInfo(CircuitBreakerManager.class.getName());
-
-    CircuitBreaker.CircuitBreakerConfig circuitBreakerConfig =
-        CircuitBreakerManager.buildCBConfig(pluginInfo);
-    CircuitBreaker circuitBreaker = new FakeMemoryPressureCircuitBreaker(circuitBreakerConfig);
-
-    h.getCore().getCircuitBreakerManager().register(circuitBreaker);
-
-    expectThrows(
-        SolrException.class,
-        () -> {
-          h.query(req("name:\"john smith\""));
-        });
-  }
-
-  public void testBuildingMemoryPressure() {
-    ExecutorService executor =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));
-
-    AtomicInteger failureCount = new AtomicInteger();
-
-    try {
-      removeAllExistingCircuitBreakers();
-
-      PluginInfo pluginInfo =
-          h.getCore().getSolrConfig().getPluginInfo(CircuitBreakerManager.class.getName());
-
-      CircuitBreaker.CircuitBreakerConfig circuitBreakerConfig =
-          CircuitBreakerManager.buildCBConfig(pluginInfo);
-      CircuitBreaker circuitBreaker =
-          new BuildingUpMemoryPressureCircuitBreaker(circuitBreakerConfig);
-
-      h.getCore().getCircuitBreakerManager().register(circuitBreaker);
-
-      List<Future<?>> futures = new ArrayList<>();
-
-      for (int i = 0; i < 5; i++) {
-        Future<?> future =
-            executor.submit(
-                () -> {
-                  try {
-                    h.query(req("name:\"john smith\""));
-                  } catch (SolrException e) {
-                    MatcherAssert.assertThat(
-                        e.getMessage(), containsString("Circuit Breakers tripped"));
-                    failureCount.incrementAndGet();
-                  } catch (Exception e) {
-                    throw new RuntimeException(e.getMessage());
-                  }
-                });
-
-        futures.add(future);
-      }
-
-      for (Future<?> future : futures) {
-        try {
-          future.get();
-        } catch (Exception e) {
-          throw new RuntimeException(e.getMessage());
-        }
-      }
-    } finally {
-      ExecutorUtil.shutdownAndAwaitTermination(executor);
-      assertEquals("Number of failed queries is not correct", 1, failureCount.get());
-    }
-  }
-
-  public void testFakeCPUCircuitBreaker() {
-    AtomicInteger failureCount = new AtomicInteger();
-
-    ExecutorService executor =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));
-    try {
-      removeAllExistingCircuitBreakers();
-
-      PluginInfo pluginInfo =
-          h.getCore().getSolrConfig().getPluginInfo(CircuitBreakerManager.class.getName());
-
-      CircuitBreaker.CircuitBreakerConfig circuitBreakerConfig =
-          CircuitBreakerManager.buildCBConfig(pluginInfo);
-      CircuitBreaker circuitBreaker = new FakeCPUCircuitBreaker(circuitBreakerConfig);
-
-      h.getCore().getCircuitBreakerManager().register(circuitBreaker);
-
-      List<Future<?>> futures = new ArrayList<>();
-
-      for (int i = 0; i < 5; i++) {
-        Future<?> future =
-            executor.submit(
-                () -> {
-                  try {
-                    h.query(req("name:\"john smith\""));
-                  } catch (SolrException e) {
-                    MatcherAssert.assertThat(
-                        e.getMessage(), containsString("Circuit Breakers tripped"));
-                    failureCount.incrementAndGet();
-                  } catch (Exception e) {
-                    throw new RuntimeException(e.getMessage());
-                  }
-                });
-
-        futures.add(future);
-      }
-
-      for (Future<?> future : futures) {
-        try {
-          future.get();
-        } catch (Exception e) {
-          throw new RuntimeException(e.getMessage());
-        }
-      }
-    } finally {
-      ExecutorUtil.shutdownAndAwaitTermination(executor);
-      assertEquals("Number of failed queries is not correct", 5, failureCount.get());
-    }
-  }
-
-  private void removeAllExistingCircuitBreakers() {
-    List<CircuitBreaker> registeredCircuitBreakers =
-        h.getCore().getCircuitBreakerManager().getRegisteredCircuitBreakers();
-
-    registeredCircuitBreakers.clear();
-  }
-
-  private static class MockCircuitBreaker extends MemoryCircuitBreaker {
-
-    public MockCircuitBreaker(CircuitBreakerConfig config) {
-      super(config);
-    }
-
-    @Override
-    public boolean isTripped() {
-      // Always return true
-      return true;
-    }
-
-    @Override
-    public String getDebugInfo() {
-      return "MockCircuitBreaker";
-    }
-  }
-
-  private static class FakeMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {
-
-    public FakeMemoryPressureCircuitBreaker(CircuitBreakerConfig config) {
-      super(config);
-    }
-
-    @Override
-    protected long calculateLiveMemoryUsage() {
-      // Return a number large enough to trigger a pushback from the circuit breaker
-      return Long.MAX_VALUE;
-    }
-  }
-
-  private static class BuildingUpMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {
-    private AtomicInteger count;
-
-    public BuildingUpMemoryPressureCircuitBreaker(CircuitBreakerConfig config) {
-      super(config);
-
-      this.count = new AtomicInteger(0);
-    }
-
-    @Override
-    protected long calculateLiveMemoryUsage() {
-      int localCount = count.getAndIncrement();
-
-      if (localCount >= 4) {
-        // TODO: To be removed
-        if (log.isInfoEnabled()) {
-          String logMessage =
-              "Blocking query from BuildingUpMemoryPressureCircuitBreaker for count " + localCount;
-          log.info(logMessage);
-        }
-        return Long.MAX_VALUE;
-      }
-
-      // TODO: To be removed
-      if (log.isInfoEnabled()) {
-        String logMessage =
-            "BuildingUpMemoryPressureCircuitBreaker: Returning unblocking value for count "
-                + localCount;
-        log.info(logMessage);
-      }
-      return Long.MIN_VALUE; // Random number guaranteed to not trip the circuit breaker
-    }
-  }
-
-  private static class FakeCPUCircuitBreaker extends CPUCircuitBreaker {
-    public FakeCPUCircuitBreaker(CircuitBreakerConfig config) {
-      super(config);
-    }
-
-    @Override
-    protected double calculateLiveCPUUsage() {
-      return 92; // Return a value large enough to trigger the circuit breaker
-    }
+    initCore("solrconfig-pluggable-circuitbreaker.xml", "schema.xml");
+    BaseTestCircuitBreaker.indexDocs();
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/util/TestLegacyCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/TestLegacyCircuitBreaker.java
new file mode 100644
index 00000000000..cd4cc499a36
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/util/TestLegacyCircuitBreaker.java
@@ -0,0 +1,38 @@
+/*
+ * 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.util;
+
+import org.junit.BeforeClass;
+
+/**
+ * Tests the original circuit breaker configuration format, which was not configurable.
+ *
+ * @deprecated Remove in 10.0
+ */
+@Deprecated(since = "9.4")
+public class TestLegacyCircuitBreaker extends BaseTestCircuitBreaker {
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    System.setProperty("filterCache.enabled", "false");
+    System.setProperty("queryResultCache.enabled", "false");
+    System.setProperty("documentCache.enabled", "true");
+
+    initCore("solrconfig-legacy-circuitbreaker.xml", "schema.xml");
+    BaseTestCircuitBreaker.indexDocs();
+  }
+}
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 8023d7bb98f..ecd3693f642 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -559,52 +559,6 @@
 
   </query>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     Circuit Breaker Section - This section consists of configurations for
-     circuit breakers
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!-- Circuit breakers are designed to allow stability and predictable query
-     execution. They prevent operations that can take down the node and cause
-     noisy neighbour issues.
-
-     The CircuitBreakerManager is the default manager for all circuit breakers.
-     The enabled flag here controls the activation/deactivation of all circuit
-     breakers specified within.
-  -->
-  <circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
-    <!-- Memory Circuit Breaker
-
-     Specific configuration for max JVM heap usage circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the threshold percentage of maximum heap allocated
-     beyond which queries will be rejected until the current JVM usage goes below the threshold.
-     The valid value for this range is 50-95.
-
-     Consider a scenario where the max heap allocated is 4 GB and memThreshold is defined as 75.
-     Threshold JVM usage will be 4 * 0.75 = 3 GB. Its generally a good idea to keep this value
-     between 75 - 80% of maximum heap allocated.
-
-     If, at any point, the current JVM heap usage goes above 3 GB, queries will be rejected until
-     the heap usage goes below 3 GB again. If you see queries getting rejected with 503 error code,
-     check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
-     you what transpired (if the failure was caused by tripped circuit breakers).
-    -->
-    <!--
-    <str name="memEnabled">true</str>
-    <str name="memThreshold">75</str>
-    -->
-
-    <!-- CPU Circuit Breaker Configuration
-
-     Specific configuration for CPU utilization based circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the average load over the last minute at which the
-     circuit breaker should start rejecting queries.
-    -->
-    <!--
-    <str name="cpuEnabled">true</str>
-    <str name="cpuThreshold">75</str>
-    -->
-  </circuitBreaker>
-
   <!-- Request Dispatcher
 
        This section contains instructions for how the SolrDispatchFilter
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index bd61f96dc82..2fd3d0ae857 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -579,52 +579,6 @@
 
   </query>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     Circuit Breaker Section - This section consists of configurations for
-     circuit breakers
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!-- Circuit breakers are designed to allow stability and predictable query
-     execution. They prevent operations that can take down the node and cause
-     noisy neighbour issues.
-
-     The CircuitBreakerManager is the default manager for all circuit breakers.
-     The enabled flag here controls the activation/deactivation of all circuit
-     breakers specified within.
-  -->
-  <circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
-    <!-- Memory Circuit Breaker
-
-     Specific configuration for max JVM heap usage circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the threshold percentage of maximum heap allocated
-     beyond which queries will be rejected until the current JVM usage goes below the threshold.
-     The valid value for this range is 50-95.
-
-     Consider a scenario where the max heap allocated is 4 GB and memThreshold is defined as 75.
-     Threshold JVM usage will be 4 * 0.75 = 3 GB. Its generally a good idea to keep this value
-     between 75 - 80% of maximum heap allocated.
-
-     If, at any point, the current JVM heap usage goes above 3 GB, queries will be rejected until
-     the heap usage goes below 3 GB again. If you see queries getting rejected with 503 error code,
-     check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
-     you what transpired (if the failure was caused by tripped circuit breakers).
-    -->
-    <!--
-    <str name="memEnabled">true</str>
-    <str name="memThreshold">75</str>
-    -->
-
-    <!-- CPU Circuit Breaker Configuration
-
-     Specific configuration for CPU utilization based circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the average load over the last minute at which the
-     circuit breaker should start rejecting queries.
-    -->
-    <!--
-    <str name="cpuEnabled">true</str>
-    <str name="cpuThreshold">75</str>
-    -->
-  </circuitBreaker>
-
   <!-- Request Dispatcher
 
        This section contains instructions for how the SolrDispatchFilter
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
index 5b29b4acd9c..a96658e61bf 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
@@ -27,23 +27,7 @@ If circuit breakers are enabled, requests may be rejected under the condition of
 It is up to the client to handle this error and potentially build a retrial logic as this should ideally be a transient situation.
 
 == Circuit Breaker Configurations
-All circuit breaker configurations are listed in the `<circuitBreaker>` tags in `solrconfig.xml` as shown below:
-
-[source,xml]
-----
-<circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
-  <!-- All specific configs in this section -->
-</circuitBreaker>
-----
-
-The `enabled` attribute controls the global activation/deactivation of circuit breakers.
-If this flag is disabled, all circuit breakers will be disabled globally.
-Per circuit breaker configurations are specified in their respective sections later.
-
-This attribute acts as the highest authority and global controller of circuit breakers.
-For using specific circuit breakers, each one needs to be individually enabled in addition to this flag being enabled.
-
-`CircuitBreakerManager` is the default manager for all circuit breakers that should be defined in the tag unless the user wishes to use a custom implementation.
+All circuit breaker configurations are listed as independent `<circuitBreaker>` entries in `solrconfig.xml` as shown below.
 
 == Currently Supported Circuit Breakers
 
@@ -52,54 +36,41 @@ For using specific circuit breakers, each one needs to be individually enabled i
 This circuit breaker tracks JVM heap memory usage and rejects incoming search requests with a 503 error code if the heap usage exceeds a configured percentage of maximum heap allocated to the JVM (-Xmx).
 The main configuration for this circuit breaker is controlling the threshold percentage at which the breaker will trip.
 
-Configuration for JVM heap usage based circuit breaker:
+To enable and configure the JVM heap usage based circuit breaker, add the following:
 
 [source,xml]
 ----
-<str name="memEnabled">true</str>
+<circuitBreaker class="org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker">
+ <double name="threshold">75</double>
+</circuitBreaker>
 ----
 
-Note that this configuration will be overridden by the global circuit breaker flag -- if circuit breakers are disabled, this flag will not help you.
-
-The triggering threshold is defined as a percentage of the max heap allocated to the JVM.
-It is controlled by the below configuration:
-
-[source,xml]
-----
-<str name="memThreshold">75</str>
-----
+The `threshold` is defined as a percentage of the max heap allocated to the JVM.
 
 It does not logically make sense to have a threshold below 50% and above 95% of the max heap allocated to the JVM.
 Hence, the range of valid values for this parameter is [50, 95], both inclusive.
 
 Consider the following example:
 
-JVM has been allocated a maximum heap of 5GB (-Xmx) and `memThreshold` is set to `75`.
+JVM has been allocated a maximum heap of 5GB (-Xmx) and `threshold` is set to `75`.
 In this scenario, the heap usage at which the circuit breaker will trip is 3.75GB.
 
-
 === CPU Utilization
 
 This circuit breaker tracks CPU utilization and triggers if the average CPU utilization over the last one minute exceeds a configurable threshold.
 Note that the value used in computation is over the last one minute -- so a sudden spike in traffic that goes down might still cause the circuit breaker to trigger for a short while before it resolves and updates the value.
 For more details of the calculation, please see https://en.wikipedia.org/wiki/Load_(computing)
 
-Configuration for CPU utilization based circuit breaker:
+To enable and configure the CPU utilization based circuit breaker:
 
 [source,xml]
 ----
-<str name="cpuEnabled">true</str>
+<circuitBreaker class="org.apache.solr.util.circuitbreaker.CPUCircuitBreaker">
+ <double  name="threshold">75</double>
+</circuitBreaker>
 ----
 
-Note that this configuration will be overridden by the global circuit breaker flag -- if circuit breakers are disabled, this flag will not help you.
-
-The triggering threshold is defined in units of CPU utilization.
-The configuration to control this is as below:
-
-[source,xml]
-----
-<str name="cpuThreshold">75</str>
-----
+The `threshold` is defined in units of CPU utilization.
 
 == Performance Considerations
 

From ed922011cb4d8b44350d851eecd96652e2a35f77 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Tue, 29 Aug 2023 13:38:08 +0100
Subject: [PATCH 038/160] SOLR-15474: three more code review tweaks (#1870)

---
 .../solr/util/circuitbreaker/CircuitBreakerManager.java      | 5 ++++-
 .../solr/util/circuitbreaker/CircuitBreakerRegistry.java     | 5 -----
 .../collection1/conf/solrconfig-pluggable-circuitbreaker.xml | 2 +-
 .../test/org/apache/solr/util/BaseTestCircuitBreaker.java    | 5 +----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index 52a839ce7a6..201b1ffaa73 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -51,7 +51,10 @@ public boolean isTripped() {
   public String getDebugInfo() {
     StringBuilder sb = new StringBuilder();
     if (memEnabled) {
-      sb.append(memCB.getDebugInfo()).append("\n");
+      sb.append(memCB.getDebugInfo());
+    }
+    if (memEnabled && cpuEnabled) {
+      sb.append("\n");
     }
     if (cpuEnabled) {
       sb.append(cpuCB.getDebugInfo());
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
index 283203e0f9b..0cb3fb0a378 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
@@ -99,9 +99,4 @@ public static String toErrorMessage(List<CircuitBreaker> circuitBreakerList) {
   public boolean isEnabled() {
     return !circuitBreakerList.isEmpty();
   }
-
-  @VisibleForTesting
-  public List<CircuitBreaker> getRegisteredCircuitBreakers() {
-    return circuitBreakerList;
-  }
 }
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
index 8b27d4fd573..660e7952e70 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -79,7 +79,7 @@
   </query>
 
   <circuitBreaker class="solr.MemoryCircuitBreaker">
-    <int  name="threshold">75</int>
+    <double  name="threshold">75</double>
   </circuitBreaker>
 
   <circuitBreaker class="solr.CPUCircuitBreaker">
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 8e3231f0341..372ddf80810 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -239,10 +239,7 @@ public void testResponseWithCBTiming() {
   }
 
   private void removeAllExistingCircuitBreakers() {
-    List<CircuitBreaker> registeredCircuitBreakers =
-        h.getCore().getCircuitBreakerRegistry().getRegisteredCircuitBreakers();
-
-    registeredCircuitBreakers.clear();
+    h.getCore().getCircuitBreakerRegistry().deregisterAll();
   }
 
   private static class MockCircuitBreaker extends MemoryCircuitBreaker {

From 9a453854a56125fef6740ce8e4a1f69fb444eabe Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Tue, 29 Aug 2023 11:23:10 -0400
Subject: [PATCH 039/160] SOLR-16825: Fix response serialization bug (#1867)

Unknown types will try to serialize using Reflection,
but will use a "toString()" serialization if no JSONProperty annotations
are found. This is backwards compatible.

Co-authored-by: Houston Putman <houston@apache.org>
---
 .../model/AddReplicaPropertyRequestBody.java  |  3 +-
 .../apache/solr/common/DelegateMapWriter.java | 46 ----------
 .../apache/solr/common/util/JavaBinCodec.java |  8 +-
 .../apache/solr/common/util/TextWriter.java   |  8 +-
 .../org/apache/solr/common/util/Utils.java    | 84 +++++++++++++++++--
 5 files changed, 85 insertions(+), 64 deletions(-)
 delete mode 100644 solr/solrj/src/java/org/apache/solr/common/DelegateMapWriter.java

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/AddReplicaPropertyRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/AddReplicaPropertyRequestBody.java
index f78c7bebd9c..603524e4ad1 100644
--- a/solr/api/src/java/org/apache/solr/client/api/model/AddReplicaPropertyRequestBody.java
+++ b/solr/api/src/java/org/apache/solr/client/api/model/AddReplicaPropertyRequestBody.java
@@ -19,9 +19,8 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.apache.solr.client.api.util.ReflectWritable;
 
-public class AddReplicaPropertyRequestBody implements ReflectWritable {
+public class AddReplicaPropertyRequestBody {
   public AddReplicaPropertyRequestBody() {}
 
   public AddReplicaPropertyRequestBody(String value) {
diff --git a/solr/solrj/src/java/org/apache/solr/common/DelegateMapWriter.java b/solr/solrj/src/java/org/apache/solr/common/DelegateMapWriter.java
deleted file mode 100644
index 9fe01b09b14..00000000000
--- a/solr/solrj/src/java/org/apache/solr/common/DelegateMapWriter.java
+++ /dev/null
@@ -1,46 +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.common;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.IOException;
-import org.apache.solr.common.util.Utils;
-
-public class DelegateMapWriter implements MapWriter {
-
-  private final Object delegate;
-
-  public DelegateMapWriter(Object delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public void writeMap(EntryWriter ew) throws IOException {
-    Utils.reflectWrite(
-        ew,
-        delegate,
-        // TODO Should we be lenient here and accept both the Jackson and our homegrown annotation?
-        field -> field.getAnnotation(JsonProperty.class) != null,
-        JsonAnyGetter.class,
-        field -> {
-          final JsonProperty prop = field.getAnnotation(JsonProperty.class);
-          return prop.value().isEmpty() ? field.getName() : prop.value();
-        });
-  }
-}
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
index 488aa8e8427..341edfb864f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
@@ -44,7 +44,6 @@
 import java.util.function.Predicate;
 import org.apache.solr.client.api.util.ReflectWritable;
 import org.apache.solr.common.ConditionalKeyMapWriter;
-import org.apache.solr.common.DelegateMapWriter;
 import org.apache.solr.common.EnumFieldValue;
 import org.apache.solr.common.IteratorWriter;
 import org.apache.solr.common.IteratorWriter.ItemWriter;
@@ -270,10 +269,11 @@ public void writeVal(Object val) throws IOException {
         if (writeKnownType(tmpVal)) return;
       }
     }
-    // Fallback to do *something*.
+    // Fallback to do *something*, either use a reflection writer or write as a string
+    // representation.
     // note: if the user of this codec doesn't want this (e.g. UpdateLog) it can supply an
     // ObjectResolver that does something else like throw an exception.
-    writeVal(val.getClass().getName() + ':' + val.toString());
+    writeVal(Utils.getReflectWriter(val));
   }
 
   protected static final Object END_OBJ = new Object();
@@ -394,7 +394,7 @@ public boolean writeKnownType(Object val) throws IOException {
       return true;
     }
     if (val instanceof ReflectWritable) {
-      writeMap(new DelegateMapWriter(val));
+      writeVal(Utils.getReflectWriter(val));
       return true;
     }
     if (val instanceof Map) {
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/TextWriter.java b/solr/solrj/src/java/org/apache/solr/common/util/TextWriter.java
index c42240aeed5..7c64954b31f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/TextWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/TextWriter.java
@@ -35,7 +35,6 @@
 import java.util.concurrent.atomic.LongAccumulator;
 import java.util.concurrent.atomic.LongAdder;
 import org.apache.solr.client.api.util.ReflectWritable;
-import org.apache.solr.common.DelegateMapWriter;
 import org.apache.solr.common.EnumFieldValue;
 import org.apache.solr.common.IteratorWriter;
 import org.apache.solr.common.MapSerializable;
@@ -88,7 +87,7 @@ default void writeVal(String name, Object val, boolean raw) throws IOException {
     } else if (val instanceof MapWriter) {
       writeMap(name, (MapWriter) val);
     } else if (val instanceof ReflectWritable) {
-      writeMap(name, new DelegateMapWriter(val));
+      writeVal(name, Utils.getReflectWriter(val));
     } else if (val instanceof MapSerializable) {
       // todo find a better way to reuse the map more efficiently
       writeMap(name, ((MapSerializable) val).toMap(new LinkedHashMap<>()), false, true);
@@ -110,8 +109,9 @@ default void writeVal(String name, Object val, boolean raw) throws IOException {
         writeStr(name, val.toString(), true);
       }
     } else {
-      // default... for debugging only.  Would be nice to "assert false" ?
-      writeStr(name, val.getClass().getName() + ':' + val.toString(), true);
+      // Fallback to do *something*, either use a reflection writer or write as a string
+      // representation.
+      writeVal(name, Utils.getReflectWriter(val));
     }
   }
 
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index 31d6e736a2e..0ae4886d670 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -20,6 +20,7 @@
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -827,6 +828,45 @@ public static void reflectWrite(MapWriter.EntryWriter ew, Object o) {
 
   public static final String CATCH_ALL_PROPERTIES_METHOD_NAME = "unknownProperties";
 
+  /**
+   * Return a writable object that will be serialized using the reflection-friendly properties of
+   * the class, notably the fields that have the {@link JsonProperty} annotation.
+   *
+   * <p>If the class has no reflection-friendly fields, then it will be serialized as a string,
+   * using the class's name and {@code toString()} method.
+   *
+   * @param o the object to get a serializable version of
+   * @return a serializable version of the object
+   */
+  public static Object getReflectWriter(Object o) {
+    List<FieldWriter> fieldWriters = null;
+    try {
+      fieldWriters =
+          Utils.getReflectData(
+              o.getClass(),
+              // TODO Should we be lenient here and accept both the Jackson and our homegrown
+              // annotation?
+              field ->
+                  field.getAnnotation(com.fasterxml.jackson.annotation.JsonProperty.class) != null,
+              JsonAnyGetter.class,
+              field -> {
+                final com.fasterxml.jackson.annotation.JsonProperty prop =
+                    field.getAnnotation(com.fasterxml.jackson.annotation.JsonProperty.class);
+                return prop.value().isEmpty() ? field.getName() : prop.value();
+              });
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException(e);
+    }
+    if (!fieldWriters.isEmpty()) {
+      return new DelegateReflectWriter(o, fieldWriters);
+    } else {
+      // Do not serialize an empty class, use a string representation instead.
+      // This is because the class is likely not using the serialization annotations
+      // and still expects to provide some information.
+      return o.getClass().getName() + ':' + o;
+    }
+  }
+
   /**
    * Convert an input object to a map, writing only those fields that match a provided {@link
    * Predicate}
@@ -851,14 +891,7 @@ public static void reflectWrite(
     } catch (IllegalAccessException e) {
       throw new RuntimeException(e);
     }
-    for (FieldWriter fieldWriter : fieldWriters) {
-      try {
-        fieldWriter.write(ew, o);
-      } catch (Throwable e) {
-        throw new RuntimeException(e);
-        // should not happen
-      }
-    }
+    reflectWrite(ew, o, fieldWriters);
   }
 
   private static List<FieldWriter> getReflectData(
@@ -887,6 +920,26 @@ private static List<FieldWriter> getReflectData(
     return Collections.unmodifiableList(mutableFieldWriters);
   }
 
+  /**
+   * Convert an input object to a map, using the provided {@link FieldWriter}s.
+   *
+   * @param ew an {@link org.apache.solr.common.MapWriter.EntryWriter} to do the actual map
+   *     insertion/writing
+   * @param o the object to be converted
+   * @param fieldWriters a list of fields to write and how to write them
+   */
+  private static void reflectWrite(
+      MapWriter.EntryWriter ew, Object o, List<FieldWriter> fieldWriters) {
+    for (FieldWriter fieldWriter : fieldWriters) {
+      try {
+        fieldWriter.write(ew, o);
+      } catch (Throwable e) {
+        throw new RuntimeException(e);
+        // should not happen
+      }
+    }
+  }
+
   private static List<FieldWriter> addTraditionalFieldWriters(
       Class<?> c,
       MethodHandles.Lookup lookup,
@@ -1010,6 +1063,21 @@ private MapWriter.EntryWriter writeEntry(CharSequence k, Object v) {
   private static final Map<Class<?>, List<FieldWriter>> storedReflectData =
       new ConcurrentHashMap<>();
 
+  public static class DelegateReflectWriter implements MapWriter {
+    private final Object object;
+    private final List<Utils.FieldWriter> fieldWriters;
+
+    DelegateReflectWriter(Object object, List<Utils.FieldWriter> fieldWriters) {
+      this.object = object;
+      this.fieldWriters = fieldWriters;
+    }
+
+    @Override
+    public void writeMap(EntryWriter ew) throws IOException {
+      Utils.reflectWrite(ew, object, fieldWriters);
+    }
+  }
+
   interface FieldWriter {
     void write(MapWriter.EntryWriter ew, Object inst) throws Throwable;
   }

From 4d656c5ef845912f54eb7b0f7936491e680cac55 Mon Sep 17 00:00:00 2001
From: Dustin Peerce <dustinpeerce@users.noreply.github.com>
Date: Wed, 30 Aug 2023 07:17:50 -0500
Subject: [PATCH 040/160] Fix configuration parameter stateCompressor in
 solr-xml doc (#1872)

---
 .../modules/configuration-guide/pages/configuring-solr-xml.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
index 8fd032db318..35cbc379bea 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
@@ -56,7 +56,7 @@ The default `solr.xml` file is found in `$SOLR_TIP/server/solr/solr.xml` and loo
     <bool name="distributedClusterStateUpdates">${distributedClusterStateUpdates:false}</bool>
     <bool name="distributedCollectionConfigSetExecution">${distributedCollectionConfigSetExecution:false}</bool>
     <int name="minStateByteLenForCompression">${minStateByteLenForCompression:-1}</int>
-    <str name="compressor">${compressor:org.apache.solr.common.util.ZLibCompressor}</str>
+    <str name="stateCompressor">${stateCompressor:org.apache.solr.common.util.ZLibCompressor}</str>
 
   </solrcloud>
 

From 22ac9105ea0382215c8fe558fc55977dc98aa14c Mon Sep 17 00:00:00 2001
From: Michael Gibney <michael@michaelgibney.net>
Date: Wed, 30 Aug 2023 16:08:03 -0400
Subject: [PATCH 041/160] SOLR-16654: Add support for node-level caches (#1351)

---
 solr/CHANGES.txt                              |   2 +-
 .../org/apache/solr/core/CoreContainer.java   |  35 ++
 .../java/org/apache/solr/core/NodeConfig.java |  16 +
 .../java/org/apache/solr/core/SolrConfig.java |   3 +-
 .../java/org/apache/solr/core/SolrCore.java   |   1 +
 .../org/apache/solr/core/SolrXmlConfig.java   |  16 +
 .../org/apache/solr/search/CacheConfig.java   |  14 +-
 .../org/apache/solr/search/CaffeineCache.java |   6 +
 .../org/apache/solr/search/SolrCache.java     |  10 +
 .../apache/solr/search/SolrIndexSearcher.java |  12 +
 .../conf/solrconfig-nodelevelcaches.xml       |  34 ++
 .../test-files/solr/solr-nodelevelcaches.xml  |  30 ++
 .../org/apache/solr/core/TestSolrXml.java     |  16 +
 .../org/apache/solr/search/TestThinCache.java | 160 ++++++
 .../org/apache/solr/search/ThinCache.java     | 472 ++++++++++++++++++
 .../pages/configuring-solr-xml.adoc           |  20 +
 .../org/apache/solr/util/TestHarness.java     |   4 +
 17 files changed, 846 insertions(+), 5 deletions(-)
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
 create mode 100644 solr/core/src/test-files/solr/solr-nodelevelcaches.xml
 create mode 100644 solr/core/src/test/org/apache/solr/search/TestThinCache.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/ThinCache.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6d503a3ebc4..ce74fc3b1cb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -70,7 +70,7 @@ Other Changes
 ==================  9.4.0 ==================
 New Features
 ---------------------
-(No changes)
+* SOLR-16654: Add support for node-level caches (Michael Gibney)
 
 Improvements
 ---------------------
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 5606d93dc85..0bc9ad59d27 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -39,6 +39,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -94,6 +95,7 @@
 import org.apache.solr.common.cloud.Replica.State;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.CollectionUtil;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.ObjectCache;
@@ -136,6 +138,8 @@
 import org.apache.solr.pkg.SolrPackageLoader;
 import org.apache.solr.request.SolrRequestHandler;
 import org.apache.solr.request.SolrRequestInfo;
+import org.apache.solr.search.CacheConfig;
+import org.apache.solr.search.SolrCache;
 import org.apache.solr.search.SolrFieldCacheBean;
 import org.apache.solr.security.AllowListUrlChecker;
 import org.apache.solr.security.AuditLoggerPlugin;
@@ -272,6 +276,8 @@ public JerseyAppHandlerCache getJerseyAppHandlerCache() {
 
   private volatile SolrClientCache solrClientCache;
 
+  private volatile Map<String, SolrCache<?, ?>> caches;
+
   private final ObjectCache objectCache = new ObjectCache();
 
   public final NodeRoles nodeRoles = new NodeRoles(System.getProperty(NodeRoles.NODE_ROLES_PROP));
@@ -710,6 +716,10 @@ public PackageStoreAPI getPackageStoreAPI() {
     return packageStoreAPI;
   }
 
+  public SolrCache<?, ?> getCache(String name) {
+    return caches.get(name);
+  }
+
   public SolrClientCache getSolrClientCache() {
     return solrClientCache;
   }
@@ -796,6 +806,20 @@ private void loadInternal() {
 
     solrClientCache = new SolrClientCache(updateShardHandler.getDefaultHttpClient());
 
+    Map<String, CacheConfig> cachesConfig = cfg.getCachesConfig();
+    if (cachesConfig.isEmpty()) {
+      this.caches = Collections.emptyMap();
+    } else {
+      Map<String, SolrCache<?, ?>> m = CollectionUtil.newHashMap(cachesConfig.size());
+      for (Map.Entry<String, CacheConfig> e : cachesConfig.entrySet()) {
+        SolrCache<?, ?> c = e.getValue().newInstance();
+        String cacheName = e.getKey();
+        c.initializeMetrics(solrMetricsContext, "nodeLevelCache/" + cacheName);
+        m.put(cacheName, c);
+      }
+      this.caches = Collections.unmodifiableMap(m);
+    }
+
     StartupLoggingUtils.checkRequestLogging();
 
     hostName = cfg.getNodeName();
@@ -1263,6 +1287,17 @@ public void shutdown() {
       // Now clear all the cores that are being operated upon.
       solrCores.close();
 
+      final Map<String, SolrCache<?, ?>> closeCaches = caches;
+      if (closeCaches != null) {
+        for (Map.Entry<String, SolrCache<?, ?>> e : caches.entrySet()) {
+          try {
+            e.getValue().close();
+          } catch (Exception ex) {
+            log.warn("error closing node-level cache: {}", e.getKey(), ex);
+          }
+        }
+      }
+
       objectCache.clear();
 
       // It's still possible that one of the pending dynamic load operation is waiting, so wake it
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
index 8117aad4523..581a2d07c0a 100644
--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
@@ -41,6 +41,7 @@
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.logging.DeprecationLog;
 import org.apache.solr.logging.LogWatcherConfig;
+import org.apache.solr.search.CacheConfig;
 import org.apache.solr.servlet.SolrDispatchFilter;
 import org.apache.solr.update.UpdateShardHandlerConfig;
 import org.apache.solr.util.ModuleUtils;
@@ -109,6 +110,8 @@ public class NodeConfig {
 
   private final MetricsConfig metricsConfig;
 
+  private final Map<String, CacheConfig> cachesConfig;
+
   private final PluginInfo tracerConfig;
 
   // Track if this config was loaded from zookeeper so that we can skip validating the zookeeper
@@ -144,6 +147,7 @@ private NodeConfig(
       Properties solrProperties,
       PluginInfo[] backupRepositoryPlugins,
       MetricsConfig metricsConfig,
+      Map<String, CacheConfig> cachesConfig,
       PluginInfo tracerConfig,
       boolean fromZookeeper,
       String defaultZkHost,
@@ -179,6 +183,7 @@ private NodeConfig(
     this.solrProperties = solrProperties;
     this.backupRepositoryPlugins = backupRepositoryPlugins;
     this.metricsConfig = metricsConfig;
+    this.cachesConfig = cachesConfig == null ? Collections.emptyMap() : cachesConfig;
     this.tracerConfig = tracerConfig;
     this.fromZookeeper = fromZookeeper;
     this.defaultZkHost = defaultZkHost;
@@ -395,6 +400,10 @@ public MetricsConfig getMetricsConfig() {
     return metricsConfig;
   }
 
+  public Map<String, CacheConfig> getCachesConfig() {
+    return cachesConfig;
+  }
+
   public PluginInfo getTracerConfiguratorPluginInfo() {
     return tracerConfig;
   }
@@ -600,6 +609,7 @@ public static class NodeConfigBuilder {
     private Properties solrProperties = new Properties();
     private PluginInfo[] backupRepositoryPlugins;
     private MetricsConfig metricsConfig;
+    private Map<String, CacheConfig> cachesConfig;
     private PluginInfo tracerConfig;
     private boolean fromZookeeper = false;
     private String defaultZkHost;
@@ -769,6 +779,11 @@ public NodeConfigBuilder setMetricsConfig(MetricsConfig metricsConfig) {
       return this;
     }
 
+    public NodeConfigBuilder setCachesConfig(Map<String, CacheConfig> cachesConfig) {
+      this.cachesConfig = cachesConfig;
+      return this;
+    }
+
     public NodeConfigBuilder setTracerConfig(PluginInfo tracerConfig) {
       this.tracerConfig = tracerConfig;
       return this;
@@ -881,6 +896,7 @@ public NodeConfig build() {
           solrProperties,
           backupRepositoryPlugins,
           metricsConfig,
+          cachesConfig,
           tracerConfig,
           fromZookeeper,
           defaultZkHost,
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 8ad87ff98f0..563d817803e 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -346,7 +346,8 @@ private SolrConfig(
       for (SolrPluginInfo plugin : plugins) loadPluginInfo(plugin);
 
       Map<String, CacheConfig> userCacheConfigs =
-          CacheConfig.getMultipleConfigs(this, "query/cache", get("query").getAll("cache"));
+          CacheConfig.getMultipleConfigs(
+              getResourceLoader(), this, "query/cache", get("query").getAll("cache"));
       List<PluginInfo> caches = getPluginInfos(SolrCache.class.getName());
       if (!caches.isEmpty()) {
         for (PluginInfo c : caches) {
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index b0b1dd2e784..b1c723aa7a5 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2639,6 +2639,7 @@ public RefCounted<SolrIndexSearcher> getSearcher(
           future =
               searcherExecutor.submit(
                   () -> {
+                    newSearcher.bootstrapFirstSearcher();
                     for (SolrEventListener listener : firstSearcherListeners) {
                       try {
                         listener.newSearcher(newSearcher, null);
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index 32f36091101..85fbaeeb193 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -46,6 +46,7 @@
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.logging.LogWatcherConfig;
 import org.apache.solr.metrics.reporters.SolrJmxReporter;
+import org.apache.solr.search.CacheConfig;
 import org.apache.solr.servlet.SolrDispatchFilter;
 import org.apache.solr.update.UpdateShardHandlerConfig;
 import org.apache.solr.util.DOMConfigNode;
@@ -177,6 +178,7 @@ public static NodeConfig fromConfig(
     // Remove this line in 10.0
     configBuilder.setHiddenSysProps(getHiddenSysProps(root.get("metrics")));
     configBuilder.setMetricsConfig(getMetricsConfig(root.get("metrics")));
+    configBuilder.setCachesConfig(getCachesConfig(loader, root.get("caches")));
     configBuilder.setFromZookeeper(fromZookeeper);
     configBuilder.setDefaultZkHost(defaultZkHost);
     configBuilder.setCoreAdminHandlerActions(coreAdminHandlerActions);
@@ -688,6 +690,20 @@ private static MetricsConfig getMetricsConfig(ConfigNode metrics) {
     return builder.setMetricReporterPlugins(reporterPlugins).build();
   }
 
+  private static Map<String, CacheConfig> getCachesConfig(
+      SolrResourceLoader loader, ConfigNode caches) {
+    Map<String, CacheConfig> ret =
+        CacheConfig.getMultipleConfigs(loader, null, null, caches.getAll("cache"));
+    for (CacheConfig c : ret.values()) {
+      if (c.getRegenerator() != null) {
+        throw new SolrException(
+            SolrException.ErrorCode.SERVER_ERROR,
+            "node-level caches should not be configured with a regenerator!");
+      }
+    }
+    return Collections.unmodifiableMap(ret);
+  }
+
   private static Object decodeNullValue(Object o) {
     if (o instanceof String) { // check if it's a JSON object
       String str = (String) o;
diff --git a/solr/core/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
index e7e2063f031..aa4d61a2204 100644
--- a/solr/core/src/java/org/apache/solr/search/CacheConfig.java
+++ b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
@@ -80,13 +80,13 @@ public void setRegenerator(CacheRegenerator regenerator) {
   }
 
   public static Map<String, CacheConfig> getMultipleConfigs(
-      SolrConfig solrConfig, String configPath, List<ConfigNode> nodes) {
+      SolrResourceLoader loader, SolrConfig solrConfig, String configPath, List<ConfigNode> nodes) {
     if (nodes == null || nodes.size() == 0) return new LinkedHashMap<>();
     Map<String, CacheConfig> result = CollectionUtil.newHashMap(nodes.size());
     for (ConfigNode node : nodes) {
       if (node.boolAttr("enabled", true)) {
         CacheConfig config =
-            getConfig(solrConfig, node.name(), node.attributes().asMap(), configPath);
+            getConfig(loader, solrConfig, node.name(), node.attributes().asMap(), configPath);
         result.put(config.args.get(NAME), config);
       }
     }
@@ -105,6 +105,15 @@ public static CacheConfig getConfig(SolrConfig solrConfig, ConfigNode node, Stri
 
   public static CacheConfig getConfig(
       SolrConfig solrConfig, String nodeName, Map<String, String> attrs, String xpath) {
+    return getConfig(solrConfig.getResourceLoader(), solrConfig, nodeName, attrs, xpath);
+  }
+
+  public static CacheConfig getConfig(
+      SolrResourceLoader loader,
+      SolrConfig solrConfig,
+      String nodeName,
+      Map<String, String> attrs,
+      String xpath) {
     CacheConfig config = new CacheConfig();
     config.nodeName = nodeName;
     Map<String, String> attrsCopy = CollectionUtil.newLinkedHashMap(attrs.size());
@@ -128,7 +137,6 @@ public static CacheConfig getConfig(
       config.args.put(NAME, config.nodeName);
     }
 
-    SolrResourceLoader loader = solrConfig.getResourceLoader();
     config.cacheImpl = config.args.get("class");
     if (config.cacheImpl == null) config.cacheImpl = "solr.CaffeineCache";
     config.clazz =
diff --git a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
index 146a6c37326..1d921030ff7 100644
--- a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
+++ b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
@@ -379,6 +379,12 @@ public void setMaxRamMB(int maxRamMB) {
     }
   }
 
+  protected void adjustMetrics(long hitsAdjust, long insertsAdjust, long lookupsAdjust) {
+    hits.add(-hitsAdjust);
+    inserts.add(-insertsAdjust);
+    lookups.add(-lookupsAdjust);
+  }
+
   @Override
   public void warm(SolrIndexSearcher searcher, SolrCache<K, V> old) {
     if (regenerator == null) {
diff --git a/solr/core/src/java/org/apache/solr/search/SolrCache.java b/solr/core/src/java/org/apache/solr/search/SolrCache.java
index 870d18ea2c9..5b09399f295 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrCache.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCache.java
@@ -134,6 +134,16 @@ public enum State {
    */
   public State getState();
 
+  /**
+   * A hook for caches that would like to perform some initialization for the first registered
+   * searcher. This method is analogous to {@link #warm(SolrIndexSearcher, SolrCache)}. The default
+   * implementation is a no-op. Implementers should not retain object references to the specified
+   * searcher.
+   */
+  default void initialSearcher(SolrIndexSearcher initialSearcher) {
+    // no-op
+  }
+
   /**
    * Warm this cache associated with <code>searcher</code> using the <code>old</code> cache object.
    * <code>this</code> and <code>old</code> will have the same concrete type.
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 6fe7dc4570c..79bc89eec9f 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -2374,6 +2374,18 @@ public boolean intersects(DocSet a, DocsEnumState deState) throws IOException {
     return a.intersects(getDocSet(deState));
   }
 
+  /**
+   * Called on the initial searcher for each core, immediately before <code>firstSearcherListeners
+   * </code> are called for the searcher. This provides the opportunity to perform initialization on
+   * the first registered searcher before the searcher begins to see any <code>firstSearcher</code>
+   * -triggered events.
+   */
+  public void bootstrapFirstSearcher() {
+    for (SolrCache<?, ?> solrCache : cacheList) {
+      solrCache.initialSearcher(this);
+    }
+  }
+
   /** Warm this searcher based on an old one (primarily for auto-cache warming). */
   @SuppressWarnings({"unchecked"})
   public void warm(SolrIndexSearcher old) {
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
new file mode 100644
index 00000000000..d6d33fe7bc6
--- /dev/null
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+  <dataDir>${solr.data.dir:}</dataDir>
+  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+  <requestHandler name="/select" class="solr.SearchHandler" />
+  <query>
+    <filterCache
+      class="solr.ThinCache"
+      parentCacheName="myNodeLevelCacheThin"
+      size="5"
+      initialSize="5"/>
+  </query>
+</config>
diff --git a/solr/core/src/test-files/solr/solr-nodelevelcaches.xml b/solr/core/src/test-files/solr/solr-nodelevelcaches.xml
new file mode 100644
index 00000000000..cc99abb7a5a
--- /dev/null
+++ b/solr/core/src/test-files/solr/solr-nodelevelcaches.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<solr>
+  <caches>
+    <cache name="myNodeLevelCache"
+      size="10"
+      initialSize="10"
+      />
+    <cache name="myNodeLevelCacheThin"
+      class="solr.ThinCache$NodeLevelCache"
+      size="10"
+      initialSize="10"
+      />
+  </caches>
+</solr>
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index 46e6c6ba9b9..1e547f3ed88 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -31,6 +31,10 @@
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.search.CacheConfig;
+import org.apache.solr.search.CaffeineCache;
+import org.apache.solr.search.SolrCache;
+import org.apache.solr.search.ThinCache;
 import org.apache.solr.update.UpdateShardHandlerConfig;
 import org.hamcrest.MatcherAssert;
 import org.junit.Before;
@@ -151,6 +155,18 @@ public void testPropertySub() throws IOException {
     assertFalse("schema cache", cfg.hasSchemaCache());
   }
 
+  public void testNodeLevelCache() throws IOException {
+    Path testSrcRoot = TEST_PATH();
+    Files.copy(testSrcRoot.resolve("solr-nodelevelcaches.xml"), solrHome.resolve("solr.xml"));
+
+    NodeConfig cfg = SolrXmlConfig.fromSolrHome(solrHome, new Properties());
+    Map<String, CacheConfig> cachesConfig = cfg.getCachesConfig();
+    SolrCache<?, ?> nodeLevelCache = cachesConfig.get("myNodeLevelCache").newInstance();
+    assertTrue(nodeLevelCache instanceof CaffeineCache);
+    SolrCache<?, ?> nodeLevelCacheThin = cachesConfig.get("myNodeLevelCacheThin").newInstance();
+    assertTrue(nodeLevelCacheThin instanceof ThinCache.NodeLevelCache);
+  }
+
   public void testExplicitNullGivesDefaults() {
     System.setProperty("jetty.port", "8000");
     String solrXml =
diff --git a/solr/core/src/test/org/apache/solr/search/TestThinCache.java b/solr/core/src/test/org/apache/solr/search/TestThinCache.java
new file mode 100644
index 00000000000..95f795054ad
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/TestThinCache.java
@@ -0,0 +1,160 @@
+/*
+ * 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.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.lucene.tests.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.metrics.SolrMetricManager;
+import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.util.stats.MetricUtils;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Test for {@link ThinCache}. */
+public class TestThinCache extends SolrTestCaseJ4 {
+
+  SolrMetricManager metricManager = new SolrMetricManager();
+  String registry = TestUtil.randomSimpleString(random(), 2, 10);
+  String scope = TestUtil.randomSimpleString(random(), 2, 10);
+
+  @Test
+  public void testSimple() {
+    Object cacheScope = new Object();
+    ThinCache.NodeLevelCache<Object, Integer, String> backing = new ThinCache.NodeLevelCache<>();
+    ThinCache<Object, Integer, String> lfuCache = new ThinCache<>();
+    lfuCache.setBacking(cacheScope, backing);
+    SolrMetricsContext solrMetricsContext = new SolrMetricsContext(metricManager, registry, "foo");
+    lfuCache.initializeMetrics(solrMetricsContext, scope + "-1");
+
+    Object cacheScope2 = new Object();
+    ThinCache<Object, Integer, String> newLFUCache = new ThinCache<>();
+    newLFUCache.setBacking(cacheScope2, backing);
+    newLFUCache.initializeMetrics(solrMetricsContext, scope + "-2");
+
+    Map<String, String> params = new HashMap<>();
+    params.put("size", "100");
+    params.put("initialSize", "10");
+
+    NoOpRegenerator regenerator = new NoOpRegenerator();
+    backing.init(params, null, null);
+    Object initObj =
+        lfuCache.init(Collections.singletonMap("autowarmCount", "25"), null, regenerator);
+    lfuCache.setState(SolrCache.State.LIVE);
+    for (int i = 0; i < 101; i++) {
+      lfuCache.put(i + 1, Integer.toString(i + 1));
+    }
+    assertEquals("15", lfuCache.get(15));
+    assertEquals("75", lfuCache.get(75));
+    assertNull(lfuCache.get(110));
+    Map<String, Object> nl = lfuCache.getMetricsMap().getValue();
+    assertEquals(3L, nl.get("lookups"));
+    assertEquals(2L, nl.get("hits"));
+    assertEquals(101L, nl.get("inserts"));
+
+    assertNull(lfuCache.get(1)); // first item put in should be the first out
+
+    // Test autowarming
+    newLFUCache.init(Collections.singletonMap("autowarmCount", "25"), initObj, regenerator);
+    newLFUCache.warm(null, lfuCache);
+    newLFUCache.setState(SolrCache.State.LIVE);
+
+    newLFUCache.put(103, "103");
+    assertEquals("15", newLFUCache.get(15));
+    assertEquals("75", newLFUCache.get(75));
+    assertNull(newLFUCache.get(50));
+    nl = newLFUCache.getMetricsMap().getValue();
+    assertEquals(3L, nl.get("lookups"));
+    assertEquals(2L, nl.get("hits"));
+    assertEquals(1L, nl.get("inserts"));
+    assertEquals(0L, nl.get("evictions"));
+
+    assertEquals(7L, nl.get("cumulative_lookups"));
+    assertEquals(4L, nl.get("cumulative_hits"));
+    assertEquals(102L, nl.get("cumulative_inserts"));
+  }
+
+  @Test
+  public void testInitCore() throws Exception {
+    for (int i = 0; i < 20; i++) {
+      assertU(adoc("id", Integer.toString(i)));
+    }
+    assertU(commit());
+    assertQ(req("q", "*:*", "fq", "id:0"));
+    assertQ(req("q", "*:*", "fq", "id:0"));
+    assertQ(req("q", "*:*", "fq", "id:1"));
+    Map<String, Object> nodeMetricsSnapshot =
+        MetricUtils.convertMetrics(
+            h.getCoreContainer().getMetricManager().registry("solr.node"),
+            List.of(
+                "CACHE.nodeLevelCache/myNodeLevelCacheThin",
+                "CACHE.nodeLevelCache/myNodeLevelCache"));
+    Map<String, Object> coreMetricsSnapshot =
+        MetricUtils.convertMetrics(
+            h.getCore().getCoreMetricManager().getRegistry(),
+            List.of("CACHE.searcher.filterCache"));
+
+    // check that metrics are accessible, and the core cache writes through to the node-level cache
+    Map<String, Number> assertions = Map.of("lookups", 3L, "hits", 1L, "inserts", 2L, "size", 2);
+    for (Map.Entry<String, Number> e : assertions.entrySet()) {
+      String key = e.getKey();
+      Number val = e.getValue();
+      assertEquals(
+          val, nodeMetricsSnapshot.get("CACHE.nodeLevelCache/myNodeLevelCacheThin.".concat(key)));
+      assertEquals(val, coreMetricsSnapshot.get("CACHE.searcher.filterCache.".concat(key)));
+    }
+
+    // for the other node-level cache, simply check that metrics are accessible
+    assertEquals(0, nodeMetricsSnapshot.get("CACHE.nodeLevelCache/myNodeLevelCache.size"));
+  }
+
+  @BeforeClass
+  public static void setupSolrHome() throws Exception {
+    // make a solr home underneath the test's TEMP_DIR, else we don't have write access to copy in
+    // `solr.xml`
+    Path tmpFile = createTempDir();
+
+    // make data and conf dirs
+    Files.createDirectories(tmpFile.resolve("data"));
+    Path confDir = tmpFile.resolve("collection1").resolve("conf");
+    Files.createDirectories(confDir);
+
+    // copy over configuration files
+    copyXmlToHome(
+        tmpFile.toFile(),
+        TEST_PATH().resolve("solr-nodelevelcaches.xml").toAbsolutePath().toString());
+    Files.copy(
+        getFile("solr/collection1/conf/solrconfig-nodelevelcaches.xml").toPath(),
+        confDir.resolve("solrconfig.xml"));
+    Files.copy(
+        getFile("solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml").toPath(),
+        confDir.resolve("solrconfig.snippet.randomindexconfig.xml"));
+    Files.copy(
+        getFile("solr/collection1/conf/schema-minimal.xml").toPath(),
+        confDir.resolve("schema.xml"));
+
+    // we want the actual `solr.xml` file to be read, instead of the normal operation, which creates
+    // a synthetic "test NodeConfig"
+    System.setProperty("solr.tests.loadSolrXml", "true");
+    initCore("solrconfig.xml", "schema.xml", tmpFile.toAbsolutePath().toString());
+  }
+}
diff --git a/solr/core/src/test/org/apache/solr/search/ThinCache.java b/solr/core/src/test/org/apache/solr/search/ThinCache.java
new file mode 100644
index 00000000000..75910b94bb9
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/ThinCache.java
@@ -0,0 +1,472 @@
+/*
+ * 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 com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAdder;
+import org.apache.lucene.util.Accountable;
+import org.apache.solr.metrics.MetricsMap;
+import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.util.IOFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DISCLAIMER: This class is initially included in the test codebase as a proof-of-concept for
+ * demonstrating/validating node-level cache configuration. Although the implementation is
+ * relatively naive, it should be usable as-is as a plugin, or as a template for developing more
+ * robust implementations.
+ *
+ * <p>A "thin" cache that does not hold strong direct references to the values that it stores and
+ * supplies. Strong references to values are held by a backing {@link NodeLevelCache}. Local
+ * references to keys (and weak references to values) are held by this ThinCache only as an
+ * approximation of the contents of the cache.
+ *
+ * <p>There are no strong guarantees regarding the consistency of local bookkeeping in the ThinCache
+ * (wrt the "source of truth" backing cache). Such guarantees are not necessary, because the local
+ * bookkeeping only exists to support functionality (such as auto-warming and metrics reporting)
+ * where strict correctness is not essential.
+ *
+ * <p>There <i>is</i> however a guarantee that any inconsistency will only be in a safe direction --
+ * i.e., that although there may be entries in the backing cache that are not represented locally in
+ * the ThinCache bookkeeping, the reverse is not true (to protect against memory leak resulting from
+ * the accumulation of stale local references with no corresponding entry in the backing cache).
+ *
+ * <p>NOTE REGARDING AUTOWARMING: because both the warming cache and the cache associated with the
+ * active searcher are backed by the same underlying node-level cache, some extra consideration must
+ * be taken in configuring autowarming. Crosstalk between thin caches is an unavoidable consequence
+ * of the node-level cache approach. Indeed, in the sense that "dynamic resource allocation" is a
+ * type of crosstalk, crosstalk could be considered to be the distinguishing <i>feature</i> of the
+ * node-level cache approach! But in order to prevent competition between active searchers and
+ * corresponding warming searchers, it is advisable to autowarm by percentage -- generally &lt;= 50%
+ * -- or set a relatively low autowarm count (wrt the anticipated overall size of the backing
+ * cache).
+ */
+public class ThinCache<S, K, V> extends SolrCacheBase
+    implements SolrCache<K, V>, Accountable, RemovalListener<K, V> {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  private static final class ScopedKey<S, K> {
+    public final S scope;
+    public final K key;
+
+    private ScopedKey(S scope, K key) {
+      this.scope = scope;
+      this.key = key;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      ScopedKey<?, ?> scopedKey = (ScopedKey<?, ?>) o;
+      return scope.equals(scopedKey.scope) && key.equals(scopedKey.key);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(scope, key);
+    }
+  }
+
+  private interface RemovalListenerRegistry<S, K, V> extends RemovalListener<ScopedKey<S, K>, V> {
+
+    void register(S scope, RemovalListener<K, V> listener);
+
+    void unregister(S scope);
+  }
+
+  private static class RemovalListenerRegistryImpl<S, K, V>
+      implements RemovalListenerRegistry<S, K, V> {
+
+    private final Map<S, RemovalListener<K, V>> listeners = new ConcurrentHashMap<>();
+
+    @Override
+    public void register(S scope, RemovalListener<K, V> listener) {
+      if (listeners.put(scope, listener) != null) {
+        throw new IllegalStateException("removal listener already added for scope " + scope);
+      }
+    }
+
+    @Override
+    public void unregister(S scope) {
+      if (listeners.remove(scope) == null) {
+        log.warn("no removal listener found for scope {}", scope);
+      }
+    }
+
+    @Override
+    public void onRemoval(ScopedKey<S, K> key, V value, RemovalCause cause) {
+      RemovalListener<K, V> listener;
+      if (key != null && (listener = listeners.get(key.scope)) != null) {
+        listener.onRemoval(key.key, value, cause);
+      }
+    }
+  }
+
+  public static final class NodeLevelCache<S, K, V> extends CaffeineCache<ScopedKey<S, K>, V>
+      implements RemovalListenerRegistry<S, K, V> {
+
+    private final RemovalListenerRegistry<S, K, V> removalListenerRegistry =
+        new RemovalListenerRegistryImpl<>();
+
+    @Override
+    public void onRemoval(ScopedKey<S, K> key, V value, RemovalCause cause) {
+      super.onRemoval(key, value, cause);
+      removalListenerRegistry.onRemoval(key, value, cause);
+    }
+
+    @Override
+    public void register(S scope, RemovalListener<K, V> listener) {
+      removalListenerRegistry.register(scope, listener);
+    }
+
+    @Override
+    public void unregister(S scope) {
+      removalListenerRegistry.unregister(scope);
+    }
+
+    @Override
+    public String getName() {
+      return NodeLevelCache.class.getName();
+    }
+
+    @Override
+    public String getDescription() {
+      return String.format(Locale.ROOT, "Node Level Cache(impl=%s)", super.getDescription());
+    }
+  }
+
+  private String description = "Thin Cache";
+
+  private NodeLevelCache<S, K, V> backing;
+
+  private S scope;
+
+  private String parentCacheName;
+
+  private final ConcurrentMap<K, ValEntry<V>> local = new ConcurrentHashMap<>();
+
+  private static final class ValEntry<V> {
+    private final LongAdder ct = new LongAdder();
+    private final WeakReference<V> ref;
+
+    private ValEntry(V val) {
+      this.ref = new WeakReference<>(val);
+    }
+  }
+
+  private static final class HitCountEntry<K, V> {
+    private final long ct;
+    private final K key;
+    private final V val;
+
+    private HitCountEntry(long ct, K key, V val) {
+      this.ct = ct;
+      this.key = key;
+      this.val = val;
+    }
+  }
+
+  @VisibleForTesting
+  void setBacking(S scope, NodeLevelCache<S, K, V> backing) {
+    this.scope = scope;
+    this.backing = backing;
+  }
+
+  private void initForSearcher(SolrIndexSearcher searcher) {
+    if (searcher != null) {
+      // `searcher` may be null for tests, in which case we assume that `this.backing` will
+      // have been set manually via `setBacking()`. In normal use, we expect `searcher != null`.
+      @SuppressWarnings("unchecked")
+      S scope = (S) searcher.getTopReaderContext().reader().getReaderCacheHelper().getKey();
+      this.scope = scope;
+      @SuppressWarnings("unchecked")
+      NodeLevelCache<S, K, V> backing =
+          (NodeLevelCache<S, K, V>) searcher.getCore().getCoreContainer().getCache(parentCacheName);
+      this.backing = backing;
+    }
+    description = generateDescription();
+    backing.register(scope, this);
+  }
+
+  @Override
+  public void initialSearcher(SolrIndexSearcher initialSearcher) {
+    initForSearcher(initialSearcher);
+  }
+
+  @Override
+  public void warm(SolrIndexSearcher searcher, SolrCache<K, V> old) {
+    initForSearcher(searcher);
+    @SuppressWarnings("unchecked")
+    ThinCache<S, K, V> other = (ThinCache<S, K, V>) old;
+    long warmingStartTimeNanos = System.nanoTime();
+    List<HitCountEntry<K, V>> orderedEntries = Collections.emptyList();
+    // warm entries
+    if (isAutowarmingOn()) {
+      orderedEntries = new ArrayList<>(other.local.size() << 1); // oversize
+      for (Entry<K, ValEntry<V>> e : other.local.entrySet()) {
+        ValEntry<V> valEntry = e.getValue();
+        V val = valEntry.ref.get();
+        if (val != null) {
+          orderedEntries.add(new HitCountEntry<>(valEntry.ct.sum(), e.getKey(), val));
+        }
+      }
+      orderedEntries.sort((a, b) -> Long.compare(b.ct, a.ct));
+    }
+
+    int size = autowarm.getWarmCount(orderedEntries.size());
+    int ct = 0;
+    for (HitCountEntry<K, V> entry : orderedEntries) {
+      try {
+        boolean continueRegen =
+            regenerator.regenerateItem(searcher, this, old, entry.key, entry.val);
+        if (!continueRegen || ++ct >= size) {
+          break;
+        }
+      } catch (Exception e) {
+        log.error("Error during auto-warming of key: {}", entry.key, e);
+      }
+    }
+
+    backing.adjustMetrics(hits.sumThenReset(), inserts.sumThenReset(), lookups.sumThenReset());
+    evictions.reset();
+    priorHits = other.hits.sum() + other.priorHits;
+    priorInserts = other.inserts.sum() + other.priorInserts;
+    priorLookups = other.lookups.sum() + other.priorLookups;
+    priorEvictions = other.evictions.sum() + other.priorEvictions;
+    warmupTimeMillis =
+        TimeUnit.MILLISECONDS.convert(
+            System.nanoTime() - warmingStartTimeNanos, TimeUnit.NANOSECONDS);
+  }
+
+  @Override
+  public Object init(Map<String, String> args, Object persistence, CacheRegenerator regenerator) {
+    super.init(args, regenerator);
+    parentCacheName = args.get("parentCacheName");
+    return persistence;
+  }
+
+  private MetricsMap cacheMap;
+  private SolrMetricsContext solrMetricsContext;
+
+  private final LongAdder hits = new LongAdder();
+  private final LongAdder inserts = new LongAdder();
+  private final LongAdder lookups = new LongAdder();
+  private final LongAdder evictions = new LongAdder();
+  private long warmupTimeMillis;
+
+  private long priorHits;
+  private long priorInserts;
+  private long priorLookups;
+  private long priorEvictions;
+
+  @Override
+  public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
+    solrMetricsContext = parentContext.getChildContext(this);
+    cacheMap =
+        new MetricsMap(
+            map -> {
+              long hitCount = hits.sum();
+              long insertCount = inserts.sum();
+              long lookupCount = lookups.sum();
+              long evictionCount = evictions.sum();
+
+              map.put(LOOKUPS_PARAM, lookupCount);
+              map.put(HITS_PARAM, hitCount);
+              map.put(HIT_RATIO_PARAM, hitRate(hitCount, lookupCount));
+              map.put(INSERTS_PARAM, insertCount);
+              map.put(EVICTIONS_PARAM, evictionCount);
+              map.put(SIZE_PARAM, local.size());
+              map.put("warmupTime", warmupTimeMillis);
+              map.put(RAM_BYTES_USED_PARAM, ramBytesUsed());
+              map.put(MAX_RAM_MB_PARAM, getMaxRamMB());
+
+              long cumLookups = priorLookups + lookupCount;
+              long cumHits = priorHits + hitCount;
+              map.put("cumulative_lookups", cumLookups);
+              map.put("cumulative_hits", cumHits);
+              map.put("cumulative_hitratio", hitRate(cumHits, cumLookups));
+              map.put("cumulative_inserts", priorInserts + insertCount);
+              map.put("cumulative_evictions", priorEvictions + evictionCount);
+            });
+    solrMetricsContext.gauge(cacheMap, true, scope, getCategory().toString());
+  }
+
+  @VisibleForTesting
+  MetricsMap getMetricsMap() {
+    return cacheMap;
+  }
+
+  // TODO: refactor this common method out of here and `CaffeineCache`
+  private static double hitRate(long hitCount, long lookupCount) {
+    return lookupCount == 0 ? 1.0 : (double) hitCount / lookupCount;
+  }
+
+  @Override
+  public SolrMetricsContext getSolrMetricsContext() {
+    return solrMetricsContext;
+  }
+
+  @Override
+  public void close() throws IOException {
+    backing.unregister(scope);
+    SolrCache.super.close();
+  }
+
+  @Override
+  public void onRemoval(K key, V value, RemovalCause cause) {
+    if (cause.wasEvicted()) {
+      evictions.increment();
+    }
+    local.remove(key);
+  }
+
+  @Override
+  public String toString() {
+    return name() + (cacheMap != null ? cacheMap.getValue().toString() : "");
+  }
+
+  @Override
+  public int size() {
+    return local.size();
+  }
+
+  @Override
+  public V put(K key, V value) {
+    inserts.increment();
+    ValEntry<V> valEntry = new ValEntry<>(value);
+    valEntry.ct.increment();
+    local.put(key, valEntry);
+    return backing.put(new ScopedKey<>(scope, key), value);
+  }
+
+  @Override
+  public V get(K key) {
+    lookups.increment();
+    V ret = backing.get(new ScopedKey<>(scope, key));
+    if (ret != null) {
+      hits.increment();
+      ValEntry<V> valEntry = local.get(key);
+      if (valEntry != null) {
+        valEntry.ct.increment();
+      }
+    }
+    return ret;
+  }
+
+  @Override
+  public V remove(K key) {
+    // NOTE: rely on `onRemoval()` to remove entry from `local`
+    return backing.remove(new ScopedKey<>(scope, key));
+  }
+
+  @Override
+  public V computeIfAbsent(K key, IOFunction<? super K, ? extends V> mappingFunction)
+      throws IOException {
+    lookups.increment();
+    boolean[] hit = new boolean[] {true};
+    V ret =
+        backing.computeIfAbsent(
+            new ScopedKey<>(scope, key),
+            (k) -> {
+              hit[0] = false;
+              inserts.increment();
+              V innerRet = mappingFunction.apply(k.key);
+              ValEntry<V> valEntry = new ValEntry<>(innerRet);
+              valEntry.ct.increment();
+              local.put(key, valEntry);
+              return innerRet;
+            });
+    if (hit[0]) {
+      hits.increment();
+    }
+    return ret;
+  }
+
+  @Override
+  public void clear() {
+    for (K key : local.keySet()) {
+      backing.remove(new ScopedKey<>(scope, key));
+    }
+    // NOTE: rely on `onRemoval()` to remove entries from `local`
+  }
+
+  @Override
+  public int getMaxSize() {
+    return backing == null ? 0 : backing.getMaxSize();
+  }
+
+  @Override
+  public void setMaxSize(int maxSize) {
+    throw new UnsupportedOperationException(
+        "limits cannot be configured directly on " + getClass());
+  }
+
+  @Override
+  public int getMaxRamMB() {
+    return backing == null ? 0 : backing.getMaxRamMB();
+  }
+
+  @Override
+  public void setMaxRamMB(int maxRamMB) {
+    throw new UnsupportedOperationException(
+        "limits cannot be configured directly on " + getClass());
+  }
+
+  @Override
+  public long ramBytesUsed() {
+    // TODO: this has yet to be implemented.
+    //  the actual implementation should be straightforward, but there are questions about what's
+    //  in and out of scope for calculating ramBytesUsed.
+    return 0;
+  }
+
+  @Override
+  public String getName() {
+    return ThinCache.class.getName();
+  }
+
+  /** Returns the description of this cache. */
+  private String generateDescription() {
+    return String.format(
+        Locale.ROOT,
+        "Thin Cache(backing=%s%s)",
+        backing.getDescription(),
+        isAutowarmingOn() ? (", " + getAutowarmDescription()) : "");
+  }
+
+  @Override
+  public String getDescription() {
+    return description;
+  }
+}
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
index 35cbc379bea..66fa7f8dc76 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
@@ -629,6 +629,26 @@ You can define system properties that should not be returned, or define custom s
 
 If you would like to customize the metrics for your installation, see the xref:deployment-guide:metrics-reporting.adoc#metrics-configuration[Metrics Configuration] section.
 
+=== The <caches> Element
+
+The `<caches>` element in `solr.xml` supports defining and configuring named node-level caches.
+
+These caches are analogous to xref:caches-warming.adoc#user-defined-caches[user-defined caches in `solrconfig.xml`], except that each named cache exists as a long-lived singleton at the node level. These node-level caches are accessible from application code via `CoreContainer.getCache(String cacheName)`.
+
+Note that because node-level caches exist above the context of an individual core, config parameters that hook into the lifecycle of a core/searcher (such as `autowarmCount` and `regenerator`) are irrelevant/ignored for node-level caches.
+
+[source,xml]
+----
+<solr>
+  <caches>
+    <cache name="myNodeLevelUserCache"
+           class="solr.CaffeineCache"
+           size="4096"
+           initialSize="1024" />
+  </caches>
+</solr>
+----
+
 == Substituting JVM System Properties in solr.xml
 
 Solr supports variable substitution of JVM system property values in `solr.xml`, which allows runtime specification of various configuration options.
diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
index 157f0a935e2..5d049e01ff4 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.SolrException;
@@ -186,6 +187,9 @@ public TestHarness(NodeConfig config, CoresLocator coresLocator) {
   }
 
   public static NodeConfig buildTestNodeConfig(Path solrHome) {
+    if ("true".equals(System.getProperty("solr.tests.loadSolrXml"))) {
+      return SolrXmlConfig.fromSolrHome(solrHome, new Properties());
+    }
     CloudConfig cloudConfig =
         (null == System.getProperty("zkHost"))
             ? null

From a03ba8a0da1b1f3def800d4d7b1504e6d2c6245f Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Thu, 31 Aug 2023 14:32:11 -0400
Subject: [PATCH 042/160] logging, MDC: collection for action=DELETE (#1869)

Logging MDC "collection" is sometimes not set when the command being processed.  DELETE is an example.
---
 .../api/collections/OverseerCollectionMessageHandler.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
index a055bbd618f..bd59bf8ede6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
@@ -19,7 +19,6 @@
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP;
 import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
-import static org.apache.solr.common.params.CollectionAdminParams.COLLECTION;
 import static org.apache.solr.common.params.CommonParams.NAME;
 
 import java.io.IOException;
@@ -113,7 +112,9 @@ public OverseerCollectionMessageHandler(
 
   @Override
   public OverseerSolrResponse processMessage(ZkNodeProps message, String operation) {
-    MDCLoggingContext.setCollection(message.getStr(COLLECTION));
+    // sometimes overseer messages have the collection name in 'name' field, not 'collection'
+    MDCLoggingContext.setCollection(
+        message.getStr(COLLECTION_PROP) != null ? message.getStr(COLLECTION_PROP) : message.getStr(NAME));
     MDCLoggingContext.setShard(message.getStr(SHARD_ID_PROP));
     MDCLoggingContext.setReplica(message.getStr(REPLICA_PROP));
     log.debug("OverseerCollectionMessageHandler.processMessage : {} , {}", operation, message);

From 585ba9ba5f9afdaf00ff2071504c4b62f2234d1f Mon Sep 17 00:00:00 2001
From: Pierre Salagnac <82967811+psalagnac@users.noreply.github.com>
Date: Thu, 31 Aug 2023 21:46:11 +0200
Subject: [PATCH 043/160] SOLR-16879: throttle BACKUPCORE, RESTORECORE, SPLIT
 (#1864)

Core Admin operations that are submitted with "async" that are also considered expensive will use a different thread pool of a lower size.  Expensive tasks are: BACKUPCORE, RESTORECORE, SPLIT


Co-authored-by: Pierre Salagnac <psalagnac@salesforce.com>
Co-authored-by: David Smiley <dsmiley@salesforce.com>
---
 solr/CHANGES.txt                              |  4 +
 .../solr/handler/admin/BackupCoreOp.java      |  5 +
 .../solr/handler/admin/CoreAdminHandler.java  | 97 +++++++++++++------
 .../handler/admin/CoreAdminOperation.java     |  6 ++
 .../solr/handler/admin/RestoreCoreOp.java     |  6 ++
 .../apache/solr/handler/admin/SplitOp.java    |  5 +
 .../solr/handler/admin/api/BackupCoreAPI.java |  5 +
 .../handler/admin/api/CoreAdminAPIBase.java   | 22 +++--
 .../handler/admin/api/RestoreCoreAPI.java     |  5 +
 9 files changed, 118 insertions(+), 37 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ce74fc3b1cb..e7e31b686d5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -107,6 +107,10 @@ Improvements
 
 * SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
 
+* SOLR-16879: Limit the number of concurrent expensive core admin operations by running them in a
+  dedicated thread pool. Backup, Restore and Split are expensive operations.
+  (Pierre Salagnac, David Smiley)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/BackupCoreOp.java b/solr/core/src/java/org/apache/solr/handler/admin/BackupCoreOp.java
index bfd939c43b4..788fb494757 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/BackupCoreOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/BackupCoreOp.java
@@ -28,6 +28,11 @@
 
 class BackupCoreOp implements CoreAdminHandler.CoreAdminOp {
 
+  @Override
+  public boolean isExpensive() {
+    return true;
+  }
+
   @Override
   public void execute(CoreAdminHandler.CallInfo it) throws Exception {
     final SolrParams params = it.req.getParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 94212c883cf..f9819dcaf80 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -97,6 +97,7 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
   protected final CoreAdminAsyncTracker coreAdminAsyncTracker;
 
   public static String RESPONSE_STATUS = "STATUS";
+
   public static String RESPONSE_MESSAGE = "msg";
   public static String OPERATION_RESPONSE = "response";
 
@@ -129,13 +130,21 @@ public final void init(NamedList<?> args) {
   @Override
   public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
     super.initializeMetrics(parentContext, scope);
-    coreAdminAsyncTracker.parallelExecutor =
+    coreAdminAsyncTracker.standardExecutor =
         MetricUtils.instrumentedExecutorService(
-            coreAdminAsyncTracker.parallelExecutor,
+            coreAdminAsyncTracker.standardExecutor,
             this,
             solrMetricsContext.getMetricRegistry(),
             SolrMetricManager.mkName(
                 "parallelCoreAdminExecutor", getCategory().name(), scope, "threadPool"));
+
+    coreAdminAsyncTracker.expensiveExecutor =
+        MetricUtils.instrumentedExecutorService(
+            coreAdminAsyncTracker.expensiveExecutor,
+            this,
+            solrMetricsContext.getMetricRegistry(),
+            SolrMetricManager.mkName(
+                "parallelCoreExpensiveAdminExecutor", getCategory().name(), scope, "threadPool"));
   }
 
   @Override
@@ -196,8 +205,6 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
       }
       // boolean doPersist = false;
       final String taskId = req.getParams().get(CommonAdminParams.ASYNC);
-      final CoreAdminAsyncTracker.TaskObject taskObject =
-          new CoreAdminAsyncTracker.TaskObject(taskId);
 
       // Pick the action
       final String action = req.getParams().get(ACTION, STATUS.toString()).toLowerCase(Locale.ROOT);
@@ -220,13 +227,16 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
       if (taskId == null) {
         callInfo.call();
       } else {
-        coreAdminAsyncTracker.submitAsyncTask(
-            taskObject,
-            action,
+        Callable<SolrQueryResponse> task =
             () -> {
               callInfo.call();
               return callInfo.rsp;
-            });
+            };
+
+        var taskObject =
+            new CoreAdminAsyncTracker.TaskObject(taskId, action, op.isExpensive(), task);
+
+        coreAdminAsyncTracker.submitAsyncTask(taskObject);
       }
     } finally {
       rsp.setHttpCaching(false);
@@ -332,7 +342,7 @@ public Name getPermissionName(AuthorizationContext ctx) {
 
   /** Method to ensure shutting down of the ThreadPool Executor. */
   public void shutdown() {
-    if (coreAdminAsyncTracker.parallelExecutor != null) coreAdminAsyncTracker.shutdown();
+    coreAdminAsyncTracker.shutdown();
   }
 
   private static final Map<String, CoreAdminOp> opMap = new HashMap<>();
@@ -393,6 +403,11 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
   }
 
   public interface CoreAdminOp {
+
+    default boolean isExpensive() {
+      return false;
+    }
+
     /**
      * @param it request/response object
      *     <p>If the request is invalid throw a SolrException with
@@ -411,10 +426,18 @@ public static class CoreAdminAsyncTracker {
     public static final String FAILED = "failed";
     public final Map<String, Map<String, TaskObject>> requestStatusMap;
 
-    private ExecutorService parallelExecutor =
+    // Executor for all standard tasks (the ones that are not flagged as expensive)
+    // We always keep 50 live threads
+    private ExecutorService standardExecutor =
         ExecutorUtil.newMDCAwareFixedThreadPool(
             50, new SolrNamedThreadFactory("parallelCoreAdminAPIBaseExecutor"));
 
+    // Executor for expensive tasks
+    // We keep the number number of max threads very low to have throttling for expensive tasks
+    private ExecutorService expensiveExecutor =
+        ExecutorUtil.newMDCAwareCachedThreadPool(
+            5, new SolrNamedThreadFactory("parallelCoreAdminAPIExpensiveExecutor"));
+
     public CoreAdminAsyncTracker() {
       HashMap<String, Map<String, TaskObject>> map = new HashMap<>(3, 1.0f);
       map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<>()));
@@ -424,36 +447,41 @@ public CoreAdminAsyncTracker() {
     }
 
     public void shutdown() {
-      ExecutorUtil.shutdownAndAwaitTermination(parallelExecutor);
+      ExecutorUtil.shutdownAndAwaitTermination(standardExecutor);
+      ExecutorUtil.shutdownAndAwaitTermination(expensiveExecutor);
     }
 
     public Map<String, TaskObject> getRequestStatusMap(String key) {
       return requestStatusMap.get(key);
     }
 
-    public void submitAsyncTask(
-        TaskObject taskObject, String action, Callable<SolrQueryResponse> task)
-        throws SolrException {
+    public void submitAsyncTask(TaskObject taskObject) throws SolrException {
       ensureTaskIdNotInUse(taskObject.taskId);
       addTask(RUNNING, taskObject);
 
+      Runnable command =
+          () -> {
+            boolean exceptionCaught = false;
+            try {
+              final SolrQueryResponse response = taskObject.task.call();
+              taskObject.setRspObject(response);
+              taskObject.setOperationRspObject(response);
+            } catch (Exception e) {
+              exceptionCaught = true;
+              taskObject.setRspObjectFromException(e);
+            } finally {
+              finishTask(taskObject, !exceptionCaught);
+            }
+          };
+
       try {
         MDC.put("CoreAdminHandler.asyncId", taskObject.taskId);
-        MDC.put("CoreAdminHandler.action", action);
-        parallelExecutor.execute(
-            () -> {
-              boolean exceptionCaught = false;
-              try {
-                final SolrQueryResponse response = task.call();
-                taskObject.setRspObject(response);
-                taskObject.setOperationRspObject(response);
-              } catch (Exception e) {
-                exceptionCaught = true;
-                taskObject.setRspObjectFromException(e);
-              } finally {
-                finishTask(taskObject, !exceptionCaught);
-              }
-            });
+        MDC.put("CoreAdminHandler.action", taskObject.action);
+        if (taskObject.expensive) {
+          expensiveExecutor.execute(command);
+        } else {
+          standardExecutor.execute(command);
+        }
       } finally {
         MDC.remove("CoreAdminHandler.asyncId");
         MDC.remove("CoreAdminHandler.action");
@@ -503,12 +531,19 @@ private void finishTask(TaskObject taskObject, boolean successful) {
      * response (if available).
      */
     public static class TaskObject {
-      public String taskId;
+      final String taskId;
+      final String action;
+      final boolean expensive;
+      final Callable<SolrQueryResponse> task;
       public String rspInfo;
       public Object operationRspInfo;
 
-      public TaskObject(String taskId) {
+      public TaskObject(
+          String taskId, String action, boolean expensive, Callable<SolrQueryResponse> task) {
         this.taskId = taskId;
+        this.action = action;
+        this.expensive = expensive;
+        this.task = task;
       }
 
       public String getRspObject() {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
index bf82ae38c4e..31251759c76 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
@@ -309,6 +309,12 @@ static Logger log() {
     return log;
   }
 
+  @Override
+  public boolean isExpensive() {
+    // delegates this to the actual implementation
+    return fun.isExpensive();
+  }
+
   /**
    * Returns the core status for a particular core.
    *
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/RestoreCoreOp.java b/solr/core/src/java/org/apache/solr/handler/admin/RestoreCoreOp.java
index b7f97469b49..c95af84d3d7 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/RestoreCoreOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/RestoreCoreOp.java
@@ -24,6 +24,12 @@
 import org.apache.solr.handler.api.V2ApiUtils;
 
 class RestoreCoreOp implements CoreAdminHandler.CoreAdminOp {
+
+  @Override
+  public boolean isExpensive() {
+    return true;
+  }
+
   @Override
   public void execute(CoreAdminHandler.CallInfo it) throws Exception {
     final SolrParams params = it.req.getParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
index 3b66794c5d5..fd29d31fcd0 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
@@ -70,6 +70,11 @@ class SplitOp implements CoreAdminHandler.CoreAdminOp {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+  @Override
+  public boolean isExpensive() {
+    return true;
+  }
+
   @Override
   public void execute(CoreAdminHandler.CallInfo it) throws Exception {
     SolrParams params = it.req.getParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/BackupCoreAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/BackupCoreAPI.java
index 8f57c58f2d9..580f2849b2f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/BackupCoreAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/BackupCoreAPI.java
@@ -56,6 +56,11 @@ public BackupCoreAPI(
     super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse);
   }
 
+  @Override
+  boolean isExpensive() {
+    return true;
+  }
+
   @POST
   @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @PermissionName(COLL_EDIT_PERM)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreAdminAPIBase.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreAdminAPIBase.java
index 6a4130e9132..69fe4c993ce 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreAdminAPIBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreAdminAPIBase.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.handler.admin.api;
 
+import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 import org.apache.solr.api.JerseyResource;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
@@ -52,6 +53,14 @@ public CoreAdminAPIBase(
     this.rsp = rsp;
   }
 
+  /**
+   * Can be overridden by operations that are expensive, so we don't execute too many of them
+   * concurrently.
+   */
+  boolean isExpensive() {
+    return false;
+  }
+
   /**
    * Wraps the subclasses logic with extra bookkeeping logic.
    *
@@ -79,22 +88,23 @@ public <T extends SolrJerseyResponse> T handlePotentiallyAsynchronousTask(
         throw new SolrException(
             SolrException.ErrorCode.BAD_REQUEST, "Core container instance missing");
       }
-      final CoreAdminHandler.CoreAdminAsyncTracker.TaskObject taskObject =
-          new CoreAdminHandler.CoreAdminAsyncTracker.TaskObject(taskId);
 
       MDCLoggingContext.setCoreName(coreName);
       TraceUtils.setDbInstance(req, coreName);
       if (taskId == null) {
         return supplier.get();
       } else {
-        coreAdminAsyncTracker.submitAsyncTask(
-            taskObject,
-            actionName,
+        Callable<SolrQueryResponse> task =
             () -> {
               T response = supplier.get();
               V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, response);
               return rsp;
-            });
+            };
+
+        final CoreAdminHandler.CoreAdminAsyncTracker.TaskObject taskObject =
+            new CoreAdminHandler.CoreAdminAsyncTracker.TaskObject(
+                taskId, actionName, isExpensive(), task);
+        coreAdminAsyncTracker.submitAsyncTask(taskObject);
       }
     } catch (CoreAdminAPIBaseException e) {
       throw e.trueException;
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCoreAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCoreAPI.java
index 03358880450..7e8ccf29862 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCoreAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCoreAPI.java
@@ -61,6 +61,11 @@ public RestoreCoreAPI(
     super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse);
   }
 
+  @Override
+  boolean isExpensive() {
+    return true;
+  }
+
   @POST
   @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @PermissionName(CORE_EDIT_PERM)

From 3cbb97549cef1664a1d6b01fd2d1367cefbb0665 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Thu, 31 Aug 2023 16:03:55 -0400
Subject: [PATCH 044/160] tidy

---
 .../api/collections/OverseerCollectionMessageHandler.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
index bd59bf8ede6..5597841d115 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
@@ -114,7 +114,9 @@ public OverseerCollectionMessageHandler(
   public OverseerSolrResponse processMessage(ZkNodeProps message, String operation) {
     // sometimes overseer messages have the collection name in 'name' field, not 'collection'
     MDCLoggingContext.setCollection(
-        message.getStr(COLLECTION_PROP) != null ? message.getStr(COLLECTION_PROP) : message.getStr(NAME));
+        message.getStr(COLLECTION_PROP) != null
+            ? message.getStr(COLLECTION_PROP)
+            : message.getStr(NAME));
     MDCLoggingContext.setShard(message.getStr(SHARD_ID_PROP));
     MDCLoggingContext.setReplica(message.getStr(REPLICA_PROP));
     log.debug("OverseerCollectionMessageHandler.processMessage : {} , {}", operation, message);

From 01831cca97a4f8ea074e9498c08b85c1fdb2d984 Mon Sep 17 00:00:00 2001
From: Colvin Cowie <colvin.cowie.dev@gmail.com>
Date: Fri, 1 Sep 2023 09:24:34 +0100
Subject: [PATCH 045/160] SOLR-16958: Fix spurious warning about LATEST
 luceneMatchVersion

---
 solr/CHANGES.txt                                        | 2 ++
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e7e31b686d5..9bfc1191052 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -151,6 +151,8 @@ Bug Fixes
 * SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
   (Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)
 
+* SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion (Colvin Cowie)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 563d817803e..89bcf88b9cb 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -420,7 +420,9 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           pe);
     }
 
-    if (Objects.equals(version, Version.LATEST) && !versionWarningAlreadyLogged.getAndSet(true)) {
+    // The use of == is intentional here because the latest matchVersion will be equal() to
+    // Version.LATEST, but will not be == to Version.LATEST
+    if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
       log.warn(
           "You should not use LATEST as luceneMatchVersion property: "
               + "if you use this setting, and then Solr upgrades to a newer release of Lucene, "

From 7bdce4cb704ec511a31db18185b2789c357ee1e9 Mon Sep 17 00:00:00 2001
From: Colvin Cowie <colvin.cowie.dev@gmail.com>
Date: Fri, 1 Sep 2023 09:44:41 +0100
Subject: [PATCH 046/160] SOLR-16958: Fix spurious warning about LATEST
 luceneMatchVersion

---
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 89bcf88b9cb..d425235f201 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -420,8 +420,7 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           pe);
     }
 
-    // The use of == is intentional here because the latest matchVersion will be equal() to
-    // Version.LATEST, but will not be == to Version.LATEST
+    // The use of == is intentional here because the latest 'V.V.V' version will be equal() to Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
     if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
       log.warn(
           "You should not use LATEST as luceneMatchVersion property: "

From f947b76595403e853a8710fa06804f0551602919 Mon Sep 17 00:00:00 2001
From: Colvin Cowie <colvin.cowie.dev@gmail.com>
Date: Fri, 1 Sep 2023 09:46:19 +0100
Subject: [PATCH 047/160] Reword comment

---
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index d425235f201..cb750ebe132 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -420,7 +420,8 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           pe);
     }
 
-    // The use of == is intentional here because the latest 'V.V.V' version will be equal() to Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
+    // The use of == is intentional here because the latest 'V.V.V' version will be equal() to
+    // Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
     if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
       log.warn(
           "You should not use LATEST as luceneMatchVersion property: "

From 9d6db8c900dca52c469e5f94ddb8e4d7fa349c03 Mon Sep 17 00:00:00 2001
From: Colvin Cowie <colvin.cowie.dev@gmail.com>
Date: Fri, 1 Sep 2023 09:47:23 +0100
Subject: [PATCH 048/160] Revert "SOLR-16958: Fix spurious warning about LATEST
 luceneMatchVersion"

---
 solr/CHANGES.txt                                        | 2 --
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9bfc1191052..e7e31b686d5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -151,8 +151,6 @@ Bug Fixes
 * SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
   (Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)
 
-* SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion (Colvin Cowie)
-
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index cb750ebe132..563d817803e 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -420,9 +420,7 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           pe);
     }
 
-    // The use of == is intentional here because the latest 'V.V.V' version will be equal() to
-    // Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
-    if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
+    if (Objects.equals(version, Version.LATEST) && !versionWarningAlreadyLogged.getAndSet(true)) {
       log.warn(
           "You should not use LATEST as luceneMatchVersion property: "
               + "if you use this setting, and then Solr upgrades to a newer release of Lucene, "

From 8c0d1a0698ca8a9d8d95d0e1de5ccc8a4ec7dc56 Mon Sep 17 00:00:00 2001
From: Colvin Cowie <colvin.cowie.dev@gmail.com>
Date: Fri, 1 Sep 2023 14:05:34 +0100
Subject: [PATCH 049/160] SOLR-16958: Fix spurious warning about LATEST
 luceneMatchVersion (#1879)

---
 solr/CHANGES.txt                                        | 2 ++
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e7e31b686d5..9bfc1191052 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -151,6 +151,8 @@ Bug Fixes
 * SOLR-16916: Use of the JSON Query DSL should ignore the defType parameter
   (Christina Chortaria, Max Kadel, Ryan Laddusaw, Jane Sandberg, David Smiley)
 
+* SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion (Colvin Cowie)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 563d817803e..7fb27347818 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -409,6 +409,7 @@ private IndexSchemaFactory.VersionedConfig readXml(SolrResourceLoader loader, St
 
   private static final AtomicBoolean versionWarningAlreadyLogged = new AtomicBoolean(false);
 
+  @SuppressWarnings("ReferenceEquality") // Use of == is intentional here
   public static final Version parseLuceneVersionString(final String matchVersion) {
     final Version version;
     try {
@@ -420,7 +421,9 @@ public static final Version parseLuceneVersionString(final String matchVersion)
           pe);
     }
 
-    if (Objects.equals(version, Version.LATEST) && !versionWarningAlreadyLogged.getAndSet(true)) {
+    // The use of == is intentional here because the latest 'V.V.V' version will be equal() to
+    // Version.LATEST, but will not be == to Version.LATEST unless 'LATEST' was supplied.
+    if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {
       log.warn(
           "You should not use LATEST as luceneMatchVersion property: "
               + "if you use this setting, and then Solr upgrades to a newer release of Lucene, "

From 199d51f1a3fe6188b405ef99f8f75ddd54729f6a Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 1 Sep 2023 15:37:39 +0100
Subject: [PATCH 050/160] NO JIRA: factor out protected
 SearchHandler.checkCircuitBreakers method (#1882)

---
 .../solr/handler/component/SearchHandler.java | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 5b5672faf8d..0d5b6c27c00 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -329,29 +329,14 @@ protected ResponseBuilder newResponseBuilder(
     return new ResponseBuilder(req, rsp, components);
   }
 
-  @Override
-  public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
-    if (req.getParams().getBool(ShardParams.IS_SHARD, false)) {
-      int purpose = req.getParams().getInt(ShardParams.SHARDS_PURPOSE, 0);
-      SolrPluginUtils.forEachRequestPurpose(
-          purpose, n -> shardPurposes.computeIfAbsent(n, name -> new Counter()).inc());
-    }
-
-    List<SearchComponent> components = getComponents();
-    ResponseBuilder rb = newResponseBuilder(req, rsp, components);
-    if (rb.requestInfo != null) {
-      rb.requestInfo.setResponseBuilder(rb);
-    }
-
-    rb.isDistrib = isDistrib(req);
-    tagRequestWithRequestId(rb);
-
-    boolean dbg = req.getParams().getBool(CommonParams.DEBUG_QUERY, false);
-    rb.setDebug(dbg);
-    if (dbg == false) { // if it's true, we are doing everything anyway.
-      SolrPluginUtils.getDebugInterests(req.getParams().getParams(CommonParams.DEBUG), rb);
-    }
-
+  /**
+   * Check if circuit breakers are tripped. Override this method in sub classes that do not want to
+   * check circuit breakers.
+   *
+   * @return true if circuit breakers are tripped, false otherwise.
+   */
+  protected boolean checkCircuitBreakers(
+      SolrQueryRequest req, SolrQueryResponse rsp, ResponseBuilder rb) {
     final RTimerTree timer = rb.isDebug() ? req.getRequestTimer() : null;
 
     final CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
@@ -376,9 +361,40 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
             new SolrException(
                 SolrException.ErrorCode.SERVICE_UNAVAILABLE,
                 "Circuit Breakers tripped " + errorMessage));
-        return;
+        return true;
       }
     }
+    return false;
+  }
+
+  @Override
+  public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
+    if (req.getParams().getBool(ShardParams.IS_SHARD, false)) {
+      int purpose = req.getParams().getInt(ShardParams.SHARDS_PURPOSE, 0);
+      SolrPluginUtils.forEachRequestPurpose(
+          purpose, n -> shardPurposes.computeIfAbsent(n, name -> new Counter()).inc());
+    }
+
+    List<SearchComponent> components = getComponents();
+    ResponseBuilder rb = newResponseBuilder(req, rsp, components);
+    if (rb.requestInfo != null) {
+      rb.requestInfo.setResponseBuilder(rb);
+    }
+
+    rb.isDistrib = isDistrib(req);
+    tagRequestWithRequestId(rb);
+
+    boolean dbg = req.getParams().getBool(CommonParams.DEBUG_QUERY, false);
+    rb.setDebug(dbg);
+    if (dbg == false) { // if it's true, we are doing everything anyway.
+      SolrPluginUtils.getDebugInterests(req.getParams().getParams(CommonParams.DEBUG), rb);
+    }
+
+    final RTimerTree timer = rb.isDebug() ? req.getRequestTimer() : null;
+
+    if (checkCircuitBreakers(req, rsp, rb)) {
+      return; // Circuit breaker tripped, return immediately
+    }
 
     // creates a ShardHandler object only if it's needed
     final ShardHandler shardHandler1 = getAndPrepShardHandler(req, rb);

From 09ee485d80e94594e25884b987736dce6f017006 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 1 Sep 2023 15:38:03 +0100
Subject: [PATCH 051/160] NO JIRA: add
 TestFieldValueFeature.testBooleanValue_docValues() case (#1881)

---
 .../solr/ltr/feature/TestFieldValueFeature.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index 8123d8ce382..5f102fb67a1 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -407,8 +407,21 @@ public void testThatDefaultFieldValueScorerIsUsedAndDefaultIsReturned() throws E
 
   @Test
   public void testBooleanValue() throws Exception {
+    implTestBooleanValue("isTrendy");
+  }
+
+  @Test
+  public void testBooleanValue_docValues() throws Exception {
+    implTestBooleanValue("dvIsTrendy");
+  }
+
+  private void implTestBooleanValue(String isTrendyFieldName) throws Exception {
     final String fstore = "test_boolean_store";
-    loadFeature("trendy", FieldValueFeature.class.getName(), fstore, "{\"field\":\"isTrendy\"}");
+    loadFeature(
+        "trendy",
+        FieldValueFeature.class.getName(),
+        fstore,
+        "{\"field\":\"" + isTrendyFieldName + "\"}");
 
     loadModel(
         "trendy-model",

From 9426902acb7081a2e9a1fa29699c5286459e1365 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Fri, 1 Sep 2023 13:07:03 -0400
Subject: [PATCH 052/160] SOLR-16825: Migrate API definitions to submodule, pt
 2 (#1866)

Extracting annotated interfaces for these APIs includes them in the SolrRequest-
generation we now do in SolrJ.
---
 .../api/endpoint/AliasPropertyApis.java       |  95 ++++++++++++++++
 .../client/api/endpoint/ListAliasesApi.java   |  52 +++++++++
 .../endpoint/ListCollectionBackupsApi.java    |  46 ++++++++
 .../api/endpoint/ListCollectionsApi.java      |  35 ++++++
 .../api/endpoint/ListConfigsetsApi.java       |  34 ++++++
 .../api/endpoint/ReloadCollectionApi.java     |  41 +++++++
 .../api/model/CollectionBackupDetails.java    |  38 +++++++
 .../solr/client/api/model/Constants.java      |   3 +
 .../api/model/GetAliasByNameResponse.java     |  32 ++++++
 .../api/model/GetAliasPropertyResponse.java   |  26 +++++
 .../model/GetAllAliasPropertiesResponse.java  |  27 +++++
 .../client/api/model/ListAliasesResponse.java |  28 +++++
 .../model/ListCollectionBackupsResponse.java  |  25 ++++
 .../api/model/ListCollectionsResponse.java    |  25 ++++
 .../api/model/ListConfigsetsResponse.java     |  26 +++++
 .../model/ReloadCollectionRequestBody.java    |  27 +++++
 .../UpdateAliasPropertiesRequestBody.java     |  32 ++++++
 .../model/UpdateAliasPropertyRequestBody.java |  24 ++++
 .../handler/admin/CollectionsHandler.java     |  29 +++--
 .../solr/handler/admin/ConfigSetsHandler.java |   6 +-
 ...iasPropertyAPI.java => AliasProperty.java} | 107 +++---------------
 .../{ListAliasesAPI.java => ListAliases.java} |  59 ++--------
 ...upsAPI.java => ListCollectionBackups.java} |  53 ++-------
 ...llectionsAPI.java => ListCollections.java} |  22 +---
 .../admin/api/ReloadCollectionAPI.java        |  33 ++----
 ...ConfigSetsAPI.java => ListConfigSets.java} |  29 +----
 .../org/apache/solr/core/PluginBagTest.java   |   6 +-
 .../handler/admin/api/ListAliasesAPITest.java |  10 +-
 .../admin/api/ReloadCollectionAPITest.java    |   7 +-
 .../configsets/ListConfigSetsAPITest.java     |  21 ++--
 .../src/resources/java-template/api.mustache  |   4 +-
 31 files changed, 712 insertions(+), 290 deletions(-)
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/GetAliasByNameResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/GetAliasPropertyResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/GetAllAliasPropertiesResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ListAliasesResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ListCollectionBackupsResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ListCollectionsResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ListConfigsetsResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ReloadCollectionRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertiesRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertyRequestBody.java
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{AliasPropertyAPI.java => AliasProperty.java} (62%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{ListAliasesAPI.java => ListAliases.java} (65%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{ListCollectionBackupsAPI.java => ListCollectionBackups.java} (70%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{ListCollectionsAPI.java => ListCollections.java} (75%)
 rename solr/core/src/java/org/apache/solr/handler/configsets/{ListConfigSetsAPI.java => ListConfigSets.java} (66%)

diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
new file mode 100644
index 00000000000..d993997d111
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
@@ -0,0 +1,95 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.model.GetAliasPropertyResponse;
+import org.apache.solr.client.api.model.GetAllAliasPropertiesResponse;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.model.UpdateAliasPropertiesRequestBody;
+import org.apache.solr.client.api.model.UpdateAliasPropertyRequestBody;
+
+/** V2 API definitions for managing and inspecting properties for collection aliases */
+@Path("/aliases/{aliasName}/properties")
+public interface AliasPropertyApis {
+
+  @GET
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Get properties for a collection alias.",
+      tags = {"alias-properties"})
+  GetAllAliasPropertiesResponse getAllAliasProperties(
+      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName)
+      throws Exception;
+
+  @GET
+  @Path("/{propName}")
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Get a specific property for a collection alias.",
+      tags = {"alias-properties"})
+  GetAliasPropertyResponse getAliasProperty(
+      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
+      @Parameter(description = "Property Name") @PathParam("propName") String propName)
+      throws Exception;
+
+  @PUT
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Update properties for a collection alias.",
+      tags = {"alias-properties"})
+  SolrJerseyResponse updateAliasProperties(
+      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
+      @RequestBody(description = "Properties that need to be updated", required = true)
+          UpdateAliasPropertiesRequestBody requestBody)
+      throws Exception;
+
+  @PUT
+  @Path("/{propName}")
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Update a specific property for a collection alias.",
+      tags = {"alias-properties"})
+  SolrJerseyResponse createOrUpdateAliasProperty(
+      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
+      @Parameter(description = "Property Name") @PathParam("propName") String propName,
+      @RequestBody(description = "Property value that needs to be updated", required = true)
+          UpdateAliasPropertyRequestBody requestBody)
+      throws Exception;
+
+  @DELETE
+  @Path("/{propName}")
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Delete a specific property for a collection alias.",
+      tags = {"alias-properties"})
+  SolrJerseyResponse deleteAliasProperty(
+      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
+      @Parameter(description = "Property Name") @PathParam("propName") String propName)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
new file mode 100644
index 00000000000..eaeddf7bd2a
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.model.GetAliasByNameResponse;
+import org.apache.solr.client.api.model.ListAliasesResponse;
+
+/** V2 API definition for listing and inspecting collection aliases */
+@Path("/aliases")
+public interface ListAliasesApi {
+
+  @GET
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "List the existing collection aliases.",
+      tags = {"aliases"})
+  ListAliasesResponse getAliases() throws Exception;
+
+  @GET
+  @Path("/{aliasName}")
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Get details for a specific collection alias.",
+      tags = {"aliases"})
+  GetAliasByNameResponse getAliasByName(
+      @Parameter(description = "Alias name.", required = true) @PathParam("aliasName")
+          String aliasName)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
new file mode 100644
index 00000000000..24701fb18cc
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
@@ -0,0 +1,46 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.model.Constants.BACKUP_LOCATION;
+import static org.apache.solr.client.api.model.Constants.BACKUP_REPOSITORY;
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import java.io.IOException;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import org.apache.solr.client.api.model.ListCollectionBackupsResponse;
+
+/** V2 API definitions for collection-backup "listing". */
+@Path("/backups/{backupName}/versions")
+public interface ListCollectionBackupsApi {
+
+  @GET
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "List existing incremental backups at the specified location.",
+      tags = {"collection-backups"})
+  ListCollectionBackupsResponse listBackupsAtLocation(
+      @PathParam("backupName") String backupName,
+      @QueryParam(BACKUP_LOCATION) String location,
+      @QueryParam(BACKUP_REPOSITORY) String repositoryName)
+      throws IOException;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
new file mode 100644
index 00000000000..fabb670a4b5
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.ListCollectionsResponse;
+
+@Path("/collections")
+public interface ListCollectionsApi {
+  @GET
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "List all collections in this Solr cluster",
+      tags = {"collections"})
+  ListCollectionsResponse listCollections();
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
new file mode 100644
index 00000000000..c1e99b805a1
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
@@ -0,0 +1,34 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.ListConfigsetsResponse;
+
+/** V2 API definition for listing configsets. */
+@Path("/cluster/configs")
+public interface ListConfigsetsApi {
+  @GET
+  @Produces({"application/json", "application/javabin"})
+  @Operation(
+      summary = "List the configsets available to Solr.",
+      tags = {"configsets"})
+  ListConfigsetsResponse listConfigSet() throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
new file mode 100644
index 00000000000..39f27d2911d
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
@@ -0,0 +1,41 @@
+/*
+ * 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.api.endpoint;
+
+import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.model.ReloadCollectionRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/** V2 API definition for reloading collections. */
+@Path("/collections/{collectionName}/reload")
+public interface ReloadCollectionApi {
+  @POST
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(
+      summary = "Reload all cores in the specified collection.",
+      tags = {"collections"})
+  SubResponseAccumulatingJerseyResponse reloadCollection(
+      @PathParam("collectionName") String collectionName, ReloadCollectionRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java b/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
new file mode 100644
index 00000000000..a46529baab4
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
@@ -0,0 +1,38 @@
+/*
+ * 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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.COLL_CONF;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+
+public class CollectionBackupDetails {
+  @JsonProperty public Integer backupId;
+  @JsonProperty public String indexVersion;
+  @JsonProperty public String startTime;
+  @JsonProperty public String endTime;
+  @JsonProperty public Integer indexFileCount;
+  @JsonProperty public Double indexSizeMB;
+
+  @JsonProperty public Map<String, String> shardBackupIds;
+
+  @JsonProperty(COLL_CONF)
+  public String configsetName;
+
+  @JsonProperty public String collectionAlias;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/Constants.java b/solr/api/src/java/org/apache/solr/client/api/model/Constants.java
index e6ad827756f..0992c2c3a17 100644
--- a/solr/api/src/java/org/apache/solr/client/api/model/Constants.java
+++ b/solr/api/src/java/org/apache/solr/client/api/model/Constants.java
@@ -48,4 +48,7 @@ private Constants() {
   public static final String DELETE_INSTANCE_DIR = "deleteInstanceDir";
 
   public static final String ONLY_IF_DOWN = "onlyIfDown";
+
+  /** The name of the config set to be used for a collection */
+  public static final String COLL_CONF = "collection.configName";
 }
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/GetAliasByNameResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/GetAliasByNameResponse.java
new file mode 100644
index 00000000000..df0498d9f12
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/GetAliasByNameResponse.java
@@ -0,0 +1,32 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+
+public class GetAliasByNameResponse extends SolrJerseyResponse {
+  @JsonProperty("name")
+  public String alias;
+
+  @JsonProperty("collections")
+  public List<String> collections;
+
+  @JsonProperty("properties")
+  public Map<String, String> properties;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/GetAliasPropertyResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/GetAliasPropertyResponse.java
new file mode 100644
index 00000000000..93e62ba04c6
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/GetAliasPropertyResponse.java
@@ -0,0 +1,26 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class GetAliasPropertyResponse extends SolrJerseyResponse {
+  @JsonProperty("value")
+  @Schema(description = "Property value.")
+  public String value;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/GetAllAliasPropertiesResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/GetAllAliasPropertiesResponse.java
new file mode 100644
index 00000000000..17b93d45471
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/GetAllAliasPropertiesResponse.java
@@ -0,0 +1,27 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Map;
+
+public class GetAllAliasPropertiesResponse extends SolrJerseyResponse {
+  @JsonProperty("properties")
+  @Schema(description = "Properties and values associated with alias.")
+  public Map<String, String> properties;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ListAliasesResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/ListAliasesResponse.java
new file mode 100644
index 00000000000..3d9c93af85e
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ListAliasesResponse.java
@@ -0,0 +1,28 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+
+public class ListAliasesResponse extends SolrJerseyResponse {
+  @JsonProperty("aliases")
+  public Map<String, String> aliases;
+
+  @JsonProperty("properties")
+  public Map<String, Map<String, String>> properties;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionBackupsResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionBackupsResponse.java
new file mode 100644
index 00000000000..038a3df2ff4
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionBackupsResponse.java
@@ -0,0 +1,25 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public class ListCollectionBackupsResponse extends SolrJerseyResponse {
+  @JsonProperty public String collection;
+  @JsonProperty public List<CollectionBackupDetails> backups;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionsResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionsResponse.java
new file mode 100644
index 00000000000..17bf44c44ec
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ListCollectionsResponse.java
@@ -0,0 +1,25 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public class ListCollectionsResponse extends SolrJerseyResponse {
+  @JsonProperty("collections")
+  public List<String> collections;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ListConfigsetsResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/ListConfigsetsResponse.java
new file mode 100644
index 00000000000..09b99dfbdc9
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ListConfigsetsResponse.java
@@ -0,0 +1,26 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public class ListConfigsetsResponse extends SolrJerseyResponse {
+
+  @JsonProperty("configSets")
+  public List<String> configSets;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ReloadCollectionRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/ReloadCollectionRequestBody.java
new file mode 100644
index 00000000000..287e5453381
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ReloadCollectionRequestBody.java
@@ -0,0 +1,27 @@
+/*
+ * 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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+// TODO Is it worth having this in a request body, or should we just make it a query param?
+public class ReloadCollectionRequestBody {
+  @JsonProperty(ASYNC)
+  public String async;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertiesRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertiesRequestBody.java
new file mode 100644
index 00000000000..de6a48a0a50
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertiesRequestBody.java
@@ -0,0 +1,32 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Map;
+
+public class UpdateAliasPropertiesRequestBody {
+
+  @Schema(description = "Properties and values to be updated on alias.")
+  @JsonProperty(value = "properties", required = true)
+  public Map<String, Object> properties;
+
+  @Schema(description = "Request ID to track this action which will be processed asynchronously.")
+  @JsonProperty("async")
+  public String async;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertyRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertyRequestBody.java
new file mode 100644
index 00000000000..a7a82536b71
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/UpdateAliasPropertyRequestBody.java
@@ -0,0 +1,24 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class UpdateAliasPropertyRequestBody {
+  @JsonProperty(required = true)
+  public Object value;
+}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 732d7eb03c2..b1949c993a1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -124,6 +124,7 @@
 import org.apache.solr.api.JerseyResource;
 import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.model.UpdateAliasPropertiesRequestBody;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.RequestStatusState;
@@ -164,7 +165,7 @@
 import org.apache.solr.handler.RequestHandlerBase;
 import org.apache.solr.handler.admin.api.AddReplicaProperty;
 import org.apache.solr.handler.admin.api.AdminAPIBase;
-import org.apache.solr.handler.admin.api.AliasPropertyAPI;
+import org.apache.solr.handler.admin.api.AliasProperty;
 import org.apache.solr.handler.admin.api.BalanceReplicasAPI;
 import org.apache.solr.handler.admin.api.BalanceShardUniqueAPI;
 import org.apache.solr.handler.admin.api.CollectionPropertyAPI;
@@ -185,10 +186,10 @@
 import org.apache.solr.handler.admin.api.DeleteShardAPI;
 import org.apache.solr.handler.admin.api.ForceLeaderAPI;
 import org.apache.solr.handler.admin.api.InstallShardDataAPI;
-import org.apache.solr.handler.admin.api.ListAliasesAPI;
-import org.apache.solr.handler.admin.api.ListCollectionBackupsAPI;
+import org.apache.solr.handler.admin.api.ListAliases;
+import org.apache.solr.handler.admin.api.ListCollectionBackups;
 import org.apache.solr.handler.admin.api.ListCollectionSnapshotsAPI;
-import org.apache.solr.handler.admin.api.ListCollectionsAPI;
+import org.apache.solr.handler.admin.api.ListCollections;
 import org.apache.solr.handler.admin.api.MigrateDocsAPI;
 import org.apache.solr.handler.admin.api.MigrateReplicasAPI;
 import org.apache.solr.handler.admin.api.ModifyCollectionAPI;
@@ -640,11 +641,10 @@ public enum CollectionOperation implements CollectionOp {
         (req, rsp, h) -> {
           String name = req.getParams().required().get(NAME);
           Map<String, Object> properties = collectToMap(req.getParams(), "property");
-          AliasPropertyAPI.UpdateAliasPropertiesRequestBody requestBody =
-              new AliasPropertyAPI.UpdateAliasPropertiesRequestBody();
+          final var requestBody = new UpdateAliasPropertiesRequestBody();
           requestBody.properties = properties;
           requestBody.async = req.getParams().get(ASYNC);
-          final AliasPropertyAPI aliasPropertyAPI = new AliasPropertyAPI(h.coreContainer, req, rsp);
+          final AliasProperty aliasPropertyAPI = new AliasProperty(h.coreContainer, req, rsp);
           final SolrJerseyResponse getAliasesResponse =
               aliasPropertyAPI.updateAliasProperties(name, requestBody);
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, getAliasesResponse);
@@ -655,7 +655,7 @@ public enum CollectionOperation implements CollectionOp {
     LISTALIASES_OP(
         LISTALIASES,
         (req, rsp, h) -> {
-          final ListAliasesAPI getAliasesAPI = new ListAliasesAPI(h.coreContainer, req, rsp);
+          final ListAliases getAliasesAPI = new ListAliases(h.coreContainer, req, rsp);
           final SolrJerseyResponse getAliasesResponse = getAliasesAPI.getAliases();
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, getAliasesResponse);
           return null;
@@ -965,8 +965,7 @@ public Map<String, Object> execute(
     LIST_OP(
         LIST,
         (req, rsp, h) -> {
-          final ListCollectionsAPI listCollectionsAPI =
-              new ListCollectionsAPI(h.coreContainer, req, rsp);
+          final ListCollections listCollectionsAPI = new ListCollections(h.coreContainer, req, rsp);
           final SolrJerseyResponse listCollectionsResponse = listCollectionsAPI.listCollections();
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, listCollectionsResponse);
           return null;
@@ -1103,7 +1102,7 @@ public Map<String, Object> execute(
         LISTBACKUP,
         (req, rsp, h) -> {
           req.getParams().required().check(NAME);
-          ListCollectionBackupsAPI.invokeFromV1Params(h.coreContainer, req, rsp);
+          ListCollectionBackups.invokeFromV1Params(h.coreContainer, req, rsp);
           return null;
         }),
     CREATESNAPSHOT_OP(
@@ -1378,8 +1377,8 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         DeleteShardAPI.class,
         ForceLeaderAPI.class,
         InstallShardDataAPI.class,
-        ListCollectionsAPI.class,
-        ListCollectionBackupsAPI.class,
+        ListCollections.class,
+        ListCollectionBackups.class,
         ReloadCollectionAPI.class,
         RenameCollectionAPI.class,
         ReplaceNodeAPI.class,
@@ -1389,8 +1388,8 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         SyncShardAPI.class,
         CollectionPropertyAPI.class,
         DeleteNode.class,
-        ListAliasesAPI.class,
-        AliasPropertyAPI.class,
+        ListAliases.class,
+        AliasProperty.class,
         ListCollectionSnapshotsAPI.class,
         CreateCollectionSnapshotAPI.class,
         DeleteCollectionSnapshot.class);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
index 96015b2486e..e5bd2945b43 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
@@ -43,7 +43,7 @@
 import org.apache.solr.handler.api.V2ApiUtils;
 import org.apache.solr.handler.configsets.CreateConfigSetAPI;
 import org.apache.solr.handler.configsets.DeleteConfigSetAPI;
-import org.apache.solr.handler.configsets.ListConfigSetsAPI;
+import org.apache.solr.handler.configsets.ListConfigSets;
 import org.apache.solr.handler.configsets.UploadConfigSetAPI;
 import org.apache.solr.handler.configsets.UploadConfigSetFileAPI;
 import org.apache.solr.request.DelegatingSolrQueryRequest;
@@ -142,7 +142,7 @@ public SolrParams getParams() {
         }
         break;
       case LIST:
-        final ListConfigSetsAPI listConfigSetsAPI = new ListConfigSetsAPI(coreContainer);
+        final ListConfigSets listConfigSetsAPI = new ListConfigSets(coreContainer);
         V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, listConfigSetsAPI.listConfigSet());
         break;
       case CREATE:
@@ -217,7 +217,7 @@ public Collection<Api> getApis() {
 
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
-    return List.of(ListConfigSetsAPI.class);
+    return List.of(ListConfigSets.class);
   }
 
   @Override
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/AliasPropertyAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java
similarity index 62%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/AliasPropertyAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java
index baeb6ddc7ac..1184751cb9a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/AliasPropertyAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CommonParams.NAME;
@@ -24,22 +23,15 @@
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.AliasPropertyApis;
+import org.apache.solr.client.api.model.GetAliasPropertyResponse;
+import org.apache.solr.client.api.model.GetAllAliasPropertiesResponse;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.model.UpdateAliasPropertiesRequestBody;
+import org.apache.solr.client.api.model.UpdateAliasPropertyRequestBody;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.Aliases;
@@ -48,32 +40,24 @@
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
 /** V2 APIs for managing and inspecting properties for collection aliases */
-@Path("/aliases/{aliasName}/properties")
-public class AliasPropertyAPI extends AdminAPIBase {
+public class AliasProperty extends AdminAPIBase implements AliasPropertyApis {
 
   @Inject
-  public AliasPropertyAPI(
+  public AliasProperty(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @GET
+  @Override
   @PermissionName(COLL_READ_PERM)
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
-  @Operation(
-      summary = "Get properties for a collection alias.",
-      tags = {"aliases"})
-  public GetAllAliasPropertiesResponse getAllAliasProperties(
-      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName)
-      throws Exception {
+  public GetAllAliasPropertiesResponse getAllAliasProperties(String aliasName) throws Exception {
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
     final GetAllAliasPropertiesResponse response =
@@ -88,16 +72,9 @@ public GetAllAliasPropertiesResponse getAllAliasProperties(
     return response;
   }
 
-  @GET
-  @Path("/{propName}")
+  @Override
   @PermissionName(COLL_READ_PERM)
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
-  @Operation(
-      summary = "Get a specific property for a collection alias.",
-      tags = {"aliases"})
-  public GetAliasPropertyResponse getAliasProperty(
-      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
-      @Parameter(description = "Property Name") @PathParam("propName") String propName)
+  public GetAliasPropertyResponse getAliasProperty(String aliasName, String propName)
       throws Exception {
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
@@ -124,17 +101,10 @@ private Aliases readAliasesFromZk() throws Exception {
     return zkStateReader.getAliases();
   }
 
-  @PUT
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
-  @Operation(
-      summary = "Update properties for a collection alias.",
-      tags = {"aliases"})
   public SolrJerseyResponse updateAliasProperties(
-      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
-      @RequestBody(description = "Properties that need to be updated", required = true)
-          UpdateAliasPropertiesRequestBody requestBody)
-      throws Exception {
+      String aliasName, UpdateAliasPropertiesRequestBody requestBody) throws Exception {
 
     if (requestBody == null) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Missing required request body");
@@ -147,18 +117,10 @@ public SolrJerseyResponse updateAliasProperties(
     return response;
   }
 
-  @PUT
-  @Path("/{propName}")
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
-  @Operation(
-      summary = "Update a specific property for a collection alias.",
-      tags = {"aliases"})
   public SolrJerseyResponse createOrUpdateAliasProperty(
-      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
-      @Parameter(description = "Property Name") @PathParam("propName") String propName,
-      @RequestBody(description = "Property value that needs to be updated", required = true)
-          UpdateAliasPropertyRequestBody requestBody)
+      String aliasName, String propName, UpdateAliasPropertyRequestBody requestBody)
       throws Exception {
     if (requestBody == null) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Missing required request body");
@@ -171,16 +133,9 @@ public SolrJerseyResponse createOrUpdateAliasProperty(
     return response;
   }
 
-  @DELETE
-  @Path("/{propName}")
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
-  @Operation(
-      summary = "Delete a specific property for a collection alias.",
-      tags = {"aliases"})
-  public SolrJerseyResponse deleteAliasProperty(
-      @Parameter(description = "Alias Name") @PathParam("aliasName") String aliasName,
-      @Parameter(description = "Property Name") @PathParam("propName") String propName)
+  public SolrJerseyResponse deleteAliasProperty(String aliasName, String propName)
       throws Exception {
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
@@ -233,32 +188,4 @@ public ZkNodeProps createRemoteMessage(
     }
     return new ZkNodeProps(remoteMessage);
   }
-
-  public static class UpdateAliasPropertiesRequestBody implements JacksonReflectMapWriter {
-
-    @Schema(description = "Properties and values to be updated on alias.")
-    @JsonProperty(value = "properties", required = true)
-    public Map<String, Object> properties;
-
-    @Schema(description = "Request ID to track this action which will be processed asynchronously.")
-    @JsonProperty("async")
-    public String async;
-  }
-
-  public static class UpdateAliasPropertyRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(required = true)
-    public Object value;
-  }
-
-  public static class GetAllAliasPropertiesResponse extends SolrJerseyResponse {
-    @JsonProperty("properties")
-    @Schema(description = "Properties and values associated with alias.")
-    public Map<String, String> properties;
-  }
-
-  public static class GetAliasPropertyResponse extends SolrJerseyResponse {
-    @JsonProperty("value")
-    @Schema(description = "Property value.")
-    public String value;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliasesAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java
similarity index 65%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/ListAliasesAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java
index 0e2626e9668..d8995ce16ae 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliasesAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java
@@ -16,22 +16,15 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.endpoint.ListAliasesApi;
+import org.apache.solr.client.api.model.GetAliasByNameResponse;
+import org.apache.solr.client.api.model.ListAliasesResponse;
 import org.apache.solr.common.cloud.Aliases;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.core.CoreContainer;
@@ -39,12 +32,11 @@
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
-/** V2 APIs for managing and inspecting collection aliases */
-@Path("/aliases")
-public class ListAliasesAPI extends AdminAPIBase {
+/** V2 API implementation for listing and inspecting collection aliases */
+public class ListAliases extends AdminAPIBase implements ListAliasesApi {
 
   @Inject
-  public ListAliasesAPI(
+  public ListAliases(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
@@ -57,12 +49,8 @@ public ListAliasesAPI(
    * <p>This API <code>GET /api/aliases</code> is analogous to the v1 <code>GET /api/cluster/aliases
    * </code> API.
    */
-  @GET
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_READ_PERM)
-  @Operation(
-      summary = "List the existing collection aliases.",
-      tags = {"aliases"})
   public ListAliasesResponse getAliases() throws Exception {
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
@@ -86,17 +74,9 @@ public ListAliasesResponse getAliases() throws Exception {
     return response;
   }
 
-  @GET
-  @Path("/{aliasName}")
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_READ_PERM)
-  @Operation(
-      summary = "Get details for a specific collection alias.",
-      tags = {"aliases"})
-  public GetAliasByNameResponse getAliasByName(
-      @Parameter(description = "Alias name.", required = true) @PathParam("aliasName")
-          String aliasName)
-      throws Exception {
+  public GetAliasByNameResponse getAliasByName(String aliasName) throws Exception {
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
     final GetAliasByNameResponse response = instantiateJerseyResponse(GetAliasByNameResponse.class);
@@ -119,25 +99,4 @@ private Aliases readAliasesFromZk() throws Exception {
 
     return zkStateReader.getAliases();
   }
-
-  /** Response for {@link ListAliasesAPI#getAliases()}. */
-  public static class ListAliasesResponse extends SolrJerseyResponse {
-    @JsonProperty("aliases")
-    public Map<String, String> aliases;
-
-    @JsonProperty("properties")
-    public Map<String, Map<String, String>> properties;
-  }
-
-  /** Response for {@link ListAliasesAPI#getAliasByName(String)}. */
-  public static class GetAliasByNameResponse extends SolrJerseyResponse {
-    @JsonProperty("name")
-    public String alias;
-
-    @JsonProperty("collections")
-    public List<String> collections;
-
-    @JsonProperty("properties")
-    public Map<String, String> properties;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackupsAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java
similarity index 70%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackupsAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java
index 3ec3c599e0d..859e0e38941 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackupsAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java
@@ -17,15 +17,12 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
-import static org.apache.solr.common.params.CollectionAdminParams.COLL_CONF;
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_ID;
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_LOCATION;
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_REPOSITORY;
 import static org.apache.solr.common.params.CoreAdminParams.NAME;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.net.URI;
@@ -33,12 +30,9 @@
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.endpoint.ListCollectionBackupsApi;
+import org.apache.solr.client.api.model.CollectionBackupDetails;
+import org.apache.solr.client.api.model.ListCollectionBackupsResponse;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.core.CoreContainer;
@@ -46,23 +40,22 @@
 import org.apache.solr.core.backup.BackupId;
 import org.apache.solr.core.backup.BackupProperties;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.jersey.SolrJacksonMapper;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
 /**
- * V2 API definitions for collection-backup "listing".
+ * V2 API implementations for collection-backup "listing".
  *
  * <p>These APIs are equivalent to the v1 '/admin/collections?action=LISTBACKUP' command.
  */
-public class ListCollectionBackupsAPI extends BackupAPIBase {
+public class ListCollectionBackups extends BackupAPIBase implements ListCollectionBackupsApi {
 
   private final ObjectMapper objectMapper;
 
   @Inject
-  public ListCollectionBackupsAPI(
+  public ListCollectionBackups(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
@@ -76,22 +69,17 @@ public static void invokeFromV1Params(
     final SolrParams v1Params = req.getParams();
     v1Params.required().check(CommonParams.NAME);
 
-    final var listApi = new ListCollectionBackupsAPI(coreContainer, req, rsp);
+    final var listApi = new ListCollectionBackups(coreContainer, req, rsp);
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
         rsp,
         listApi.listBackupsAtLocation(
             v1Params.get(NAME), v1Params.get(BACKUP_LOCATION), v1Params.get(BACKUP_REPOSITORY)));
   }
 
-  @Path("/backups/{backupName}/versions")
-  @GET
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public ListCollectionBackupsResponse listBackupsAtLocation(
-      @PathParam("backupName") String backupName,
-      @QueryParam(BACKUP_LOCATION) String location,
-      @QueryParam(BACKUP_REPOSITORY) String repositoryName)
-      throws IOException {
+      String backupName, String location, String repositoryName) throws IOException {
     final var response = instantiateJerseyResponse(ListCollectionBackupsResponse.class);
     recordCollectionForLogAndTracing(null, solrQueryRequest);
 
@@ -123,27 +111,4 @@ public ListCollectionBackupsResponse listBackupsAtLocation(
     }
     return response;
   }
-
-  public static class ListCollectionBackupsResponse extends SolrJerseyResponse {
-    @JsonProperty public String collection;
-    @JsonProperty public List<CollectionBackupDetails> backups;
-  }
-
-  // TODO Merge with CreateCollectionBackupAPI.CollectionBackupDetails, which seems very
-  // conceptually similar...
-  public static class CollectionBackupDetails implements JacksonReflectMapWriter {
-    @JsonProperty public Integer backupId;
-    @JsonProperty public String indexVersion;
-    @JsonProperty public String startTime;
-    @JsonProperty public String endTime;
-    @JsonProperty public Integer indexFileCount;
-    @JsonProperty public Double indexSizeMB;
-
-    @JsonProperty public Map<String, String> shardBackupIds;
-
-    @JsonProperty(COLL_CONF)
-    public String configsetName;
-
-    @JsonProperty public String collectionAlias;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionsAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java
similarity index 75%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionsAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java
index e03b05a6f70..2f08a7323ac 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionsAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java
@@ -17,19 +17,15 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.endpoint.ListCollectionsApi;
+import org.apache.solr.client.api.model.ListCollectionsResponse;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.jersey.PermissionName;
@@ -41,17 +37,14 @@
  *
  * <p>This API (GET /v2/collections) is equivalent to the v1 /admin/collections?action=LIST command
  */
-@Path("/collections")
-public class ListCollectionsAPI extends AdminAPIBase {
+public class ListCollections extends AdminAPIBase implements ListCollectionsApi {
 
   @Inject
-  public ListCollectionsAPI(
-      CoreContainer coreContainer, SolrQueryRequest req, SolrQueryResponse rsp) {
+  public ListCollections(CoreContainer coreContainer, SolrQueryRequest req, SolrQueryResponse rsp) {
     super(coreContainer, req, rsp);
   }
 
-  @GET
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_READ_PERM)
   public ListCollectionsResponse listCollections() {
     final ListCollectionsResponse response =
@@ -67,9 +60,4 @@ public ListCollectionsResponse listCollections() {
 
     return response;
   }
-
-  public static class ListCollectionsResponse extends SolrJerseyResponse {
-    @JsonProperty("collections")
-    public List<String> collections;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java
index 22c2abdaca3..be80062d87a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java
@@ -16,29 +16,23 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CommonParams.NAME;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.ReloadCollectionApi;
+import org.apache.solr.client.api.model.ReloadCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -46,13 +40,12 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * V2 API for reloading collections.
+ * V2 API implementation for reloading collections.
  *
  * <p>The new API (POST /v2/collections/collectionName/reload {...}) is analogous to the v1
  * /admin/collections?action=RELOAD command.
  */
-@Path("/collections/{collectionName}/reload")
-public class ReloadCollectionAPI extends AdminAPIBase {
+public class ReloadCollectionAPI extends AdminAPIBase implements ReloadCollectionApi {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
@@ -64,12 +57,10 @@ public ReloadCollectionAPI(
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse reloadCollection(
-      @PathParam("collectionName") String collectionName, ReloadCollectionRequestBody requestBody)
-      throws Exception {
+      String collectionName, ReloadCollectionRequestBody requestBody) throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     ensureRequiredParameterProvided(COLLECTION_PROP, collectionName);
     fetchAndValidateZooKeeperAwareCoreContainer();
@@ -80,7 +71,7 @@ public SubResponseAccumulatingJerseyResponse reloadCollection(
         response,
         CollectionParams.CollectionAction.RELOAD,
         remoteMessage,
-        requestBody != null ? requestBody.asyncId : null);
+        requestBody != null ? requestBody.async : null);
     return response;
   }
 
@@ -90,7 +81,7 @@ public static ZkNodeProps createRemoteMessage(
     remoteMessage.put(QUEUE_OPERATION, CollectionParams.CollectionAction.RELOAD.toLower());
     remoteMessage.put(NAME, collectionName);
     if (requestBody != null) {
-      insertIfNotNull(remoteMessage, ASYNC, requestBody.asyncId);
+      insertIfNotNull(remoteMessage, ASYNC, requestBody.async);
     }
 
     return new ZkNodeProps(remoteMessage);
@@ -103,15 +94,9 @@ public static void invokeFromV1Params(
     final var params = request.getParams();
     params.required().check(NAME);
     final var requestBody = new ReloadCollectionRequestBody();
-    requestBody.asyncId = params.get(ASYNC); // Note, 'async' may or may not have been provided.
+    requestBody.async = params.get(ASYNC); // Note, 'async' may or may not have been provided.
 
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
         response, api.reloadCollection(params.get(NAME), requestBody));
   }
-
-  // TODO Is it worth having this in a request body, or should we just make it a query param?
-  public static class ReloadCollectionRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(ASYNC)
-    public String asyncId;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java
similarity index 66%
rename from solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java
rename to solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java
index 58dcdfec5e9..c3403eb3af8 100644
--- a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java
@@ -18,53 +18,36 @@
 
 import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Operation;
-import java.util.List;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import org.apache.solr.api.JerseyResource;
-import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.endpoint.ListConfigsetsApi;
+import org.apache.solr.client.api.model.ListConfigsetsResponse;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.jersey.PermissionName;
 
 /**
- * V2 API for adding or updating a single file within a configset.
+ * V2 API implementation for listing all available configsets.
  *
  * <p>This API (GET /v2/cluster/configs) is analogous to the v1 /admin/configs?action=LIST command.
  */
-@Path("/cluster/configs")
-public class ListConfigSetsAPI extends JerseyResource {
+public class ListConfigSets extends JerseyResource implements ListConfigsetsApi {
 
   @Context public HttpHeaders headers;
 
   private final CoreContainer coreContainer;
 
   @Inject
-  public ListConfigSetsAPI(CoreContainer coreContainer) {
+  public ListConfigSets(CoreContainer coreContainer) {
     this.coreContainer = coreContainer;
   }
 
-  @GET
-  @Produces({"application/json", "application/javabin"})
-  @Operation(
-      summary = "List the configsets available to Solr.",
-      tags = {"configset"})
+  @Override
   @PermissionName(CONFIG_READ_PERM)
   public ListConfigsetsResponse listConfigSet() throws Exception {
     final ListConfigsetsResponse response = instantiateJerseyResponse(ListConfigsetsResponse.class);
     response.configSets = coreContainer.getConfigSetService().listConfigs();
     return response;
   }
-
-  /** Response body POJO for the {@link ListConfigSetsAPI} resource. */
-  public static class ListConfigsetsResponse extends SolrJerseyResponse {
-
-    @JsonProperty("configSets")
-    public List<String> configSets;
-  }
 }
diff --git a/solr/core/src/test/org/apache/solr/core/PluginBagTest.java b/solr/core/src/test/org/apache/solr/core/PluginBagTest.java
index bfc585b8840..d3831489edb 100644
--- a/solr/core/src/test/org/apache/solr/core/PluginBagTest.java
+++ b/solr/core/src/test/org/apache/solr/core/PluginBagTest.java
@@ -28,7 +28,7 @@
 import org.apache.solr.handler.admin.ConfigSetsHandler;
 import org.apache.solr.handler.admin.api.CollectionPropertyAPI;
 import org.apache.solr.handler.component.SearchComponent;
-import org.apache.solr.handler.configsets.ListConfigSetsAPI;
+import org.apache.solr.handler.configsets.ListConfigSets;
 import org.apache.solr.jersey.APIConfigProvider;
 import org.apache.solr.jersey.APIConfigProvider.APIConfig;
 import org.apache.solr.jersey.APIConfigProviderBinder;
@@ -95,12 +95,12 @@ public void testCreatesContainerSpecificJerseyAppIfNoCoreProvided() {
   public void testRegistersJerseyResourcesAssociatedWithRequestHandlers() {
     final PluginBag<SolrRequestHandler> handlerPluginBag =
         new PluginBag<>(SolrRequestHandler.class, null);
-    assertFalse(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSetsAPI.class));
+    assertFalse(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSets.class));
 
     handlerPluginBag.put("/foo", new ConfigSetsHandler(coreContainer));
     final ResourceConfig config = handlerPluginBag.getJerseyEndpoints();
 
-    assertTrue(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSetsAPI.class));
+    assertTrue(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSets.class));
   }
 
   @Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
index 2a6607c40b6..9939217b4b0 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ListAliasesAPITest.java
@@ -23,20 +23,20 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.GetAliasByNameResponse;
+import org.apache.solr.client.api.model.ListAliasesResponse;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.cloud.Aliases;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.cloud.ZkStateReader.AliasesManager;
 import org.apache.solr.core.CoreContainer;
-import org.apache.solr.handler.admin.api.ListAliasesAPI.GetAliasByNameResponse;
-import org.apache.solr.handler.admin.api.ListAliasesAPI.ListAliasesResponse;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/** Unit tests for {@link ListAliasesAPI} */
+/** Unit tests for {@link ListAliases} */
 public class ListAliasesAPITest extends SolrTestCaseJ4 {
 
   private CoreContainer mockCoreContainer;
@@ -44,7 +44,7 @@ public class ListAliasesAPITest extends SolrTestCaseJ4 {
   private SolrQueryRequest mockQueryRequest;
   private SolrQueryResponse queryResponse;
 
-  private ListAliasesAPI getAliasesAPI;
+  private ListAliases getAliasesAPI;
 
   @BeforeClass
   public static void ensureWorkingMockito() {
@@ -70,7 +70,7 @@ public void setUp() throws Exception {
     when(mockQueryRequest.getSpan()).thenReturn(Span.getInvalid());
     queryResponse = new SolrQueryResponse();
 
-    getAliasesAPI = new ListAliasesAPI(mockCoreContainer, mockQueryRequest, queryResponse);
+    getAliasesAPI = new ListAliases(mockCoreContainer, mockQueryRequest, queryResponse);
   }
 
   @Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCollectionAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCollectionAPITest.java
index e7534dc0c1a..5900fece7a4 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCollectionAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCollectionAPITest.java
@@ -22,6 +22,7 @@
 import static org.apache.solr.common.params.CoreAdminParams.NAME;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.ReloadCollectionRequestBody;
 import org.apache.solr.common.SolrException;
 import org.junit.Test;
 
@@ -34,7 +35,7 @@ public void testReportsErrorIfCollectionNameMissing() {
             SolrException.class,
             () -> {
               final var api = new ReloadCollectionAPI(null, null, null);
-              api.reloadCollection(null, new ReloadCollectionAPI.ReloadCollectionRequestBody());
+              api.reloadCollection(null, new ReloadCollectionRequestBody());
             });
 
     assertEquals(400, thrown.code());
@@ -44,8 +45,8 @@ public void testReportsErrorIfCollectionNameMissing() {
   // TODO message creation
   @Test
   public void testCreateRemoteMessageAllProperties() {
-    final var requestBody = new ReloadCollectionAPI.ReloadCollectionRequestBody();
-    requestBody.asyncId = "someAsyncId";
+    final var requestBody = new ReloadCollectionRequestBody();
+    requestBody.async = "someAsyncId";
     final var remoteMessage =
         ReloadCollectionAPI.createRemoteMessage("someCollName", requestBody).getProperties();
 
diff --git a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
index e26d4d2a73e..635dc8305e5 100644
--- a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
@@ -29,6 +29,7 @@
 import javax.inject.Singleton;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Response;
+import org.apache.solr.client.api.model.ListConfigsetsResponse;
 import org.apache.solr.client.solrj.response.ConfigSetAdminResponse;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.ConfigSetService;
@@ -44,7 +45,7 @@
 import org.junit.Test;
 
 /**
- * Unit tests for {@link ListConfigSetsAPI}.
+ * Unit tests for {@link ListConfigSets}.
  *
  * <p>Serves primarily as a model and example of how to write unit tests using Jersey's test
  * framework.
@@ -63,7 +64,7 @@ protected Application configure() {
     forceSet(TestProperties.CONTAINER_PORT, "0");
     resetMocks();
     final ResourceConfig config = new ResourceConfig();
-    config.register(ListConfigSetsAPI.class);
+    config.register(ListConfigSets.class);
     config.register(SolrJacksonMapper.class);
     config.register(
         new AbstractBinder() {
@@ -107,8 +108,7 @@ public void testSuccessfulListConfigsetsTyped() throws Exception {
     when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
     when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
 
-    final ListConfigSetsAPI.ListConfigsetsResponse response =
-        target("/cluster/configs").request().get(ListConfigSetsAPI.ListConfigsetsResponse.class);
+    final var response = target("/cluster/configs").request().get(ListConfigsetsResponse.class);
 
     assertNotNull(response.configSets);
     assertNull(response.error);
@@ -120,11 +120,11 @@ public void testSuccessfulListConfigsetsTyped() throws Exception {
   /**
    * Test the v2 to v1 response mapping for /cluster/configs
    *
-   * <p>{@link org.apache.solr.handler.admin.ConfigSetsHandler} uses {@link ListConfigSetsAPI} (and
-   * its response class {@link ListConfigSetsAPI.ListConfigsetsResponse}) internally to serve the v1
-   * version of this functionality. So it's important to make sure that the v2 response stays
-   * compatible with SolrJ - both because that's important in its own right and because that ensures
-   * we haven't accidentally changed the v1 response format.
+   * <p>{@link org.apache.solr.handler.admin.ConfigSetsHandler} uses {@link ListConfigSets} (and its
+   * response class {@link ListConfigsetsResponse}) internally to serve the v1 version of this
+   * functionality. So it's important to make sure that the v2 response stays compatible with SolrJ
+   * - both because that's important in its own right and because that ensures we haven't
+   * accidentally changed the v1 response format.
    */
   @Test
   public void testListConfigsetsV1Compatibility() throws Exception {
@@ -132,8 +132,7 @@ public void testListConfigsetsV1Compatibility() throws Exception {
     when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
     when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
 
-    final ListConfigSetsAPI.ListConfigsetsResponse response =
-        target("/cluster/configs").request().get(ListConfigSetsAPI.ListConfigsetsResponse.class);
+    final var response = target("/cluster/configs").request().get(ListConfigsetsResponse.class);
     final NamedList<Object> squashedResponse = new NamedList<>();
     V2ApiUtils.squashIntoNamedList(squashedResponse, response);
     final ConfigSetAdminResponse.List solrjResponse = new ConfigSetAdminResponse.List();
diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustache
index bf53b49bdd5..84f7f06ebf3 100644
--- a/solr/solrj/src/resources/java-template/api.mustache
+++ b/solr/solrj/src/resources/java-template/api.mustache
@@ -98,7 +98,7 @@ public class {{classname}} {
              * @param {{paramName}} {{description}}
              */
             {{/description}}
-            public void {{schema.setter}}({{dataType}} {{paramName}}) {
+            public void {{schema.setter}}({{{dataType}}} {{paramName}}) {
                 this.{{paramName}} = {{paramName}};
             }
 
@@ -113,7 +113,7 @@ public class {{classname}} {
              * @param {{baseName}} {{description}}
              */
              {{/description}}
-             public void {{setter}}({{dataType}} {{baseName}}) {
+             public void {{setter}}({{{dataType}}} {{baseName}}) {
                this.requestBody.{{baseName}} = {{baseName}};
             }
             {{/vars}}

From 8b4fd4161e927aab257bee7dd94bea61c479f4ad Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Fri, 1 Sep 2023 15:29:33 -0400
Subject: [PATCH 053/160] SOLR-15734: Add dev-docs on Solr APIs (#1876)

Solr's API situation generally has seen a lot of change in the last few
years.  Some documentation on how Solr "does" APIs currently and how
users may write new APIs should go a long way towards making it easier
for developers to feel comfortable in this part of the code.
---
 dev-docs/apis.adoc | 83 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 dev-docs/apis.adoc

diff --git a/dev-docs/apis.adoc b/dev-docs/apis.adoc
new file mode 100644
index 00000000000..49ff7df5a11
--- /dev/null
+++ b/dev-docs/apis.adoc
@@ -0,0 +1,83 @@
+= APIs in Solr
+:toc: left
+
+Solr's codebase currently has a handful of ways of defining APIs.
+This complexity stems largely from two ongoing transitions:
+1. Away from our "v1" APIs and towards the new "v2" API. 
+2. Away from a legacy API framework towards the off-the-shelf JAX-RS library for implementing our v2 APIs
+
+As we finish these transitions, this complexity should simplify considerably.
+But in the interim, this document can help guide developers who need to understand or modify APIs in Solr.
+
+== API Types
+
+APIs in Solr (regardless of whether v1 or v2) can typically be classified as either "per-core" or "cluster" APIs.
+
+Per-core APIs, as the name suggests, typically affect only a single core or collection, usually used to search or analyze that core's contents in some way.
+Implementation-wise, they're registered on the `SolrCore` object itself.
+They are configured in solrconfig.xml, which also means they can differ from one core to another based on the configset being used.
+
+Alternatively "cluster" APIs potentially affect the entire Solr instance or cluster.
+They're registered on the `CoreContainer` object itself.
+It's much less common to provide configuration for these APIs, but it is possible to do so using `solr.xml`.
+
+== V1 APIs
+
+v1 APIs are the primary way that users consume Solr, as our v2 APIs remain "experimental".
+Many new APIs are added as "v2 only", however updates to existing v1 APIs still happen frequently.
+
+v1 APIs exist in Solr as implementations of the `SolrRequestHandler` interface, usually making use of the `RequestHandlerBase` base class.
+RequestHandlers have two methods of primary interest:
+1. `init`, often used to parse per-API configuration or otherwise setup the class
+2. `handleRequest` (or `handleRequestBody` if using `RequestHandlerBase`), the main entrypoint for the API, containing the business logic and constructing the response.
+
+While they do define many aspects of the endpoint's interface (e.g. query parameters, request body format, response format, etc.), RequestHandler's don't actually specify the URL path that they're located at.
+These paths are instead either hardcoded at registration time (see `CoreContainer.load` and `ImplicitPlugins.json`), or specified by users in configuration files (typically `solrconfig.xml`).
+
+== V2 APIs
+
+v2 APIs are currently still "experimental", and not necessarily recommended yet for users.
+But they're approaching parity with v1 and will eventually replace Solr's "RequestHandler"-based APIs.
+
+=== New "JAX-RS" APIs
+
+New v2 APIs in Solr are written in compliance with "JAX-RS", a library and specification that uses annotations to define APIs.
+Many libraries implement the JAX-RS spec: Solr currently uses the implementation provided by the "Jersey" project.
+
+These v2 API definitions consist of two parts: a JAX-RS annotated interface in the `api` module "defining" the API, and a class in `core` "implementing" the interface.
+Separating the API "definition" and "implementation" in this way allows us to only define each API in a single place, and use code generators to produce other API-related bits such as SolrJ code and ref-guide documentation.
+
+=== Writing JAX-RS APIs
+
+Writing a new v2 API may appear daunting, but additions in reality are actually pretty simple:
+
+1. *Create POJO ("Plain Old Java Object") classes as needed to represent the API's request and response*:
+** POJOs are used to represent both the body of the API request (for some `POST` and `PUT` endpoints), as well as the response from the API.
+** Re-use of existing classes here is preferred where possible.  A library of available POJOs can be found in the `org.apache.solr.client.api.model` package of the `api` gradle project.
+** POJO class fields are typically "public" and annotated with the Jackson `@JsonProperty` annotations to allow serialization/deserialization.
+** POJO class fields should also have a Swagger `@Schema` annotation where possible, describing the purpose of the field.  These descriptions are technically non-functional, but add lots of value to our OpenAPI spec and any artifacts generated downstream.
+2. *Find or create an interface to hold the v2 API definition*:
+** API interfaces live in the `org.apache.solr.client.api.endpoint` package of the `api` gradle project.  Interfaces are usually given an "-Api" suffix to indicate their role.
+** If a new API is similar enough to existing APIs, it may make sense to add the new API definition into an existing interface instead of creating a wholly new one.  Use your best judgement.
+3. *Add a method to the chosen interface representing the API*:
+** The method should take an argument representing each path and query parameter (annotated with `@PathParam` or `@QueryParam` as appropriate).  If the API is a `PUT` or `POST` that expects a request body, the method should take the request body POJO as its final argument, annotated with `@RequestBody`.
+** Each method parameter should also be annotated with the Swagger `@Parameter` annotation.  Like the `@Schema` annotation mentioned above, `@Parameter` isn't strictly required for correct operation, but they add lots of value to our OpenAPI spec and generated artifacts.
+** As a return value, the method should return the response-body POJO.
+4. *Futher JAX-RS Annotation*: The interface method in step (3) has specified its inputs and outputs, but several additional annotations are needed to define how users access the API, and to make it play nice with the code-generation done by Solr's build.
+** Each interface must have a `@Path` annotation describing the path that the API is accessed from.  Specific interface methods can also be given `@Path` annotations, making the "effective path" a concatenation of the interface and method-level values.  `@Path` supports a limited regex syntax, and curly-brackets can be used to create named placeholders for path-parameters.
+** Each interface method should be given an HTTP-method annotation (e.g. `@GET`, `@POST`, etc.)
+** Each interface method must be marked with a Swagger `@Operation` annotation.  This annotation is used to provide metadata about the API that appears in the OpenAPI specification and in any artifacts generated from that downstream.  At a minimum, `summary` and `tags` values should be specified on the annotation.  (`tags` is used by our SolrJ code generation to group similar APIs together.  Typically APIs are only given a single tag representing the plural name of the most relevant "resource" (e.g. `tags = {"aliases"}`, `tags = {"replica-properties"}`)
+5. *Create a class implementing the API interface*: Implementation classes live in the `core` gradle project, typically in the `org.apache.solr.handler` package or one of its descendants.
+** Implementing classes must extent `JerseyResource`, and are typically named similarly to the API interface created in (2) above without the "-Api" suffix. e.g. `class AddReplicaProperty extends JerseyResource implements AddReplicaPropertyApi`)
+** Solr's use of Jersey offers us some limited dependency-injection ("DI") capabilities.  Class constructors annotated with `@Inject` can depend on a selection of types made available through DI, such as `CoreContainer`, `SolrQueryRequest`, `SolrCore`, etc.  See the factory-bindings in `JerseyApplications` (or other API classes) for a sense of which types are available for constructor injection.
+** Add a body to your classes method(s).  For the most part this is "normal" Java development.
+6. *Register your API*: APIs must be registered to be available at runtime.  If the v2 API is associated with an existing v1 RequestHandler, the API class name can be added to the handler's `getJerseyResources` method.  If there is no associated RequestHandler, the API should be registered similar to other APIs in `CoreContainer.load`.
+
+A good example for each of these steps can be seen in Solr's v2 "add-replica-property" API, which has a defining interface https://github.com/apache/solr/blob/9426902acb7081a2e9a1fa29699c5286459e1365/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java[AddReplicaPropertyApi], an implementing class https://github.com/apache/solr/blob/9426902acb7081a2e9a1fa29699c5286459e1365/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaProperty.java[AddReplicaProperty], and the two POJOs https://github.com/apache/solr/blob/main/solr/api/src/java/org/apache/solr/client/api/model/AddReplicaPropertyRequestBody.java[AddReplicaPropertyRequestBody] and https://github.com/apache/solr/blob/main/solr/api/src/java/org/apache/solr/client/api/model/SolrJerseyResponse.java[SolrJerseyResponse].
+
+=== Legacy v2 API Framework
+
+While we've settled on JAX-RS as our framework for defining v2 APIs going forward, Solr still retains many v2 APIs that were written using an older homegrown framework.
+This framework defines APIs using annotations (e.g. `@EndPoint`) similar to those used by JAX-RS, but lacks the full range of features and 3rd-party tooling.
+We're in the process of migrating these API definitions to JAX-RS and hope to remove all support for this legacy framework in a future release.
+

From 931de5157226655ec18b2530b4ac27905f0b5818 Mon Sep 17 00:00:00 2001
From: Lamine <104593675+laminelam@users.noreply.github.com>
Date: Sun, 3 Sep 2023 10:49:58 -0500
Subject: [PATCH 054/160] SOLR-16897: Add support of OAuth 2.0/OIDC 'code with
 PKCE' flow (#1792)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lamine Idjeraoui <lidjeraoui@apple.com>
Co-authored-by: Jan Høydahl <janhoy@apache.org>
---
 solr/CHANGES.txt                              |   2 +
 .../solr/servlet/LoadAdminUiServlet.java      |  37 ++++++-
 .../solr/servlet/LoadAdminUiServletTest.java  | 102 ++++++++++++++++++
 .../solr/security/jwt/JWTAuthPlugin.java      |  23 +++-
 .../solr/security/jwt/JWTIssuerConfig.java    |  59 ++++++++++
 .../security/jwt_plugin_jwk_security.json     |   2 +
 ...plugin_jwk_security_blockUnknownFalse.json |   2 +
 .../jwt/JWTAuthPluginIntegrationTest.java     |   4 +
 .../solr/security/jwt/JWTAuthPluginTest.java  |  14 +++
 .../security/jwt/JWTIssuerConfigTest.java     |  12 ++-
 .../pages/jwt-authentication-plugin.adoc      |   2 +
 11 files changed, 255 insertions(+), 4 deletions(-)
 create mode 100644 solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9bfc1191052..13cf7644f01 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -107,6 +107,8 @@ Improvements
 
 * SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
 
+* SOLR-16896, SOLR-16897: Add support of OAuth 2.0/OIDC 'code with PKCE' flow (Lamine Idjeraoui, janhoy, Kevin Risden)
+
 * SOLR-16879: Limit the number of concurrent expensive core admin operations by running them in a
   dedicated thread pool. Backup, Restore and Split are expensive operations.
   (Pierre Salagnac, David Smiley)
diff --git a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
index 5a7e797f297..9da4bc84775 100644
--- a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
+++ b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
@@ -16,11 +16,15 @@
  */
 package org.apache.solr.servlet;
 
+import com.google.common.net.HttpHeaders;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.output.CloseShieldOutputStream;
@@ -37,6 +41,8 @@ public final class LoadAdminUiServlet extends BaseSolrServlet {
   // check system properties for whether or not admin UI is disabled, default is false
   private static final boolean disabled =
       Boolean.parseBoolean(System.getProperty("disableAdminUI", "false"));
+  // list of comma separated URLs to inject into the CSP connect-src directive
+  public static final String SYSPROP_CSP_CONNECT_SRC_URLS = "solr.ui.headers.csp.connect-src.urls";
 
   @Override
   public void doGet(HttpServletRequest _request, HttpServletResponse _response) throws IOException {
@@ -60,15 +66,20 @@ public void doGet(HttpServletRequest _request, HttpServletResponse _response) th
       if (in != null && cores != null) {
         response.setCharacterEncoding("UTF-8");
         response.setContentType("text/html");
+        String connectSrc = generateCspConnectSrc();
+        response.setHeader(
+            HttpHeaders.CONTENT_SECURITY_POLICY,
+            "default-src 'none'; base-uri 'none'; connect-src "
+                + connectSrc
+                + "; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self';");
 
         // We have to close this to flush OutputStreamWriter buffer
         try (Writer out =
             new OutputStreamWriter(
                 CloseShieldOutputStream.wrap(response.getOutputStream()), StandardCharsets.UTF_8)) {
-          Package pack = SolrCore.class.getPackage();
           String html =
               new String(in.readAllBytes(), StandardCharsets.UTF_8)
-                  .replace("${version}", pack.getSpecificationVersion());
+                  .replace("${version}", getSolrCorePackageSpecVersion());
           out.write(html);
         }
       } else {
@@ -76,4 +87,26 @@ public void doGet(HttpServletRequest _request, HttpServletResponse _response) th
       }
     }
   }
+
+  /**
+   * Retrieves the specification version of the SolrCore package.
+   *
+   * @return The specification version of the SolrCore class's package or Unknown if it's
+   *     unavailable.
+   */
+  private String getSolrCorePackageSpecVersion() {
+    Package pack = SolrCore.class.getPackage();
+    return pack.getSpecificationVersion() != null ? pack.getSpecificationVersion() : "Unknown";
+  }
+
+  /**
+   * Fetch the value of {@link #SYSPROP_CSP_CONNECT_SRC_URLS} system property, split by comma, and
+   * concatenate them into a space-separated string that can be used in CSP connect-src directive
+   */
+  private String generateCspConnectSrc() {
+    String cspURLs = System.getProperty(SYSPROP_CSP_CONNECT_SRC_URLS, "");
+    List<String> props = new ArrayList<>(Arrays.asList(cspURLs.split(",")));
+    props.add("'self'");
+    return String.join(" ", props);
+  }
 }
diff --git a/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java b/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java
new file mode 100644
index 00000000000..299029f86f7
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.servlet;
+
+import static org.apache.solr.servlet.LoadAdminUiServlet.SYSPROP_CSP_CONNECT_SRC_URLS;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Set;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.core.CoreContainer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class LoadAdminUiServletTest extends SolrTestCaseJ4 {
+
+  @InjectMocks private LoadAdminUiServlet servlet;
+  @Mock private HttpServletRequest mockRequest;
+  @Mock private HttpServletResponse mockResponse;
+  @Mock private CoreContainer coreContainer;
+  @Mock private ServletConfig servletConfig;
+  @Mock private ServletContext mockServletContext;
+  @Mock private ServletOutputStream mockOutputStream;
+
+  private static final Set<String> CSP_URLS =
+      Set.of(
+          "http://example1.com/token",
+          "https://example2.com/path/uri1",
+          "http://example3.com/oauth2/uri2");
+
+  @Override
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    MockitoAnnotations.openMocks(this);
+    when(mockRequest.getRequestURI()).thenReturn("/path/URI");
+    when(mockRequest.getContextPath()).thenReturn("/path");
+    when(mockRequest.getAttribute("org.apache.solr.CoreContainer")).thenReturn(coreContainer);
+    when(servletConfig.getServletContext()).thenReturn(mockServletContext);
+    when(mockResponse.getOutputStream()).thenReturn(mockOutputStream);
+    InputStream mockInputStream =
+        new ByteArrayInputStream("mock content".getBytes(StandardCharsets.UTF_8));
+    when(mockServletContext.getResourceAsStream(anyString())).thenReturn(mockInputStream);
+  }
+
+  @BeforeClass
+  public static void ensureWorkingMockito() {
+    assumeWorkingMockito();
+  }
+
+  @Test
+  public void testDefaultCSPHeaderSet() throws IOException {
+    System.setProperty(SYSPROP_CSP_CONNECT_SRC_URLS, String.join(",", CSP_URLS));
+    ArgumentCaptor<String> headerNameCaptor = ArgumentCaptor.forClass(String.class);
+    ArgumentCaptor<String> headerValueCaptor = ArgumentCaptor.forClass(String.class);
+    servlet.doGet(mockRequest, mockResponse);
+
+    verify(mockResponse).setHeader(headerNameCaptor.capture(), headerValueCaptor.capture());
+    assertEquals("Content-Security-Policy", headerNameCaptor.getValue());
+    String cspValue = headerValueCaptor.getValue();
+    for (String endpoint : CSP_URLS) {
+      assertTrue("Expected CSP value to contain " + endpoint, cspValue.contains(endpoint));
+    }
+  }
+
+  @Override
+  @After
+  public void tearDown() throws Exception {
+    super.tearDown();
+  }
+}
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
index ae20606f7e7..3e3f7578fc9 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
@@ -63,6 +63,7 @@
 import org.apache.solr.security.ConfigEditablePlugin;
 import org.apache.solr.security.jwt.JWTAuthPlugin.JWTAuthenticationResponse.AuthCode;
 import org.apache.solr.security.jwt.api.ModifyJWTAuthPluginConfigAPI;
+import org.apache.solr.servlet.LoadAdminUiServlet;
 import org.apache.solr.util.CryptoKeys;
 import org.eclipse.jetty.client.api.Request;
 import org.jose4j.jwa.AlgorithmConstraints;
@@ -130,7 +131,9 @@ public class JWTAuthPlugin extends AuthenticationPlugin
           JWTIssuerConfig.PARAM_CLIENT_ID,
           JWTIssuerConfig.PARAM_WELL_KNOWN_URL,
           JWTIssuerConfig.PARAM_AUDIENCE,
-          JWTIssuerConfig.PARAM_AUTHORIZATION_ENDPOINT);
+          JWTIssuerConfig.PARAM_AUTHORIZATION_ENDPOINT,
+          JWTIssuerConfig.PARAM_TOKEN_ENDPOINT,
+          JWTIssuerConfig.PARAM_AUTHORIZATION_FLOW);
 
   private JwtConsumer jwtConsumer;
   private boolean requireExpirationTime;
@@ -280,10 +283,24 @@ public void init(Map<String, Object> pluginConfig) {
     }
 
     initConsumer();
+    registerTokenEndpointForCsp();
 
     lastInitTime = Instant.now();
   }
 
+  /**
+   * Record Issuer token URL as a system property so it can be picked up and sent to Admin UI as CSP
+   */
+  protected void registerTokenEndpointForCsp() {
+    final String syspropName = LoadAdminUiServlet.SYSPROP_CSP_CONNECT_SRC_URLS;
+    String url = !issuerConfigs.isEmpty() ? getPrimaryIssuer().getTokenEndpoint() : null;
+    if (url != null) {
+      System.setProperty(syspropName, url);
+    } else {
+      System.clearProperty(syspropName);
+    }
+  }
+
   /**
    * Given a configuration object of a file name or list of file names, read X509 certificates from
    * each file
@@ -336,6 +353,8 @@ private Optional<JWTIssuerConfig> parseIssuerFromTopLevelConfig(Map<String, Obje
               .setJwksUrl(conf.get(JWTIssuerConfig.PARAM_JWKS_URL))
               .setAuthorizationEndpoint(
                   (String) conf.get(JWTIssuerConfig.PARAM_AUTHORIZATION_ENDPOINT))
+              .setTokenEndpoint((String) conf.get(JWTIssuerConfig.PARAM_TOKEN_ENDPOINT))
+              .setAuthorizationFlow((String) conf.get(JWTIssuerConfig.PARAM_AUTHORIZATION_FLOW))
               .setClientId((String) conf.get(JWTIssuerConfig.PARAM_CLIENT_ID))
               .setWellKnownUrl((String) conf.get(JWTIssuerConfig.PARAM_WELL_KNOWN_URL));
       if (conf.get(JWTIssuerConfig.PARAM_JWK) != null) {
@@ -847,9 +866,11 @@ protected String generateAuthDataHeader() {
     Map<String, Object> data = new HashMap<>();
     data.put(
         JWTIssuerConfig.PARAM_AUTHORIZATION_ENDPOINT, primaryIssuer.getAuthorizationEndpoint());
+    data.put(JWTIssuerConfig.PARAM_TOKEN_ENDPOINT, primaryIssuer.getTokenEndpoint());
     data.put("client_id", primaryIssuer.getClientId());
     data.put("scope", adminUiScope);
     data.put("redirect_uris", redirectUris);
+    data.put("authorization_flow", primaryIssuer.getAuthorizationFlow());
     String headerJson = Utils.toJSONString(data);
     return Base64.getEncoder().encodeToString(headerJson.getBytes(StandardCharsets.UTF_8));
   }
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTIssuerConfig.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTIssuerConfig.java
index 55ccbcc956a..947d040da8b 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTIssuerConfig.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTIssuerConfig.java
@@ -21,6 +21,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.Charset;
@@ -32,8 +33,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.common.util.Utils;
 import org.jose4j.http.Get;
 import org.jose4j.http.SimpleResponse;
@@ -41,9 +44,12 @@
 import org.jose4j.jwk.JsonWebKey;
 import org.jose4j.jwk.JsonWebKeySet;
 import org.jose4j.lang.JoseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Holds information about an IdP (issuer), such as issuer ID, JWK url(s), keys etc */
 public class JWTIssuerConfig {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   static final String PARAM_ISS_NAME = "name";
   static final String PARAM_JWKS_URL = "jwksUrl";
   static final String PARAM_JWK = "jwk";
@@ -51,7 +57,9 @@ public class JWTIssuerConfig {
   static final String PARAM_AUDIENCE = "aud";
   static final String PARAM_WELL_KNOWN_URL = "wellKnownUrl";
   static final String PARAM_AUTHORIZATION_ENDPOINT = "authorizationEndpoint";
+  static final String PARAM_TOKEN_ENDPOINT = "tokenEndpoint";
   static final String PARAM_CLIENT_ID = "clientId";
+  static final String PARAM_AUTHORIZATION_FLOW = "authorizationFlow";
 
   private static HttpsJwksFactory httpsJwksFactory = new HttpsJwksFactory(3600, 5000);
   private String iss;
@@ -64,12 +72,18 @@ public class JWTIssuerConfig {
   private WellKnownDiscoveryConfig wellKnownDiscoveryConfig;
   private String clientId;
   private String authorizationEndpoint;
+  private String tokenEndpoint;
+  private String authorizationFlow;
   private Collection<X509Certificate> trustedCerts;
 
   public static boolean ALLOW_OUTBOUND_HTTP =
       Boolean.parseBoolean(System.getProperty("solr.auth.jwt.allowOutboundHttp", "false"));
   public static final String ALLOW_OUTBOUND_HTTP_ERR_MSG =
       "HTTPS required for IDP communication. Please use SSL or start your nodes with -Dsolr.auth.jwt.allowOutboundHttp=true to allow HTTP for test purposes.";
+  private static final String DEFAULT_AUTHORIZATION_FLOW =
+      "implicit"; // 'implicit' to be deprecated
+  private static final Set<String> VALID_AUTHORIZATION_FLOWS =
+      Set.of(DEFAULT_AUTHORIZATION_FLOW, "code_pkce");
 
   /**
    * Create config for further configuration with setters, builder style. Once all values are set,
@@ -117,6 +131,10 @@ public void init() {
       if (authorizationEndpoint == null) {
         authorizationEndpoint = wellKnownDiscoveryConfig.getAuthorizationEndpoint();
       }
+
+      if (tokenEndpoint == null) {
+        tokenEndpoint = wellKnownDiscoveryConfig.getTokenEndpoint();
+      }
     }
     if (iss == null && usesHttpsJwk() && !JWTAuthPlugin.PRIMARY_ISSUER.equals(name)) {
       throw new SolrException(
@@ -141,6 +159,8 @@ protected void parseConfigMap(Map<String, Object> configMap) {
     setJwksUrl(confJwksUrl);
     setJsonWebKeySet(conf.get(PARAM_JWK));
     setAuthorizationEndpoint((String) conf.get(PARAM_AUTHORIZATION_ENDPOINT));
+    setTokenEndpoint((String) conf.get(PARAM_TOKEN_ENDPOINT));
+    setAuthorizationFlow((String) conf.get(PARAM_AUTHORIZATION_FLOW));
 
     conf.remove(PARAM_WELL_KNOWN_URL);
     conf.remove(PARAM_ISSUER);
@@ -150,6 +170,8 @@ protected void parseConfigMap(Map<String, Object> configMap) {
     conf.remove(PARAM_JWKS_URL);
     conf.remove(PARAM_JWK);
     conf.remove(PARAM_AUTHORIZATION_ENDPOINT);
+    conf.remove(PARAM_TOKEN_ENDPOINT);
+    conf.remove(PARAM_AUTHORIZATION_FLOW);
 
     if (!conf.isEmpty()) {
       throw new SolrException(
@@ -315,6 +337,41 @@ public JWTIssuerConfig setAuthorizationEndpoint(String authorizationEndpoint) {
     return this;
   }
 
+  public String getTokenEndpoint() {
+    return tokenEndpoint;
+  }
+
+  public JWTIssuerConfig setTokenEndpoint(String tokenEndpoint) {
+    this.tokenEndpoint = tokenEndpoint;
+    return this;
+  }
+
+  public String getAuthorizationFlow() {
+    return authorizationFlow;
+  }
+
+  public JWTIssuerConfig setAuthorizationFlow(String authorizationFlow) {
+    this.authorizationFlow =
+        StrUtils.isNullOrEmpty(authorizationFlow)
+            ? DEFAULT_AUTHORIZATION_FLOW
+            : authorizationFlow.trim();
+    if (!VALID_AUTHORIZATION_FLOWS.contains(this.authorizationFlow)) {
+      throw new SolrException(
+          SolrException.ErrorCode.SERVER_ERROR,
+          "Invalid value for "
+              + PARAM_AUTHORIZATION_FLOW
+              + ". Expected one of "
+              + VALID_AUTHORIZATION_FLOWS
+              + " but found "
+              + authorizationFlow);
+    }
+    if (this.authorizationFlow.equals("implicit")) {
+      log.warn(
+          "JWT authentication plugin is using 'implicit flow' which is deprecated and less secure. It's recommended to switch to 'code_pkce'");
+    }
+    return this;
+  }
+
   public Map<String, Object> asConfig() {
     HashMap<String, Object> config = new HashMap<>();
     putIfNotNull(config, PARAM_ISS_NAME, name);
@@ -324,6 +381,8 @@ public Map<String, Object> asConfig() {
     putIfNotNull(config, PARAM_WELL_KNOWN_URL, wellKnownUrl);
     putIfNotNull(config, PARAM_CLIENT_ID, clientId);
     putIfNotNull(config, PARAM_AUTHORIZATION_ENDPOINT, authorizationEndpoint);
+    putIfNotNull(config, PARAM_TOKEN_ENDPOINT, tokenEndpoint);
+    putIfNotNull(config, PARAM_AUTHORIZATION_FLOW, authorizationFlow);
     if (jsonWebKeySet != null) {
       putIfNotNull(config, PARAM_JWK, jsonWebKeySet.getJsonWebKeys());
     }
diff --git a/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security.json b/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security.json
index 772089e3819..313b409a230 100644
--- a/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security.json
+++ b/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security.json
@@ -13,6 +13,8 @@
     "realm": "my-solr-jwt",
     "adminUiScope": "solr:admin",
     "authorizationEndpoint": "http://acmepaymentscorp/oauth/auz/authorize",
+    "tokenEndpoint": "http://acmepaymentscorp/oauth/oauth20/token",
+    "authorizationFlow": "code_pkce",
     "clientId": "solr-cluster"
   }
 }
\ No newline at end of file
diff --git a/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security_blockUnknownFalse.json b/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security_blockUnknownFalse.json
index ef5bcdeea4a..e9dafff1c2f 100644
--- a/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security_blockUnknownFalse.json
+++ b/solr/modules/jwt-auth/src/test-files/solr/security/jwt_plugin_jwk_security_blockUnknownFalse.json
@@ -13,6 +13,8 @@
     "realm": "my-solr-jwt-blockunknown-false",
     "adminUiScope": "solr:admin",
     "authorizationEndpoint": "http://acmepaymentscorp/oauth/auz/authorize",
+    "tokenEndpoint": "http://acmepaymentscorp/oauth/oauth20/token",
+    "authorizationFlow": "code_pkce",
     "clientId": "solr-cluster"
   },
   "authorization": {
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
index a7dad973d86..23cefdbca51 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
@@ -162,6 +162,8 @@ public void testStaticJwtKeys() throws Exception {
     String authData = new String(Base64.getDecoder().decode(headers.get("X-Solr-AuthData")), UTF_8);
     assertEquals(
         "{\n"
+            + "  \"tokenEndpoint\":\"http://acmepaymentscorp/oauth/oauth20/token\",\n"
+            + "  \"authorization_flow\":\"code_pkce\",\n"
             + "  \"scope\":\"solr:admin\",\n"
             + "  \"redirect_uris\":[],\n"
             + "  \"authorizationEndpoint\":\"http://acmepaymentscorp/oauth/auz/authorize\",\n"
@@ -184,6 +186,8 @@ public void infoRequestValidateXSolrAuthHeadersBlockUnknownFalse() throws Except
     String authData = new String(Base64.getDecoder().decode(headers.get("X-Solr-AuthData")), UTF_8);
     assertEquals(
         "{\n"
+            + "  \"tokenEndpoint\":\"http://acmepaymentscorp/oauth/oauth20/token\",\n"
+            + "  \"authorization_flow\":\"code_pkce\",\n"
             + "  \"scope\":\"solr:admin\",\n"
             + "  \"redirect_uris\":[],\n"
             + "  \"authorizationEndpoint\":\"http://acmepaymentscorp/oauth/auz/authorize\",\n"
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
index f40ffee9be9..9e04865c6c3 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
@@ -45,6 +45,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.security.VerifiedUserRoles;
+import org.apache.solr.servlet.LoadAdminUiServlet;
 import org.apache.solr.util.CryptoKeys;
 import org.jose4j.jwk.RsaJsonWebKey;
 import org.jose4j.jwk.RsaJwkGenerator;
@@ -519,6 +520,8 @@ public void bothJwksUrlAndJwkFails() {
   public void xSolrAuthDataHeader() {
     testConfig.put("adminUiScope", "solr:admin");
     testConfig.put("authorizationEndpoint", "http://acmepaymentscorp/oauth/auz/authorize");
+    testConfig.put("tokenEndpoint", "http://acmepaymentscorp/oauth/oauth20/token");
+    testConfig.put("authorizationFlow", "code_pkce");
     testConfig.put("clientId", "solr-cluster");
     plugin.init(testConfig);
     String headerBase64 = plugin.generateAuthDataHeader();
@@ -528,6 +531,8 @@ public void xSolrAuthDataHeader() {
     assertEquals("solr:admin", parsed.get("scope"));
     assertEquals(
         "http://acmepaymentscorp/oauth/auz/authorize", parsed.get("authorizationEndpoint"));
+    assertEquals("http://acmepaymentscorp/oauth/oauth20/token", parsed.get("tokenEndpoint"));
+    assertEquals("code_pkce", parsed.get("authorization_flow"));
     assertEquals("solr-cluster", parsed.get("client_id"));
   }
 
@@ -703,4 +708,13 @@ public void parseCertsFromFile() throws IOException {
             .toString();
     assertEquals(2, plugin.parseCertsFromFile(pemFilePath).size());
   }
+
+  @Test
+  public void testRegisterTokenEndpointForCsp() {
+    testConfig.put("tokenEndpoint", "http://acmepaymentscorp/oauth/oauth20/token");
+    plugin.init(testConfig);
+    assertEquals(
+        "http://acmepaymentscorp/oauth/oauth20/token",
+        System.getProperty(LoadAdminUiServlet.SYSPROP_CSP_CONNECT_SRC_URLS));
+  }
 }
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
index 3355486001a..57c0261b897 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
@@ -53,15 +53,19 @@ public void setUp() throws Exception {
             .setAud("audience")
             .setClientId("clientid")
             .setWellKnownUrl("wellknown")
-            .setAuthorizationEndpoint("https://issuer/authz");
+            .setAuthorizationEndpoint("https://issuer/authz")
+            .setTokenEndpoint("https://issuer/token")
+            .setAuthorizationFlow("code_pkce");
 
     testIssuerConfigMap = testIssuer.asConfig();
 
     testIssuerJson =
         "{\n"
             + "  \"aud\":\"audience\",\n"
+            + "  \"tokenEndpoint\":\"https://issuer/token\",\n"
             + "  \"wellKnownUrl\":\"wellknown\",\n"
             + "  \"clientId\":\"clientid\",\n"
+            + "  \"authorizationFlow\":\"code_pkce\",\n"
             + "  \"jwksUrl\":[\"https://issuer/path\"],\n"
             + "  \"name\":\"name\",\n"
             + "  \"iss\":\"issuer\",\n"
@@ -89,6 +93,11 @@ public void parseConfigMapNoName() {
     new JWTIssuerConfig(testIssuerConfigMap).isValid();
   }
 
+  @Test(expected = SolrException.class)
+  public void setInvalidAuthorizationFlow() {
+    new JWTIssuerConfig("name").setAuthorizationFlow("invalid_flow");
+  }
+
   @Test
   public void parseJwkSet() throws Exception {
     HashMap<String, Object> testJwks = new HashMap<>();
@@ -173,6 +182,7 @@ public void wellKnownConfigFromString() throws IOException {
     assertEquals("https://acmepaymentscorp/oauth/jwks", config.getJwksUrl());
     assertEquals("http://acmepaymentscorp", config.getIssuer());
     assertEquals("http://acmepaymentscorp/oauth/auz/authorize", config.getAuthorizationEndpoint());
+    assertEquals("http://acmepaymentscorp/oauth/oauth20/token", config.getTokenEndpoint());
     assertEquals(
         Arrays.asList(
             "READ", "WRITE", "DELETE", "openid", "scope", "profile", "email", "address", "phone"),
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adoc
index ec79558548e..e4de26a87ad 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adoc
@@ -85,6 +85,8 @@ jwk                  ; As an alternative to `jwksUrl` you may provide a static J
 iss                  ; Unique issuer id as configured on the IdP. Incoming tokens must have a matching `iss` claim. Also used to resolve issuer when multiple issuers configured.      ; Auto configured if `wellKnownUrl` is provided
 aud                  ; Validates that the `aud` (audience) claim equals this string      ; Uses `clientId` if configured
 authorizationEndpoint; The URL for the Id Provider's authorization endpoint ; Auto configured if `wellKnownUrl` is provided
+tokenEndpoint; The URL for the Id Provider's token endpoint ; Auto configured if `wellKnownUrl` is provided
+authorizationFlow; Specifies the OAuth 2.0 flow to be used. Supported flows are 'implicit' and 'code_pkce' (for authorization code with 'Proof Key for Code Exchange'). Note: 'implicit' is deprecated and it is highly recommended to use 'code_pkce' instead. ; implicit
 |===
 
 TIP: For backwards compatibility, all the configuration keys for the primary issuer may be configured as top-level keys, except `name`.

From 0eef652827fb4bd2cf8b61b8a0eb4f388f201b7c Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 5 Sep 2023 06:15:26 -0400
Subject: [PATCH 055/160] SOLR-16956: fix not being able to stop a solr by port
 number (#1880)

---
 solr/bin/solr                            |  1 +
 solr/packaging/test/test_start_solr.bats | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/solr/bin/solr b/solr/bin/solr
index 8a6d0560757..e11eec4e8d4 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1301,6 +1301,7 @@ if [ $# -gt 0 ]; then
               exit 1
             fi
             SOLR_PORT="$2"
+            PROVIDED_SOLR_PORT="${SOLR_PORT}"
             PASS_TO_RUN_EXAMPLE+=("-p" "$SOLR_PORT")
             shift 2
         ;;
diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.bats
index e0d7e5d981e..3b664759da4 100644
--- a/solr/packaging/test/test_start_solr.bats
+++ b/solr/packaging/test/test_start_solr.bats
@@ -36,3 +36,16 @@ teardown() {
   run bash -c 'solr stop -all 2>&1'
   refute_output --partial 'forcefully killing'
 }
+
+@test "stop command for single port" {
+
+  solr start
+  solr start -p 7574
+  solr assert --started http://localhost:8983/solr --timeout 5000
+  solr assert --started http://localhost:7574/solr --timeout 5000
+  
+  run solr stop -p 7574
+  solr assert --not-started http://localhost:7574/solr --timeout 5000
+  solr assert --started http://localhost:8983/solr --timeout 5000
+
+}

From 275be009825080856cd5ecd084da9ba8b07e6e38 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Wed, 6 Sep 2023 12:06:03 +0200
Subject: [PATCH 056/160] Update org.semver4j:semver4j dependency from 4.3 to
 5.1 (#1771)

---
 solr/licenses/semver4j-4.3.0.jar.sha1 | 1 -
 solr/licenses/semver4j-5.1.0.jar.sha1 | 1 +
 versions.lock                         | 2 +-
 versions.props                        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/semver4j-4.3.0.jar.sha1
 create mode 100644 solr/licenses/semver4j-5.1.0.jar.sha1

diff --git a/solr/licenses/semver4j-4.3.0.jar.sha1 b/solr/licenses/semver4j-4.3.0.jar.sha1
deleted file mode 100644
index abf80df034a..00000000000
--- a/solr/licenses/semver4j-4.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-71760ca3e4136264c17107659d9df540594340a6
diff --git a/solr/licenses/semver4j-5.1.0.jar.sha1 b/solr/licenses/semver4j-5.1.0.jar.sha1
new file mode 100644
index 00000000000..69c3649226d
--- /dev/null
+++ b/solr/licenses/semver4j-5.1.0.jar.sha1
@@ -0,0 +1 @@
+e4afaf5d7297c8fbb67517ba6f1150b50e034b84
diff --git a/versions.lock b/versions.lock
index 25d922b05a8..6c037f14e21 100644
--- a/versions.lock
+++ b/versions.lock
@@ -343,7 +343,7 @@ org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
 org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
 org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
-org.semver4j:semver4j:4.3.0 (1 constraints: 09050836)
+org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
 org.slf4j:jcl-over-slf4j:2.0.7 (3 constraints: cd1757a6)
 org.slf4j:jul-to-slf4j:2.0.7 (3 constraints: 27289948)
 org.slf4j:slf4j-api:2.0.7 (59 constraints: 0d112d8b)
diff --git a/versions.props b/versions.props
index 3e61cbe6326..2a23593521e 100644
--- a/versions.props
+++ b/versions.props
@@ -66,7 +66,7 @@ org.mockito:mockito*=5.3.1
 org.openjdk.jmh:*=1.37
 org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
-org.semver4j:semver4j=4.3.0
+org.semver4j:semver4j=5.1.0
 org.slf4j:*=2.0.7
 org.xerial.snappy:snappy-java=1.1.10.1
 software.amazon.awssdk:*=2.20.128

From abbc695ad4f1a9956a634e06d7794b34df3e1683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Wed, 6 Sep 2023 15:35:53 +0200
Subject: [PATCH 057/160] SOLR-16954 Make Circuit Breakers available for Update
 Requests (#1871)

Co-authored-by: Christine Poerschke <cpoerschke@apache.org>
---
 solr/CHANGES.txt                              |  2 +
 .../handler/ContentStreamHandlerBase.java     | 35 ++++++++++++
 .../solr/handler/component/SearchHandler.java | 13 ++---
 .../util/circuitbreaker/CircuitBreaker.java   | 54 +++++++++++++++++++
 .../CircuitBreakerRegistry.java               | 44 ++++++++-------
 .../solrconfig-pluggable-circuitbreaker.xml   | 12 +++++
 .../solr/util/BaseTestCircuitBreaker.java     | 47 +++++++++++++---
 .../pages/circuit-breakers.adoc               | 31 +++++++++--
 8 files changed, 198 insertions(+), 40 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 13cf7644f01..5013377536d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -72,6 +72,8 @@ New Features
 ---------------------
 * SOLR-16654: Add support for node-level caches (Michael Gibney)
 
+* SOLR-16954: Make Circuit Breakers available for Update Requests (janhoy, Christine Poerschke, Pierre Salagnac)
+
 Improvements
 ---------------------
 * SOLR-16490: `/admin/cores?action=backupcore` now has a v2 equivalent, available at
diff --git a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
index f00c68b39e4..fb40af3c081 100644
--- a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
@@ -16,6 +16,11 @@
  */
 package org.apache.solr.handler;
 
+import static org.apache.solr.common.params.CommonParams.FAILURE;
+import static org.apache.solr.common.params.CommonParams.STATUS;
+
+import java.util.List;
+import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.ContentStream;
@@ -26,6 +31,8 @@
 import org.apache.solr.update.SolrCoreState;
 import org.apache.solr.update.processor.UpdateRequestProcessor;
 import org.apache.solr.update.processor.UpdateRequestProcessorChain;
+import org.apache.solr.util.circuitbreaker.CircuitBreaker;
+import org.apache.solr.util.circuitbreaker.CircuitBreakerRegistry;
 
 /**
  * Shares common code between various handlers that manipulate {@link
@@ -49,6 +56,10 @@ public void init(NamedList<?> args) {
 
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
+    if (checkCircuitBreakers(req, rsp)) {
+      return; // Circuit breaker tripped, return immediately
+    }
+
     /*
        We track update requests so that we can preserve consistency by waiting for them to complete
        on a node shutdown and then immediately trigger a leader election without waiting for the core to close.
@@ -101,6 +112,30 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
     }
   }
 
+  /**
+   * Check if {@link SolrRequestType#UPDATE} circuit breakers are tripped. Override this method in
+   * sub classes that do not want to check circuit breakers.
+   *
+   * @return true if circuit breakers are tripped, false otherwise.
+   */
+  protected boolean checkCircuitBreakers(SolrQueryRequest req, SolrQueryResponse rsp) {
+    CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
+    if (circuitBreakerRegistry.isEnabled(SolrRequestType.UPDATE)) {
+      List<CircuitBreaker> trippedCircuitBreakers =
+          circuitBreakerRegistry.checkTripped(SolrRequestType.UPDATE);
+      if (trippedCircuitBreakers != null) {
+        String errorMessage = CircuitBreakerRegistry.toErrorMessage(trippedCircuitBreakers);
+        rsp.add(STATUS, FAILURE);
+        rsp.setException(
+            new SolrException(
+                CircuitBreaker.getErrorCode(trippedCircuitBreakers),
+                "Circuit Breakers tripped " + errorMessage));
+        return true;
+      }
+    }
+    return false;
+  }
+
   protected abstract ContentStreamLoader newLoader(
       SolrQueryRequest req, UpdateRequestProcessor processor);
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 0d5b6c27c00..10f99ac49f8 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.lucene.index.ExitableDirectoryReader;
 import org.apache.lucene.search.TotalHits;
+import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.SolrDocumentList;
@@ -330,8 +331,8 @@ protected ResponseBuilder newResponseBuilder(
   }
 
   /**
-   * Check if circuit breakers are tripped. Override this method in sub classes that do not want to
-   * check circuit breakers.
+   * Check if {@link SolrRequestType#QUERY} circuit breakers are tripped. Override this method in
+   * sub classes that do not want to check circuit breakers.
    *
    * @return true if circuit breakers are tripped, false otherwise.
    */
@@ -340,18 +341,18 @@ protected boolean checkCircuitBreakers(
     final RTimerTree timer = rb.isDebug() ? req.getRequestTimer() : null;
 
     final CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
-    if (circuitBreakerRegistry.isEnabled()) {
+    if (circuitBreakerRegistry.isEnabled(SolrRequestType.QUERY)) {
       List<CircuitBreaker> trippedCircuitBreakers;
 
       if (timer != null) {
         RTimerTree subt = timer.sub("circuitbreaker");
         rb.setTimer(subt);
 
-        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped();
+        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped(SolrRequestType.QUERY);
 
         rb.getTimer().stop();
       } else {
-        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped();
+        trippedCircuitBreakers = circuitBreakerRegistry.checkTripped(SolrRequestType.QUERY);
       }
 
       if (trippedCircuitBreakers != null) {
@@ -359,7 +360,7 @@ protected boolean checkCircuitBreakers(
         rsp.add(STATUS, FAILURE);
         rsp.setException(
             new SolrException(
-                SolrException.ErrorCode.SERVICE_UNAVAILABLE,
+                CircuitBreaker.getErrorCode(trippedCircuitBreakers),
                 "Circuit Breakers tripped " + errorMessage));
         return true;
       }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
index 8959c35e7a8..3082bf82e4a 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
@@ -17,6 +17,12 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.util.SolrPluginUtils;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
@@ -36,6 +42,10 @@
  * @lucene.experimental
  */
 public abstract class CircuitBreaker implements NamedListInitializedPlugin {
+  // Only query requests are checked by default
+  private Set<SolrRequestType> requestTypes = Set.of(SolrRequestType.QUERY);
+  private final List<SolrRequestType> SUPPORTED_TYPES =
+      List.of(SolrRequestType.QUERY, SolrRequestType.UPDATE);
 
   @Override
   public void init(NamedList<?> args) {
@@ -52,4 +62,48 @@ public CircuitBreaker() {}
 
   /** Get error message when the circuit breaker triggers */
   public abstract String getErrorMessage();
+
+  /**
+   * Set the request types for which this circuit breaker should be checked. If not called, the
+   * circuit breaker will be checked for the {@link SolrRequestType#QUERY} request type only.
+   *
+   * @param requestTypes list of strings representing request types
+   * @throws IllegalArgumentException if the request type is not valid
+   */
+  public void setRequestTypes(List<String> requestTypes) {
+    this.requestTypes =
+        requestTypes.stream()
+            .map(t -> SolrRequestType.valueOf(t.toUpperCase(Locale.ROOT)))
+            .peek(
+                t -> {
+                  if (!SUPPORTED_TYPES.contains(t)) {
+                    throw new IllegalArgumentException(
+                        String.format(
+                            Locale.ROOT,
+                            "Request type %s is not supported for circuit breakers",
+                            t.name()));
+                  }
+                })
+            .collect(Collectors.toSet());
+  }
+
+  public Set<SolrRequestType> getRequestTypes() {
+    return requestTypes;
+  }
+
+  /**
+   * Return the proper error code to use in exception. For legacy use of {@link CircuitBreaker} we
+   * return 503 for backward compatibility, else return 429.
+   *
+   * @deprecated Remove in 10.0
+   */
+  @Deprecated(since = "9.4")
+  public static SolrException.ErrorCode getErrorCode(List<CircuitBreaker> trippedCircuitBreakers) {
+    if (trippedCircuitBreakers != null
+        && trippedCircuitBreakers.stream().anyMatch(cb -> cb instanceof CircuitBreakerManager)) {
+      return SolrException.ErrorCode.SERVICE_UNAVAILABLE;
+    } else {
+      return SolrException.ErrorCode.TOO_MANY_REQUESTS;
+    }
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
index 0cb3fb0a378..84c2f61fb9b 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
@@ -19,7 +19,11 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
 
 /**
  * Keeps track of all registered circuit breaker instances for various request types. Responsible
@@ -30,27 +34,37 @@
  */
 public class CircuitBreakerRegistry {
 
-  private final List<CircuitBreaker> circuitBreakerList = new ArrayList<>();
+  private final Map<SolrRequestType, List<CircuitBreaker>> circuitBreakerMap = new HashMap<>();
 
   public CircuitBreakerRegistry() {}
 
   public void register(CircuitBreaker circuitBreaker) {
-    circuitBreakerList.add(circuitBreaker);
+    circuitBreaker
+        .getRequestTypes()
+        .forEach(
+            r -> {
+              List<CircuitBreaker> list =
+                  circuitBreakerMap.computeIfAbsent(r, k -> new ArrayList<>());
+              list.add(circuitBreaker);
+            });
   }
 
   @VisibleForTesting
   public void deregisterAll() {
-    circuitBreakerList.clear();
+    circuitBreakerMap.clear();
   }
+
   /**
    * Check and return circuit breakers that have triggered
    *
+   * @param requestType {@link SolrRequestType} to check for.
    * @return CircuitBreakers which have triggered, null otherwise.
    */
-  public List<CircuitBreaker> checkTripped() {
+  public List<CircuitBreaker> checkTripped(SolrRequestType requestType) {
     List<CircuitBreaker> triggeredCircuitBreakers = null;
 
-    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
+    for (CircuitBreaker circuitBreaker :
+        circuitBreakerMap.getOrDefault(requestType, Collections.emptyList())) {
       if (circuitBreaker.isTripped()) {
         if (triggeredCircuitBreakers == null) {
           triggeredCircuitBreakers = new ArrayList<>();
@@ -63,22 +77,6 @@ public List<CircuitBreaker> checkTripped() {
     return triggeredCircuitBreakers;
   }
 
-  /**
-   * Returns true if *any* circuit breaker has triggered, false if none have triggered.
-   *
-   * <p>NOTE: This method short circuits the checking of circuit breakers -- the method will return
-   * as soon as it finds a circuit breaker that has triggered.
-   */
-  public boolean checkAnyTripped() {
-    for (CircuitBreaker circuitBreaker : circuitBreakerList) {
-      if (circuitBreaker.isTripped()) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   /**
    * Construct the final error message to be printed when circuit breakers trip.
    *
@@ -96,7 +94,7 @@ public static String toErrorMessage(List<CircuitBreaker> circuitBreakerList) {
     return sb.toString();
   }
 
-  public boolean isEnabled() {
-    return !circuitBreakerList.isEmpty();
+  public boolean isEnabled(SolrRequestType requestType) {
+    return circuitBreakerMap.containsKey(requestType);
   }
 }
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
index 660e7952e70..ad0efe5a444 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -80,6 +80,18 @@
 
   <circuitBreaker class="solr.MemoryCircuitBreaker">
     <double  name="threshold">75</double>
+    <arr name="requestTypes">
+      <str>update</str>
+    </arr>
+  </circuitBreaker>
+
+  <circuitBreaker class="solr.MemoryCircuitBreaker">
+    <double  name="threshold">80</double>
+<!-- Default is query
+    <arr name="requestTypes">
+      <str>query</str>
+    </arr>
+-->
   </circuitBreaker>
 
   <circuitBreaker class="solr.CPUCircuitBreaker">
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 372ddf80810..025db34ed76 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -32,6 +32,7 @@
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;
 import org.apache.solr.util.circuitbreaker.CircuitBreaker;
+import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
 import org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker;
 import org.hamcrest.MatcherAssert;
 import org.junit.After;
@@ -79,21 +80,42 @@ public void testCBAlwaysTrips() {
         });
   }
 
-  public void testCBFakeMemoryPressure() {
+  public void testCBFakeMemoryPressure() throws Exception {
     removeAllExistingCircuitBreakers();
 
-    CircuitBreaker circuitBreaker = new FakeMemoryPressureCircuitBreaker();
-    MemoryCircuitBreaker memoryCircuitBreaker = (MemoryCircuitBreaker) circuitBreaker;
+    // Update and query will not trip
+    h.update(
+        "<add><doc><field name=\"id\">1</field><field name=\"name\">john smith</field></doc></add>");
+    h.query(req("name:\"john smith\""));
 
-    memoryCircuitBreaker.setThreshold(75);
+    MemoryCircuitBreaker searchBreaker = new FakeMemoryPressureCircuitBreaker();
+    searchBreaker.setThreshold(80);
+    // Default request type is "query"
+    // searchBreaker.setRequestTypes(List.of("query"));
+    h.getCore().getCircuitBreakerRegistry().register(searchBreaker);
 
-    h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+    // Query will trip, but not update due to defaults
+    expectThrows(SolrException.class, () -> h.query(req("name:\"john smith\"")));
+    h.update(
+        "<add><doc><field name=\"id\">2</field><field name=\"name\">john smith</field></doc></add>");
+
+    MemoryCircuitBreaker updateBreaker = new FakeMemoryPressureCircuitBreaker();
+    updateBreaker.setThreshold(75);
+    updateBreaker.setRequestTypes(List.of("update"));
+    h.getCore().getCircuitBreakerRegistry().register(updateBreaker);
 
+    // Now also update will trip
     expectThrows(
         SolrException.class,
-        () -> {
-          h.query(req("name:\"john smith\""));
-        });
+        () ->
+            h.update(
+                "<add><doc><field name=\"id\">1</field><field name=\"name\">john smith</field></doc></add>"));
+  }
+
+  public void testBadRequestType() {
+    expectThrows(
+        IllegalArgumentException.class,
+        () -> new MemoryCircuitBreaker().setRequestTypes(List.of("badRequestType")));
   }
 
   public void testBuildingMemoryPressure() {
@@ -238,6 +260,15 @@ public void testResponseWithCBTiming() {
         "//lst[@name='process']/double[@name='time']");
   }
 
+  public void testErrorCode() {
+    assertEquals(
+        SolrException.ErrorCode.SERVICE_UNAVAILABLE,
+        CircuitBreaker.getErrorCode(List.of(new CircuitBreakerManager())));
+    assertEquals(
+        SolrException.ErrorCode.TOO_MANY_REQUESTS,
+        CircuitBreaker.getErrorCode(List.of(new MemoryCircuitBreaker())));
+  }
+
   private void removeAllExistingCircuitBreakers() {
     h.getCore().getCircuitBreakerRegistry().deregisterAll();
   }
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
index a96658e61bf..b517a2dd195 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
@@ -22,18 +22,19 @@ resource configuration.
 
 == When To Use Circuit Breakers
 Circuit breakers should be used when the user wishes to trade request throughput for a higher Solr stability.
-If circuit breakers are enabled, requests may be rejected under the condition of high node duress with an appropriate HTTP error code (typically 503).
+If circuit breakers are enabled, requests may be rejected under the condition of high node duress with HTTP error code 429 'Too Many Requests'.
 
 It is up to the client to handle this error and potentially build a retrial logic as this should ideally be a transient situation.
 
 == Circuit Breaker Configurations
 All circuit breaker configurations are listed as independent `<circuitBreaker>` entries in `solrconfig.xml` as shown below.
+A circuit breaker can register itself to trip for query requests and/or update requests. By default only search requests are affected. A user may register multiple circuit breakers of the same type with different thresholds for each request type.
 
 == Currently Supported Circuit Breakers
 
 === JVM Heap Usage
 
-This circuit breaker tracks JVM heap memory usage and rejects incoming search requests with a 503 error code if the heap usage exceeds a configured percentage of maximum heap allocated to the JVM (-Xmx).
+This circuit breaker tracks JVM heap memory usage and rejects incoming requests with a 429 error code if the heap usage exceeds a configured percentage of maximum heap allocated to the JVM (-Xmx).
 The main configuration for this circuit breaker is controlling the threshold percentage at which the breaker will trip.
 
 To enable and configure the JVM heap usage based circuit breaker, add the following:
@@ -72,8 +73,32 @@ To enable and configure the CPU utilization based circuit breaker:
 
 The `threshold` is defined in units of CPU utilization.
 
+== Advanced example
+
+In this example we will prevent update requests above 80% CPU load, and prevent query requests above 95% CPU load. Supported request types are `query` and `update`.
+This would prevent expensive bulk updates from impacting search. Note also the support for short-form class name.
+
+[source,xml]
+----
+<config>
+  <circuitBreaker class="solr.CPUCircuitBreaker">
+   <double  name="threshold">80</double>
+   <arr name="requestTypes">
+     <str>update</str>
+   </arr>
+  </circuitBreaker>
+
+  <circuitBreaker class="solr.CPUCircuitBreaker">
+   <double  name="threshold">95</double>
+   <arr name="requestTypes">
+     <str>query</str>
+   </arr>
+  </circuitBreaker>
+</config>
+----
+
 == Performance Considerations
 
-It is worth noting that while JVM or CPU circuit breakers do not add any noticeable overhead per query, having too many circuit breakers checked for a single request can cause a performance overhead.
+It is worth noting that while JVM or CPU circuit breakers do not add any noticeable overhead per request, having too many circuit breakers checked for a single request can cause a performance overhead.
 
 In addition, it is a good practice to exponentially back off while retrying requests on a busy node.

From ba80f82f64f61d19ae48cf58704a4b42b7301c15 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Wed, 6 Sep 2023 11:13:59 -0400
Subject: [PATCH 058/160] SOLR-16825: Remove unneeded @Produces annotations
 (#1885)

Besides cluttering up our APIs definitions, these annotations were
resulting in some noisy warnings at in our build output.

This commit removes them across the 'api' module.
---
 .../solr/client/api/endpoint/AddReplicaPropertyApi.java  | 4 ----
 .../solr/client/api/endpoint/AliasPropertyApis.java      | 9 ---------
 .../apache/solr/client/api/endpoint/DeleteAliasApi.java  | 4 ----
 .../solr/client/api/endpoint/DeleteCollectionApi.java    | 4 ----
 .../client/api/endpoint/DeleteCollectionBackupApi.java   | 5 -----
 .../client/api/endpoint/DeleteCollectionSnapshotApi.java | 4 ----
 .../apache/solr/client/api/endpoint/DeleteNodeApi.java   | 4 ----
 .../solr/client/api/endpoint/DeleteReplicaApi.java       | 5 -----
 .../client/api/endpoint/DeleteReplicaPropertyApi.java    | 4 ----
 .../apache/solr/client/api/endpoint/ListAliasesApi.java  | 6 ------
 .../client/api/endpoint/ListCollectionBackupsApi.java    | 3 ---
 .../solr/client/api/endpoint/ListCollectionsApi.java     | 4 ----
 .../solr/client/api/endpoint/ListConfigsetsApi.java      | 2 --
 .../solr/client/api/endpoint/ReloadCollectionApi.java    | 5 -----
 .../solr/handler/configsets/ListConfigSetsAPITest.java   | 8 +++++---
 15 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
index 9403358770a..8dce6a28e54 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java
@@ -17,15 +17,12 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 
@@ -33,7 +30,6 @@
 public interface AddReplicaPropertyApi {
 
   @PUT
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Adds a property to the specified replica",
       tags = {"replica-properties"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
index d993997d111..7bc167a2b36 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java
@@ -16,8 +16,6 @@
  */
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -26,8 +24,6 @@
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import org.apache.solr.client.api.model.GetAliasPropertyResponse;
 import org.apache.solr.client.api.model.GetAllAliasPropertiesResponse;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
@@ -39,7 +35,6 @@
 public interface AliasPropertyApis {
 
   @GET
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Get properties for a collection alias.",
       tags = {"alias-properties"})
@@ -49,7 +44,6 @@ GetAllAliasPropertiesResponse getAllAliasProperties(
 
   @GET
   @Path("/{propName}")
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Get a specific property for a collection alias.",
       tags = {"alias-properties"})
@@ -59,7 +53,6 @@ GetAliasPropertyResponse getAliasProperty(
       throws Exception;
 
   @PUT
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Update properties for a collection alias.",
       tags = {"alias-properties"})
@@ -71,7 +64,6 @@ SolrJerseyResponse updateAliasProperties(
 
   @PUT
   @Path("/{propName}")
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Update a specific property for a collection alias.",
       tags = {"alias-properties"})
@@ -84,7 +76,6 @@ SolrJerseyResponse createOrUpdateAliasProperty(
 
   @DELETE
   @Path("/{propName}")
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete a specific property for a collection alias.",
       tags = {"alias-properties"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteAliasApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteAliasApi.java
index 24759ead2ad..05d32068683 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteAliasApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteAliasApi.java
@@ -17,14 +17,11 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 
@@ -32,7 +29,6 @@
 public interface DeleteAliasApi {
 
   @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Deletes an alias by its name",
       tags = {"aliases"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionApi.java
index 9e28e7b1722..8cf0010066e 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionApi.java
@@ -17,14 +17,11 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 
@@ -32,7 +29,6 @@
 public interface DeleteCollectionApi {
 
   @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Deletes a collection from SolrCloud",
       tags = {"collections"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
index 1135e4d89d7..e53f8ea96d7 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionBackupApi.java
@@ -20,7 +20,6 @@
 import static org.apache.solr.client.api.model.Constants.ASYNC;
 import static org.apache.solr.client.api.model.Constants.BACKUP_LOCATION;
 import static org.apache.solr.client.api.model.Constants.BACKUP_REPOSITORY;
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -28,7 +27,6 @@
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.BackupDeletionResponseBody;
 import org.apache.solr.client.api.model.PurgeUnusedFilesRequestBody;
@@ -39,7 +37,6 @@ public interface DeleteCollectionBackupApi {
 
   @Path("/versions/{backupId}")
   @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete incremental backup point by ID",
       tags = {"collection-backups"})
@@ -54,7 +51,6 @@ BackupDeletionResponseBody deleteSingleBackupById(
 
   @Path("/versions")
   @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete all incremental backup points older than the most recent N",
       tags = {"collection-backups"})
@@ -69,7 +65,6 @@ BackupDeletionResponseBody deleteMultipleBackupsByRecency(
 
   @Path("/purgeUnused")
   @PUT
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Garbage collect orphaned incremental backup files",
       tags = {"collection-backups"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
index f9d1afc8387..fb77fbd6dc8 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteCollectionSnapshotApi.java
@@ -17,14 +17,11 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Parameter;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.DeleteCollectionSnapshotResponse;
 
@@ -33,7 +30,6 @@ public interface DeleteCollectionSnapshotApi {
   /** This API is analogous to V1's (POST /solr/admin/collections?action=DELETESNAPSHOT) */
   @DELETE
   @Path("/collections/{collName}/snapshots/{snapshotName}")
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   DeleteCollectionSnapshotResponse deleteSnapshot(
       @Parameter(description = "The name of the collection.", required = true)
           @PathParam("collName")
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
index 323b70dbabb..0495d298cb9 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteNodeApi.java
@@ -17,15 +17,12 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import org.apache.solr.client.api.model.DeleteNodeRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 
@@ -33,7 +30,6 @@
 public interface DeleteNodeApi {
 
   @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete all replicas off of the specified SolrCloud node",
       tags = {"node"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
index a728c12aadc..f17abdfab26 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaApi.java
@@ -24,14 +24,12 @@
 import static org.apache.solr.client.api.model.Constants.DELETE_INSTANCE_DIR;
 import static org.apache.solr.client.api.model.Constants.FOLLOW_ALIASES;
 import static org.apache.solr.client.api.model.Constants.ONLY_IF_DOWN;
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
 
 import io.swagger.v3.oas.annotations.Operation;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.ScaleCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
@@ -46,7 +44,6 @@ public interface DeleteReplicaApi {
 
   @DELETE
   @Path("/shards/{shardName}/replicas/{replicaName}")
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete an single replica by name",
       tags = {"replicas"})
@@ -65,7 +62,6 @@ SubResponseAccumulatingJerseyResponse deleteReplicaByName(
 
   @DELETE
   @Path("/shards/{shardName}/replicas")
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete one or more replicas from the specified collection and shard",
       tags = {"replicas"})
@@ -84,7 +80,6 @@ SubResponseAccumulatingJerseyResponse deleteReplicasByCount(
 
   @PUT
   @Path("/scale")
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Scale the replica count for all shards in the specified collection",
       tags = {"replicas"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
index 15d98564ffe..8e8f52fd33a 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/DeleteReplicaPropertyApi.java
@@ -17,14 +17,11 @@
 
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 
 /**
@@ -36,7 +33,6 @@
 public interface DeleteReplicaPropertyApi {
 
   @DELETE
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Delete an existing replica property",
       tags = {"replica-properties"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
index eaeddf7bd2a..3f786b9d5e7 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListAliasesApi.java
@@ -16,15 +16,11 @@
  */
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import org.apache.solr.client.api.model.GetAliasByNameResponse;
 import org.apache.solr.client.api.model.ListAliasesResponse;
 
@@ -33,7 +29,6 @@
 public interface ListAliasesApi {
 
   @GET
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "List the existing collection aliases.",
       tags = {"aliases"})
@@ -41,7 +36,6 @@ public interface ListAliasesApi {
 
   @GET
   @Path("/{aliasName}")
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Get details for a specific collection alias.",
       tags = {"aliases"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
index 24701fb18cc..59657085b95 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionBackupsApi.java
@@ -18,14 +18,12 @@
 
 import static org.apache.solr.client.api.model.Constants.BACKUP_LOCATION;
 import static org.apache.solr.client.api.model.Constants.BACKUP_REPOSITORY;
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
 
 import io.swagger.v3.oas.annotations.Operation;
 import java.io.IOException;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.ListCollectionBackupsResponse;
 
@@ -34,7 +32,6 @@
 public interface ListCollectionBackupsApi {
 
   @GET
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "List existing incremental backups at the specified location.",
       tags = {"collection-backups"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
index fabb670a4b5..bb8baa210f3 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListCollectionsApi.java
@@ -16,18 +16,14 @@
  */
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import org.apache.solr.client.api.model.ListCollectionsResponse;
 
 @Path("/collections")
 public interface ListCollectionsApi {
   @GET
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "List all collections in this Solr cluster",
       tags = {"collections"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
index c1e99b805a1..b00a47cac19 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ListConfigsetsApi.java
@@ -19,14 +19,12 @@
 import io.swagger.v3.oas.annotations.Operation;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import org.apache.solr.client.api.model.ListConfigsetsResponse;
 
 /** V2 API definition for listing configsets. */
 @Path("/cluster/configs")
 public interface ListConfigsetsApi {
   @GET
-  @Produces({"application/json", "application/javabin"})
   @Operation(
       summary = "List the configsets available to Solr.",
       tags = {"configsets"})
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
index 39f27d2911d..2bf85b90626 100644
--- a/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReloadCollectionApi.java
@@ -16,14 +16,10 @@
  */
 package org.apache.solr.client.api.endpoint;
 
-import static org.apache.solr.client.api.util.Constants.BINARY_CONTENT_TYPE_V2;
-
 import io.swagger.v3.oas.annotations.Operation;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import org.apache.solr.client.api.model.ReloadCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 
@@ -31,7 +27,6 @@
 @Path("/collections/{collectionName}/reload")
 public interface ReloadCollectionApi {
   @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
   @Operation(
       summary = "Reload all cores in the specified collection.",
       tags = {"collections"})
diff --git a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
index 635dc8305e5..a0cf41622cd 100644
--- a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
@@ -91,7 +91,7 @@ public void testSuccessfulListConfigsetsRaw() throws Exception {
     when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
     when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
 
-    final Response response = target("/cluster/configs").request().get();
+    final Response response = target("/cluster/configs").request("application/json").get();
     final String jsonBody = response.readEntity(String.class);
 
     assertEquals(200, response.getStatus());
@@ -108,7 +108,8 @@ public void testSuccessfulListConfigsetsTyped() throws Exception {
     when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
     when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
 
-    final var response = target("/cluster/configs").request().get(ListConfigsetsResponse.class);
+    final var response =
+        target("/cluster/configs").request("application/json").get(ListConfigsetsResponse.class);
 
     assertNotNull(response.configSets);
     assertNull(response.error);
@@ -132,7 +133,8 @@ public void testListConfigsetsV1Compatibility() throws Exception {
     when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
     when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
 
-    final var response = target("/cluster/configs").request().get(ListConfigsetsResponse.class);
+    final var response =
+        target("/cluster/configs").request("application/json").get(ListConfigsetsResponse.class);
     final NamedList<Object> squashedResponse = new NamedList<>();
     V2ApiUtils.squashIntoNamedList(squashedResponse, response);
     final ConfigSetAdminResponse.List solrjResponse = new ConfigSetAdminResponse.List();

From b098aa2023c67a0c07e20cae2fc019002e6477f5 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Wed, 6 Sep 2023 18:35:16 +0200
Subject: [PATCH 059/160] Update org.eclipse.jetty*:* to v10.0.16 (#1888)

---
 solr/licenses/http2-client-10.0.15.jar.sha1   |  1 -
 solr/licenses/http2-client-10.0.16.jar.sha1   |  1 +
 solr/licenses/http2-common-10.0.15.jar.sha1   |  1 -
 solr/licenses/http2-common-10.0.16.jar.sha1   |  1 +
 solr/licenses/http2-hpack-10.0.15.jar.sha1    |  1 -
 solr/licenses/http2-hpack-10.0.16.jar.sha1    |  1 +
 ...tp2-http-client-transport-10.0.15.jar.sha1 |  1 -
 ...tp2-http-client-transport-10.0.16.jar.sha1 |  1 +
 solr/licenses/http2-server-10.0.15.jar.sha1   |  1 -
 solr/licenses/http2-server-10.0.16.jar.sha1   |  1 +
 .../jetty-alpn-client-10.0.15.jar.sha1        |  1 -
 .../jetty-alpn-client-10.0.16.jar.sha1        |  1 +
 .../jetty-alpn-java-client-10.0.15.jar.sha1   |  1 -
 .../jetty-alpn-java-client-10.0.16.jar.sha1   |  1 +
 .../jetty-alpn-java-server-10.0.15.jar.sha1   |  1 -
 .../jetty-alpn-java-server-10.0.16.jar.sha1   |  1 +
 .../jetty-alpn-server-10.0.15.jar.sha1        |  1 -
 .../jetty-alpn-server-10.0.16.jar.sha1        |  1 +
 solr/licenses/jetty-client-10.0.15.jar.sha1   |  1 -
 solr/licenses/jetty-client-10.0.16.jar.sha1   |  1 +
 solr/licenses/jetty-deploy-10.0.15.jar.sha1   |  1 -
 solr/licenses/jetty-deploy-10.0.16.jar.sha1   |  1 +
 solr/licenses/jetty-http-10.0.15.jar.sha1     |  1 -
 solr/licenses/jetty-http-10.0.16.jar.sha1     |  1 +
 solr/licenses/jetty-io-10.0.15.jar.sha1       |  1 -
 solr/licenses/jetty-io-10.0.16.jar.sha1       |  1 +
 solr/licenses/jetty-jmx-10.0.15.jar.sha1      |  1 -
 solr/licenses/jetty-jmx-10.0.16.jar.sha1      |  1 +
 solr/licenses/jetty-rewrite-10.0.15.jar.sha1  |  1 -
 solr/licenses/jetty-rewrite-10.0.16.jar.sha1  |  1 +
 solr/licenses/jetty-security-10.0.15.jar.sha1 |  1 -
 solr/licenses/jetty-security-10.0.16.jar.sha1 |  1 +
 solr/licenses/jetty-server-10.0.15.jar.sha1   |  1 -
 solr/licenses/jetty-server-10.0.16.jar.sha1   |  1 +
 solr/licenses/jetty-servlet-10.0.15.jar.sha1  |  1 -
 solr/licenses/jetty-servlet-10.0.16.jar.sha1  |  1 +
 solr/licenses/jetty-servlets-10.0.15.jar.sha1 |  1 -
 solr/licenses/jetty-servlets-10.0.16.jar.sha1 |  1 +
 .../jetty-start-10.0.15-shaded.jar.sha1       |  1 -
 .../jetty-start-10.0.16-shaded.jar.sha1       |  1 +
 solr/licenses/jetty-util-10.0.15.jar.sha1     |  1 -
 solr/licenses/jetty-util-10.0.16.jar.sha1     |  1 +
 solr/licenses/jetty-webapp-10.0.15.jar.sha1   |  1 -
 solr/licenses/jetty-webapp-10.0.16.jar.sha1   |  1 +
 solr/licenses/jetty-xml-10.0.15.jar.sha1      |  1 -
 solr/licenses/jetty-xml-10.0.16.jar.sha1      |  1 +
 versions.lock                                 | 44 +++++++++----------
 versions.props                                |  2 +-
 48 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 solr/licenses/http2-client-10.0.15.jar.sha1
 create mode 100644 solr/licenses/http2-client-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/http2-common-10.0.15.jar.sha1
 create mode 100644 solr/licenses/http2-common-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/http2-hpack-10.0.15.jar.sha1
 create mode 100644 solr/licenses/http2-hpack-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/http2-http-client-transport-10.0.15.jar.sha1
 create mode 100644 solr/licenses/http2-http-client-transport-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/http2-server-10.0.15.jar.sha1
 create mode 100644 solr/licenses/http2-server-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-client-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-client-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-client-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-client-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-server-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-server-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-server-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-server-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-client-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-client-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-deploy-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-deploy-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-http-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-http-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-io-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-io-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-jmx-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-jmx-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-rewrite-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-rewrite-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-security-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-security-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-server-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-server-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlet-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-servlet-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlets-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-servlets-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-start-10.0.15-shaded.jar.sha1
 create mode 100644 solr/licenses/jetty-start-10.0.16-shaded.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-util-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-webapp-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-webapp-10.0.16.jar.sha1
 delete mode 100644 solr/licenses/jetty-xml-10.0.15.jar.sha1
 create mode 100644 solr/licenses/jetty-xml-10.0.16.jar.sha1

diff --git a/solr/licenses/http2-client-10.0.15.jar.sha1 b/solr/licenses/http2-client-10.0.15.jar.sha1
deleted file mode 100644
index 1fb6b95c441..00000000000
--- a/solr/licenses/http2-client-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-70ba44dc67e6c4ff3c9d0fddf0b530ff1718a5b7
diff --git a/solr/licenses/http2-client-10.0.16.jar.sha1 b/solr/licenses/http2-client-10.0.16.jar.sha1
new file mode 100644
index 00000000000..9c0d69e62e6
--- /dev/null
+++ b/solr/licenses/http2-client-10.0.16.jar.sha1
@@ -0,0 +1 @@
+1d5ada7bfa44f016ec5089d71e83c7d2596bb993
diff --git a/solr/licenses/http2-common-10.0.15.jar.sha1 b/solr/licenses/http2-common-10.0.15.jar.sha1
deleted file mode 100644
index a1cdb73ed15..00000000000
--- a/solr/licenses/http2-common-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-997745dc17547fbf7d2ab945ef1ecc875a1d0872
diff --git a/solr/licenses/http2-common-10.0.16.jar.sha1 b/solr/licenses/http2-common-10.0.16.jar.sha1
new file mode 100644
index 00000000000..69ff610174b
--- /dev/null
+++ b/solr/licenses/http2-common-10.0.16.jar.sha1
@@ -0,0 +1 @@
+c510d982936eb1ee44f6d8f78816f59ca06c0c2f
diff --git a/solr/licenses/http2-hpack-10.0.15.jar.sha1 b/solr/licenses/http2-hpack-10.0.15.jar.sha1
deleted file mode 100644
index 1d138302c34..00000000000
--- a/solr/licenses/http2-hpack-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f83ed0b45e29af41e7b078e30e844f07bb9c10d5
diff --git a/solr/licenses/http2-hpack-10.0.16.jar.sha1 b/solr/licenses/http2-hpack-10.0.16.jar.sha1
new file mode 100644
index 00000000000..c7fcc824692
--- /dev/null
+++ b/solr/licenses/http2-hpack-10.0.16.jar.sha1
@@ -0,0 +1 @@
+71d71f1ac93bb5e0b1539b2a9c257018b9969022
diff --git a/solr/licenses/http2-http-client-transport-10.0.15.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.15.jar.sha1
deleted file mode 100644
index bdc15087200..00000000000
--- a/solr/licenses/http2-http-client-transport-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d06da4f9927d78db8d4e905d156af77ebdef7109
diff --git a/solr/licenses/http2-http-client-transport-10.0.16.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.16.jar.sha1
new file mode 100644
index 00000000000..5b440b9d6e6
--- /dev/null
+++ b/solr/licenses/http2-http-client-transport-10.0.16.jar.sha1
@@ -0,0 +1 @@
+780b6092e64ffb46ff490290add3ed2a2df2f646
diff --git a/solr/licenses/http2-server-10.0.15.jar.sha1 b/solr/licenses/http2-server-10.0.15.jar.sha1
deleted file mode 100644
index 6bdc00a0465..00000000000
--- a/solr/licenses/http2-server-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-508fcf41cefc997bab33b9f7722dff231086f8cd
diff --git a/solr/licenses/http2-server-10.0.16.jar.sha1 b/solr/licenses/http2-server-10.0.16.jar.sha1
new file mode 100644
index 00000000000..6b7996abcf2
--- /dev/null
+++ b/solr/licenses/http2-server-10.0.16.jar.sha1
@@ -0,0 +1 @@
+2117c48664430a2a32bca2239b75ee57b8084e8b
diff --git a/solr/licenses/jetty-alpn-client-10.0.15.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.15.jar.sha1
deleted file mode 100644
index 11ac116c904..00000000000
--- a/solr/licenses/jetty-alpn-client-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24fd9dc56ce6bcd8fab03c202edc248b77f56bd3
diff --git a/solr/licenses/jetty-alpn-client-10.0.16.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.16.jar.sha1
new file mode 100644
index 00000000000..31a82a8316c
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-10.0.16.jar.sha1
@@ -0,0 +1 @@
+6df5cc027975573d8994e4d9a89d76d5a9c5121a
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.15.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.15.jar.sha1
deleted file mode 100644
index ce016268d5e..00000000000
--- a/solr/licenses/jetty-alpn-java-client-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d67e504e06c4a1fb2fb3a1d5bf06dda2b254121
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.16.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.16.jar.sha1
new file mode 100644
index 00000000000..ea52966c985
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-10.0.16.jar.sha1
@@ -0,0 +1 @@
+df847a02e1092e4255858f216b1f0df43a98be04
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.15.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.15.jar.sha1
deleted file mode 100644
index 1b9112b6447..00000000000
--- a/solr/licenses/jetty-alpn-java-server-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13994a7ce7c3fa6f23fcf51204b1afc3c6f89c68
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.16.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.16.jar.sha1
new file mode 100644
index 00000000000..3fb471965be
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-10.0.16.jar.sha1
@@ -0,0 +1 @@
+5cbcaffb0b45e923862d8bbdac53556642c8edca
diff --git a/solr/licenses/jetty-alpn-server-10.0.15.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.15.jar.sha1
deleted file mode 100644
index 963dfd8eb97..00000000000
--- a/solr/licenses/jetty-alpn-server-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f6d594d09d5e302013bf74820d48b11f47dde75
diff --git a/solr/licenses/jetty-alpn-server-10.0.16.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.16.jar.sha1
new file mode 100644
index 00000000000..19aeb175a23
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-10.0.16.jar.sha1
@@ -0,0 +1 @@
+6af901179b5270fafa8c82e89bd23f37b57f66e9
diff --git a/solr/licenses/jetty-client-10.0.15.jar.sha1 b/solr/licenses/jetty-client-10.0.15.jar.sha1
deleted file mode 100644
index b81cd44cbe8..00000000000
--- a/solr/licenses/jetty-client-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b1834dc03744e1201adafc04c5f6f564d38f1d5
diff --git a/solr/licenses/jetty-client-10.0.16.jar.sha1 b/solr/licenses/jetty-client-10.0.16.jar.sha1
new file mode 100644
index 00000000000..acf38316f62
--- /dev/null
+++ b/solr/licenses/jetty-client-10.0.16.jar.sha1
@@ -0,0 +1 @@
+62b5879f0530efa5296d0b296e588b79f3e4f0e5
diff --git a/solr/licenses/jetty-deploy-10.0.15.jar.sha1 b/solr/licenses/jetty-deploy-10.0.15.jar.sha1
deleted file mode 100644
index b609e60a63b..00000000000
--- a/solr/licenses/jetty-deploy-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c3c9641cc7216249a6abf4b124a44fe8d60be8e
diff --git a/solr/licenses/jetty-deploy-10.0.16.jar.sha1 b/solr/licenses/jetty-deploy-10.0.16.jar.sha1
new file mode 100644
index 00000000000..ce800f8a663
--- /dev/null
+++ b/solr/licenses/jetty-deploy-10.0.16.jar.sha1
@@ -0,0 +1 @@
+2f1690ae512b2149550114b15cbdc0bf22069873
diff --git a/solr/licenses/jetty-http-10.0.15.jar.sha1 b/solr/licenses/jetty-http-10.0.15.jar.sha1
deleted file mode 100644
index 55ebe6f33dd..00000000000
--- a/solr/licenses/jetty-http-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53c4702201c33501bc37a982e5325b5f11084a4e
diff --git a/solr/licenses/jetty-http-10.0.16.jar.sha1 b/solr/licenses/jetty-http-10.0.16.jar.sha1
new file mode 100644
index 00000000000..f292b913874
--- /dev/null
+++ b/solr/licenses/jetty-http-10.0.16.jar.sha1
@@ -0,0 +1 @@
+0bf1c1db5bb6e97c1040ee5c1053ec46b9895c5a
diff --git a/solr/licenses/jetty-io-10.0.15.jar.sha1 b/solr/licenses/jetty-io-10.0.15.jar.sha1
deleted file mode 100644
index 78badcd9857..00000000000
--- a/solr/licenses/jetty-io-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4481d9593bb89c4da016e49463b0d477faca06dc
diff --git a/solr/licenses/jetty-io-10.0.16.jar.sha1 b/solr/licenses/jetty-io-10.0.16.jar.sha1
new file mode 100644
index 00000000000..8db002cd026
--- /dev/null
+++ b/solr/licenses/jetty-io-10.0.16.jar.sha1
@@ -0,0 +1 @@
+a96c25a805a64a39a7c6e81dbd779bd228ca13aa
diff --git a/solr/licenses/jetty-jmx-10.0.15.jar.sha1 b/solr/licenses/jetty-jmx-10.0.15.jar.sha1
deleted file mode 100644
index bfeb8684899..00000000000
--- a/solr/licenses/jetty-jmx-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e42b10a3442639747dd2d925d6b8becd51e3cf52
diff --git a/solr/licenses/jetty-jmx-10.0.16.jar.sha1 b/solr/licenses/jetty-jmx-10.0.16.jar.sha1
new file mode 100644
index 00000000000..031e28e1069
--- /dev/null
+++ b/solr/licenses/jetty-jmx-10.0.16.jar.sha1
@@ -0,0 +1 @@
+aa728ec15d722b6114436521db044750d815b92b
diff --git a/solr/licenses/jetty-rewrite-10.0.15.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.15.jar.sha1
deleted file mode 100644
index ec99309f2f7..00000000000
--- a/solr/licenses/jetty-rewrite-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a06287e5475ad32397213d5b261d9ae357feea7
diff --git a/solr/licenses/jetty-rewrite-10.0.16.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.16.jar.sha1
new file mode 100644
index 00000000000..9bb5bc57d25
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-10.0.16.jar.sha1
@@ -0,0 +1 @@
+6d482b3d7928d9fcdd00a3f5fd702e7a96d4727f
diff --git a/solr/licenses/jetty-security-10.0.15.jar.sha1 b/solr/licenses/jetty-security-10.0.15.jar.sha1
deleted file mode 100644
index 44ed78bcdbe..00000000000
--- a/solr/licenses/jetty-security-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ae9c2fd327090fc749a6656109adf88f84f05854
diff --git a/solr/licenses/jetty-security-10.0.16.jar.sha1 b/solr/licenses/jetty-security-10.0.16.jar.sha1
new file mode 100644
index 00000000000..fbdc2b91405
--- /dev/null
+++ b/solr/licenses/jetty-security-10.0.16.jar.sha1
@@ -0,0 +1 @@
+7735aba773abefb79f0f68e058bf7b303df9364e
diff --git a/solr/licenses/jetty-server-10.0.15.jar.sha1 b/solr/licenses/jetty-server-10.0.15.jar.sha1
deleted file mode 100644
index d3cf9fc738c..00000000000
--- a/solr/licenses/jetty-server-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1e941f30300d64b122d5346f1599ecaa8e270ba
diff --git a/solr/licenses/jetty-server-10.0.16.jar.sha1 b/solr/licenses/jetty-server-10.0.16.jar.sha1
new file mode 100644
index 00000000000..0220349e506
--- /dev/null
+++ b/solr/licenses/jetty-server-10.0.16.jar.sha1
@@ -0,0 +1 @@
+fefaa98e95b9737562d196d24f7846734ce99e17
diff --git a/solr/licenses/jetty-servlet-10.0.15.jar.sha1 b/solr/licenses/jetty-servlet-10.0.15.jar.sha1
deleted file mode 100644
index 44ed0b1ece6..00000000000
--- a/solr/licenses/jetty-servlet-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-17e21100d9eabae2c0f560ab2c1d5f0edfc4a57b
diff --git a/solr/licenses/jetty-servlet-10.0.16.jar.sha1 b/solr/licenses/jetty-servlet-10.0.16.jar.sha1
new file mode 100644
index 00000000000..4fe3c7337b4
--- /dev/null
+++ b/solr/licenses/jetty-servlet-10.0.16.jar.sha1
@@ -0,0 +1 @@
+3b995aca89a81109672587f81d411efbd0530d2a
diff --git a/solr/licenses/jetty-servlets-10.0.15.jar.sha1 b/solr/licenses/jetty-servlets-10.0.15.jar.sha1
deleted file mode 100644
index 8b083d602eb..00000000000
--- a/solr/licenses/jetty-servlets-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73b1391880e636d2e804154704dbf3bfe429e622
diff --git a/solr/licenses/jetty-servlets-10.0.16.jar.sha1 b/solr/licenses/jetty-servlets-10.0.16.jar.sha1
new file mode 100644
index 00000000000..4527090c936
--- /dev/null
+++ b/solr/licenses/jetty-servlets-10.0.16.jar.sha1
@@ -0,0 +1 @@
+dcb14edd4b5453f38f7dc084bb43003090c6f8fa
diff --git a/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1
deleted file mode 100644
index ff9a3675dbc..00000000000
--- a/solr/licenses/jetty-start-10.0.15-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e0ca1e20769d4189e68b8c42457de75cca24c08
diff --git a/solr/licenses/jetty-start-10.0.16-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.16-shaded.jar.sha1
new file mode 100644
index 00000000000..2a43ac78457
--- /dev/null
+++ b/solr/licenses/jetty-start-10.0.16-shaded.jar.sha1
@@ -0,0 +1 @@
+d9960222bae7b11846d919557dbef0296d157a3e
diff --git a/solr/licenses/jetty-util-10.0.15.jar.sha1 b/solr/licenses/jetty-util-10.0.15.jar.sha1
deleted file mode 100644
index 5418cf4190e..00000000000
--- a/solr/licenses/jetty-util-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eb8901d419e83f2f06809e0cdceaf38b06426f01
diff --git a/solr/licenses/jetty-util-10.0.16.jar.sha1 b/solr/licenses/jetty-util-10.0.16.jar.sha1
new file mode 100644
index 00000000000..a2c6113afe7
--- /dev/null
+++ b/solr/licenses/jetty-util-10.0.16.jar.sha1
@@ -0,0 +1 @@
+1513b0c4d8ce627835a5511950d4c40be6450258
diff --git a/solr/licenses/jetty-webapp-10.0.15.jar.sha1 b/solr/licenses/jetty-webapp-10.0.15.jar.sha1
deleted file mode 100644
index c04a11ad334..00000000000
--- a/solr/licenses/jetty-webapp-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecda5b8297bc963cf411542a1143ad224532508a
diff --git a/solr/licenses/jetty-webapp-10.0.16.jar.sha1 b/solr/licenses/jetty-webapp-10.0.16.jar.sha1
new file mode 100644
index 00000000000..77c5f35abf2
--- /dev/null
+++ b/solr/licenses/jetty-webapp-10.0.16.jar.sha1
@@ -0,0 +1 @@
+5e84843afea5f39fda05c301abd0b7cfe929ec8c
diff --git a/solr/licenses/jetty-xml-10.0.15.jar.sha1 b/solr/licenses/jetty-xml-10.0.15.jar.sha1
deleted file mode 100644
index 2eb14f63413..00000000000
--- a/solr/licenses/jetty-xml-10.0.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d30d139b35bf183757b7ef5372dec5096bc39a60
diff --git a/solr/licenses/jetty-xml-10.0.16.jar.sha1 b/solr/licenses/jetty-xml-10.0.16.jar.sha1
new file mode 100644
index 00000000000..2369cf061df
--- /dev/null
+++ b/solr/licenses/jetty-xml-10.0.16.jar.sha1
@@ -0,0 +1 @@
+66dc24cea5422d14e9482dc4273d7ccea4b1def7
diff --git a/versions.lock b/versions.lock
index 6c037f14e21..d82e118dee1 100644
--- a/versions.lock
+++ b/versions.lock
@@ -275,28 +275,28 @@ org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
 org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
-org.eclipse.jetty:jetty-alpn-client:10.0.15 (3 constraints: f12e1a60)
-org.eclipse.jetty:jetty-alpn-java-client:10.0.15 (2 constraints: 1f1b936e)
-org.eclipse.jetty:jetty-alpn-java-server:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty:jetty-alpn-server:10.0.15 (2 constraints: f5160f49)
-org.eclipse.jetty:jetty-client:10.0.15 (2 constraints: 1f1b936e)
-org.eclipse.jetty:jetty-deploy:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty:jetty-http:10.0.15 (6 constraints: 764fc18c)
-org.eclipse.jetty:jetty-io:10.0.15 (9 constraints: b57d78e3)
-org.eclipse.jetty:jetty-jmx:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty:jetty-rewrite:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty:jetty-security:10.0.15 (2 constraints: bc131b79)
-org.eclipse.jetty:jetty-server:10.0.15 (7 constraints: d26d3b23)
-org.eclipse.jetty:jetty-servlet:10.0.15 (2 constraints: 36134761)
-org.eclipse.jetty:jetty-servlets:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty:jetty-util:10.0.15 (9 constraints: a5819691)
-org.eclipse.jetty:jetty-webapp:10.0.15 (2 constraints: 4413cf61)
-org.eclipse.jetty:jetty-xml:10.0.15 (3 constraints: 1121b6ba)
-org.eclipse.jetty.http2:http2-client:10.0.15 (2 constraints: 1f1b936e)
-org.eclipse.jetty.http2:http2-common:10.0.15 (3 constraints: df24e261)
-org.eclipse.jetty.http2:http2-hpack:10.0.15 (2 constraints: 221568e0)
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.15 (1 constraints: 69059140)
-org.eclipse.jetty.http2:http2-server:10.0.15 (1 constraints: 69059140)
+org.eclipse.jetty:jetty-alpn-client:10.0.16 (3 constraints: f42ea460)
+org.eclipse.jetty:jetty-alpn-java-client:10.0.16 (2 constraints: 211bd36e)
+org.eclipse.jetty:jetty-alpn-java-server:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty:jetty-alpn-server:10.0.16 (2 constraints: f7164449)
+org.eclipse.jetty:jetty-client:10.0.16 (2 constraints: 211bd36e)
+org.eclipse.jetty:jetty-deploy:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty:jetty-http:10.0.16 (6 constraints: 7b4faa8e)
+org.eclipse.jetty:jetty-io:10.0.16 (9 constraints: bd7d6ce8)
+org.eclipse.jetty:jetty-jmx:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty:jetty-rewrite:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty:jetty-security:10.0.16 (2 constraints: be134779)
+org.eclipse.jetty:jetty-server:10.0.16 (7 constraints: d76dba26)
+org.eclipse.jetty:jetty-servlet:10.0.16 (2 constraints: 38137261)
+org.eclipse.jetty:jetty-servlets:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty:jetty-util:10.0.16 (9 constraints: ac815797)
+org.eclipse.jetty:jetty-webapp:10.0.16 (2 constraints: 4613fa61)
+org.eclipse.jetty:jetty-xml:10.0.16 (3 constraints: 142134bb)
+org.eclipse.jetty.http2:http2-client:10.0.16 (2 constraints: 211bd36e)
+org.eclipse.jetty.http2:http2-common:10.0.16 (3 constraints: e2247262)
+org.eclipse.jetty.http2:http2-hpack:10.0.16 (2 constraints: 241599e0)
+org.eclipse.jetty.http2:http2-http-client-transport:10.0.16 (1 constraints: 6a059240)
+org.eclipse.jetty.http2:http2-server:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf)
 org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9)
 org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9)
diff --git a/versions.props b/versions.props
index 2a23593521e..334ed14d0be 100644
--- a/versions.props
+++ b/versions.props
@@ -54,7 +54,7 @@ org.apache.zookeeper:*=3.9.0
 org.bitbucket.b_c:jose4j=0.9.3
 org.carrot2:carrot2-core=4.5.1
 org.codehaus.woodstox:stax2-api=4.2.1
-org.eclipse.jetty*:*=10.0.15
+org.eclipse.jetty*:*=10.0.16
 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
 org.glassfish.hk2*:*=2.6.1
 org.glassfish.jersey*:*=2.35

From bc7c8190de0d91fcbef835018aa183f1d8f250ca Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 6 Sep 2023 15:18:03 -0700
Subject: [PATCH 060/160] SOLR-16955 Tracing v2 apis breaks SecurityConfHandler
 (#1884)

---
 solr/CHANGES.txt                              |   2 +
 .../java/org/apache/solr/api/V2HttpCall.java  |  18 +--
 .../handler/admin/SecurityConfHandler.java    |   8 ++
 .../solr/servlet/SolrDispatchFilter.java      |   8 +-
 .../apache/solr/util/tracing/TraceUtils.java  |  10 ++
 .../BasicAuthIntegrationTracingTest.java      | 121 ++++++++++++++++++
 .../opentelemetry/TestDistributedTracing.java |   2 +-
 7 files changed, 150 insertions(+), 19 deletions(-)
 create mode 100644 solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5013377536d..a8fdf86d7ae 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -157,6 +157,8 @@ Bug Fixes
 
 * SOLR-16958: Fix spurious warning about LATEST luceneMatchVersion (Colvin Cowie)
 
+* SOLR-16955: Tracing v2 apis breaks SecurityConfHandler (Alex Deparvu, David Smiley)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 92008542a60..a57b286a9a3 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -44,7 +44,6 @@
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.util.CommandOperation;
 import org.apache.solr.common.util.JsonSchemaValidator;
 import org.apache.solr.common.util.PathTrie;
 import org.apache.solr.common.util.SuppressForbidden;
@@ -503,22 +502,7 @@ protected void populateTracingSpan(Span span) {
 
     // Get the templatize-ed path, ex: "/c/{collection}"
     final String path = computeEndpointPath();
-
-    String verb = null;
-    // if this api has commands ...
-    final Map<String, JsonSchemaValidator> validators = getValidators(); // should be cached
-    if (validators != null && validators.isEmpty() == false && solrReq != null) {
-      boolean validateInput = true; // because getCommands caches it; and we want it validated later
-      // does this request have one command?
-      List<CommandOperation> cmds = solrReq.getCommands(validateInput);
-      if (cmds.size() == 1) {
-        verb = cmds.get(0).name;
-      }
-    }
-    if (verb == null) {
-      verb = req.getMethod().toLowerCase(Locale.ROOT);
-    }
-
+    final String verb = req.getMethod().toLowerCase(Locale.ROOT);
     span.updateName(verb + ":" + path);
   }
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
index 9142449cba6..95e1d10f351 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import org.apache.solr.api.AnnotatedApi;
 import org.apache.solr.api.Api;
 import org.apache.solr.api.ApiBag;
@@ -52,6 +53,7 @@
 import org.apache.solr.security.AuthorizationPlugin;
 import org.apache.solr.security.ConfigEditablePlugin;
 import org.apache.solr.security.PermissionNameProvider;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -147,6 +149,7 @@ private void doEdit(
 
         if (persistConf(securityConfig)) {
           securityConfEdited();
+          updateTraceOps(req, configEditablePlugin.getClass().getSimpleName(), commandsCopy);
           return;
         }
       }
@@ -156,6 +159,11 @@ private void doEdit(
         SERVER_ERROR, "Failed to persist security config after 3 attempts. Giving up");
   }
 
+  private void updateTraceOps(SolrQueryRequest req, String clazz, List<CommandOperation> commands) {
+    TraceUtils.setOperations(
+        req, clazz, commands.stream().map(c -> c.name).collect(Collectors.toUnmodifiableList()));
+  }
+
   /** Hook where you can do stuff after a config has been edited. Defaults to NOP */
   protected void securityConfEdited() {}
 
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 7b9c2b7e90c..4bb869ca1ec 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -239,7 +239,13 @@ private void dispatch(
       if (log.isDebugEnabled()) {
         log.debug("User principal: {}", request.getUserPrincipal());
       }
-      TraceUtils.setUser(span, String.valueOf(request.getUserPrincipal()));
+      final String principalName;
+      if (request.getUserPrincipal() != null) {
+        principalName = request.getUserPrincipal().getName();
+      } else {
+        principalName = null;
+      }
+      TraceUtils.setUser(span, String.valueOf(principalName));
     }
 
     HttpSolrCall call = getHttpSolrCall(request, response, retry);
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index 3505f4daac6..e63d8c6cbde 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -25,6 +25,7 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import java.util.List;
 import java.util.function.Consumer;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -52,6 +53,8 @@ public class TraceUtils {
   public static final AttributeKey<String> TAG_RESPONSE_WRITER =
       AttributeKey.stringKey("responseWriter");
   public static final AttributeKey<String> TAG_CONTENT_TYPE = AttributeKey.stringKey("contentType");
+  public static final AttributeKey<List<String>> TAG_OPS = AttributeKey.stringArrayKey("ops");
+  public static final AttributeKey<String> TAG_CLASS = AttributeKey.stringKey("class");
 
   @Deprecated
   private static final AttributeKey<String> TAG_HTTP_METHOD_DEP =
@@ -140,4 +143,11 @@ public static Span startHttpRequestSpan(HttpServletRequest request, Context cont
     spanBuilder.setAttribute(TAG_DB_TYPE, TAG_DB_TYPE_SOLR);
     return spanBuilder.startSpan();
   }
+
+  public static void setOperations(SolrQueryRequest req, String clazz, List<String> ops) {
+    if (!ops.isEmpty()) {
+      req.getSpan().setAttribute(TAG_OPS, ops);
+      req.getSpan().setAttribute(TAG_CLASS, clazz);
+    }
+  }
 }
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java
new file mode 100644
index 00000000000..cdbf9f27141
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.opentelemetry;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.apache.solr.opentelemetry.TestDistributedTracing.getAndClearSpans;
+import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.TracerProvider;
+import java.util.List;
+import java.util.Map;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.V2Request;
+import org.apache.solr.cloud.SolrCloudTestCase;
+import org.apache.solr.common.util.Utils;
+import org.apache.solr.security.BasicAuthPlugin;
+import org.apache.solr.security.RuleBasedAuthorizationPlugin;
+import org.apache.solr.util.tracing.TraceUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class BasicAuthIntegrationTracingTest extends SolrCloudTestCase {
+
+  private static final String COLLECTION = "collection1";
+  private static final String USER = "solr";
+  private static final String PASS = "SolrRocksAgain";
+  private static final String SECURITY_JSON =
+      Utils.toJSONString(
+          Map.of(
+              "authorization",
+              Map.of(
+                  "class",
+                  RuleBasedAuthorizationPlugin.class.getName(),
+                  "user-role",
+                  singletonMap(USER, "admin"),
+                  "permissions",
+                  singletonList(Map.of("name", "all", "role", "admin"))),
+              "authentication",
+              Map.of(
+                  "class",
+                  BasicAuthPlugin.class.getName(),
+                  "blockUnknown",
+                  true,
+                  "credentials",
+                  singletonMap(USER, getSaltedHashedValue(PASS)))));
+
+  @BeforeClass
+  public static void setupCluster() throws Exception {
+    // force early init
+    CustomTestOtelTracerConfigurator.prepareForTest();
+
+    configureCluster(4)
+        .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
+        .withSolrXml(TEST_PATH().resolve("solr.xml"))
+        .withTraceIdGenerationDisabled()
+        .withSecurityJson(SECURITY_JSON)
+        .configure();
+
+    assertNotEquals(
+        "Expecting active otel, not noop impl",
+        TracerProvider.noop(),
+        GlobalOpenTelemetry.get().getTracerProvider());
+
+    CollectionAdminRequest.createCollection(COLLECTION, "config", 2, 2)
+        .setBasicAuthCredentials(USER, PASS)
+        .process(cluster.getSolrClient());
+    cluster.waitForActiveCollection(COLLECTION, 2, 4);
+  }
+
+  @AfterClass
+  public static void afterClass() {
+    CustomTestOtelTracerConfigurator.resetForTest();
+  }
+
+  /** See SOLR-16955 */
+  @Test
+  public void testSetupBasicAuth() throws Exception {
+    getAndClearSpans(); // reset
+
+    CloudSolrClient cloudClient = cluster.getSolrClient();
+    Map<String, Object> ops =
+        Map.of(
+            "set-user", Map.of("harry", "HarryIsCool"),
+            "set-property", Map.of("blockUnknown", true));
+    V2Request req =
+        new V2Request.Builder("/cluster/security/authentication")
+            .withMethod(SolrRequest.METHOD.POST)
+            .withPayload(Utils.toJSONString(ops))
+            .build();
+    req.setBasicAuthCredentials(USER, PASS);
+    assertEquals(0, req.process(cloudClient, COLLECTION).getStatus());
+
+    var finishedSpans = getAndClearSpans();
+    assertEquals(1, finishedSpans.size());
+    var span = finishedSpans.get(0);
+    assertEquals("post:/cluster/security/authentication", span.getName());
+    assertEquals("solr", span.getAttributes().get(TraceUtils.TAG_USER));
+    assertEquals(
+        BasicAuthPlugin.class.getSimpleName(), span.getAttributes().get(TraceUtils.TAG_CLASS));
+    assertEquals(List.copyOf(ops.keySet()), span.getAttributes().get(TraceUtils.TAG_OPS));
+  }
+}
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 f6e088e5168..23cf76f1cbf 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
@@ -201,7 +201,7 @@ private void assertOneSpanIsChildOfAnother(List<SpanData> finishedSpans) {
     assertEquals(child.getTraceId(), parent.getTraceId());
   }
 
-  private List<SpanData> getAndClearSpans() {
+  static List<SpanData> getAndClearSpans() {
     InMemorySpanExporter exporter = CustomTestOtelTracerConfigurator.getInMemorySpanExporter();
     List<SpanData> result = new ArrayList<>(exporter.getFinishedSpanItems());
     Collections.reverse(result); // nicer to see spans chronologically

From aeea7bcd1e07bf35c1c9859e4055b9b5d002c09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Fri, 8 Sep 2023 00:48:29 +0200
Subject: [PATCH 061/160] SOLR-16954: Fix test failure in UPDATE circuit
 breaker (#1896)

---
 .../org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java  | 2 +-
 .../apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java   | 2 +-
 .../collection1/conf/solrconfig-pluggable-circuitbreaker.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 3e9cf47a2e5..262bd80444d 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -89,7 +89,7 @@ public String getDebugInfo() {
 
   @Override
   public String getErrorMessage() {
-    return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold."
+    return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold. "
         + "Seen CPU usage "
         + seenCPUUsage.get()
         + " and allocated threshold "
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
index 49311ddc934..0a568e5bf9e 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
@@ -89,7 +89,7 @@ public String getDebugInfo() {
 
   @Override
   public String getErrorMessage() {
-    return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold."
+    return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold. "
         + "Seen JVM heap memory usage "
         + seenMemory.get()
         + " and allocated threshold "
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
index ad0efe5a444..8719a00ea7b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -79,7 +79,7 @@
   </query>
 
   <circuitBreaker class="solr.MemoryCircuitBreaker">
-    <double  name="threshold">75</double>
+    <double  name="threshold">99</double>
     <arr name="requestTypes">
       <str>update</str>
     </arr>

From 7ae613c6c3fcefb9393ef55ca4501e7452cc4ca1 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 8 Sep 2023 11:01:52 -0400
Subject: [PATCH 062/160] SOLR-16964: Default the sniHostCheck setting to the
 checkPeerName envVar (#1897)

---
 solr/CHANGES.txt                                            | 5 +++++
 solr/bin/solr                                               | 2 +-
 solr/bin/solr.cmd                                           | 2 +-
 solr/bin/solr.in.cmd                                        | 3 ++-
 solr/bin/solr.in.sh                                         | 3 ++-
 .../modules/deployment-guide/pages/enabling-ssl.adoc        | 6 ++++--
 .../upgrade-notes/pages/major-changes-in-solr-9.adoc        | 4 ++++
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a8fdf86d7ae..3ee0834653b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -115,6 +115,11 @@ Improvements
   dedicated thread pool. Backup, Restore and Split are expensive operations.
   (Pierre Salagnac, David Smiley)
 
+* SOLR-16964: The solr.jetty.ssl.sniHostCheck option now defaults to the value of SOLR_SSL_CHECK_PEER_NAME, if it is provided.
+  This will enable client and server hostName check settings to be governed by the same environment variable.
+  If users want separate client/server settings, they can manually override the solr.jetty.ssl.sniHostCheck option in SOLR_OPTS. (Houston Putman)
+
+
 Optimizations
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index e11eec4e8d4..458421e0d1c 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -259,7 +259,7 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
   fi
 
   if [ -n "$SOLR_SSL_CHECK_PEER_NAME" ]; then
-    SOLR_SSL_OPTS+=" -Dsolr.ssl.checkPeerName=$SOLR_SSL_CHECK_PEER_NAME"
+    SOLR_SSL_OPTS+=" -Dsolr.ssl.checkPeerName=$SOLR_SSL_CHECK_PEER_NAME -Dsolr.jetty.ssl.sniHostCheck=$SOLR_SSL_CHECK_PEER_NAME"
   fi
 
   if [ -n "$SOLR_SSL_CLIENT_TRUST_STORE" ]; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index ce37a20d20e..93f1aaa17fd 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -146,7 +146,7 @@ IF "%SOLR_SSL_ENABLED%"=="true" (
     )
   )
   IF DEFINED SOLR_SSL_CHECK_PEER_NAME (
-   set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.ssl.checkPeerName=%SOLR_SSL_CHECK_PEER_NAME%"
+   set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.ssl.checkPeerName=%SOLR_SSL_CHECK_PEER_NAME% -Dsolr.jetty.ssl.sniHostCheck=%SOLR_SSL_CHECK_PEER_NAME%"
   )
 ) ELSE (
   set SOLR_SSL_OPTS=
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index 5f982cb16b5..f9892d33d66 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -159,7 +159,8 @@ REM set SOLR_SSL_WANT_CLIENT_AUTH=false
 REM Verify client hostname during SSL handshake
 REM set SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
 REM SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
-REM this to false can be useful to disable these checks when re-using a certificate on many hosts
+REM this to false can be useful to disable these checks when re-using a certificate on many hosts.
+REM This will also be used for the default value of whether SNI Host checking should be enabled.
 REM set SOLR_SSL_CHECK_PEER_NAME=true
 REM Override Key/Trust Store types if necessary
 REM set SOLR_SSL_KEY_STORE_TYPE=PKCS12
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index 117ef1761a9..f6da91c2f3b 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -173,7 +173,8 @@
 # Verify client's hostname during SSL handshake
 #SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
 # SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
-# this to false can be useful to disable these checks when re-using a certificate on many hosts
+# this to false can be useful to disable these checks when re-using a certificate on many hosts.
+# This will also be used for the default value of whether SNI Host checking should be enabled.
 #SOLR_SSL_CHECK_PEER_NAME=true
 # Override Key/Trust Store types if necessary
 #SOLR_SSL_KEY_STORE_TYPE=PKCS12
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
index 4450d677866..1177f423c62 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
@@ -90,7 +90,8 @@ SOLR_SSL_NEED_CLIENT_AUTH=false
 # Enable clients to authenticate (but not require)
 SOLR_SSL_WANT_CLIENT_AUTH=false
 # SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
-# this to false can be useful to disable these checks when re-using a certificate on many hosts
+# this to false can be useful to disable these checks when re-using a certificate on many hosts.
+# This will also be used for the default value of whether SNI Host checking should be enabled.
 SOLR_SSL_CHECK_PEER_NAME=true
 ----
 ====
@@ -114,7 +115,8 @@ set SOLR_SSL_NEED_CLIENT_AUTH=false
 REM Enable clients to authenticate (but not require)
 set SOLR_SSL_WANT_CLIENT_AUTH=false
 REM SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
-REM this to false can be useful to disable these checks when re-using a certificate on many hosts
+REM this to false can be useful to disable these checks when re-using a certificate on many hosts.
+REM This will also be used for the default value of whether SNI Host checking should be enabled.
 set SOLR_SSL_CHECK_PEER_NAME=true
 ----
 ====
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 2e670ca9f06..002f6cd3e23 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -80,6 +80,10 @@ Therefore, when using the default settings, nodes that were previously excluded
 * The Embedded Zookeeper can now be configured to listen to (or bind to) more hosts than just `localhost`,
 see the  xref:deployment-guide:securing-solr.adoc#network-configuration[Network Configuration documentation] for more information.
 
+=== Security
+* The `solr.jetty.ssl.sniHostCheck` option now defaults to the value of `SOLR_SSL_CHECK_PEER_NAME`, if it is provided.
+This will enable client and server hostName check settings to be governed by the same environment variable.
+If users want separate client/server settings, they can manually override the `solr.jetty.ssl.sniHostCheck` option in `SOLR_OPTS`.
 
 == Solr 9.3
 === Binary Releases

From ca4692b5a26a060831a6682e4961f93b9871362b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Sun, 10 Sep 2023 20:40:24 +0200
Subject: [PATCH 063/160] SOLR-16044: SlowRequest logging disabled if SolrCore
 logger set to ERROR (#1907)

---
 solr/CHANGES.txt                                                | 2 ++
 solr/core/src/java/org/apache/solr/core/SolrCore.java           | 2 +-
 .../java/org/apache/solr/jersey/PostRequestLoggingFilter.java   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3ee0834653b..945e2b508a7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -164,6 +164,8 @@ Bug Fixes
 
 * SOLR-16955: Tracing v2 apis breaks SecurityConfHandler (Alex Deparvu, David Smiley)
 
+* SOLR-16044: SlowRequest logging is no longer disabled if SolrCore logger set to ERROR (janhoy, hossman)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index b1c723aa7a5..944d4684016 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2901,7 +2901,7 @@ public void execute(SolrRequestHandler handler, SolrQueryRequest req, SolrQueryR
       }
 
       /* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
-      if (log.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
+      if (slowLog.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
         final long qtime = (long) (req.getRequestTimer().getTime());
         if (qtime >= slowQueryThresholdMillis) {
           slowLog.warn("slow: {}", rsp.getToLogAsString());
diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
index 4ce9490c115..3925b297d6a 100644
--- a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
@@ -101,7 +101,7 @@ public void filter(
         response.responseHeader.qTime);
 
     /* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
-    if (log.isWarnEnabled()
+    if (slowCoreRequestLogger.isWarnEnabled()
         && solrConfig != null
         && solrConfig.slowQueryThresholdMillis >= 0
         && response.responseHeader.qTime >= solrConfig.slowQueryThresholdMillis) {

From b614c1fa02ac9f34144a0d0239edfc66a7700c01 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 11 Sep 2023 01:06:22 -0400
Subject: [PATCH 064/160] SOLR-16654: Improve test (#1886)

* remove 2 test config files
* revert "solr.tests.loadSolrXml" option recently added
* use EmbeddedSolrServerTestRule for initialization
---
 .../conf/solrconfig-nodelevelcaches.xml       | 34 --------
 .../test-files/solr/solr-nodelevelcaches.xml  | 30 -------
 .../org/apache/solr/core/TestSolrXml.java     |  9 +--
 .../org/apache/solr/search/TestThinCache.java | 81 ++++++++++++-------
 .../org/apache/solr/util/TestHarness.java     |  9 ++-
 5 files changed, 59 insertions(+), 104 deletions(-)
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
 delete mode 100644 solr/core/src/test-files/solr/solr-nodelevelcaches.xml

diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
deleted file mode 100644
index d6d33fe7bc6..00000000000
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nodelevelcaches.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<config>
-  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <dataDir>${solr.data.dir:}</dataDir>
-  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-  <schemaFactory class="ClassicIndexSchemaFactory"/>
-  <requestHandler name="/select" class="solr.SearchHandler" />
-  <query>
-    <filterCache
-      class="solr.ThinCache"
-      parentCacheName="myNodeLevelCacheThin"
-      size="5"
-      initialSize="5"/>
-  </query>
-</config>
diff --git a/solr/core/src/test-files/solr/solr-nodelevelcaches.xml b/solr/core/src/test-files/solr/solr-nodelevelcaches.xml
deleted file mode 100644
index cc99abb7a5a..00000000000
--- a/solr/core/src/test-files/solr/solr-nodelevelcaches.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<solr>
-  <caches>
-    <cache name="myNodeLevelCache"
-      size="10"
-      initialSize="10"
-      />
-    <cache name="myNodeLevelCacheThin"
-      class="solr.ThinCache$NodeLevelCache"
-      size="10"
-      initialSize="10"
-      />
-  </caches>
-</solr>
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index 1e547f3ed88..51ac2bb0e65 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -34,6 +34,7 @@
 import org.apache.solr.search.CacheConfig;
 import org.apache.solr.search.CaffeineCache;
 import org.apache.solr.search.SolrCache;
+import org.apache.solr.search.TestThinCache;
 import org.apache.solr.search.ThinCache;
 import org.apache.solr.update.UpdateShardHandlerConfig;
 import org.hamcrest.MatcherAssert;
@@ -155,11 +156,9 @@ public void testPropertySub() throws IOException {
     assertFalse("schema cache", cfg.hasSchemaCache());
   }
 
-  public void testNodeLevelCache() throws IOException {
-    Path testSrcRoot = TEST_PATH();
-    Files.copy(testSrcRoot.resolve("solr-nodelevelcaches.xml"), solrHome.resolve("solr.xml"));
-
-    NodeConfig cfg = SolrXmlConfig.fromSolrHome(solrHome, new Properties());
+  public void testNodeLevelCache() {
+    NodeConfig cfg =
+        SolrXmlConfig.fromString(createTempDir(), TestThinCache.SOLR_NODE_LEVEL_CACHE_XML);
     Map<String, CacheConfig> cachesConfig = cfg.getCachesConfig();
     SolrCache<?, ?> nodeLevelCache = cachesConfig.get("myNodeLevelCache").newInstance();
     assertTrue(nodeLevelCache instanceof CaffeineCache);
diff --git a/solr/core/src/test/org/apache/solr/search/TestThinCache.java b/solr/core/src/test/org/apache/solr/search/TestThinCache.java
index 95f795054ad..c485b9fe46a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestThinCache.java
+++ b/solr/core/src/test/org/apache/solr/search/TestThinCache.java
@@ -26,13 +26,63 @@
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.metrics.SolrMetricManager;
 import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.util.EmbeddedSolrServerTestRule;
+import org.apache.solr.util.TestHarness;
 import org.apache.solr.util.stats.MetricUtils;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 /** Test for {@link ThinCache}. */
 public class TestThinCache extends SolrTestCaseJ4 {
 
+  @ClassRule public static EmbeddedSolrServerTestRule solrRule = new EmbeddedSolrServerTestRule();
+  public static final String SOLR_NODE_LEVEL_CACHE_XML =
+      "<solr>\n"
+          + "  <caches>\n"
+          + "    <cache name='myNodeLevelCache'\n"
+          + "      size='10'\n"
+          + "      initialSize='10'\n"
+          + "      />\n"
+          + "    <cache name='myNodeLevelCacheThin'\n"
+          + "      class='solr.ThinCache$NodeLevelCache'\n"
+          + "      size='10'\n"
+          + "      initialSize='10'\n"
+          + "      />\n"
+          + "  </caches>\n"
+          + "</solr>";
+
+  @BeforeClass
+  public static void setupSolrHome() throws Exception {
+    Path home = createTempDir("home");
+    Files.writeString(home.resolve("solr.xml"), SOLR_NODE_LEVEL_CACHE_XML);
+
+    solrRule.startSolr(home);
+
+    Path configSet = createTempDir("configSet");
+    copyMinConf(configSet.toFile());
+    // insert a special filterCache configuration
+    Path solrConfig = configSet.resolve("conf/solrconfig.xml");
+    Files.writeString(
+        solrConfig,
+        Files.readString(solrConfig)
+            .replace(
+                "</config>",
+                "<query>\n"
+                    + "<filterCache\n"
+                    + "      class=\"solr.ThinCache\"\n"
+                    + "      parentCacheName=\"myNodeLevelCacheThin\"\n"
+                    + "      size=\"5\"\n"
+                    + "      initialSize=\"5\"/>\n"
+                    + "</query></config>"));
+
+    solrRule.newCollection().withConfigSet(configSet.toString()).create();
+
+    // legacy; get rid of this someday!
+    h = new TestHarness(solrRule.getCoreContainer());
+    lrf = h.getRequestFactory("/select", 0, 20);
+  }
+
   SolrMetricManager metricManager = new SolrMetricManager();
   String registry = TestUtil.randomSimpleString(random(), 2, 10);
   String scope = TestUtil.randomSimpleString(random(), 2, 10);
@@ -126,35 +176,4 @@ public void testInitCore() throws Exception {
     // for the other node-level cache, simply check that metrics are accessible
     assertEquals(0, nodeMetricsSnapshot.get("CACHE.nodeLevelCache/myNodeLevelCache.size"));
   }
-
-  @BeforeClass
-  public static void setupSolrHome() throws Exception {
-    // make a solr home underneath the test's TEMP_DIR, else we don't have write access to copy in
-    // `solr.xml`
-    Path tmpFile = createTempDir();
-
-    // make data and conf dirs
-    Files.createDirectories(tmpFile.resolve("data"));
-    Path confDir = tmpFile.resolve("collection1").resolve("conf");
-    Files.createDirectories(confDir);
-
-    // copy over configuration files
-    copyXmlToHome(
-        tmpFile.toFile(),
-        TEST_PATH().resolve("solr-nodelevelcaches.xml").toAbsolutePath().toString());
-    Files.copy(
-        getFile("solr/collection1/conf/solrconfig-nodelevelcaches.xml").toPath(),
-        confDir.resolve("solrconfig.xml"));
-    Files.copy(
-        getFile("solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml").toPath(),
-        confDir.resolve("solrconfig.snippet.randomindexconfig.xml"));
-    Files.copy(
-        getFile("solr/collection1/conf/schema-minimal.xml").toPath(),
-        confDir.resolve("schema.xml"));
-
-    // we want the actual `solr.xml` file to be read, instead of the normal operation, which creates
-    // a synthetic "test NodeConfig"
-    System.setProperty("solr.tests.loadSolrXml", "true");
-    initCore("solrconfig.xml", "schema.xml", tmpFile.toAbsolutePath().toString());
-  }
 }
diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
index 5d049e01ff4..2f8dc0121a7 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.SolrException;
@@ -94,6 +93,11 @@ public static SolrConfig createConfig(Path solrHome, String confFile) {
     return createConfig(solrHome, SolrTestCaseJ4.DEFAULT_TEST_CORENAME, confFile);
   }
 
+  public TestHarness(CoreContainer coreContainer) {
+    this.container = coreContainer;
+    this.coreName = SolrTestCaseJ4.DEFAULT_TEST_CORENAME;
+  }
+
   /**
    * @param coreName to initialize
    * @param dataDirectory path for index data, will not be cleaned up
@@ -187,9 +191,6 @@ public TestHarness(NodeConfig config, CoresLocator coresLocator) {
   }
 
   public static NodeConfig buildTestNodeConfig(Path solrHome) {
-    if ("true".equals(System.getProperty("solr.tests.loadSolrXml"))) {
-      return SolrXmlConfig.fromSolrHome(solrHome, new Properties());
-    }
     CloudConfig cloudConfig =
         (null == System.getProperty("zkHost"))
             ? null

From 88b5571569da33c49c82d088337a48d34b7b02a4 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Mon, 11 Sep 2023 13:58:40 -0400
Subject: [PATCH 065/160] SOLR-16825: Migrate api definitions to submodule, pt
 3 (#1902)

This commit covers the rename-collection, get-public-key, sync-shard, balance-
replicas, force-leader, and replace-node APIs.

Extracting annotated interfaces for these APIs includes them in the SolrRequest-
generation we now do in SolrJ.
---
 .../api/endpoint/BalanceReplicasApi.java      | 36 ++++++++++++
 .../client/api/endpoint/ForceLeaderApi.java   | 34 +++++++++++
 .../client/api/endpoint/GetPublicKeyApi.java  | 33 +++++++++++
 .../api/endpoint/RenameCollectionApi.java     | 37 ++++++++++++
 .../client/api/endpoint/ReplaceNodeApi.java   | 45 +++++++++++++++
 .../client/api/endpoint/SyncShardApi.java     | 37 ++++++++++++
 .../api/model/BalanceReplicasRequestBody.java | 50 ++++++++++++++++
 .../client/api/model/PublicKeyResponse.java   | 26 +++++++++
 .../model/RenameCollectionRequestBody.java    | 31 ++++++++++
 .../api/model/ReplaceNodeRequestBody.java     | 50 ++++++++++++++++
 .../handler/admin/CollectionsHandler.java     | 30 +++++-----
 ...eReplicasAPI.java => BalanceReplicas.java} | 54 ++----------------
 .../{ForceLeaderAPI.java => ForceLeader.java} | 25 +++-----
 ...llectionAPI.java => RenameCollection.java} | 41 ++++---------
 .../{ReplaceNodeAPI.java => ReplaceNode.java} | 57 ++-----------------
 .../api/{SyncShardAPI.java => SyncShard.java} | 24 +++-----
 .../{PublicKeyAPI.java => GetPublicKey.java}  | 26 ++-------
 .../solr/security/PublicKeyHandler.java       |  4 +-
 .../solr/cloud/BalanceReplicasTest.java       |  9 +--
 .../handler/admin/api/ForceLeaderAPITest.java | 10 ++--
 .../admin/api/MigrateReplicasAPITest.java     |  2 +-
 .../handler/admin/api/ReplaceNodeAPITest.java | 13 ++---
 .../handler/admin/api/SyncShardAPITest.java   |  6 +-
 ...cKeyAPITest.java => GetPublicKeyTest.java} |  6 +-
 .../src/resources/java-template/api.mustache  |  1 +
 25 files changed, 465 insertions(+), 222 deletions(-)
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceReplicasApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ForceLeaderApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/GetPublicKeyApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/RenameCollectionApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/ReplaceNodeApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/SyncShardApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/PublicKeyResponse.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/RenameCollectionRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{BalanceReplicasAPI.java => BalanceReplicas.java} (63%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{ForceLeaderAPI.java => ForceLeader.java} (88%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{RenameCollectionAPI.java => RenameCollection.java} (76%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{ReplaceNodeAPI.java => ReplaceNode.java} (64%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{SyncShardAPI.java => SyncShard.java} (83%)
 rename solr/core/src/java/org/apache/solr/security/{PublicKeyAPI.java => GetPublicKey.java} (63%)
 rename solr/core/src/test/org/apache/solr/security/{PublicKeyAPITest.java => GetPublicKeyTest.java} (84%)

diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceReplicasApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceReplicasApi.java
new file mode 100644
index 00000000000..d05719efea8
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceReplicasApi.java
@@ -0,0 +1,36 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import org.apache.solr.client.api.model.BalanceReplicasRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+@Path("cluster/replicas/balance")
+public interface BalanceReplicasApi {
+  @POST
+  @Operation(
+      summary = "Balance Replicas across the given set of Nodes.",
+      tags = {"cluster"})
+  SolrJerseyResponse balanceReplicas(
+      @RequestBody(description = "Contains user provided parameters")
+          BalanceReplicasRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ForceLeaderApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ForceLeaderApi.java
new file mode 100644
index 00000000000..2a0336a2d3d
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ForceLeaderApi.java
@@ -0,0 +1,34 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/** V2 API definition for triggering a leader election on a particular collection and shard. */
+@Path("/collections/{collectionName}/shards/{shardName}/force-leader")
+public interface ForceLeaderApi {
+  @POST
+  @Operation(
+      summary = "Force leader election to occur on the specified collection and shard",
+      tags = {"shards"})
+  SolrJerseyResponse forceShardLeader(
+      @PathParam("collectionName") String collectionName, @PathParam("shardName") String shardName);
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/GetPublicKeyApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/GetPublicKeyApi.java
new file mode 100644
index 00000000000..562a2945d9e
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/GetPublicKeyApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import org.apache.solr.client.api.model.PublicKeyResponse;
+
+/** V2 API definition to fetch the public key of the receiving node. */
+@Path("/node/key")
+public interface GetPublicKeyApi {
+
+  @GET
+  @Operation(
+      summary = "Retrieve the public key of the receiving Solr node.",
+      tags = {"node"})
+  PublicKeyResponse getPublicKey();
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/RenameCollectionApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/RenameCollectionApi.java
new file mode 100644
index 00000000000..6eee0d431f2
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/RenameCollectionApi.java
@@ -0,0 +1,37 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.RenameCollectionRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/** V2 API definition for "renaming" an existing collection */
+@Path("/collections/{collectionName}/rename")
+public interface RenameCollectionApi {
+
+  @POST
+  @Operation(
+      summary = "Rename a SolrCloud collection",
+      tags = {"collections"})
+  SubResponseAccumulatingJerseyResponse renameCollection(
+      @PathParam("collectionName") String collectionName, RenameCollectionRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/ReplaceNodeApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReplaceNodeApi.java
new file mode 100644
index 00000000000..56762fa524d
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/ReplaceNodeApi.java
@@ -0,0 +1,45 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.ReplaceNodeRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/**
+ * V2 API definition for recreating replicas in one node (the source) on another node(s) (the
+ * target).
+ */
+@Path("cluster/nodes/{sourceNodeName}/replace/")
+public interface ReplaceNodeApi {
+  @POST
+  @Operation(
+      summary = "'Replace' a specified node by moving all replicas elsewhere",
+      tags = {"node"})
+  SolrJerseyResponse replaceNode(
+      @Parameter(description = "The name of the node to be replaced.", required = true)
+          @PathParam("sourceNodeName")
+          String sourceNodeName,
+      @RequestBody(description = "Contains user provided parameters", required = true)
+          ReplaceNodeRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/SyncShardApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/SyncShardApi.java
new file mode 100644
index 00000000000..1e9805be65a
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/SyncShardApi.java
@@ -0,0 +1,37 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/**
+ * V2 API definition for triggering a shard-sync operation within a particular collection and shard.
+ */
+@Path("/collections/{collectionName}/shards/{shardName}/sync")
+public interface SyncShardApi {
+  @POST
+  @Operation(
+      summary = "Trigger a 'sync' operation for the specified shard",
+      tags = {"shards"})
+  SolrJerseyResponse syncShard(
+      @PathParam("collectionName") String collectionName, @PathParam("shardName") String shardName)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java
new file mode 100644
index 00000000000..f270a48b269
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Set;
+
+public class BalanceReplicasRequestBody {
+
+  public BalanceReplicasRequestBody() {}
+
+  public BalanceReplicasRequestBody(Set<String> nodes, Boolean waitForFinalState, String async) {
+    this.nodes = nodes;
+    this.waitForFinalState = waitForFinalState;
+    this.async = async;
+  }
+
+  @Schema(
+      description =
+          "The set of nodes across which replicas will be balanced. Defaults to all live data nodes.")
+  @JsonProperty(value = "nodes")
+  public Set<String> nodes;
+
+  @Schema(
+      description =
+          "If true, the request will complete only when all affected replicas become active. "
+              + "If false, the API will return the status of the single action, which may be "
+              + "before the new replica is online and active.")
+  @JsonProperty("waitForFinalState")
+  public Boolean waitForFinalState = false;
+
+  @Schema(description = "Request ID to track this action which will be processed asynchronously.")
+  @JsonProperty("async")
+  public String async;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/PublicKeyResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/PublicKeyResponse.java
new file mode 100644
index 00000000000..d561b16fcbb
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/PublicKeyResponse.java
@@ -0,0 +1,26 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class PublicKeyResponse extends SolrJerseyResponse {
+  @JsonProperty("key")
+  @Schema(description = "The public key of the receiving Solr node.")
+  public String key;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/RenameCollectionRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/RenameCollectionRequestBody.java
new file mode 100644
index 00000000000..145618d029e
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/RenameCollectionRequestBody.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.api.model;
+
+import static org.apache.solr.client.api.model.Constants.ASYNC;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RenameCollectionRequestBody {
+  @JsonProperty(required = true)
+  public String to;
+
+  @JsonProperty(ASYNC)
+  public String async;
+
+  @JsonProperty public Boolean followAliases;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java
new file mode 100644
index 00000000000..303fd64e8db
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class ReplaceNodeRequestBody {
+
+  public ReplaceNodeRequestBody() {}
+
+  public ReplaceNodeRequestBody(String targetNodeName, Boolean waitForFinalState, String async) {
+    this.targetNodeName = targetNodeName;
+    this.waitForFinalState = waitForFinalState;
+    this.async = async;
+  }
+
+  @Schema(
+      description =
+          "The target node where replicas will be copied. If this parameter is not provided, Solr "
+              + "will identify nodes automatically based on policies or number of cores in each node.")
+  @JsonProperty("targetNodeName")
+  public String targetNodeName;
+
+  @Schema(
+      description =
+          "If true, the request will complete only when all affected replicas become active. "
+              + "If false, the API will return the status of the single action, which may be "
+              + "before the new replica is online and active.")
+  @JsonProperty("waitForFinalState")
+  public Boolean waitForFinalState = false;
+
+  @Schema(description = "Request ID to track this action which will be processed asynchronously.")
+  @JsonProperty("async")
+  public String async;
+}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index b1949c993a1..97de7a36bb3 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -123,6 +123,7 @@
 import org.apache.solr.api.Api;
 import org.apache.solr.api.JerseyResource;
 import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody;
+import org.apache.solr.client.api.model.ReplaceNodeRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.UpdateAliasPropertiesRequestBody;
 import org.apache.solr.client.solrj.SolrResponse;
@@ -166,7 +167,7 @@
 import org.apache.solr.handler.admin.api.AddReplicaProperty;
 import org.apache.solr.handler.admin.api.AdminAPIBase;
 import org.apache.solr.handler.admin.api.AliasProperty;
-import org.apache.solr.handler.admin.api.BalanceReplicasAPI;
+import org.apache.solr.handler.admin.api.BalanceReplicas;
 import org.apache.solr.handler.admin.api.BalanceShardUniqueAPI;
 import org.apache.solr.handler.admin.api.CollectionPropertyAPI;
 import org.apache.solr.handler.admin.api.CollectionStatusAPI;
@@ -184,7 +185,7 @@
 import org.apache.solr.handler.admin.api.DeleteReplica;
 import org.apache.solr.handler.admin.api.DeleteReplicaProperty;
 import org.apache.solr.handler.admin.api.DeleteShardAPI;
-import org.apache.solr.handler.admin.api.ForceLeaderAPI;
+import org.apache.solr.handler.admin.api.ForceLeader;
 import org.apache.solr.handler.admin.api.InstallShardDataAPI;
 import org.apache.solr.handler.admin.api.ListAliases;
 import org.apache.solr.handler.admin.api.ListCollectionBackups;
@@ -196,11 +197,11 @@
 import org.apache.solr.handler.admin.api.MoveReplicaAPI;
 import org.apache.solr.handler.admin.api.RebalanceLeadersAPI;
 import org.apache.solr.handler.admin.api.ReloadCollectionAPI;
-import org.apache.solr.handler.admin.api.RenameCollectionAPI;
-import org.apache.solr.handler.admin.api.ReplaceNodeAPI;
+import org.apache.solr.handler.admin.api.RenameCollection;
+import org.apache.solr.handler.admin.api.ReplaceNode;
 import org.apache.solr.handler.admin.api.RestoreCollectionAPI;
 import org.apache.solr.handler.admin.api.SplitShardAPI;
-import org.apache.solr.handler.admin.api.SyncShardAPI;
+import org.apache.solr.handler.admin.api.SyncShard;
 import org.apache.solr.handler.api.V2ApiUtils;
 import org.apache.solr.logging.MDCLoggingContext;
 import org.apache.solr.request.SolrQueryRequest;
@@ -607,7 +608,7 @@ public enum CollectionOperation implements CollectionOp {
     SYNCSHARD_OP(
         SYNCSHARD,
         (req, rsp, h) -> {
-          SyncShardAPI.invokeFromV1Params(h.coreContainer, req, rsp);
+          SyncShard.invokeFromV1Params(h.coreContainer, req, rsp);
           return null;
         }),
 
@@ -722,7 +723,7 @@ public enum CollectionOperation implements CollectionOp {
     FORCELEADER_OP(
         FORCELEADER,
         (req, rsp, h) -> {
-          ForceLeaderAPI.invokeFromV1Params(h.coreContainer, req, rsp);
+          ForceLeader.invokeFromV1Params(h.coreContainer, req, rsp);
           return null;
         }),
     CREATESHARD_OP(
@@ -1175,12 +1176,11 @@ public Map<String, Object> execute(
         (req, rsp, h) -> {
           final SolrParams params = req.getParams();
           final RequiredSolrParams requiredParams = req.getParams().required();
-          final ReplaceNodeAPI.ReplaceNodeRequestBody requestBody =
-              new ReplaceNodeAPI.ReplaceNodeRequestBody();
+          final var requestBody = new ReplaceNodeRequestBody();
           requestBody.targetNodeName = params.get(TARGET_NODE);
           requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
           requestBody.async = params.get(ASYNC);
-          final ReplaceNodeAPI replaceNodeAPI = new ReplaceNodeAPI(h.coreContainer, req, rsp);
+          final ReplaceNode replaceNodeAPI = new ReplaceNode(h.coreContainer, req, rsp);
           final SolrJerseyResponse replaceNodeResponse =
               replaceNodeAPI.replaceNode(requiredParams.get(SOURCE_NODE), requestBody);
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, replaceNodeResponse);
@@ -1375,17 +1375,17 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         DeleteReplica.class,
         DeleteReplicaProperty.class,
         DeleteShardAPI.class,
-        ForceLeaderAPI.class,
+        ForceLeader.class,
         InstallShardDataAPI.class,
         ListCollections.class,
         ListCollectionBackups.class,
         ReloadCollectionAPI.class,
-        RenameCollectionAPI.class,
-        ReplaceNodeAPI.class,
+        RenameCollection.class,
+        ReplaceNode.class,
         MigrateReplicasAPI.class,
-        BalanceReplicasAPI.class,
+        BalanceReplicas.class,
         RestoreCollectionAPI.class,
-        SyncShardAPI.class,
+        SyncShard.class,
         CollectionPropertyAPI.class,
         DeleteNode.class,
         ListAliases.class,
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicasAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java
similarity index 63%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicasAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java
index 53e23886585..6e163857296 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicasAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.params.CollectionParams.NODES;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
@@ -24,47 +23,35 @@
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.BalanceReplicasApi;
+import org.apache.solr.client.api.model.BalanceReplicasRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.params.CollectionParams.CollectionAction;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
 /** V2 API for balancing the replicas that already exist across a set of nodes. */
-@Path("cluster/replicas/balance")
-public class BalanceReplicasAPI extends AdminAPIBase {
+public class BalanceReplicas extends AdminAPIBase implements BalanceReplicasApi {
 
   @Inject
-  public BalanceReplicasAPI(
+  public BalanceReplicas(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  @Operation(summary = "Balance Replicas across the given set of Nodes.")
-  public SolrJerseyResponse balanceReplicas(
-      @RequestBody(description = "Contains user provided parameters")
-          BalanceReplicasRequestBody requestBody)
+  public SolrJerseyResponse balanceReplicas(BalanceReplicasRequestBody requestBody)
       throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
@@ -96,33 +83,4 @@ public ZkNodeProps createRemoteMessage(BalanceReplicasRequestBody requestBody) {
 
     return new ZkNodeProps(remoteMessage);
   }
-
-  public static class BalanceReplicasRequestBody implements JacksonReflectMapWriter {
-
-    public BalanceReplicasRequestBody() {}
-
-    public BalanceReplicasRequestBody(Set<String> nodes, Boolean waitForFinalState, String async) {
-      this.nodes = nodes;
-      this.waitForFinalState = waitForFinalState;
-      this.async = async;
-    }
-
-    @Schema(
-        description =
-            "The set of nodes across which replicas will be balanced. Defaults to all live data nodes.")
-    @JsonProperty(value = "nodes")
-    public Set<String> nodes;
-
-    @Schema(
-        description =
-            "If true, the request will complete only when all affected replicas become active. "
-                + "If false, the API will return the status of the single action, which may be "
-                + "before the new replica is online and active.")
-    @JsonProperty("waitForFinalState")
-    public Boolean waitForFinalState = false;
-
-    @Schema(description = "Request ID to track this action which will be processed asynchronously.")
-    @JsonProperty("async")
-    public String async;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeaderAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java
similarity index 88%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeaderAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java
index b0881a34bac..c3080e3ef16 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeaderAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
@@ -27,11 +26,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.ForceLeaderApi;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.cloud.ZkShardTerms;
@@ -49,29 +44,25 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * V2 API for triggering a leader election on a particular collection and shard.
+ * V2 API implementation for triggering a leader election on a particular collection and shard.
  *
  * <p>This API (POST /v2/collections/collectionName/shards/shardName/force-leader) is analogous to
  * the v1 /admin/collections?action=FORCELEADER command.
  */
-@Path("/collections/{collectionName}/shards/{shardName}/force-leader")
-public class ForceLeaderAPI extends AdminAPIBase {
+public class ForceLeader extends AdminAPIBase implements ForceLeaderApi {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Inject
-  public ForceLeaderAPI(
+  public ForceLeader(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  public SolrJerseyResponse forceLeader(
-      @PathParam("collectionName") String collectionName,
-      @PathParam("shardName") String shardName) {
+  public SolrJerseyResponse forceShardLeader(String collectionName, String shardName) {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     ensureRequiredParameterProvided(COLLECTION_PROP, collectionName);
     ensureRequiredParameterProvided(SHARD_ID_PROP, shardName);
@@ -84,12 +75,12 @@ public SolrJerseyResponse forceLeader(
 
   public static void invokeFromV1Params(
       CoreContainer coreContainer, SolrQueryRequest request, SolrQueryResponse response) {
-    final var api = new ForceLeaderAPI(coreContainer, request, response);
+    final var api = new ForceLeader(coreContainer, request, response);
     final var params = request.getParams();
     params.required().check(COLLECTION_PROP, SHARD_ID_PROP);
 
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
-        response, api.forceLeader(params.get(COLLECTION_PROP), params.get(SHARD_ID_PROP)));
+        response, api.forceShardLeader(params.get(COLLECTION_PROP), params.get(SHARD_ID_PROP)));
   }
 
   private void doForceLeaderElection(String extCollectionName, String shardName) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java
similarity index 76%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollectionAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java
index 2fd2d7fb405..8cec8535a7f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;
@@ -25,48 +24,40 @@
 import static org.apache.solr.common.params.CommonParams.NAME;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.RenameCollectionApi;
+import org.apache.solr.client.api.model.RenameCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
 /**
- * V2 API for "renaming" an existing collection
+ * V2 API implementation to "rename" an existing collection
  *
  * <p>This API is analogous to the v1 /admin/collections?action=RENAME command.
  */
-@Path("/collections/{collectionName}/rename")
-public class RenameCollectionAPI extends AdminAPIBase {
+public class RenameCollection extends AdminAPIBase implements RenameCollectionApi {
 
   @Inject
-  public RenameCollectionAPI(
+  public RenameCollection(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse renameCollection(
-      @PathParam("collectionName") String collectionName, RenameCollectionRequestBody requestBody)
-      throws Exception {
+      String collectionName, RenameCollectionRequestBody requestBody) throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     if (requestBody == null) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Missing required request body");
@@ -81,7 +72,7 @@ public SubResponseAccumulatingJerseyResponse renameCollection(
         response,
         CollectionParams.CollectionAction.RENAME,
         remoteMessage,
-        requestBody != null ? requestBody.asyncId : null);
+        requestBody != null ? requestBody.async : null);
     return response;
   }
 
@@ -92,7 +83,7 @@ public static ZkNodeProps createRemoteMessage(
     remoteMessage.put(NAME, collectionName);
     remoteMessage.put(TARGET, requestBody.to);
     insertIfNotNull(remoteMessage, FOLLOW_ALIASES, requestBody.followAliases);
-    insertIfNotNull(remoteMessage, ASYNC, requestBody.asyncId);
+    insertIfNotNull(remoteMessage, ASYNC, requestBody.async);
 
     return new ZkNodeProps(remoteMessage);
   }
@@ -100,26 +91,16 @@ public static ZkNodeProps createRemoteMessage(
   public static void invokeFromV1Params(
       CoreContainer coreContainer, SolrQueryRequest request, SolrQueryResponse response)
       throws Exception {
-    final var api = new RenameCollectionAPI(coreContainer, request, response);
+    final var api = new RenameCollection(coreContainer, request, response);
     final var params = request.getParams();
     params.required().check(COLLECTION_PROP, TARGET);
     final var requestBody = new RenameCollectionRequestBody();
     requestBody.to = params.get(TARGET);
     // Optional parameters
-    requestBody.asyncId = params.get(ASYNC);
+    requestBody.async = params.get(ASYNC);
     requestBody.followAliases = params.getBool(FOLLOW_ALIASES);
 
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
         response, api.renameCollection(params.get(COLLECTION_PROP), requestBody));
   }
-
-  public static class RenameCollectionRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(required = true)
-    public String to;
-
-    @JsonProperty(ASYNC)
-    public String asyncId;
-
-    @JsonProperty public Boolean followAliases;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNodeAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java
similarity index 64%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNodeAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java
index e2e63760ab7..ab597b54038 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNodeAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.common.params.CollectionParams.SOURCE_NODE;
 import static org.apache.solr.common.params.CollectionParams.TARGET_NODE;
@@ -25,17 +24,11 @@
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.ReplaceNodeApi;
+import org.apache.solr.client.api.model.ReplaceNodeRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -43,7 +36,6 @@
 import org.apache.solr.common.params.CollectionParams.CollectionAction;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -53,26 +45,19 @@
  *
  * <p>This API is analogous to the v1 /admin/collections?action=REPLACENODE command.
  */
-@Path("cluster/nodes/{sourceNodeName}/replace/")
-public class ReplaceNodeAPI extends AdminAPIBase {
+public class ReplaceNode extends AdminAPIBase implements ReplaceNodeApi {
 
   @Inject
-  public ReplaceNodeAPI(
+  public ReplaceNode(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  public SolrJerseyResponse replaceNode(
-      @Parameter(description = "The name of the node to be replaced.", required = true)
-          @PathParam("sourceNodeName")
-          String sourceNodeName,
-      @RequestBody(description = "Contains user provided parameters", required = true)
-          ReplaceNodeRequestBody requestBody)
+  public SolrJerseyResponse replaceNode(String sourceNodeName, ReplaceNodeRequestBody requestBody)
       throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
@@ -111,34 +96,4 @@ private void insertIfValueNotNull(Map<String, Object> dest, String key, Object v
       dest.put(key, value);
     }
   }
-
-  public static class ReplaceNodeRequestBody implements JacksonReflectMapWriter {
-
-    public ReplaceNodeRequestBody() {}
-
-    public ReplaceNodeRequestBody(String targetNodeName, Boolean waitForFinalState, String async) {
-      this.targetNodeName = targetNodeName;
-      this.waitForFinalState = waitForFinalState;
-      this.async = async;
-    }
-
-    @Schema(
-        description =
-            "The target node where replicas will be copied. If this parameter is not provided, Solr "
-                + "will identify nodes automatically based on policies or number of cores in each node.")
-    @JsonProperty("targetNodeName")
-    public String targetNodeName;
-
-    @Schema(
-        description =
-            "If true, the request will complete only when all affected replicas become active. "
-                + "If false, the API will return the status of the single action, which may be "
-                + "before the new replica is online and active.")
-    @JsonProperty("waitForFinalState")
-    public Boolean waitForFinalState = false;
-
-    @Schema(description = "Request ID to track this action which will be processed asynchronously.")
-    @JsonProperty("async")
-    public String async;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShardAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java
similarity index 83%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/SyncShardAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java
index 1b7b44b0dea..b506f585673 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShardAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
@@ -25,11 +24,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.SyncShardApi;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -46,28 +41,25 @@
 import org.apache.solr.response.SolrQueryResponse;
 
 /**
- * V2 API for triggering a shard-sync operation within a particular collection and shard.
+ * V2 API implementation for triggering a shard-sync operation within a particular collection and
+ * shard.
  *
  * <p>This API (POST /v2/collections/cName/shards/sName/sync {...}) is analogous to the v1
  * /admin/collections?action=SYNCSHARD command.
  */
-@Path("/collections/{collectionName}/shards/{shardName}/sync")
-public class SyncShardAPI extends AdminAPIBase {
+public class SyncShard extends AdminAPIBase implements SyncShardApi {
 
   @Inject
-  public SyncShardAPI(
+  public SyncShard(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
-  public SolrJerseyResponse syncShard(
-      @PathParam("collectionName") String collectionName, @PathParam("shardName") String shardName)
-      throws Exception {
+  public SolrJerseyResponse syncShard(String collectionName, String shardName) throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     ensureRequiredParameterProvided(COLLECTION_PROP, collectionName);
     ensureRequiredParameterProvided(SHARD_ID_PROP, shardName);
@@ -105,7 +97,7 @@ private void doSyncShard(String extCollectionName, String shardName)
   public static void invokeFromV1Params(
       CoreContainer coreContainer, SolrQueryRequest request, SolrQueryResponse response)
       throws Exception {
-    final var api = new SyncShardAPI(coreContainer, request, response);
+    final var api = new SyncShard(coreContainer, request, response);
     final var params = request.getParams();
     params.required().check(COLLECTION_PROP, SHARD_ID_PROP);
 
diff --git a/solr/core/src/java/org/apache/solr/security/PublicKeyAPI.java b/solr/core/src/java/org/apache/solr/security/GetPublicKey.java
similarity index 63%
rename from solr/core/src/java/org/apache/solr/security/PublicKeyAPI.java
rename to solr/core/src/java/org/apache/solr/security/GetPublicKey.java
index 46483462e5f..1f7e991667d 100644
--- a/solr/core/src/java/org/apache/solr/security/PublicKeyAPI.java
+++ b/solr/core/src/java/org/apache/solr/security/GetPublicKey.java
@@ -17,45 +17,31 @@
 
 package org.apache.solr.security;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import org.apache.solr.api.JerseyResource;
-import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.client.api.endpoint.GetPublicKeyApi;
+import org.apache.solr.client.api.model.PublicKeyResponse;
 import org.apache.solr.jersey.PermissionName;
 
 /**
- * V2 API for fetching the public key of the receiving node.
+ * V2 API implementation to fetch the public key of the receiving node.
  *
  * <p>This API is analogous to the v1 /admin/info/key endpoint.
  */
-@Path("/node/key")
-public class PublicKeyAPI extends JerseyResource {
+public class GetPublicKey extends JerseyResource implements GetPublicKeyApi {
 
   private final SolrNodeKeyPair nodeKeyPair;
 
   @Inject
-  public PublicKeyAPI(SolrNodeKeyPair nodeKeyPair) {
+  public GetPublicKey(SolrNodeKeyPair nodeKeyPair) {
     this.nodeKeyPair = nodeKeyPair;
   }
 
-  @GET
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(PermissionNameProvider.Name.ALL)
   public PublicKeyResponse getPublicKey() {
     final PublicKeyResponse response = instantiateJerseyResponse(PublicKeyResponse.class);
     response.key = nodeKeyPair.getKeyPair().getPublicKeyStr();
     return response;
   }
-
-  public static class PublicKeyResponse extends SolrJerseyResponse {
-    @JsonProperty("key")
-    @Schema(description = "The public key of the receiving Solr node.")
-    public String key;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java b/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java
index 9dbde9d0966..5f2941fec23 100644
--- a/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java
+++ b/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java
@@ -50,7 +50,7 @@ public CryptoKeys.RSAKeyPair getKeyPair() {
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
-        rsp, new PublicKeyAPI(nodeKeyPair).getPublicKey());
+        rsp, new GetPublicKey(nodeKeyPair).getPublicKey());
   }
 
   @Override
@@ -80,6 +80,6 @@ public Collection<Api> getApis() {
 
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
-    return List.of(PublicKeyAPI.class);
+    return List.of(GetPublicKey.class);
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java
index 82a75027e68..a14b372df2e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java
@@ -33,14 +33,15 @@
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
+import org.apache.solr.client.api.model.BalanceReplicasRequestBody;
 import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.common.MapWriterMap;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.common.util.Utils;
-import org.apache.solr.handler.admin.api.BalanceReplicasAPI;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -101,7 +102,7 @@ public void testAllNodes() throws Exception {
     postDataAndGetResponse(
         cluster.getSolrClient(),
         "/api/cluster/replicas/balance",
-        BalanceReplicasAPI.BalanceReplicasRequestBody.EMPTY);
+        new MapWriterMap(Collections.emptyMap()));
 
     collection = cloudClient.getClusterState().getCollectionOrNull(coll, false);
     log.debug("### After balancing: {}", collection);
@@ -149,8 +150,8 @@ public void testSomeNodes() throws Exception {
     postDataAndGetResponse(
         cluster.getSolrClient(),
         "/api/cluster/replicas/balance",
-        new BalanceReplicasAPI.BalanceReplicasRequestBody(
-            new HashSet<>(l.subList(1, 4)), true, null));
+        Utils.getReflectWriter(
+            new BalanceReplicasRequestBody(new HashSet<>(l.subList(1, 4)), true, null)));
 
     collection = cloudClient.getClusterState().getCollectionOrNull(coll, false);
     log.debug("### After balancing: {}", collection);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ForceLeaderAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ForceLeaderAPITest.java
index 09f97a4757f..be1fce44fb8 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ForceLeaderAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ForceLeaderAPITest.java
@@ -21,7 +21,7 @@
 import org.apache.solr.common.SolrException;
 import org.junit.Test;
 
-/** Unit tests for {@link ForceLeaderAPI} */
+/** Unit tests for {@link ForceLeader} */
 public class ForceLeaderAPITest extends SolrTestCaseJ4 {
   @Test
   public void testReportsErrorIfCollectionNameMissing() {
@@ -29,8 +29,8 @@ public void testReportsErrorIfCollectionNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new ForceLeaderAPI(null, null, null);
-              api.forceLeader(null, "someShard");
+              final var api = new ForceLeader(null, null, null);
+              api.forceShardLeader(null, "someShard");
             });
 
     assertEquals(400, thrown.code());
@@ -43,8 +43,8 @@ public void testReportsErrorIfShardNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new ForceLeaderAPI(null, null, null);
-              api.forceLeader("someCollection", null);
+              final var api = new ForceLeader(null, null, null);
+              api.forceShardLeader("someCollection", null);
             });
 
     assertEquals(400, thrown.code());
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/MigrateReplicasAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/MigrateReplicasAPITest.java
index e87a4c67532..f9bf865d4e0 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/MigrateReplicasAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/MigrateReplicasAPITest.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-/** Unit tests for {@link ReplaceNodeAPI} */
+/** Unit tests for {@link ReplaceNode} */
 public class MigrateReplicasAPITest extends SolrTestCaseJ4 {
 
   private CoreContainer mockCoreContainer;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ReplaceNodeAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ReplaceNodeAPITest.java
index 3a460245775..e49eb56de0d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ReplaceNodeAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ReplaceNodeAPITest.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Optional;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.ReplaceNodeRequestBody;
 import org.apache.solr.cloud.OverseerSolrResponse;
 import org.apache.solr.cloud.api.collections.DistributedCollectionConfigSetCommandRunner;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -37,13 +38,13 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-/** Unit tests for {@link ReplaceNodeAPI} */
+/** Unit tests for {@link ReplaceNode} */
 public class ReplaceNodeAPITest extends SolrTestCaseJ4 {
 
   private CoreContainer mockCoreContainer;
   private SolrQueryRequest mockQueryRequest;
   private SolrQueryResponse queryResponse;
-  private ReplaceNodeAPI replaceNodeApi;
+  private ReplaceNode replaceNodeApi;
   private DistributedCollectionConfigSetCommandRunner mockCommandRunner;
   private ArgumentCaptor<ZkNodeProps> messageCapturer;
 
@@ -65,7 +66,7 @@ public void setUp() throws Exception {
         .thenReturn(new OverseerSolrResponse(new NamedList<>()));
     mockQueryRequest = mock(SolrQueryRequest.class);
     queryResponse = new SolrQueryResponse();
-    replaceNodeApi = new ReplaceNodeAPI(mockCoreContainer, mockQueryRequest, queryResponse);
+    replaceNodeApi = new ReplaceNode(mockCoreContainer, mockQueryRequest, queryResponse);
     messageCapturer = ArgumentCaptor.forClass(ZkNodeProps.class);
 
     when(mockCoreContainer.isZooKeeperAware()).thenReturn(true);
@@ -73,8 +74,7 @@ public void setUp() throws Exception {
 
   @Test
   public void testCreatesValidOverseerMessage() throws Exception {
-    ReplaceNodeAPI.ReplaceNodeRequestBody requestBody =
-        new ReplaceNodeAPI.ReplaceNodeRequestBody("demoTargetNode", false, "async");
+    final var requestBody = new ReplaceNodeRequestBody("demoTargetNode", false, "async");
     replaceNodeApi.replaceNode("demoSourceNode", requestBody);
     verify(mockCommandRunner).runCollectionCommand(messageCapturer.capture(), any(), anyLong());
 
@@ -102,8 +102,7 @@ public void testRequestBodyCanBeOmittedAltogether() throws Exception {
 
   @Test
   public void testOptionalValuesNotAddedToRemoteMessageIfNotProvided() throws Exception {
-    ReplaceNodeAPI.ReplaceNodeRequestBody requestBody =
-        new ReplaceNodeAPI.ReplaceNodeRequestBody("demoTargetNode", null, null);
+    final var requestBody = new ReplaceNodeRequestBody("demoTargetNode", null, null);
     replaceNodeApi.replaceNode("demoSourceNode", requestBody);
     verify(mockCommandRunner).runCollectionCommand(messageCapturer.capture(), any(), anyLong());
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/SyncShardAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/SyncShardAPITest.java
index 25ca5bb9cd1..23d3f8982a2 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/SyncShardAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/SyncShardAPITest.java
@@ -21,7 +21,7 @@
 import org.apache.solr.common.SolrException;
 import org.junit.Test;
 
-/** Unit tests for {@link SyncShardAPI} */
+/** Unit tests for {@link SyncShard} */
 public class SyncShardAPITest extends SolrTestCaseJ4 {
   @Test
   public void testReportsErrorIfCollectionNameMissing() {
@@ -29,7 +29,7 @@ public void testReportsErrorIfCollectionNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new SyncShardAPI(null, null, null);
+              final var api = new SyncShard(null, null, null);
               api.syncShard(null, "someShard");
             });
 
@@ -43,7 +43,7 @@ public void testReportsErrorIfShardNameMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new SyncShardAPI(null, null, null);
+              final var api = new SyncShard(null, null, null);
               api.syncShard("someCollection", null);
             });
 
diff --git a/solr/core/src/test/org/apache/solr/security/PublicKeyAPITest.java b/solr/core/src/test/org/apache/solr/security/GetPublicKeyTest.java
similarity index 84%
rename from solr/core/src/test/org/apache/solr/security/PublicKeyAPITest.java
rename to solr/core/src/test/org/apache/solr/security/GetPublicKeyTest.java
index f75b32b85d9..77bf4646a74 100644
--- a/solr/core/src/test/org/apache/solr/security/PublicKeyAPITest.java
+++ b/solr/core/src/test/org/apache/solr/security/GetPublicKeyTest.java
@@ -20,14 +20,14 @@
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.Test;
 
-/** Unit test for {@link PublicKeyAPI} */
-public class PublicKeyAPITest extends SolrTestCaseJ4 {
+/** Unit test for {@link GetPublicKey} */
+public class GetPublicKeyTest extends SolrTestCaseJ4 {
 
   @Test
   public void testRetrievesPublicKey() {
     final SolrNodeKeyPair nodeKeyPair = new SolrNodeKeyPair(null);
 
-    final PublicKeyAPI.PublicKeyResponse response = new PublicKeyAPI(nodeKeyPair).getPublicKey();
+    final var response = new GetPublicKey(nodeKeyPair).getPublicKey();
 
     assertEquals(nodeKeyPair.getKeyPair().getPublicKeyStr(), response.key);
   }
diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustache
index 84f7f06ebf3..93108eae513 100644
--- a/solr/solrj/src/resources/java-template/api.mustache
+++ b/solr/solrj/src/resources/java-template/api.mustache
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;

From 78b02620807ebada04be58988196d1f46c7c3a24 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Mon, 11 Sep 2023 16:02:53 -0400
Subject: [PATCH 066/160] SOLR-16415: ZK DistributedMap should reject slash in
 IDs. (#1824)

* asyncId should not have forward slashes in it
* SizeLimitedDistributedMap should be resilient to directories (from before)
---
 solr/CHANGES.txt                              |  3 ++
 .../org/apache/solr/cloud/DistributedMap.java | 23 ++++++++++++--
 .../solr/cloud/SizeLimitedDistributedMap.java | 12 +++----
 .../apache/solr/cloud/TestDistributedMap.java | 31 +++++++++++++++++++
 .../cloud/TestSizeLimitedDistributedMap.java  | 30 ++++++++++++++++++
 .../pages/collections-api.adoc                |  1 +
 6 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 945e2b508a7..0099c2245fc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -166,6 +166,9 @@ Bug Fixes
 
 * SOLR-16044: SlowRequest logging is no longer disabled if SolrCore logger set to ERROR (janhoy, hossman)
 
+* SOLR-16415: asyncId must not have '/'; enforce this.  Enhance ZK cleanup to process directories
+  instead of fail.  (David Smiley, Paul McArthur)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
index 323c378f71d..fb2347c3e82 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.cloud;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -27,12 +28,17 @@
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A distributed map. This supports basic map functions e.g. get, put, contains for interaction with
  * zk which don't have to be ordered i.e. DistributedQueue.
  */
 public class DistributedMap {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   protected final String dir;
 
   protected SolrZkClient zookeeper;
@@ -54,7 +60,14 @@ public DistributedMap(SolrZkClient zookeeper, String dir) {
     this.zookeeper = zookeeper;
   }
 
+  private void assertKeyFormat(String trackingId) {
+    if (trackingId == null || trackingId.length() == 0 || trackingId.contains("/")) {
+      throw new SolrException(ErrorCode.BAD_REQUEST, "Unsupported key format: " + trackingId);
+    }
+  }
+
   public void put(String trackingId, byte[] data) throws KeeperException, InterruptedException {
+    assertKeyFormat(trackingId);
     zookeeper.makePath(
         dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, false, true);
   }
@@ -62,10 +75,11 @@ public void put(String trackingId, byte[] data) throws KeeperException, Interrup
   /**
    * Puts an element in the map only if there isn't one with the same trackingId already
    *
-   * @return True if the the element was added. False if it wasn't (because the key already exists)
+   * @return True if the element was added. False if it wasn't (because the key already exists)
    */
   public boolean putIfAbsent(String trackingId, byte[] data)
       throws KeeperException, InterruptedException {
+    assertKeyFormat(trackingId);
     try {
       zookeeper.makePath(
           dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, true, true);
@@ -94,10 +108,15 @@ public int size() throws KeeperException, InterruptedException {
    * not deleted exception an exception occurred while deleting
    */
   public boolean remove(String trackingId) throws KeeperException, InterruptedException {
+    final var path = dir + "/" + PREFIX + trackingId;
     try {
-      zookeeper.delete(dir + "/" + PREFIX + trackingId, -1, true);
+      zookeeper.delete(path, -1, true);
     } catch (KeeperException.NoNodeException e) {
       return false;
+    } catch (KeeperException.NotEmptyException hack) {
+      // because dirty data before we enforced the rules on put() (trackingId shouldn't have slash)
+      log.warn("Cleaning malformed key ID starting with {}", path);
+      zookeeper.clean(path);
     }
     return true;
   }
diff --git a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
index ab495fffea8..c4c8923b218 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
@@ -91,13 +91,11 @@ protected boolean lessThan(Long a, Long b) {
       for (String child : children) {
         Long id = childToModificationZxid.get(child);
         if (id != null && id <= topElementMzxId) {
-          try {
-            zookeeper.delete(dir + "/" + child, -1, true);
-            if (onOverflowObserver != null)
-              onOverflowObserver.onChildDelete(child.substring(PREFIX.length()));
-          } catch (KeeperException.NoNodeException ignored) {
-            // this could happen if multiple threads try to clean the same map
-          }
+          String trackingId = child.substring(PREFIX.length());
+          boolean removed = remove(trackingId);
+          if (removed && onOverflowObserver != null) {
+            onOverflowObserver.onChildDelete(trackingId);
+          } // else, probably multiple threads cleaning the queue simultaneously
         }
       }
     }
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
index 0b3325e96e5..aa5915f007b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -218,6 +219,36 @@ public void testClear() throws KeeperException, InterruptedException {
     }
   }
 
+  public void testMalformed() throws InterruptedException, KeeperException {
+    try (SolrZkClient zkClient =
+        new SolrZkClient.Builder()
+            .withUrl(zkServer.getZkHost())
+            .withTimeout(10000, TimeUnit.MILLISECONDS)
+            .build()) {
+      String path = getAndMakeInitialPath(zkClient);
+      DistributedMap map = createMap(zkClient, path);
+      expectThrows(SolrException.class, () -> map.put("has/slash", new byte[0]));
+    }
+  }
+
+  public void testRemoveMalformed() throws InterruptedException, KeeperException {
+    try (SolrZkClient zkClient =
+        new SolrZkClient.Builder()
+            .withUrl(zkServer.getZkHost())
+            .withTimeout(10000, TimeUnit.MILLISECONDS)
+            .build()) {
+      String path = getAndMakeInitialPath(zkClient);
+      // Add a "legacy" / malformed key
+      final var key = "slash/test/0";
+      zkClient.makePath(path + "/" + DistributedMap.PREFIX + key, new byte[0], true);
+
+      DistributedMap map = createMap(zkClient, path);
+      assertEquals(1, map.size());
+      map.remove("slash");
+      assertEquals(0, map.size());
+    }
+  }
+
   protected DistributedMap createMap(SolrZkClient zkClient, String path) {
     return new DistributedMap(zkClient, path);
   }
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
index 493b7bf062b..a534e2e2a30 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
@@ -25,9 +25,11 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.zookeeper.KeeperException;
 
 public class TestSizeLimitedDistributedMap extends TestDistributedMap {
 
@@ -136,4 +138,32 @@ public void testConcurrentCleanup() throws Exception {
   protected DistributedMap createMap(SolrZkClient zkClient, String path) {
     return new SizeLimitedDistributedMap(zkClient, path, Overseer.NUM_RESPONSES_TO_STORE, null);
   }
+
+  public void testCleanupForKeysWithSlashes() throws InterruptedException, KeeperException {
+    try (SolrZkClient zkClient =
+        new SolrZkClient.Builder()
+            .withUrl(zkServer.getZkHost())
+            .withTimeout(10000, TimeUnit.MILLISECONDS)
+            .build()) {
+      int maxEntries = 10;
+      String path = getAndMakeInitialPath(zkClient);
+
+      // Add a "legacy" / malformed key
+      zkClient.makePath(path + "/" + DistributedMap.PREFIX + "slash/test/0", new byte[0], true);
+
+      AtomicInteger overFlowCounter = new AtomicInteger();
+      DistributedMap map =
+          new SizeLimitedDistributedMap(
+              zkClient, path, maxEntries, (element) -> overFlowCounter.incrementAndGet());
+
+      // Now add regular keys until we reach the size limit of the map.
+      // Once we hit the limit, the oldest item (the one we added above with slashes) is deleted,
+      // but that fails.
+      for (int i = 1; i <= maxEntries; ++i) {
+        map.put(String.valueOf(i), new byte[0]);
+      }
+      assertTrue(map.size() <= maxEntries);
+      assertEquals(1, overFlowCounter.get());
+    }
+  }
 }
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adoc
index 59955461b91..452c384bcc0 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adoc
@@ -36,6 +36,7 @@ Because this API has a large number of commands and options, we've grouped the c
 
 Since some collection API calls can be long running tasks (such as SPLITSHARD), you can optionally have the calls run asynchronously.
 Specifying `async=<request-id>` enables you to make an asynchronous call, the status of which can be requested using the <<requeststatus,REQUESTSTATUS>> call at any time.
+The ID provided can be any string so long as it doesn't have a `/` in it.
 
 As of now, REQUESTSTATUS does not automatically clean up the tracking data structures, meaning the status of completed or failed tasks stays stored in ZooKeeper unless cleared manually.
 DELETESTATUS can be used to clear the stored statuses.

From 676fd578db5d4b0ce6c303a2df84e541f0eb8448 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Mon, 11 Sep 2023 18:58:56 -0400
Subject: [PATCH 067/160] SOLR-16970: SOLR_OPTS should override most options
 (#1913)

---
 solr/CHANGES.txt  |  2 +
 solr/bin/solr     | 92 ++++++++++++++++++++++++----------------------
 solr/bin/solr.cmd | 93 ++++++++++++++++++++++++++---------------------
 3 files changed, 102 insertions(+), 85 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0099c2245fc..7f36982d3ab 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -119,6 +119,8 @@ Improvements
   This will enable client and server hostName check settings to be governed by the same environment variable.
   If users want separate client/server settings, they can manually override the solr.jetty.ssl.sniHostCheck option in SOLR_OPTS. (Houston Putman)
 
+* SOLR-16970: SOLR_OPTS is now able to override options set by the Solr control scripts, "bin/solr" and "bin/solr.cmd". (Houston Putman)
+
 
 Optimizations
 ---------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 458421e0d1c..32a2465eccb 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -628,7 +628,7 @@ function jetty_port() {
 function run_tool() {
 
   # shellcheck disable=SC2086
-  "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} -Dsolr.install.dir="$SOLR_TIP" \
+  "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} ${SOLR_TOOL_OPTS:-} -Dsolr.install.dir="$SOLR_TIP" \
     -Dlog4j.configurationFile="$DEFAULT_SERVER_DIR/resources/log4j2-console.xml" \
     -classpath "$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*:$DEFAULT_SERVER_DIR/lib/ext/*:$DEFAULT_SERVER_DIR/lib/*" \
     org.apache.solr.cli.SolrCLI "$@"
@@ -742,7 +742,7 @@ function stop_solr() {
   if [ -n "$SOLR_PID"  ]; then
     echo -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting up to $SOLR_STOP_WAIT seconds to allow Jetty process $SOLR_PID to stop gracefully."
     # shellcheck disable=SC2086
-    "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
+    "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_TOOL_OPTS:-} -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
       (loops=0
       while true
       do
@@ -1222,6 +1222,7 @@ fi
 FG="false"
 FORCE=false
 SOLR_OPTS=(${SOLR_OPTS:-})
+SCRIPT_SOLR_OPTS=()
 PASS_TO_RUN_EXAMPLE=()
 
 if [ $# -gt 0 ]; then
@@ -1370,6 +1371,7 @@ if [ $# -gt 0 ]; then
               break # out-of-args, stop looping
             elif [ "${1:0:2}" == "-D" ]; then
               # pass thru any opts that begin with -D (java system props)
+              # These should go to the end of SOLR_OPTS, as they should override everything else
               SOLR_OPTS+=("$1")
               PASS_TO_RUN_EXAMPLE+=("$1")
               shift
@@ -1388,20 +1390,20 @@ fi
 
 # Solr modules option
 if [[ -n "${SOLR_MODULES:-}" ]] ; then
-  SOLR_OPTS+=("-Dsolr.modules=$SOLR_MODULES")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.modules=$SOLR_MODULES")
 fi
 
 # Default placement plugin
 if [[ -n "${SOLR_PLACEMENTPLUGIN_DEFAULT:-}" ]] ; then
-  SOLR_OPTS+=("-Dsolr.placementplugin.default=$SOLR_PLACEMENTPLUGIN_DEFAULT")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.placementplugin.default=$SOLR_PLACEMENTPLUGIN_DEFAULT")
 fi
 
 # Remote streaming and stream body
 if [ "${SOLR_ENABLE_REMOTE_STREAMING:-false}" == "true" ]; then
-  SOLR_OPTS+=("-Dsolr.enableRemoteStreaming=true")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.enableRemoteStreaming=true")
 fi
 if [ "${SOLR_ENABLE_STREAM_BODY:-false}" == "true" ]; then
-  SOLR_OPTS+=("-Dsolr.enableStreamBody=true")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.enableStreamBody=true")
 fi
 
 : ${SOLR_SERVER_DIR:=$DEFAULT_SERVER_DIR}
@@ -1494,15 +1496,15 @@ if [[ "$SCRIPT_CMD" == "stop" ]]; then
 fi
 
 if [ -n "${SOLR_PORT_ADVERTISE:-}" ]; then
-  SOLR_OPTS+=("-Dsolr.port.advertise=$SOLR_PORT_ADVERTISE")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.port.advertise=$SOLR_PORT_ADVERTISE")
 fi
 
 if [ -n "${SOLR_JETTY_HOST:-}" ]; then
-  SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")
 fi
 
 if [ -n "${SOLR_ZK_EMBEDDED_HOST:-}" ]; then
-  SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")
+  SCRIPT_SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")
 fi
 
 : "${STOP_PORT:=$((SOLR_PORT - 1000))}"
@@ -1736,8 +1738,8 @@ else
   JAVA_MEM_OPTS=("-Xms$SOLR_HEAP" "-Xmx$SOLR_HEAP")
 fi
 
-# Pick default for Java thread stack size, and then add to SOLR_OPTS
-SOLR_OPTS+=(${SOLR_JAVA_STACK_SIZE:-"-Xss256k"})
+# Pick default for Java thread stack size, and then add to SCRIPT_SOLR_OPTS
+SCRIPT_SOLR_OPTS+=(${SOLR_JAVA_STACK_SIZE:-"-Xss256k"})
 
 : "${SOLR_TIMEZONE:=UTC}"
 
@@ -1778,79 +1780,83 @@ function start_solr() {
   fi
 
   if [ -n "${SOLR_WAIT_FOR_ZK:-}" ]; then
-    SOLR_OPTS+=("-DwaitForZk=$SOLR_WAIT_FOR_ZK")
+    SCRIPT_SOLR_OPTS+=("-DwaitForZk=$SOLR_WAIT_FOR_ZK")
   fi
 
   if [ -n "${SOLR_DATA_HOME:-}" ]; then
-    SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")
+    SCRIPT_SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")
   fi
 
   if [ -n "${SOLR_DELETE_UNKNOWN_CORES:-}" ]; then
-    SOLR_OPTS+=("-Dsolr.deleteUnknownCores=$SOLR_DELETE_UNKNOWN_CORES")
+    SCRIPT_SOLR_OPTS+=("-Dsolr.deleteUnknownCores=$SOLR_DELETE_UNKNOWN_CORES")
   fi
 
-  # If SSL-related system props are set, add them to SOLR_OPTS
+  # If SSL-related system props are set, add them to SCRIPT_SOLR_OPTS
   if [ "$SOLR_SSL_ENABLED" == "true" ]; then
     # If using SSL and solr.jetty.https.port not set explicitly, use the jetty.port
     SSL_PORT_PROP="-Dsolr.jetty.https.port=$SOLR_PORT"
-    SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")
+    SCRIPT_SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")
   fi
 
-  # If authentication system props are set, add them to SOLR_OPTS
+  # If authentication system props are set, add them to SCRIPT_SOLR_OPTS
   if [ -n "$AUTHC_OPTS" ]; then
-    SOLR_OPTS+=($AUTHC_OPTS)
+    SCRIPT_SOLR_OPTS+=($AUTHC_OPTS)
   fi
 
-  # If there are internal options set by Solr (users should not use this variable), add them to SOLR_OPTS
+  # If there are internal options set by Solr (users should not use this variable), add them to SCRIPT_SOLR_OPTS
   if [ -n "$SOLR_OPTS_INTERNAL" ]; then
-    SOLR_OPTS+=($SOLR_OPTS_INTERNAL)
+    SCRIPT_SOLR_OPTS+=($SOLR_OPTS_INTERNAL)
   fi
 
-  # If a heap dump directory is specified, enable it in SOLR_OPTS
+  # If a heap dump directory is specified, enable it in SCRIPT_SOLR_OPTS
   if [[ -z "${SOLR_HEAP_DUMP_DIR:-}" ]] && [[ "${SOLR_HEAP_DUMP:-}" == "true" ]]; then
     SOLR_HEAP_DUMP_DIR="${SOLR_LOGS_DIR}/dumps"
   fi
   if [[ -n "${SOLR_HEAP_DUMP_DIR:-}" ]]; then
-    SOLR_OPTS+=("-XX:+HeapDumpOnOutOfMemoryError")
-    SOLR_OPTS+=("-XX:HeapDumpPath=$SOLR_HEAP_DUMP_DIR/solr-$(date +%s)-pid$$.hprof")
+    SCRIPT_SOLR_OPTS+=("-XX:+HeapDumpOnOutOfMemoryError")
+    SCRIPT_SOLR_OPTS+=("-XX:HeapDumpPath=$SOLR_HEAP_DUMP_DIR/solr-$(date +%s)-pid$$.hprof")
   fi
 
   if $verbose ; then
     echo -e "\nStarting Solr using the following settings:"
-    echo -e "    JAVA            = $JAVA"
-    echo -e "    SOLR_SERVER_DIR = $SOLR_SERVER_DIR"
-    echo -e "    SOLR_HOME       = $SOLR_HOME"
-    echo -e "    SOLR_HOST       = ${SOLR_HOST:-}"
-    echo -e "    SOLR_PORT       = $SOLR_PORT"
-    echo -e "    STOP_PORT       = $STOP_PORT"
-    echo -e "    JAVA_MEM_OPTS   = ${JAVA_MEM_OPTS[*]}"
-    echo -e "    GC_TUNE         = ${GC_TUNE_ARR[*]}"
-    echo -e "    GC_LOG_OPTS     = ${GC_LOG_OPTS[*]}"
-    echo -e "    SOLR_TIMEZONE   = $SOLR_TIMEZONE"
+    echo -e "    JAVA               = $JAVA"
+    echo -e "    SOLR_SERVER_DIR    = $SOLR_SERVER_DIR"
+    echo -e "    SOLR_HOME          = $SOLR_HOME"
+    echo -e "    SOLR_HOST          = ${SOLR_HOST:-}"
+    echo -e "    SOLR_PORT          = $SOLR_PORT"
+    echo -e "    STOP_PORT          = $STOP_PORT"
+    echo -e "    JAVA_MEM_OPTS      = ${JAVA_MEM_OPTS[*]}"
+    echo -e "    GC_TUNE            = ${GC_TUNE_ARR[*]}"
+    echo -e "    GC_LOG_OPTS        = ${GC_LOG_OPTS[*]}"
+    echo -e "    SOLR_TIMEZONE      = $SOLR_TIMEZONE"
 
     if [ "$SOLR_MODE" == "solrcloud" ]; then
-      echo -e "    CLOUD_MODE_OPTS = ${CLOUD_MODE_OPTS[*]}"
+      echo -e "    CLOUD_MODE_OPTS    = ${CLOUD_MODE_OPTS[*]}"
     fi
 
     if [ -n "${SOLR_OPTS:-}" ]; then
-      echo -e "    SOLR_OPTS       = ${SOLR_OPTS[*]}"
+      echo -e "    SOLR_OPTS (USER)   = ${SOLR_OPTS[*]}"
+    fi
+
+    if [ -n "${SCRIPT_SOLR_OPTS:-}" ]; then
+      echo -e "    SOLR_OPTS (SCRIPT) = ${SCRIPT_SOLR_OPTS[*]}"
     fi
 
     if [ -n "${SOLR_ADDL_ARGS:-}" ]; then
-      echo -e "    SOLR_ADDL_ARGS  = $SOLR_ADDL_ARGS"
+      echo -e "    SOLR_ADDL_ARGS     = $SOLR_ADDL_ARGS"
     fi
 
     if [ "${ENABLE_REMOTE_JMX_OPTS:-false}" == "true" ]; then
-      echo -e "    RMI_PORT        = ${RMI_PORT:-}"
-      echo -e "    REMOTE_JMX_OPTS = ${REMOTE_JMX_OPTS[*]}"
+      echo -e "    RMI_PORT           = ${RMI_PORT:-}"
+      echo -e "    REMOTE_JMX_OPTS    = ${REMOTE_JMX_OPTS[*]}"
     fi
 
     if [ -n "${SOLR_LOG_LEVEL:-}" ]; then
-      echo -e "    SOLR_LOG_LEVEL  = $SOLR_LOG_LEVEL"
+      echo -e "    SOLR_LOG_LEVEL     = $SOLR_LOG_LEVEL"
     fi
 
     if [ -n "${SOLR_DATA_HOME:-}" ]; then
-      echo -e "    SOLR_DATA_HOME  = $SOLR_DATA_HOME"
+      echo -e "    SOLR_DATA_HOME     = $SOLR_DATA_HOME"
     fi
     echo
   fi
@@ -1865,14 +1871,14 @@ function start_solr() {
 
   # Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463
   if [[ "$JAVA_VER_NUM" -ge "17" ]] ; then
-    SOLR_OPTS+=("-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put")
+    SCRIPT_SOLR_OPTS+=("-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put")
     echo "Java $JAVA_VER_NUM detected. Enabled workaround for SOLR-16463"
   fi
 
   # Vector optimizations are only supported for Java 20 and 21 for now.
   # This will need to change as Lucene is upgraded and newer Java versions are released
   if [[ "$JAVA_VER_NUM" -ge "20" ]] && [[ "$JAVA_VER_NUM" -le "21" ]] ; then
-    SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")
+    SCRIPT_SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")
     echo "Java $JAVA_VER_NUM detected. Incubating Panama Vector APIs have been enabled"
   fi
 
@@ -1886,7 +1892,7 @@ function start_solr() {
     # OOME is thrown. Program operation after OOME is unpredictable.
     "-XX:+CrashOnOutOfMemoryError" "-XX:ErrorFile=${SOLR_LOGS_DIR}/jvm_crash_%p.log" \
     "-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.install.dir=$SOLR_TIP" "-Dsolr.install.symDir=$SOLR_TIP_SYM" \
-    "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}")
+    "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SCRIPT_SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}" "${SOLR_OPTS[@]}")
 
   mk_writable_dir "$SOLR_LOGS_DIR" "Logs"
   if [[ -n "${SOLR_HEAP_DUMP_DIR:-}" ]]; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 93f1aaa17fd..572204b8f8b 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -805,22 +805,24 @@ IF NOT "%SOLR_HOST%"=="" (
   set SOLR_HOST_ARG=
 )
 
+set SCRIPT_SOLR_OPTS=
+
 REM Solr modules option
 IF DEFINED SOLR_MODULES (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.modules=%SOLR_MODULES%"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.modules=%SOLR_MODULES%"
 )
 
 REM Default placement plugin
 IF DEFINED SOLR_PLACEMENTPLUGIN_DEFAULT (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.placementplugin.default=%SOLR_PLACEMENTPLUGIN_DEFAULT%"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.placementplugin.default=%SOLR_PLACEMENTPLUGIN_DEFAULT%"
 )
 
 REM Remote streaming and stream body
 IF "%SOLR_ENABLE_REMOTE_STREAMING%"=="true" (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.enableRemoteStreaming=true"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.enableRemoteStreaming=true"
 )
 IF "%SOLR_ENABLE_STREAM_BODY%"=="true" (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.enableStreamBody=true"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.enableStreamBody=true"
 )
 
 IF "%SOLR_SERVER_DIR%"=="" set "SOLR_SERVER_DIR=%DEFAULT_SERVER_DIR%"
@@ -923,7 +925,7 @@ IF "%SCRIPT_CMD%"=="stop" (
           set found_it=1
           @echo Stopping Solr process %%N running on port %SOLR_PORT%
           IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000
-          "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
+          "%JAVA%" %SOLR_SSL_OPTS% %SOLR_TOOL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
           del "%SOLR_TIP%"\bin\solr-%SOLR_PORT%.port
           REM wait for the process to terminate
           CALL :wait_for_process_exit %%N !SOLR_STOP_WAIT!
@@ -948,15 +950,15 @@ IF "%SOLR_PORT%"=="" set SOLR_PORT=8983
 IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000
 
 IF DEFINED SOLR_PORT_ADVERTISE (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.port.advertise=%SOLR_PORT_ADVERTISE%"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.port.advertise=%SOLR_PORT_ADVERTISE%"
 )
 
 IF DEFINED SOLR_JETTY_HOST (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%"
 )
 
 IF DEFINED SOLR_ZK_EMBEDDED_HOST (
-  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%"
+  set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%"
 )
 
 IF "%SCRIPT_CMD%"=="start" (
@@ -1097,7 +1099,7 @@ IF "%SOLR_ADMIN_UI_DISABLED%"=="true" (
 IF NOT "%SOLR_HEAP%"=="" set SOLR_JAVA_MEM=-Xms%SOLR_HEAP% -Xmx%SOLR_HEAP%
 IF "%SOLR_JAVA_MEM%"=="" set SOLR_JAVA_MEM=-Xms512m -Xmx512m
 IF "%SOLR_JAVA_STACK_SIZE%"=="" set SOLR_JAVA_STACK_SIZE=-Xss256k
-set SOLR_OPTS=%SOLR_JAVA_STACK_SIZE% %SOLR_OPTS%
+set SCRIPT_SOLR_OPTS=%SOLR_JAVA_STACK_SIZE% %SCRIPT_SOLR_OPTS%
 IF "%SOLR_TIMEZONE%"=="" set SOLR_TIMEZONE=UTC
 
 IF "%GC_TUNE%"=="" (
@@ -1112,14 +1114,14 @@ IF "%GC_TUNE%"=="" (
 
 REM Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463
 if !JAVA_MAJOR_VERSION! GEQ 17  (
-  set SOLR_OPTS=%SOLR_OPTS% -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put
+  set SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put
   echo Java %JAVA_MAJOR_VERSION% detected. Enabled workaround for SOLR-16463
 )
 
 REM Vector optimizations are only supported for Java 20 and 21 for now.
 REM This will need to change as Lucene is upgraded and newer Java versions are released
 if !JAVA_MAJOR_VERSION! GEQ 20 if !JAVA_MAJOR_VERSION! LEQ 21 (
-  set SOLR_OPTS=%SOLR_OPTS% --add-modules jdk.incubator.vector
+  set SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% --add-modules jdk.incubator.vector
   echo Java %JAVA_MAJOR_VERSION% detected. Incubating Panama Vector APIs have been enabled
 )
 
@@ -1149,44 +1151,48 @@ if !JAVA_MAJOR_VERSION! GEQ 9 if NOT "%JAVA_VENDOR%" == "OpenJ9" (
 
 IF "%verbose%"=="1" (
   @echo Starting Solr using the following settings:
-  CALL :safe_echo "    JAVA            = %JAVA%"
-  CALL :safe_echo "    SOLR_SERVER_DIR = %SOLR_SERVER_DIR%"
-  CALL :safe_echo "    SOLR_HOME       = %SOLR_HOME%"
-  @echo     SOLR_HOST       = %SOLR_HOST%
-  @echo     SOLR_PORT       = %SOLR_PORT%
-  @echo     STOP_PORT       = %STOP_PORT%
-  @echo     SOLR_JAVA_MEM   = %SOLR_JAVA_MEM%
-  @echo     GC_TUNE         = !GC_TUNE!
-  @echo     GC_LOG_OPTS     = %GC_LOG_OPTS%
-  @echo     SOLR_TIMEZONE   = %SOLR_TIMEZONE%
+  CALL :safe_echo "    JAVA              = %JAVA%"
+  CALL :safe_echo "    SOLR_SERVER_DIR   = %SOLR_SERVER_DIR%"
+  CALL :safe_echo "    SOLR_HOME         = %SOLR_HOME%"
+  @echo     SOLR_HOST         = %SOLR_HOST%
+  @echo     SOLR_PORT         = %SOLR_PORT%
+  @echo     STOP_PORT         = %STOP_PORT%
+  @echo     SOLR_JAVA_MEM     = %SOLR_JAVA_MEM%
+  @echo     GC_TUNE           = !GC_TUNE!
+  @echo     GC_LOG_OPTS       = %GC_LOG_OPTS%
+  @echo     SOLR_TIMEZONE     = %SOLR_TIMEZONE%
 
   IF "%SOLR_MODE%"=="solrcloud" (
-    @echo     CLOUD_MODE_OPTS = %CLOUD_MODE_OPTS%
+    @echo     CLOUD_MODE_OPTS   = %CLOUD_MODE_OPTS%
   )
 
   IF NOT "%SOLR_OPTS%"=="" (
-    @echo     SOLR_OPTS       = %SOLR_OPTS%
+    @echo     SOLR_OPTS (USER)   = %SOLR_OPTS%
+  )
+
+  IF NOT "%SCRIPT_SOLR_OPTS%"=="" (
+    @echo     SOLR_OPTS (SCRIPT) = %SCRIPT_SOLR_OPTS%
   )
 
   IF NOT "%SOLR_ADDL_ARGS%"=="" (
-    CALL :safe_echo "     SOLR_ADDL_ARGS  = %SOLR_ADDL_ARGS%"
+    CALL :safe_echo "     SOLR_ADDL_ARGS    = %SOLR_ADDL_ARGS%"
   )
 
   IF NOT "%SOLR_JETTY_ADDL_CONFIG%"=="" (
-    CALL :safe_echo "     SOLR_JETTY_ADDL_CONFIG  = %SOLR_JETTY_ADDL_CONFIG%"
+    CALL :safe_echo "     SOLR_JETTY_ADDL_CONFIG    = %SOLR_JETTY_ADDL_CONFIG%"
   )
 
   IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
-    @echo     RMI_PORT        = !RMI_PORT!
-    @echo     REMOTE_JMX_OPTS = %REMOTE_JMX_OPTS%
+    @echo     RMI_PORT          = !RMI_PORT!
+    @echo     REMOTE_JMX_OPTS   = %REMOTE_JMX_OPTS%
   )
 
   IF NOT "%SOLR_LOG_LEVEL%"=="" (
-    @echo     SOLR_LOG_LEVEL  = !SOLR_LOG_LEVEL!
+    @echo     SOLR_LOG_LEVEL    = !SOLR_LOG_LEVEL!
   )
 
   IF NOT "%SOLR_DATA_HOME%"=="" (
-    @echo     SOLR_DATA_HOME  = !SOLR_DATA_HOME!
+    @echo     SOLR_DATA_HOME    = !SOLR_DATA_HOME!
   )
 
   @echo.
@@ -1207,7 +1213,7 @@ IF NOT "!IP_ACL_OPTS!"=="" set "START_OPTS=%START_OPTS% !IP_ACL_OPTS!"
 IF NOT "%REMOTE_JMX_OPTS%"=="" set "START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%"
 IF NOT "%SOLR_ADDL_ARGS%"=="" set "START_OPTS=%START_OPTS% %SOLR_ADDL_ARGS%"
 IF NOT "%SOLR_HOST_ARG%"=="" set "START_OPTS=%START_OPTS% %SOLR_HOST_ARG%"
-IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"
+IF NOT "%SCRIPT_SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SCRIPT_SOLR_OPTS%"
 IF NOT "%SOLR_OPTS_INTERNAL%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS_INTERNAL%"
 IF NOT "!SECURITY_MANAGER_OPTS!"=="" set "START_OPTS=%START_OPTS% !SECURITY_MANAGER_OPTS!"
 IF "%SOLR_SSL_ENABLED%"=="true" (
@@ -1223,6 +1229,9 @@ set "START_OPTS=%START_OPTS% -Dsolr.log.dir=%SOLR_LOGS_DIR_QUOTED% -Djava.util.l
 IF NOT "%SOLR_DATA_HOME%"=="" set "START_OPTS=%START_OPTS% -Dsolr.data.home=%SOLR_DATA_HOME_QUOTED%"
 IF NOT DEFINED LOG4J_CONFIG set "LOG4J_CONFIG=%SOLR_SERVER_DIR%\resources\log4j2.xml"
 
+REM This should be the last thing added to START_OPTS, so that users can override as much as possible
+IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"
+
 cd /d "%SOLR_SERVER_DIR%"
 
 IF NOT EXIST "%SOLR_LOGS_DIR%" (
@@ -1272,7 +1281,7 @@ IF "%FG%"=="1" (
     set SOLR_START_WAIT=30
   )
   REM now wait to see Solr come online ...
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
     -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
     -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
     org.apache.solr.cli.SolrCLI status -maxWaitSecs !SOLR_START_WAIT! -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:%SOLR_PORT%/solr
@@ -1287,7 +1296,7 @@ goto done
 :run_example
 REM Run the requested example
 
-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -Dsolr.install.symDir="%SOLR_TIP%" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
@@ -1311,7 +1320,7 @@ for /f "usebackq" %%i in (`dir /b "%SOLR_TIP%\bin" ^| findstr /i "^solr-.*\.port
           set has_info=1
           echo Found Solr process %%k running on port !SOME_SOLR_PORT!
           REM Passing in %2 (-h or -help) directly is captured by a custom help path for usage output
-          "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+          "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
             -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
             -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
             org.apache.solr.cli.SolrCLI status -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!SOME_SOLR_PORT!/solr %2
@@ -1326,7 +1335,7 @@ set has_info=
 goto done
 
 :run_solrcli
-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI %*
@@ -1475,7 +1484,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="The -d option must be set for upconfig."
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%^
@@ -1489,7 +1498,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="The -d option must be set for downconfig."
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%
@@ -1508,7 +1517,7 @@ IF "!ZK_OP!"=="upconfig" (
       goto zk_short_usage
   )
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1521,7 +1530,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="<dest> must be specified for 'mv' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! %ZK_VERBOSE%
@@ -1530,7 +1539,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to remove must be specified when using the 'rm' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1539,7 +1548,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to remove must be specified when using the 'ls' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
@@ -1548,7 +1557,7 @@ IF "!ZK_OP!"=="upconfig" (
     set ERROR_MSG="Zookeeper path to create must be specified when using the 'mkroot' command"
     goto zk_short_usage
   )
-  "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+  "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
   -Dlog4j.configurationFile="file:///%SOLR_SERVER_DIR%\resources\log4j2-console.xml" ^
   -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
   org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! %ZK_VERBOSE%
@@ -1609,7 +1618,7 @@ if "!AUTH_PORT!"=="" (
     )
   )
 )
-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%"Ω %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
     -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
     -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
     org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^

From e016a6774140c813267d9d70fb38f6cf903615e6 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Mon, 11 Sep 2023 19:07:19 -0400
Subject: [PATCH 068/160] SOLR-16970: Fix typo in solr.cmd

---
 solr/bin/solr.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 572204b8f8b..bb297a64d62 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1618,7 +1618,7 @@ if "!AUTH_PORT!"=="" (
     )
   )
 )
-"%JAVA%"Ω %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^
     -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
     -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
     org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^

From b98d936bd33634086f0840e47e15840c2dc699ad Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Tue, 12 Sep 2023 11:47:53 -0400
Subject: [PATCH 069/160] Add full mTLS integration tests for Solr (#1912)

---
 solr/packaging/build.gradle       |   1 +
 solr/packaging/test/test_ssl.bats | 289 +++++++++++++++++++++++++++++-
 2 files changed, 289 insertions(+), 1 deletion(-)

diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
index 310aa45049c..aa366eaafd6 100644
--- a/solr/packaging/build.gradle
+++ b/solr/packaging/build.gradle
@@ -256,6 +256,7 @@ task integrationTests(type: BatsTask) {
   environment SOLR_TIP: distDir.toString()
   environment SOLR_HOME: solrHome
   environment SOLR_LOGS_DIR: "$solrHome/logs"
+  environment TEST_OUTPUT_DIR: integrationTestOutput
   environment TEST_FAILURE_DIR: solrTestFailuresDir
   environment BATS_LIB_PREFIX: "$nodeProjectDir/node_modules"
 }
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index a40d3232a13..f3aae8d6edc 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -57,8 +57,51 @@ teardown() {
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://127.0.0.1:8983/solr/test/select?q=*:*'
+  assert_output --partial '"numFound":0'
+}
+
+@test "use different hostname when not checking peer-name" {
+  # Create a keystore
+  export ssl_dir="${BATS_TEST_TMPDIR}/ssl"
+  mkdir -p "$ssl_dir"
+  (
+    cd "$ssl_dir"
+    rm -f solr-ssl.keystore.p12 solr-ssl.pem
+    # Using a CN that is not localhost, as we will not be checking peer-name
+    keytool -genkeypair -alias solr-ssl -keyalg RSA -keysize 2048 -keypass secret -storepass secret -validity 9999 -keystore solr-ssl.keystore.p12 -storetype PKCS12 -ext "SAN=DNS:test.solr.apache.org,IP:127.0.0.1" -dname "CN=test.solr.apache.org, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country"
+    openssl pkcs12 -in solr-ssl.keystore.p12 -out solr-ssl.pem -passin pass:secret -passout pass:secret
+  )
+
+  # Set ENV_VARs so that Solr uses this keystore
+  export SOLR_SSL_ENABLED=true
+  export SOLR_SSL_KEY_STORE=$ssl_dir/solr-ssl.keystore.p12
+  export SOLR_SSL_KEY_STORE_PASSWORD=secret
+  export SOLR_SSL_TRUST_STORE=$ssl_dir/solr-ssl.keystore.p12
+  export SOLR_SSL_TRUST_STORE_PASSWORD=secret
+  export SOLR_SSL_NEED_CLIENT_AUTH=false
+  export SOLR_SSL_WANT_CLIENT_AUTH=false
+  export SOLR_SSL_CHECK_PEER_NAME=false
+  # Remove later when SOLR-16963 is resolved
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
+  export SOLR_HOST=localhost
+
+  solr start -c
+  solr assert --started https://localhost:8983/solr --timeout 5000
+
+  run solr create -c test -s 2
+  assert_output --partial "Created collection 'test'"
+
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -k 'https://localhost:8983/solr/test/select?q=*:*'
   assert_output --partial '"numFound":0'
+
+  export SOLR_SSL_CHECK_PEER_NAME=true
+  # Remove later when SOLR-16963 is resolved
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
+
+  # This should fail the peername check
+  run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*'
+  assert_output --partial 'Server refused connection'
 }
 
 @test "start solr with ssl and auth" {
@@ -155,3 +198,247 @@ teardown() {
   run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
   assert_output --partial '"urlScheme":"https"'
 }
+
+@test "start solr with mTLS needed" {
+  # Make a test tmp dir, as the security policy includes TMP, so that might already contain the BATS_TEST_TMPDIR
+  test_tmp_dir="${BATS_TEST_TMPDIR}/tmp"
+  mkdir -p "${test_tmp_dir}"
+  test_tmp_dir="$(cd -P "${test_tmp_dir}" && pwd)"
+
+  export SOLR_SECURITY_MANAGER_ENABLED=true
+  export SOLR_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"
+  export SOLR_TOOL_OPTS="-Djava.io.tmpdir=${test_tmp_dir} -Djavax.net.debug=SSL,keymanager,trustmanager,ssl:handshake"
+
+  export ssl_dir="${BATS_TEST_TMPDIR}/ssl"
+  export server_ssl_dir="${ssl_dir}/server"
+  export client_ssl_dir="${ssl_dir}/client"
+
+  # Create a root & intermediary CA
+  echo "${ssl_dir}"
+  mkdir -p "${ssl_dir}"
+  (
+    cd "$ssl_dir"
+    rm -f root.p12 root.pem ca.p12 ca.pem
+
+    keytool -genkeypair -keystore root.p12 -storetype PKCS12 -keypass secret -storepass secret -alias root -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore ca.p12 -storetype PKCS12 -keypass secret -storepass secret -alias ca -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    keytool -keystore root.p12 -storetype PKCS12 -storepass secret -alias root -exportcert -rfc > root.pem
+
+    keytool -storepass secret -storetype PKCS12 -keystore ca.p12 -certreq -alias ca | \
+        keytool -storepass secret -keystore root.p12  -storetype PKCS12 \
+        -gencert -alias root -ext BC=0 -rfc > ca.pem
+    keytool -keystore ca.p12 -importcert -storetype PKCS12 -storepass secret -alias root -file root.pem -noprompt
+    keytool -keystore ca.p12 -importcert -storetype PKCS12 -storepass secret -alias ca -file ca.pem
+  )
+  # Create a server keystore & truststore
+  mkdir -p "$server_ssl_dir"
+  (
+    cd "$server_ssl_dir"
+    rm -f solr-server.keystore.p12 server.pem solr-server.truststore.p12
+
+    # Create a keystore and certificate
+    keytool -genkeypair -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -alias server -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    # Trust the keystore cert with the CA
+    keytool -storepass server-key -keystore solr-server.keystore.p12 -storetype PKCS12 -certreq -alias server | \
+        keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
+        -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias server -file server.pem
+
+    # Create a truststore with just the Root CA
+    keytool -keystore solr-server.truststore.p12 -storetype PKCS12 -keypass server-trust -storepass server-trust -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-server.truststore.p12 -storetype PKCS12 -keypass server-trust -storepass server-trust -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+  )
+  # Create a client keystore & truststore
+  mkdir -p "$client_ssl_dir"
+  (
+    cd "$client_ssl_dir"
+    rm -f solr-client.keystore.p12 client.pem solr-client.truststore.p12
+
+    # Create a keystore and certificate
+    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    # Trust the keystore cert with the CA
+    keytool -storepass client-key -keystore solr-client.keystore.p12 -storetype PKCS12 -certreq -alias client | \
+        keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
+        -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias client -file client.pem
+
+    # Create a truststore with just the Root CA
+    keytool -keystore solr-client.truststore.p12 -storetype PKCS12 -keypass client-trust -storepass client-trust -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-client.truststore.p12 -storetype PKCS12 -keypass client-trust -storepass client-trust -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+  )
+
+  # Set ENV_VARs so that Solr uses this keystore
+  export SOLR_SSL_ENABLED=true
+  export SOLR_SSL_KEY_STORE="$server_ssl_dir/solr-server.keystore.p12"
+  export SOLR_SSL_KEY_STORE_PASSWORD=server-key
+  export SOLR_SSL_KEY_STORE_TYPE=PKCS12
+  export SOLR_SSL_TRUST_STORE="$server_ssl_dir/solr-server.truststore.p12"
+  export SOLR_SSL_TRUST_STORE_PASSWORD=server-trust
+  export SOLR_SSL_TRUST_STORE_TYPE=PKCS12
+  export SOLR_SSL_CLIENT_KEY_STORE="$client_ssl_dir/solr-client.keystore.p12"
+  export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=client-key
+  export SOLR_SSL_CLIENT_KEY_STORE_TYPE=PKCS12
+  export SOLR_SSL_CLIENT_TRUST_STORE="$client_ssl_dir/solr-client.truststore.p12"
+  export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=client-trust
+  export SOLR_SSL_CLIENT_TRUST_STORE_TYPE=PKCS12
+  export SOLR_SSL_NEED_CLIENT_AUTH=true
+  export SOLR_SSL_WANT_CLIENT_AUTH=false
+  export SOLR_SSL_CHECK_PEER_NAME=true
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
+  export SOLR_HOST=localhost
+
+  solr start -c
+  solr start -c -z localhost:9983 -p 8984
+
+  export SOLR_SSL_KEY_STORE=
+  export SOLR_SSL_KEY_STORE_PASSWORD=
+  export SOLR_SSL_TRUST_STORE=
+  export SOLR_SSL_TRUST_STORE_PASSWORD=
+
+  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:8984/solr --timeout 5000
+
+  run solr create -c test -s 2
+  assert_output --partial "Created collection 'test'"
+
+  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+  assert_output --partial '"urlScheme":"https"'
+
+  run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
+  assert_output --partial '"numFound":0'
+
+  export SOLR_SSL_CLIENT_KEY_STORE=
+  export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
+
+  run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  assert_output --partial 'Server refused connection'
+}
+
+@test "start solr with mTLS wanted" {
+  # Make a test tmp dir, as the security policy includes TMP, so that might already contain the BATS_TEST_TMPDIR
+  test_tmp_dir="${BATS_TEST_TMPDIR}/tmp"
+  mkdir -p "${test_tmp_dir}"
+  test_tmp_dir="$(cd -P "${test_tmp_dir}" && pwd)"
+
+  export SOLR_SECURITY_MANAGER_ENABLED=true
+  export SOLR_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"
+  export SOLR_TOOL_OPTS="-Djava.io.tmpdir=${test_tmp_dir} -Djavax.net.debug=SSL,keymanager,trustmanager,ssl:handshake"
+
+  export ssl_dir="${BATS_TEST_TMPDIR}/ssl"
+  export server_ssl_dir="${ssl_dir}/server"
+  export client_ssl_dir="${ssl_dir}/client"
+
+  # Create a root & intermediary CA
+  echo "${ssl_dir}"
+  mkdir -p "${ssl_dir}"
+  (
+    cd "$ssl_dir"
+    rm -f root.p12 root.pem ca.p12 ca.pem
+
+    keytool -genkeypair -keystore root.p12 -storetype PKCS12 -keypass secret -storepass secret -alias root -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore ca.p12 -storetype PKCS12 -keypass secret -storepass secret -alias ca -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    keytool -keystore root.p12 -storetype PKCS12 -storepass secret -alias root -exportcert -rfc > root.pem
+
+    keytool -storepass secret -storetype PKCS12 -keystore ca.p12 -certreq -alias ca | \
+     keytool -storepass secret -keystore root.p12  -storetype PKCS12 \
+     -gencert -alias root -ext BC=0 -rfc > ca.pem
+    keytool -keystore ca.p12 -importcert -storetype PKCS12 -storepass secret -alias root -file root.pem -noprompt
+    keytool -keystore ca.p12 -importcert -storetype PKCS12 -storepass secret -alias ca -file ca.pem
+  )
+  # Create a server keystore & truststore
+  mkdir -p "$server_ssl_dir"
+  (
+    cd "$server_ssl_dir"
+    rm -f solr-server.keystore.p12 server.pem solr-server.truststore.p12
+
+    # Create a keystore and certificate
+    keytool -genkeypair -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -alias server -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    # Trust the keystore cert with the CA
+    keytool -storepass server-key -keystore solr-server.keystore.p12 -storetype PKCS12 -certreq -alias server | \
+     keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
+     -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+    keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias server -file server.pem
+
+    # Create a truststore with just the Root CA
+    keytool -keystore solr-server.truststore.p12 -storetype PKCS12 -keypass server-trust -storepass server-trust -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-server.truststore.p12 -storetype PKCS12 -keypass server-trust -storepass server-trust -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+  )
+  # Create a client keystore & truststore
+  mkdir -p "$client_ssl_dir"
+  (
+    cd "$client_ssl_dir"
+    rm -f solr-client.keystore.p12 client.pem solr-client.truststore.p12
+
+    # Create a keystore and certificate
+    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+
+    # Trust the keystore cert with the CA
+    keytool -storepass client-key -keystore solr-client.keystore.p12 -storetype PKCS12 -certreq -alias client | \
+     keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
+     -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+    keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias client -file client.pem
+
+    # Create a truststore with just the Root CA
+    keytool -keystore solr-client.truststore.p12 -storetype PKCS12 -keypass client-trust -storepass client-trust -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
+    keytool -keystore solr-client.truststore.p12 -storetype PKCS12 -keypass client-trust -storepass client-trust -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
+  )
+
+  # Set ENV_VARs so that Solr uses this keystore
+  export SOLR_SSL_ENABLED=true
+  export SOLR_SSL_KEY_STORE="$server_ssl_dir/solr-server.keystore.p12"
+  export SOLR_SSL_KEY_STORE_PASSWORD=server-key
+  export SOLR_SSL_KEY_STORE_TYPE=PKCS12
+  export SOLR_SSL_TRUST_STORE="$server_ssl_dir/solr-server.truststore.p12"
+  export SOLR_SSL_TRUST_STORE_PASSWORD=server-trust
+  export SOLR_SSL_TRUST_STORE_TYPE=PKCS12
+  export SOLR_SSL_CLIENT_KEY_STORE="$client_ssl_dir/solr-client.keystore.p12"
+  export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=client-key
+  export SOLR_SSL_CLIENT_KEY_STORE_TYPE=PKCS12
+  export SOLR_SSL_CLIENT_TRUST_STORE="$client_ssl_dir/solr-client.truststore.p12"
+  export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=client-trust
+  export SOLR_SSL_CLIENT_TRUST_STORE_TYPE=PKCS12
+  export SOLR_SSL_NEED_CLIENT_AUTH=false
+  export SOLR_SSL_WANT_CLIENT_AUTH=true
+  export SOLR_SSL_CHECK_PEER_NAME=true
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
+  export SOLR_HOST=localhost
+
+  solr start -c
+  solr start -c -z localhost:9983 -p 8984
+
+  export SOLR_SSL_KEY_STORE=
+  export SOLR_SSL_KEY_STORE_PASSWORD=
+  export SOLR_SSL_TRUST_STORE=
+  export SOLR_SSL_TRUST_STORE_PASSWORD=
+
+  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:8984/solr --timeout 5000
+
+  run solr create -c test -s 2
+  assert_output --partial "Created collection 'test'"
+
+  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+  assert_output --partial '"urlScheme":"https"'
+
+  run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
+  assert_output --partial '"numFound":0'
+
+  export SOLR_SSL_CLIENT_KEY_STORE=
+  export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
+
+  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  assert_output --partial '"numFound":0'
+}

From b163a0e50469dbb6357cef8506fba760710ef16b Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 12 Sep 2023 14:44:23 -0400
Subject: [PATCH 070/160] SOLR-15771: bin/solr auth enable should model best
 practices for security.json (#1851)

Introduce a security.json that defines four roles: `search`, `index`, `admin` and `superadmin`, and assigns the `superadmin` to the user created by running bin/solr auth.
---
 solr/CHANGES.txt                              |  2 +
 .../java/org/apache/solr/cli/AuthTool.java    | 57 +++++++-------
 solr/core/src/resources/security.json         | 74 +++++++++++++++++++
 solr/packaging/test/test_auth.bats            |  3 +-
 solr/packaging/test/test_ssl.bats             |  2 +-
 solr/solr-ref-guide/antora.template.yml       |  2 +-
 solr/solr-ref-guide/build.gradle              |  4 +-
 .../pages/solr-control-script-reference.adoc  | 45 ++++-------
 8 files changed, 122 insertions(+), 67 deletions(-)
 create mode 100644 solr/core/src/resources/security.json

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7f36982d3ab..41c21f7f90b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,8 @@ New Features
 
 * SOLR-16954: Make Circuit Breakers available for Update Requests (janhoy, Christine Poerschke, Pierre Salagnac)
 
+* SOLR-15771: bin/auth creates reasonable roles and permissions for security: 'search', 'index', 'admin', and 'superadmin' and assigns user superadmin role. (Eric Pugh, janhoy)
+
 Improvements
 ---------------------
 * SOLR-16490: `/admin/cores?action=backupcore` now has a v2 equivalent, available at
diff --git a/solr/core/src/java/org/apache/solr/cli/AuthTool.java b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
index 318f9feaced..2afd71706b6 100644
--- a/solr/core/src/java/org/apache/solr/cli/AuthTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
@@ -17,10 +17,15 @@
 
 package org.apache.solr.cli;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.Console;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -37,6 +42,7 @@
 import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.core.SolrCore;
 import org.apache.solr.security.Sha256AuthenticationProvider;
 import org.apache.zookeeper.KeeperException;
 
@@ -350,37 +356,26 @@ private int handleBasicAuth(CommandLine cli) throws Exception {
 
         boolean blockUnknown = Boolean.parseBoolean(cli.getOptionValue("blockUnknown", "true"));
 
-        String securityJson =
-            "{"
-                + "\n  \"authentication\":{"
-                + "\n   \"blockUnknown\": "
-                + blockUnknown
-                + ","
-                + "\n   \"class\":\"solr.BasicAuthPlugin\","
-                + "\n   \"credentials\":{\""
-                + username
-                + "\":\""
-                + Sha256AuthenticationProvider.getSaltedHashedValue(password)
-                + "\"}"
-                + "\n  },"
-                + "\n  \"authorization\":{"
-                + "\n   \"class\":\"solr.RuleBasedAuthorizationPlugin\","
-                + "\n   \"permissions\":["
-                + "\n {\"name\":\"security-edit\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"security-read\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"config-edit\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"config-read\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"collection-admin-edit\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"collection-admin-read\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"core-admin-edit\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"core-admin-read\", \"role\":\"admin\"},"
-                + "\n {\"name\":\"all\", \"role\":\"admin\"}"
-                + "\n   ],"
-                + "\n   \"user-role\":{\""
-                + username
-                + "\":\"admin\"}"
-                + "\n  }"
-                + "\n}";
+        String resourceName = "security.json";
+        final URL resource = SolrCore.class.getClassLoader().getResource(resourceName);
+        if (null == resource) {
+          throw new IllegalArgumentException("invalid resource name: " + resourceName);
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode securityJson1 = mapper.readTree(resource.openStream());
+        ((ObjectNode) securityJson1).put("blockUnknown", blockUnknown);
+        JsonNode credentialsNode = securityJson1.get("authentication").get("credentials");
+        ((ObjectNode) credentialsNode)
+            .put(username, Sha256AuthenticationProvider.getSaltedHashedValue(password));
+        JsonNode userRoleNode = securityJson1.get("authorization").get("user-role");
+        String[] predefinedRoles = {"superadmin", "admin", "search", "index"};
+        ArrayNode rolesNode = mapper.createArrayNode();
+        for (String role : predefinedRoles) {
+          rolesNode.add(role);
+        }
+        ((ObjectNode) userRoleNode).set(username, rolesNode);
+        String securityJson = securityJson1.toPrettyString();
 
         if (!updateIncludeFileOnly) {
           echoIfVerbose("Uploading following security.json: " + securityJson, cli);
diff --git a/solr/core/src/resources/security.json b/solr/core/src/resources/security.json
new file mode 100644
index 00000000000..f503f7c4e30
--- /dev/null
+++ b/solr/core/src/resources/security.json
@@ -0,0 +1,74 @@
+{
+  "authentication": {
+    "blockUnknown": false,
+    "class": "solr.BasicAuthPlugin",
+    "credentials": {
+      "search": "9ch2qWOmNSeGpfcgLRXafhm5z3KeRti5qCNLn7SmK1I= aXNjZWd4YW9mMzZ0cjE1Nw==",
+      "index": "of9xlSadImtR0MH4obzJvKSZkuE5DIJh5NOui2hWDeA= dTRuYzU4Y3F4N2hxd2sxeA==",
+      "admin": "6clS8rTEj1x1LP/uRCxOZsLdps7Sovokru09WdJX+7A= NGMyZGFhN2lrNHFsdXZybA==",
+      "superadmin": "9wzPajmLBIIi8BmToy8lxveDxfL6Vl/BX/Ss3xrs3XQ= OWZna2hwendocXFnODU5ZQ=="
+    }
+  },
+  "authorization": {
+    "class": "solr.RuleBasedAuthorizationPlugin",
+    "permissions": [{
+        "name": "security-edit",
+        "role": "superadmin"
+      },
+      {
+        "name": "security-read",
+        "role": "admin"
+      },
+      {
+        "name": "config-edit",
+        "role": "admin"
+      },
+      {
+        "name": "config-read",
+        "role": "admin"
+      },
+      {
+        "name": "collection-admin-edit",
+        "role": "admin"
+      },
+      {
+        "name": "core-admin-edit",
+        "role": "admin"
+      },
+      {
+        "name": "core-admin-read",
+        "role": "admin"
+      },
+      {
+        "name": "read",
+        "role": "search"
+      },
+      {
+        "name": "collection-admin-read",
+        "role": "search"
+      },
+      {
+        "name": "update",
+        "role": "index"
+      },
+      {
+        "name": "health",
+        "role": null
+      },
+      {
+        "name": "metrics-read",
+        "role": null
+      },
+      {
+        "name": "all",
+        "role": "admin"
+      }
+    ],
+    "user-role": {
+      "search": ["search"],
+      "index": ["index", "search"],
+      "admin": ["admin", "index", "search"],
+      "superadmin": ["superadmin", "admin", "index", "search"]
+    }
+  }
+}
diff --git a/solr/packaging/test/test_auth.bats b/solr/packaging/test/test_auth.bats
index 666fcb8ee7a..99a6480a59f 100644
--- a/solr/packaging/test/test_auth.bats
+++ b/solr/packaging/test/test_auth.bats
@@ -23,6 +23,8 @@ setup() {
   run solr auth disable
 }
 
+# Note: there are additional auth related tests in test_ssl.bats
+
 @test "auth rejects blockUnknown option with invalid boolean" {
   run ! solr auth enable -type basicAuth -credentials any:any -blockUnknown ture
   assert_output --partial "Argument [blockUnknown] must be either true or false, but was [ture]"
@@ -32,4 +34,3 @@ setup() {
   run ! solr auth enable -type basicAuth -credentials any:any -updateIncludeFileOnly ture
   assert_output --partial "Argument [updateIncludeFileOnly] must be either true or false, but was [ture]"
 }
-
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index f3aae8d6edc..9fdcbd43a59 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -138,7 +138,7 @@ teardown() {
 
   # When the Jenkins box "curl" supports --fail-with-body, add "--fail-with-body" and change "run" to "run !", to expect a failure
   run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
-  assert_output --partial '401 require authentication'
+  assert_output --partial 'Error 401 Authentication'
 }
 
 @test "start solr with client truststore and security manager" {
diff --git a/solr/solr-ref-guide/antora.template.yml b/solr/solr-ref-guide/antora.template.yml
index 8f3d62e5522..30246b6aaf1 100644
--- a/solr/solr-ref-guide/antora.template.yml
+++ b/solr/solr-ref-guide/antora.template.yml
@@ -54,4 +54,4 @@ asciidoc:
     dep-version-tika: '${dep_version_tika}'
     dep-version-zookeeper: '${dep_version_zookeeper}'
     dep-version-lucene: '${dep_version_lucene}'
-    dep-version-opentelemetry: '${dep_version_opentelemetry}'
\ No newline at end of file
+    dep-version-opentelemetry: '${dep_version_opentelemetry}'
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index 0c42b97029b..39554ab7783 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -59,9 +59,9 @@ dependencies {
 }
 
 ext {
-    antoraVersion = "3.0.1"
+    antoraVersion = "3.1.4"
     antoraLunrExtensionVersion = "1.0.0-alpha.8"
-    asciidoctorMathjaxVersion = "0.0.8"
+    asciidoctorMathjaxVersion = "0.0.9"
     linkCheckerVersion = "1.4.2"
     gulpCliVersion = "2.3.0"
     // Most recent commit as of 2022-06-24, this repo does not have tags
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
index 7d2a164ea28..54143627189 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
@@ -845,11 +845,13 @@ Base Solr URL, which can be used in SolrCloud mode to determine the ZooKeeper co
 
 == Authentication
 
-The `bin/solr` script allows enabling or disabling Basic Authentication, allowing you to configure authentication from the command line.
+The `bin/solr` script allows enabling or disabling Authentication, allowing you to configure authentication from the command line.
 
-Currently, this script only enables Basic Authentication, and is only available when using SolrCloud mode.
+Currently this command is only available when using SolrCloud mode and must be run on the machine hosting Solr.  
+
+For Basic Authentication the script provides https://github.com/apache/solr/blob/main/solr/core/resources/security.json[user roles and permission mappings], and maps the created user to the `superadmin` role.
+For Kerberos it only enables the security.json, it doesn't set up any users or role mappings.  
 
-Must be run on the machine hosting Solr.
 
 === Enabling Basic Authentication
 
@@ -860,28 +862,8 @@ For more information on Basic Authentication support specifically, see the secti
 
 The `bin/solr auth enable` command makes several changes to enable Basic Authentication:
 
-* Creates a `security.json` file and uploads it to ZooKeeper.
-The `security.json` file will look similar to:
+* Take the base https://github.com/apache/solr/blob/main/solr/core/resources/security.json[security.json] file, evolves it using `auth` command parameters, and uploads the new file to ZooKeeper.
 +
-[source,json]
-----
-{
-  "authentication":{
-   "blockUnknown": false,
-   "class":"solr.BasicAuthPlugin",
-   "credentials":{"user":"vgGVo69YJeUg/O6AcFiowWsdyOUdqfQvOLsrpIPMCzk= 7iTnaKOWe+Uj5ZfGoKKK2G6hrcF10h6xezMQK+LBvpI="}
-  },
-  "authorization":{
-   "class":"solr.RuleBasedAuthorizationPlugin",
-   "permissions":[
- {"name":"security-edit", "role":"admin"},
- {"name":"collection-admin-edit", "role":"admin"},
- {"name":"core-admin-edit", "role":"admin"}
-   ],
-   "user-role":{"user":"admin"}
-  }
-}
-----
 * Adds two lines to `bin/solr.in.sh` or `bin\solr.in.cmd` to set the authentication type, and the path to `basicAuth.conf`:
 +
 [source,subs="attributes"]
@@ -949,13 +931,14 @@ When `false`, unauthenticated users will still be able to access Solr, but only
 +
 Specify the full path to the include file in the environment.
 If not specified this script looks for an include file named solr.in.sh to set environment variables. Specifically, the following locations are searched in this order:
-    <script location>/.
-    $HOME/.solr.in.sh
-    /usr/share/solr
-    /usr/local/share/solr
-    /etc/default
-    /var/solr
-    /opt/solr
++
+* `<script location>/.`
+* `$HOME/.solr.in.sh`
+* `/usr/share/solr`
+* `/usr/local/share/solr`
+* `/etc/default`
+* `/var/solr`
+* `/opt/solr`
 
 `-updateIncludeFileOnly <true|false>`::
 +

From cf302655ef6406c158f1866b4de9f56d5ca7dde8 Mon Sep 17 00:00:00 2001
From: igiguere <igiguere@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:51:19 -0400
Subject: [PATCH 071/160] SOLR-14886 : suppress stack traces in query response
 (#1632)

Added a property "hideStackTrace" to solr.xml or system property 'solr.hideStackTrace' to not include error stack trace in the response.
---------
Co-authored-by: Christine Poerschke <cpoerschke@apache.org>
Co-authored-by: Alex Deparvu <stillalex@apache.org>
---
 solr/CHANGES.txt                              |   1 +
 .../org/apache/solr/core/CoreContainer.java   |   4 +
 .../java/org/apache/solr/core/NodeConfig.java |  15 ++
 .../org/apache/solr/core/SolrXmlConfig.java   |   3 +
 .../handler/component/QueryComponent.java     |  16 +-
 .../solr/handler/component/SearchHandler.java |   8 +-
 .../solr/jersey/CatchAllExceptionMapper.java  |   8 +-
 .../apache/solr/rest/BaseSolrResource.java    |   7 +-
 .../SearchGroupShardResponseProcessor.java    |   8 +-
 .../TopGroupsShardResponseProcessor.java      |   8 +-
 .../org/apache/solr/servlet/HttpSolrCall.java |  14 +-
 .../apache/solr/servlet/ResponseUtils.java    |  62 ++++++-
 solr/core/src/test-files/solr/solr-50-all.xml |   1 +
 solr/core/src/test-files/solr/solr.xml        |   1 +
 .../org/apache/solr/core/TestSolrXml.java     |   1 +
 .../solr/servlet/HideStackTraceTest.java      | 175 ++++++++++++++++++
 solr/server/solr/solr.xml                     |   1 +
 .../pages/configuring-solr-xml.adoc           |  10 +
 18 files changed, 317 insertions(+), 26 deletions(-)
 create mode 100644 solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 41c21f7f90b..aed23219f66 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -123,6 +123,7 @@ Improvements
 
 * SOLR-16970: SOLR_OPTS is now able to override options set by the Solr control scripts, "bin/solr" and "bin/solr.cmd". (Houston Putman)
 
+* SOLR-14886: Suppress stack traces in query response (Isabelle Giguere via Alex Deparvu)
 
 Optimizations
 ---------------------
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 0bc9ad59d27..b35cbbef058 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -2443,6 +2443,10 @@ public long getStatus() {
     return status;
   }
 
+  public boolean hideStackTrace() {
+    return cfg.hideStackTraces();
+  }
+
   /**
    * Retrieve the aliases from zookeeper. This is typically cached and does not hit zookeeper after
    * the first use.
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
index 581a2d07c0a..9177889f447 100644
--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
@@ -67,6 +67,8 @@ public class NodeConfig {
 
   private final List<String> allowUrls;
 
+  private final boolean hideStackTraces;
+
   private final String sharedLibDirectory;
 
   private final String modules;
@@ -153,6 +155,7 @@ private NodeConfig(
       String defaultZkHost,
       Set<Path> allowPaths,
       List<String> allowUrls,
+      boolean hideStackTraces,
       String configSetServiceClass,
       String modules,
       Set<String> hiddenSysProps) {
@@ -189,6 +192,7 @@ private NodeConfig(
     this.defaultZkHost = defaultZkHost;
     this.allowPaths = allowPaths;
     this.allowUrls = allowUrls;
+    this.hideStackTraces = hideStackTraces;
     this.configSetServiceClass = configSetServiceClass;
     this.modules = modules;
     this.hiddenSysProps = hiddenSysProps;
@@ -452,6 +456,10 @@ public List<String> getAllowUrls() {
     return allowUrls;
   }
 
+  public boolean hideStackTraces() {
+    return hideStackTraces;
+  }
+
   // Configures SOLR_HOME/lib to the shared class loader
   private void setupSharedLib() {
     // Always add $SOLR_HOME/lib to the shared resource loader
@@ -615,6 +623,7 @@ public static class NodeConfigBuilder {
     private String defaultZkHost;
     private Set<Path> allowPaths = Collections.emptySet();
     private List<String> allowUrls = Collections.emptyList();
+    private boolean hideStackTrace = Boolean.getBoolean("solr.hideStackTrace");
 
     private final Path solrHome;
     private final String nodeName;
@@ -809,6 +818,11 @@ public NodeConfigBuilder setAllowUrls(List<String> urls) {
       return this;
     }
 
+    public NodeConfigBuilder setHideStackTrace(boolean hide) {
+      this.hideStackTrace = hide;
+      return this;
+    }
+
     public NodeConfigBuilder setConfigSetServiceClass(String configSetServiceClass) {
       this.configSetServiceClass = configSetServiceClass;
       return this;
@@ -902,6 +916,7 @@ public NodeConfig build() {
           defaultZkHost,
           allowPaths,
           allowUrls,
+          hideStackTrace,
           configSetServiceClass,
           modules,
           resolveHiddenSysPropsFromSysPropOrEnvOrDefault(hiddenSysProps));
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index 85fbaeeb193..df0645c8f69 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -372,6 +372,9 @@ private static NodeConfig fillSolrSection(NodeConfig.NodeConfigBuilder builder,
               case "allowPaths":
                 builder.setAllowPaths(separatePaths(it.txt()));
                 break;
+              case "hideStackTrace":
+                builder.setHideStackTrace(it.boolVal(false));
+                break;
               case "configSetBaseDir":
                 builder.setConfigSetBaseDirectory(it.txt());
                 break;
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 5efde4786ce..a2b46a30d46 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -906,9 +906,11 @@ protected void mergeIds(ResponseBuilder rb, ShardRequest sreq) {
             t = ((SolrServerException) t).getCause();
           }
           nl.add("error", t.toString());
-          StringWriter trace = new StringWriter();
-          t.printStackTrace(new PrintWriter(trace));
-          nl.add("trace", trace.toString());
+          if (!rb.req.getCore().getCoreContainer().hideStackTrace()) {
+            StringWriter trace = new StringWriter();
+            t.printStackTrace(new PrintWriter(trace));
+            nl.add("trace", trace.toString());
+          }
           if (srsp.getShardAddress() != null) {
             nl.add("shardAddress", srsp.getShardAddress());
           }
@@ -1297,9 +1299,11 @@ protected void returnFields(ResponseBuilder rb, ShardRequest sreq) {
                 t = ((SolrServerException) t).getCause();
               }
               nl.add("error", t.toString());
-              StringWriter trace = new StringWriter();
-              t.printStackTrace(new PrintWriter(trace));
-              nl.add("trace", trace.toString());
+              if (!rb.req.getCore().getCoreContainer().hideStackTrace()) {
+                StringWriter trace = new StringWriter();
+                t.printStackTrace(new PrintWriter(trace));
+                nl.add("trace", trace.toString());
+              }
             }
           }
 
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 10f99ac49f8..be35ad99a1d 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -601,9 +601,11 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
           }
         }
         nl.add("error", cause.toString());
-        StringWriter trace = new StringWriter();
-        cause.printStackTrace(new PrintWriter(trace));
-        nl.add("trace", trace.toString());
+        if (!core.getCoreContainer().hideStackTrace()) {
+          StringWriter trace = new StringWriter();
+          cause.printStackTrace(new PrintWriter(trace));
+          nl.add("trace", trace.toString());
+        }
       } else if (rb.getResults() != null) {
         nl.add("numFound", rb.getResults().docList.matches());
         nl.add(
diff --git a/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java b/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java
index d3886ae8727..12e3b5ef017 100644
--- a/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java
+++ b/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java
@@ -108,8 +108,12 @@ public static Response buildExceptionResponse(
         containerRequestContext.getProperty(SOLR_JERSEY_RESPONSE) == null
             ? new SolrJerseyResponse()
             : (SolrJerseyResponse) containerRequestContext.getProperty(SOLR_JERSEY_RESPONSE);
-
-    response.error = ResponseUtils.getTypedErrorInfo(normalizedException, log);
+    response.error =
+        ResponseUtils.getTypedErrorInfo(
+            normalizedException,
+            log,
+            solrQueryRequest.getCore() != null
+                && solrQueryRequest.getCore().getCoreContainer().hideStackTrace());
     response.responseHeader.status = response.error.code;
     final String mediaType =
         V2ApiUtils.getMediaTypeFromWtParam(solrQueryRequest, MediaType.APPLICATION_JSON);
diff --git a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
index 2e63d5cab2e..cbfa72993b7 100644
--- a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
+++ b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
@@ -143,7 +143,12 @@ protected void handleException(Logger log) {
     Exception exception = getSolrResponse().getException();
     if (null != exception) {
       NamedList<Object> info = new SimpleOrderedMap<>();
-      this.statusCode = ResponseUtils.getErrorInfo(exception, info, log);
+      this.statusCode =
+          ResponseUtils.getErrorInfo(
+              exception,
+              info,
+              log,
+              solrCore != null && solrCore.getCoreContainer().hideStackTrace());
       getSolrResponse().add("error", info);
       String message = (String) info.get("msg");
       if (null != message && !message.trim().isEmpty()) {
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
index a748f917977..a88817de8ff 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
@@ -89,9 +89,11 @@ public void process(ResponseBuilder rb, ShardRequest shardRequest) {
             t = t.getCause();
           }
           nl.add("error", t.toString());
-          StringWriter trace = new StringWriter();
-          t.printStackTrace(new PrintWriter(trace));
-          nl.add("trace", trace.toString());
+          if (!rb.req.getCore().getCoreContainer().hideStackTrace()) {
+            StringWriter trace = new StringWriter();
+            t.printStackTrace(new PrintWriter(trace));
+            nl.add("trace", trace.toString());
+          }
         } else {
           nl.add("numFound", response.get("totalHitCount"));
         }
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index 39060f60782..4c7b46c7e77 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -101,9 +101,11 @@ public void process(ResponseBuilder rb, ShardRequest shardRequest) {
             t = ((SolrServerException) t).getCause();
           }
           individualShardInfo.add("error", t.toString());
-          StringWriter trace = new StringWriter();
-          t.printStackTrace(new PrintWriter(trace));
-          individualShardInfo.add("trace", trace.toString());
+          if (!rb.req.getCore().getCoreContainer().hideStackTrace()) {
+            StringWriter trace = new StringWriter();
+            t.printStackTrace(new PrintWriter(trace));
+            individualShardInfo.add("trace", trace.toString());
+          }
         } else {
           // summary for successful shard response is added down below
         }
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index f1e5a25693c..9137f3ded4e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -837,7 +837,12 @@ protected void sendError(Throwable ex) throws IOException {
       try {
         if (exp != null) {
           SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
-          int code = ResponseUtils.getErrorInfo(ex, info, log);
+          int code =
+              ResponseUtils.getErrorInfo(
+                  ex,
+                  info,
+                  log,
+                  localCore != null && localCore.getCoreContainer().hideStackTrace());
           sendError(code, info.toString());
         }
       } finally {
@@ -971,7 +976,12 @@ protected void writeResponse(
 
       if (solrRsp.getException() != null) {
         NamedList<Object> info = new SimpleOrderedMap<>();
-        int code = ResponseUtils.getErrorInfo(solrRsp.getException(), info, log);
+        int code =
+            ResponseUtils.getErrorInfo(
+                solrRsp.getException(),
+                info,
+                log,
+                core != null && core.getCoreContainer().hideStackTrace());
         solrRsp.add("error", info);
         response.setStatus(code);
       }
diff --git a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
index 337243e25e6..1f7427f669f 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
@@ -28,6 +28,10 @@
 public class ResponseUtils {
   private ResponseUtils() {}
 
+  // System property to use if the Solr core does not exist or solr.hideStackTrace is not
+  // configured. (i.e.: a lot of unit test).
+  private static final boolean SYSTEM_HIDE_STACK_TRACES = Boolean.getBoolean("solr.hideStackTrace");
+
   /**
    * Adds the given Throwable's message to the given NamedList.
    *
@@ -42,6 +46,27 @@ private ResponseUtils() {}
    * @see #getTypedErrorInfo(Throwable, Logger)
    */
   public static int getErrorInfo(Throwable ex, NamedList<Object> info, Logger log) {
+    return getErrorInfo(ex, info, log, false);
+  }
+
+  /**
+   * Adds the given Throwable's message to the given NamedList.
+   *
+   * <p>Primarily used by v1 code; v2 endpoints or dispatch code should call {@link
+   * #getTypedErrorInfo(Throwable, Logger)}
+   *
+   * <p>If the response code is not a regular code, the Throwable's stack trace is both logged and
+   * added to the given NamedList.
+   *
+   * <p>Status codes less than 100 are adjusted to be 500.
+   *
+   * <p>Stack trace will not be output if hideTrace=true OR system property
+   * solr.hideStackTrace=true.
+   *
+   * @see #getTypedErrorInfo(Throwable, Logger)
+   */
+  public static int getErrorInfo(
+      Throwable ex, NamedList<Object> info, Logger log, boolean hideTrace) {
     int code = 500;
     if (ex instanceof SolrException) {
       SolrException solrExc = (SolrException) ex;
@@ -70,10 +95,13 @@ public static int getErrorInfo(Throwable ex, NamedList<Object> info, Logger log)
 
     // For any regular code, don't include the stack trace
     if (code == 500 || code < 100) {
-      StringWriter sw = new StringWriter();
-      ex.printStackTrace(new PrintWriter(sw));
+      // hide all stack traces, as configured
+      if (!hideStackTrace(hideTrace)) {
+        StringWriter sw = new StringWriter();
+        ex.printStackTrace(new PrintWriter(sw));
+        info.add("trace", sw.toString());
+      }
       log.error("500 Exception", ex);
-      info.add("trace", sw.toString());
 
       // non standard codes have undefined results with various servers
       if (code < 100) {
@@ -96,6 +124,22 @@ public static int getErrorInfo(Throwable ex, NamedList<Object> info, Logger log)
    * @see #getErrorInfo(Throwable, NamedList, Logger)
    */
   public static ErrorInfo getTypedErrorInfo(Throwable ex, Logger log) {
+    return getTypedErrorInfo(ex, log, false);
+  }
+
+  /**
+   * Adds information about the given Throwable to a returned {@link ErrorInfo}
+   *
+   * <p>Primarily used by v2 API code, which can handle such typed information.
+   *
+   * <p>Status codes less than 100 are adjusted to be 500.
+   *
+   * <p>Stack trace will not be output if hideTrace=true OR system property
+   * solr.hideStackTrace=true.
+   *
+   * @see #getErrorInfo(Throwable, NamedList, Logger)
+   */
+  public static ErrorInfo getTypedErrorInfo(Throwable ex, Logger log, boolean hideTrace) {
     final ErrorInfo errorInfo = new ErrorInfo();
     int code = 500;
     if (ex instanceof SolrException) {
@@ -120,10 +164,12 @@ public static ErrorInfo getTypedErrorInfo(Throwable ex, Logger log) {
 
     // For any regular code, don't include the stack trace
     if (code == 500 || code < 100) {
-      StringWriter sw = new StringWriter();
-      ex.printStackTrace(new PrintWriter(sw));
+      if (!hideStackTrace(hideTrace)) {
+        StringWriter sw = new StringWriter();
+        ex.printStackTrace(new PrintWriter(sw));
+        errorInfo.trace = sw.toString();
+      }
       log.error("500 Exception", ex);
-      errorInfo.trace = sw.toString();
 
       // non standard codes have undefined results with various servers
       if (code < 100) {
@@ -135,4 +181,8 @@ public static ErrorInfo getTypedErrorInfo(Throwable ex, Logger log) {
     errorInfo.code = code;
     return errorInfo;
   }
+
+  private static boolean hideStackTrace(final boolean hideTrace) {
+    return hideTrace || SYSTEM_HIDE_STACK_TRACES;
+  }
 }
diff --git a/solr/core/src/test-files/solr/solr-50-all.xml b/solr/core/src/test-files/solr/solr-50-all.xml
index 6803d2be0db..4680027ecd9 100644
--- a/solr/core/src/test-files/solr/solr-50-all.xml
+++ b/solr/core/src/test-files/solr/solr-50-all.xml
@@ -29,6 +29,7 @@
   <int name="transientCacheSize">66</int>
   <int name="replayUpdatesThreads">100</int>
   <int name="maxBooleanClauses">42</int>
+  <bool name="hideStackTrace">true</bool>
 
   <coreAdminHandlerActions>
     <str name="action1">testCoreAdminHandlerAction1</str>
diff --git a/solr/core/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xml
index c7c6b44a362..b2606a44c6d 100644
--- a/solr/core/src/test-files/solr/solr.xml
+++ b/solr/core/src/test-files/solr/solr.xml
@@ -28,6 +28,7 @@
   <str name="coreRootDirectory">${coreRootDirectory:.}</str>
   <str name="allowPaths">${solr.allowPaths:}</str>
   <str name="allowUrls">${solr.tests.allowUrls:}</str>
+  <bool name="hideStackTrace">${solr.hideStackTrace:true}</bool>
 
   <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
     <str name="urlScheme">${urlScheme:}</str>
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index 51ac2bb0e65..3445db478e4 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -135,6 +135,7 @@ public void testAllInfoPresent() throws IOException {
                     : Set.of("/tmp", "/home/john").stream()
                         .map(s -> Path.of(s))
                         .collect(Collectors.toSet())));
+    assertTrue("hideStackTrace", cfg.hideStackTraces());
     System.clearProperty("solr.allowPaths");
   }
 
diff --git a/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java
new file mode 100644
index 00000000000..dc6af6f2716
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java
@@ -0,0 +1,175 @@
+/*
+ * 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.servlet;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.util.EntityUtils;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.handler.component.ResponseBuilder;
+import org.apache.solr.handler.component.SearchComponent;
+import org.apache.solr.util.SolrJettyTestRule;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+/** SOLR-14886 : Suppress stack trace in Query response */
+@SuppressSSL
+public class HideStackTraceTest extends SolrTestCaseJ4 {
+
+  @ClassRule public static final SolrJettyTestRule solrRule = new SolrJettyTestRule();
+
+  @BeforeClass
+  public static void setupSolrHome() throws Exception {
+
+    System.setProperty("solr.hideStackTrace", "true");
+
+    Path configSet = createTempDir("configSet");
+    copyMinConf(configSet.toFile());
+    // insert a special filterCache configuration
+    Path solrConfig = configSet.resolve("conf/solrconfig.xml");
+    Files.writeString(
+        solrConfig,
+        Files.readString(solrConfig)
+            .replace(
+                "</config>",
+                "  <searchComponent name=\"errorComponent\" class=\"org.apache.solr.servlet.HideStackTraceTest$ErrorComponent\"/>\n"
+                    + "  <requestHandler name=\"/withError\" class=\"solr.SearchHandler\">\n"
+                    + "    <arr name=\"first-components\">\n"
+                    + "      <str>errorComponent</str>\n"
+                    + "    </arr>\n"
+                    + "  </requestHandler>\n"
+                    + "</config>"));
+
+    solrRule.startSolr(LuceneTestCase.createTempDir());
+    solrRule.newCollection().withConfigSet(configSet.toString()).create();
+  }
+
+  @AfterClass
+  public static void cleanup() throws Exception {
+    System.clearProperty("solr.hideStackTrace");
+  }
+
+  @Test
+  public void testHideStackTrace() throws Exception {
+    // Normal stack:
+    // {
+    // "responseHeader":{
+    // "status":500,
+    // "QTime":10
+    // },
+    // "error":{
+    // "msg":"Stack trace should not be populated.",
+    // "trace":"java.lang.RuntimeException: Stack trace should not be populated.\n\tat
+    // org.apache.solr.servlet.HideStackTraceTest$ErrorComponent.process(HideStackTraceTest.java:130)\n\tat
+    // org.apache.solr.handler.component.SearchHandler.handleRequestBody(SearchHandler.java:442)\n\tat
+    // org.apache.solr.handler.RequestHandlerBase.handleRequest(RequestHandlerBase.java:224)\n\tat
+    // org.apache.solr.core.SolrCore.execute(SolrCore.java:2890)\n\tat
+    // org.apache.solr.servlet.HttpSolrCall.executeCoreRequest(HttpSolrCall.java:870)\n\tat
+    // org.apache.solr.servlet.HttpSolrCall.call(HttpSolrCall.java:559)\n\tat
+    // org.apache.solr.servlet.SolrDispatchFilter.dispatch(SolrDispatchFilter.java:254)\n\tat
+    // org.apache.solr.servlet.SolrDispatchFilter.lambda$0(SolrDispatchFilter.java:215)\n\tat
+    // org.apache.solr.servlet.ServletUtils.traceHttpRequestExecution2(ServletUtils.java:241)\n\tat
+    // org.apache.solr.servlet.ServletUtils.rateLimitRequest(ServletUtils.java:211)\n\tat
+    // org.apache.solr.servlet.SolrDispatchFilter.doFilter(SolrDispatchFilter.java:209)\n\tat
+    // org.apache.solr.servlet.SolrDispatchFilter.doFilter(SolrDispatchFilter.java:192)\n\tat
+    // org.eclipse.jetty.servlet.FilterHolder.doFilter(FilterHolder.java:202)\n\tat
+    // org.eclipse.jetty.servlet.ServletHandler$Chain.doFilter(ServletHandler.java:1635)\n\tat
+    // org.apache.solr.embedded.JettySolrRunner$DebugFilter.doFilter(JettySolrRunner.java:187)\n\tat
+    // org.eclipse.jetty.servlet.FilterHolder.doFilter(FilterHolder.java:202)\n\tat
+    // org.eclipse.jetty.servlet.ServletHandler$Chain.doFilter(ServletHandler.java:1635)\n\tat
+    // org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:527)\n\tat
+    // org.eclipse.jetty.server.handler.ScopedHandler.nextHandle(ScopedHandler.java:221)\n\tat
+    // org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:1570)\n\tat
+    // org.eclipse.jetty.server.handler.ScopedHandler.nextHandle(ScopedHandler.java:221)\n\tat
+    // org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1384)\n\tat
+    // org.eclipse.jetty.server.handler.ScopedHandler.nextScope(ScopedHandler.java:176)\n\tat
+    // org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:484)\n\tat
+    // org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:1543)\n\tat
+    // org.eclipse.jetty.server.handler.ScopedHandler.nextScope(ScopedHandler.java:174)\n\tat
+    // org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1306)\n\tat
+    // org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:129)\n\tat
+    // org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:122)\n\tat
+    // org.eclipse.jetty.rewrite.handler.RewriteHandler.handle(RewriteHandler.java:301)\n\tat
+    // org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:122)\n\tat
+    // org.eclipse.jetty.server.handler.gzip.GzipHandler.handle(GzipHandler.java:822)\n\tat
+    // org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:122)\n\tat
+    // org.eclipse.jetty.server.Server.handle(Server.java:563)\n\tat
+    // org.eclipse.jetty.server.HttpChannel.lambda$handle$0(HttpChannel.java:505)\n\tat
+    // org.eclipse.jetty.server.HttpChannel.dispatch(HttpChannel.java:762)\n\tat
+    // org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:497)\n\tat
+    // org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:282)\n\tat
+    // org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:314)\n\tat
+    // org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:100)\n\tat
+    // org.eclipse.jetty.io.SelectableChannelEndPoint$1.run(SelectableChannelEndPoint.java:53)\n\tat
+    // org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:969)\n\tat
+    // org.eclipse.jetty.util.thread.QueuedThreadPool$Runner.doRunJob(QueuedThreadPool.java:1194)\n\tat
+    // org.eclipse.jetty.util.thread.QueuedThreadPool$Runner.run(QueuedThreadPool.java:1149)\n\tat
+    // java.base/java.lang.Thread.run(Thread.java:833)\n",
+    // "code":500
+    // }
+    // }
+
+    // Supressed stack:
+    // {
+    // "responseHeader":{
+    // "status":500,
+    // "QTime":9
+    // },
+    // "error":{
+    // "msg":"Stack trace should not be populated.",
+    // "code":500
+    // }
+    // }
+
+    final String url = solrRule.getBaseUrl().toString() + "/collection1/withError?q=*:*&wt=json";
+    final HttpGet get = new HttpGet(url);
+    try (var client = HttpClientUtil.createClient(null);
+        CloseableHttpResponse response = client.execute(get)) {
+      assertEquals(500, response.getStatusLine().getStatusCode());
+      String responseJson = EntityUtils.toString(response.getEntity());
+      assertFalse(responseJson.contains("\"trace\""));
+      assertFalse(
+          responseJson.contains("org.apache.solr.servlet.HideStackTraceTest$ErrorComponent"));
+    }
+  }
+
+  public static class ErrorComponent extends SearchComponent {
+
+    @Override
+    public void prepare(ResponseBuilder rb) throws IOException {
+      // prepared
+    }
+
+    @Override
+    public void process(ResponseBuilder rb) throws IOException {
+      throw new RuntimeException("Stack trace should not be populated.");
+    }
+
+    @Override
+    public String getDescription() {
+      return null;
+    }
+  }
+}
diff --git a/solr/server/solr/solr.xml b/solr/server/solr/solr.xml
index d309f18cb40..bf364331214 100644
--- a/solr/server/solr/solr.xml
+++ b/solr/server/solr/solr.xml
@@ -33,6 +33,7 @@
   <str name="modules">${solr.modules:}</str>
   <str name="allowPaths">${solr.allowPaths:}</str>
   <str name="allowUrls">${solr.allowUrls:}</str>
+  <str name="hideStackTrace">${solr.hideStackTrace:false}</str>
 
   <solrcloud>
 
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
index 66fa7f8dc76..09dc697ed49 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
@@ -39,6 +39,7 @@ The default `solr.xml` file is found in `$SOLR_TIP/server/solr/solr.xml` and loo
   <str name="modules">${solr.modules:}</str>
   <str name="allowPaths">${solr.allowPaths:}</str>
   <str name="allowUrls">${solr.allowUrls:}</str>
+  <str name="hideStackTrace">${solr.hideStackTrace:false}</str>
 
   <solrcloud>
 
@@ -254,6 +255,15 @@ In SolrCloud mode, the allow-list is automatically configured to include all liv
 The allow-list can also be configured with the `solr.allowUrls` system property in `solr.in.sh` / `solr.in.cmd`.
 If you need to disable this feature for backwards compatibility, you can set the system property `solr.disable.allowUrls=true`.
 
+`hideStackTrace`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: none
+|===
++
+When this attribute is set to `true`, Solr will not return any stack traces in the HTTP response in case of errors.  By default (`false`), stack traces are hidden only for predictable Solr exceptions, but are returned in the response for unexpected exceptions (i.e.: HTTP 500)
+
 `shareSchema`::
 +
 [%autowidth,frame=none]

From 4989aadf2794d688879353fd8219a69190ad1049 Mon Sep 17 00:00:00 2001
From: Vincent P <vincent.primault@gmail.com>
Date: Tue, 12 Sep 2023 23:23:21 +0200
Subject: [PATCH 072/160] SOLR-16899: Do not statically register ops in
 CoreAdminHandler (#1892)

Co-authored-by: Vincent Primault <vprimault@salesforce.com>
Co-authored-by: Alex Deparvu <stillalex@apache.org>
---
 solr/CHANGES.txt                               |  2 ++
 .../solr/handler/admin/CoreAdminHandler.java   | 18 +++++++++++-------
 .../admin/CoreAdminHandlerActionTest.java      |  3 +--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index aed23219f66..86eeec69ea1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -174,6 +174,8 @@ Bug Fixes
 * SOLR-16415: asyncId must not have '/'; enforce this.  Enhance ZK cleanup to process directories
   instead of fail.  (David Smiley, Paul McArthur)
 
+* SOLR-16899: CoreAdminOp are statically registered in CoreAdminHandler, preventing more than one Solr instance in the same JVM (Vincent Primault via Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index f9819dcaf80..8ee1bf3254a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -95,6 +95,7 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   protected final CoreContainer coreContainer;
   protected final CoreAdminAsyncTracker coreAdminAsyncTracker;
+  protected final Map<String, CoreAdminOp> opMap;
 
   public static String RESPONSE_STATUS = "STATUS";
 
@@ -107,6 +108,7 @@ public CoreAdminHandler() {
     // should happen in the constructor...
     this.coreContainer = null;
     this.coreAdminAsyncTracker = new CoreAdminAsyncTracker();
+    this.opMap = initializeOpMap();
   }
 
   /**
@@ -117,6 +119,7 @@ public CoreAdminHandler() {
   public CoreAdminHandler(final CoreContainer coreContainer) {
     this.coreContainer = coreContainer;
     this.coreAdminAsyncTracker = new CoreAdminAsyncTracker();
+    this.opMap = initializeOpMap();
   }
 
   @Override
@@ -275,6 +278,14 @@ protected void handleCustomAction(SolrQueryRequest req, SolrQueryResponse rsp) {
           Map.entry(ZkStateReader.NUM_SHARDS_PROP, CloudDescriptor.NUM_SHARDS),
           Map.entry(CoreAdminParams.REPLICA_TYPE, CloudDescriptor.REPLICA_TYPE));
 
+  private static Map<String, CoreAdminOp> initializeOpMap() {
+    Map<String, CoreAdminOp> opMap = new HashMap<>();
+    for (CoreAdminOperation op : CoreAdminOperation.values()) {
+      opMap.put(op.action.toString().toLowerCase(Locale.ROOT), op);
+    }
+    return opMap;
+  }
+
   protected static Map<String, String> buildCoreParams(SolrParams params) {
 
     Map<String, String> coreParams = new HashMap<>();
@@ -345,8 +356,6 @@ public void shutdown() {
     coreAdminAsyncTracker.shutdown();
   }
 
-  private static final Map<String, CoreAdminOp> opMap = new HashMap<>();
-
   public static class CallInfo {
     public final CoreAdminHandler handler;
     public final SolrQueryRequest req;
@@ -397,11 +406,6 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         CoreSnapshotAPI.class, InstallCoreDataAPI.class, BackupCoreAPI.class, RestoreCoreAPI.class);
   }
 
-  static {
-    for (CoreAdminOperation op : CoreAdminOperation.values())
-      opMap.put(op.action.toString().toLowerCase(Locale.ROOT), op);
-  }
-
   public interface CoreAdminOp {
 
     default boolean isExpensive() {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerActionTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerActionTest.java
index 58ca65a795b..235db7af21e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerActionTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerActionTest.java
@@ -47,8 +47,7 @@ public class CoreAdminHandlerActionTest extends SolrTestCaseJ4 {
   public static void beforeClass() throws Exception {
 
     setupNoCoreTest(createTempDir(), SOLR_XML);
-
-    admin = new CoreAdminHandler(h.getCoreContainer());
+    admin = h.getCoreContainer().getMultiCoreHandler();
   }
 
   @Test

From 04e92d7734f7304fbcb66a2b34099942223d8719 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Tue, 12 Sep 2023 15:13:34 -0700
Subject: [PATCH 073/160] SOLR-15367 Convert "rid" functionality into a default
 Tracer (#1898)

---
 solr/CHANGES.txt                              |  4 +--
 .../solr/handler/component/SearchHandler.java | 32 +++++++++++++++++--
 .../solr/logging/MDCLoggingContext.java       |  4 +++
 .../solr/util/tracing/SimplePropagator.java   |  4 +--
 .../pages/distributed-tracing.adoc            |  9 ++++++
 .../pages/major-changes-in-solr-9.adoc        |  5 +++
 .../solr/common/params/CommonParams.java      |  4 +++
 7 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 86eeec69ea1..d9b09f16e59 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -19,8 +19,6 @@ Improvements
 
 * SOLR-16536: Replace OpenTracing instrumentation with OpenTelemetry (Alex Deparvu, janhoy)
 
-* SOLR-15367: Convert "rid" functionality into a default Tracer (Alex Deparvu, David Smiley)
-
 Optimizations
 ---------------------
 (No changes)
@@ -76,6 +74,8 @@ New Features
 
 * SOLR-15771: bin/auth creates reasonable roles and permissions for security: 'search', 'index', 'admin', and 'superadmin' and assigns user superadmin role. (Eric Pugh, janhoy)
 
+* SOLR-15367: Convert "rid" functionality into a default Tracer (Alex Deparvu, David Smiley)
+
 Improvements
 ---------------------
 * SOLR-16490: `/admin/cores?action=backupcore` now has a v2 equivalent, available at
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index be35ad99a1d..995e6a3c684 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -52,6 +52,7 @@
 import org.apache.solr.core.PluginInfo;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.logging.MDCLoggingContext;
 import org.apache.solr.metrics.MetricsMap;
 import org.apache.solr.metrics.SolrMetricsContext;
 import org.apache.solr.pkg.PackageAPI;
@@ -86,9 +87,27 @@ public class SearchHandler extends RequestHandlerBase
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  /** A counter to ensure that no RID is equal, even if they fall in the same millisecond */
+  /**
+   * A counter to ensure that no RID is equal, even if they fall in the same millisecond
+   *
+   * @deprecated this was replaced by the auto-generated trace ids
+   */
+  @Deprecated(since = "9.4")
   private static final AtomicLong ridCounter = new AtomicLong();
 
+  /**
+   * An opt-out flag to prevent the addition of {@link CommonParams#REQUEST_ID} tracing on
+   * distributed queries
+   *
+   * <p>Defaults to 'false' if not specified.
+   *
+   * @see CommonParams#DISABLE_REQUEST_ID
+   * @deprecated this was replaced by the auto-generated trace ids
+   */
+  @Deprecated(since = "9.4")
+  private static final boolean DISABLE_REQUEST_ID_DEFAULT =
+      Boolean.getBoolean("solr.disableRequestId");
+
   private HandlerMetrics metricsShard = HandlerMetrics.NO_OP;
   private final Map<String, Counter> shardPurposes = new ConcurrentHashMap<>();
 
@@ -626,7 +645,7 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
 
   private void tagRequestWithRequestId(ResponseBuilder rb) {
     final boolean ridTaggingDisabled =
-        rb.req.getParams().getBool(CommonParams.DISABLE_REQUEST_ID, false);
+        rb.req.getParams().getBool(CommonParams.DISABLE_REQUEST_ID, DISABLE_REQUEST_ID_DEFAULT);
     if (!ridTaggingDisabled) {
       String rid = getOrGenerateRequestId(rb.req);
 
@@ -665,7 +684,14 @@ private void tagRequestWithRequestId(ResponseBuilder rb) {
    */
   public static String getOrGenerateRequestId(SolrQueryRequest req) {
     String rid = req.getParams().get(CommonParams.REQUEST_ID);
-    return StrUtils.isNotBlank(rid) ? rid : generateRid(req);
+    if (StrUtils.isNotBlank(rid)) {
+      return rid;
+    }
+    String traceId = MDCLoggingContext.getTraceId();
+    if (StrUtils.isNotBlank(traceId)) {
+      return traceId;
+    }
+    return generateRid(req);
   }
 
   private static String generateRid(SolrQueryRequest req) {
diff --git a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
index bebebf00945..28f4ee0e7b8 100644
--- a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
+++ b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
@@ -58,6 +58,10 @@ public static void setTracerId(String traceId) {
     }
   }
 
+  public static String getTraceId() {
+    return MDC.get(TRACE_ID);
+  }
+
   public static void setShard(String shard) {
     if (shard != null) {
       MDC.put(SHARD_ID_PROP, shard);
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
index 01a72e0a1ff..aa029899347 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
@@ -45,11 +45,11 @@ public class SimplePropagator implements TextMapPropagator {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String TRACE_HOST_NAME =
-      System.getProperty("trace_host_name", System.getProperty("host"));
+      System.getProperty("solr.traceHostName", System.getProperty("host"));
   private static final TextMapPropagator INSTANCE = new SimplePropagator();
   private static final ContextKey<String> TRACE_ID_KEY = ContextKey.named("trace_id");
 
-  static final String TRACE_ID = System.getProperty("TRACE_ID", "X-Trace-Id");
+  static final String TRACE_ID = System.getProperty("solr.traceIdHeader", "X-Trace-Id");
   private static final List<String> FIELDS = List.of(TRACE_ID);
 
   private static final AtomicLong traceCounter = new AtomicLong(0);
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
index e51d7fbed15..18cac7c8695 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
@@ -25,6 +25,15 @@ A sampled distributed tracing query request displayed in Jaeger UI looks like th
 .Tracing of a Solr query
 image::distributed-tracing/query-request-tracing.png[]
 
+== Always-on Trace Id generation
+
+Solr includes an always-on trace id generator. This will inject trace id headers for every Solr request, propagating the client supplied value or generating a new id as needed and replaces the existing `rid` mechanism.
+
+The header name it uses for propagation is `X-Trace-Id`, this can be changed by updating the system property `solr.traceIdHeader`.
+
+This plugin will not be enabled if another Tracing mechanism is setup via Solr config.
+This plugin can be disabled by setting the `solr.alwaysOnTraceId` system property to `false`.
+
 == Modules and Configuration
 
 The `TracerConfigurator` is a class used to provide an instance of `io.opentracing.Tracer` based on configuration in `solr.xml`.
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 002f6cd3e23..cfe1d8b9b7f 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -85,6 +85,11 @@ see the  xref:deployment-guide:securing-solr.adoc#network-configuration[Network
 This will enable client and server hostName check settings to be governed by the same environment variable.
 If users want separate client/server settings, they can manually override the `solr.jetty.ssl.sniHostCheck` option in `SOLR_OPTS`.
 
+=== Deprecations
+* The `rid` request id query parameter has been deprecated in favor of the always-on trace generation.
+To disable the `rid` generation set the system property `solr.disableRequestId` to `true`.
+To disable the always-on trace generation set the system property `solr.alwaysOnTraceId` to `false`.
+
 == Solr 9.3
 === Binary Releases
 * Solr now comes with two xref:deployment-guide:installing-solr.adoc#available-solr-packages[binary releases] and xref:deployment-guide:solr-in-docker.adoc#available-images[docker images], **full** and **slim**.
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
index 740be2e128f..e6408744846 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
@@ -268,7 +268,9 @@ public static EchoParamStyle get(String v) {
    * Request ID parameter added to all distributed queries (that do not opt out)
    *
    * @see #DISABLE_REQUEST_ID
+   * @deprecated this was replaced by the auto-generated trace ids
    */
+  @Deprecated(since = "9.4")
   String REQUEST_ID = "rid";
 
   /**
@@ -277,7 +279,9 @@ public static EchoParamStyle get(String v) {
    * <p>Defaults to 'false' if not specified.
    *
    * @see #REQUEST_ID
+   * @deprecated this was replaced by the auto-generated trace ids
    */
+  @Deprecated(since = "9.4")
   String DISABLE_REQUEST_ID = "disableRequestId";
 
   /** Request Purpose parameter added to each internal shard request when using debug=track */

From 107958984333c9650a6124a9751a1ba725baf387 Mon Sep 17 00:00:00 2001
From: Sanjay Dutt <sanjaydutt.unofficial@gmail.com>
Date: Wed, 13 Sep 2023 07:38:23 +0530
Subject: [PATCH 074/160] [SOLR-16461] Create v2 equivalent of v1
 ReplicationHandler 'BACKUP' (#1119)

---
 solr/CHANGES.txt                              |   3 +
 .../org/apache/solr/api/JerseyResource.java   |   7 +
 .../solr/handler/ReplicationHandler.java      | 142 ++++++++-----
 .../handler/admin/api/SnapshotBackupAPI.java  | 194 ++++++++++++++++++
 .../apache/solr/jersey/APIConfigProvider.java |   6 +-
 .../solr/jersey/APIConfigProviderBinder.java  |   5 +-
 .../admin/api/SnapshotBackupAPITest.java      | 148 +++++++++++++
 7 files changed, 452 insertions(+), 53 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java
 create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d9b09f16e59..c608bf4f314 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -125,6 +125,9 @@ Improvements
 
 * SOLR-14886: Suppress stack traces in query response (Isabelle Giguere via Alex Deparvu)
 
+* SOLR-16461: `/solr/coreName/replication?command=backup` now has a v2 equivalent, available at
+  `/api/cores/coreName/replication/backups` (Sanjay Dutt, Jason Gerlowski, Alex Deparvu)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/api/JerseyResource.java b/solr/core/src/java/org/apache/solr/api/JerseyResource.java
index 6a304654e27..b7ff482fd1c 100644
--- a/solr/core/src/java/org/apache/solr/api/JerseyResource.java
+++ b/solr/core/src/java/org/apache/solr/api/JerseyResource.java
@@ -103,4 +103,11 @@ protected void ensureRequiredParameterProvided(String parameterName, Object para
           SolrException.ErrorCode.BAD_REQUEST, "Missing required parameter: " + parameterName);
     }
   }
+
+  protected void ensureRequiredRequestBodyProvided(Object requestBody) {
+    if (requestBody == null) {
+      throw new SolrException(
+          SolrException.ErrorCode.BAD_REQUEST, "Required request-body is missing");
+    }
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 9f6d09bab22..ab40ff02543 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -50,6 +50,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.Adler32;
@@ -90,8 +91,12 @@
 import org.apache.solr.core.backup.repository.BackupRepository;
 import org.apache.solr.core.backup.repository.LocalFileSystemRepository;
 import org.apache.solr.handler.IndexFetcher.IndexFetchResult;
+import org.apache.solr.handler.ReplicationHandler.ReplicationHandlerConfig;
 import org.apache.solr.handler.admin.api.CoreReplicationAPI;
+import org.apache.solr.handler.admin.api.SnapshotBackupAPI;
 import org.apache.solr.handler.api.V2ApiUtils;
+import org.apache.solr.jersey.APIConfigProvider;
+import org.apache.solr.jersey.APIConfigProvider.APIConfig;
 import org.apache.solr.metrics.MetricsMap;
 import org.apache.solr.metrics.SolrMetricsContext;
 import org.apache.solr.request.SolrQueryRequest;
@@ -137,7 +142,8 @@
  *
  * @since solr 1.4
  */
-public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAware {
+public class ReplicationHandler extends RequestHandlerBase
+    implements SolrCoreAware, APIConfigProvider<ReplicationHandlerConfig> {
 
   public static final String PATH = "/replication";
 
@@ -217,8 +223,6 @@ public String toString() {
 
   private volatile long executorStartTime;
 
-  private int numberBackupsToKeep = 0; // zero: do not delete old backups
-
   private int numTimesReplicated = 0;
 
   private final Map<String, FileInfo> confFileInfoCache = new HashMap<>();
@@ -236,6 +240,8 @@ public String toString() {
 
   private PollListener pollListener;
 
+  private final ReplicationHandlerConfig replicationHandlerConfig = new ReplicationHandlerConfig();
+
   public interface PollListener {
     void onComplete(SolrCore solrCore, IndexFetchResult fetchResult) throws IOException;
   }
@@ -593,50 +599,19 @@ private void populateCommitInfo(SolrQueryResponse rsp) {
   private void doSnapShoot(SolrParams params, SolrQueryResponse rsp, SolrQueryRequest req) {
     try {
       int numberToKeep = params.getInt(NUMBER_BACKUPS_TO_KEEP_REQUEST_PARAM, 0);
-      if (numberToKeep > 0 && numberBackupsToKeep > 0) {
-        throw new SolrException(
-            ErrorCode.BAD_REQUEST,
-            "Cannot use "
-                + NUMBER_BACKUPS_TO_KEEP_REQUEST_PARAM
-                + " if "
-                + NUMBER_BACKUPS_TO_KEEP_INIT_PARAM
-                + " was specified in the configuration.");
-      }
-      numberToKeep = Math.max(numberToKeep, numberBackupsToKeep);
-      if (numberToKeep < 1) {
-        numberToKeep = Integer.MAX_VALUE;
-      }
-
       String location = params.get(CoreAdminParams.BACKUP_LOCATION);
       String repoName = params.get(CoreAdminParams.BACKUP_REPOSITORY);
-      CoreContainer cc = core.getCoreContainer();
-      BackupRepository repo = null;
-      if (repoName != null) {
-        repo = cc.newBackupRepository(repoName);
-        location = repo.getBackupLocation(location);
-        if (location == null) {
-          throw new IllegalArgumentException("location is required");
-        }
-      } else {
-        repo = new LocalFileSystemRepository();
-        if (location == null) {
-          location = core.getDataDir();
-        } else {
-          location =
-              core.getCoreDescriptor().getInstanceDir().resolve(location).normalize().toString();
-        }
-      }
-      if ("file".equals(repo.createURI("x").getScheme())) {
-        core.getCoreContainer().assertPathAllowed(Paths.get(location));
-      }
-
-      // small race here before the commit point is saved
-      URI locationUri = repo.createDirectoryURI(location);
       String commitName = params.get(CoreAdminParams.COMMIT_NAME);
-      SnapShooter snapShooter =
-          new SnapShooter(repo, core, locationUri, params.get(NAME), commitName);
-      snapShooter.validateCreateSnapshot();
-      snapShooter.createSnapAsync(numberToKeep, (nl) -> snapShootDetails = nl);
+      String name = params.get(NAME);
+      doSnapShoot(
+          numberToKeep,
+          replicationHandlerConfig.numberBackupsToKeep,
+          location,
+          repoName,
+          commitName,
+          name,
+          core,
+          (nl) -> snapShootDetails = nl);
       rsp.add(STATUS, OK_STATUS);
     } catch (SolrException e) {
       throw e;
@@ -647,6 +622,58 @@ private void doSnapShoot(SolrParams params, SolrQueryResponse rsp, SolrQueryRequ
     }
   }
 
+  public static void doSnapShoot(
+      int numberToKeep,
+      int numberBackupsToKeep,
+      String location,
+      String repoName,
+      String commitName,
+      String name,
+      SolrCore core,
+      Consumer<NamedList<?>> result)
+      throws IOException {
+    if (numberToKeep > 0 && numberBackupsToKeep > 0) {
+      throw new SolrException(
+          ErrorCode.BAD_REQUEST,
+          "Cannot use "
+              + NUMBER_BACKUPS_TO_KEEP_REQUEST_PARAM
+              + " if "
+              + NUMBER_BACKUPS_TO_KEEP_INIT_PARAM
+              + " was specified in the configuration.");
+    }
+    numberToKeep = Math.max(numberToKeep, numberBackupsToKeep);
+    if (numberToKeep < 1) {
+      numberToKeep = Integer.MAX_VALUE;
+    }
+
+    CoreContainer cc = core.getCoreContainer();
+    BackupRepository repo = null;
+    if (repoName != null) {
+      repo = cc.newBackupRepository(repoName);
+      location = repo.getBackupLocation(location);
+      if (location == null) {
+        throw new IllegalArgumentException("location is required");
+      }
+    } else {
+      repo = new LocalFileSystemRepository();
+      if (location == null) {
+        location = core.getDataDir();
+      } else {
+        location =
+            core.getCoreDescriptor().getInstanceDir().resolve(location).normalize().toString();
+      }
+    }
+    if ("file".equals(repo.createURI("x").getScheme())) {
+      core.getCoreContainer().assertPathAllowed(Paths.get(location));
+    }
+
+    // small race here before the commit point is saved
+    URI locationUri = repo.createDirectoryURI(location);
+    SnapShooter snapShooter = new SnapShooter(repo, core, locationUri, name, commitName);
+    snapShooter.validateCreateSnapshot();
+    snapShooter.createSnapAsync(numberToKeep, result);
+  }
+
   /**
    * This method adds an Object of FileStream to the response . The FileStream implements a custom
    * protocol which is understood by IndexFetcher.FileFetcher
@@ -1239,9 +1266,9 @@ public void inform(SolrCore core) {
     registerCloseHook();
     Object nbtk = initArgs.get(NUMBER_BACKUPS_TO_KEEP_INIT_PARAM);
     if (nbtk != null) {
-      numberBackupsToKeep = Integer.parseInt(nbtk.toString());
+      replicationHandlerConfig.numberBackupsToKeep = Integer.parseInt(nbtk.toString());
     } else {
-      numberBackupsToKeep = 0;
+      replicationHandlerConfig.numberBackupsToKeep = 0;
     }
     NamedList<?> follower = getObjectWithBackwardCompatibility(initArgs, "follower", "slave");
     boolean enableFollower = isEnabled(follower);
@@ -1374,7 +1401,7 @@ public void inform(SolrCore core) {
 
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
-    return List.of(CoreReplicationAPI.class);
+    return List.of(CoreReplicationAPI.class, SnapshotBackupAPI.class);
   }
 
   @Override
@@ -1474,7 +1501,7 @@ public void postCommit() {
         }
         if (snapshoot) {
           try {
-            int numberToKeep = numberBackupsToKeep;
+            int numberToKeep = replicationHandlerConfig.numberBackupsToKeep;
             if (numberToKeep < 1) {
               numberToKeep = Integer.MAX_VALUE;
             }
@@ -1898,4 +1925,23 @@ private static Long readIntervalNs(String interval) {
    * @lucene.internal
    */
   public static final String WAIT = "wait";
+
+  public static class ReplicationHandlerConfig implements APIConfig {
+
+    private int numberBackupsToKeep = 0; // zero: do not delete old backups
+
+    public int getNumberBackupsToKeep() {
+      return numberBackupsToKeep;
+    }
+  }
+
+  @Override
+  public ReplicationHandlerConfig provide() {
+    return replicationHandlerConfig;
+  }
+
+  @Override
+  public Class<ReplicationHandlerConfig> getConfigClass() {
+    return ReplicationHandlerConfig.class;
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java
new file mode 100644
index 00000000000..4002db925c0
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java
@@ -0,0 +1,194 @@
+/*
+ * 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.handler.admin.api;
+
+import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
+import static org.apache.solr.handler.ReplicationHandler.ERR_STATUS;
+import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.function.Consumer;
+import javax.inject.Inject;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.solr.api.JerseyResource;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.annotation.JsonProperty;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.ReplicationHandler;
+import org.apache.solr.handler.ReplicationHandler.ReplicationHandlerConfig;
+import org.apache.solr.jersey.JacksonReflectMapWriter;
+import org.apache.solr.jersey.PermissionName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** V2 endpoint for Backup API used for User-Managed clusters and Single-Node Installation. */
+@Path("/cores/{coreName}/replication/backups")
+public class SnapshotBackupAPI extends JerseyResource {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private final SolrCore solrCore;
+  private final ReplicationHandlerConfig replicationHandlerConfig;
+
+  @Inject
+  public SnapshotBackupAPI(SolrCore solrCore, ReplicationHandlerConfig replicationHandlerConfig) {
+    this.solrCore = solrCore;
+    this.replicationHandlerConfig = replicationHandlerConfig;
+  }
+
+  /**
+   * This API (POST /api/cores/coreName/replication/backups {...}) is analogous to the v1
+   * /solr/coreName/replication?command=backup
+   */
+  @POST
+  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Operation(summary = "Backup command using ReplicationHandler")
+  @PermissionName(CORE_EDIT_PERM)
+  public BackupReplicationResponse createBackup(
+      @RequestBody BackupReplicationRequestBody backupReplicationPayload) throws Exception {
+    ensureRequiredRequestBodyProvided(backupReplicationPayload);
+    ReplicationHandler replicationHandler =
+        (ReplicationHandler) solrCore.getRequestHandler(ReplicationHandler.PATH);
+    return doBackup(replicationHandler, backupReplicationPayload);
+  }
+
+  private BackupReplicationResponse doBackup(
+      ReplicationHandler replicationHandler,
+      BackupReplicationRequestBody backupReplicationPayload) {
+    BackupReplicationResponse response = instantiateJerseyResponse(BackupReplicationResponse.class);
+    int numberToKeep = backupReplicationPayload.numberToKeep;
+    int numberBackupsToKeep = replicationHandlerConfig.getNumberBackupsToKeep();
+    String location = backupReplicationPayload.location;
+    String repoName = backupReplicationPayload.repository;
+    String commitName = backupReplicationPayload.commitName;
+    String name = backupReplicationPayload.name;
+    Consumer<NamedList<?>> resultConsumer = result -> response.result = result;
+    try {
+      doSnapShoot(
+          numberToKeep,
+          numberBackupsToKeep,
+          location,
+          repoName,
+          commitName,
+          name,
+          solrCore,
+          resultConsumer);
+      response.status = ReplicationHandler.OK_STATUS;
+    } catch (SolrException e) {
+      throw e;
+    } catch (Exception e) {
+      log.error("Exception while creating a snapshot", e);
+      reportErrorOnResponse(
+          response, "Error encountered while creating a snapshot: " + e.getMessage(), e);
+    }
+    return response;
+  }
+
+  /** Separate method helps with testing */
+  protected void doSnapShoot(
+      int numberToKeep,
+      int numberBackupsToKeep,
+      String location,
+      String repoName,
+      String commitName,
+      String name,
+      SolrCore solrCore,
+      Consumer<NamedList<?>> resultConsumer)
+      throws IOException {
+    ReplicationHandler.doSnapShoot(
+        numberToKeep,
+        numberBackupsToKeep,
+        location,
+        repoName,
+        commitName,
+        name,
+        solrCore,
+        resultConsumer);
+  }
+
+  /* POJO for v2 endpoints request body. */
+  public static class BackupReplicationRequestBody implements JacksonReflectMapWriter {
+
+    public BackupReplicationRequestBody() {}
+
+    public BackupReplicationRequestBody(
+        String location, String name, int numberToKeep, String repository, String commitName) {
+      this.location = location;
+      this.name = name;
+      this.numberToKeep = numberToKeep;
+      this.repository = repository;
+      this.commitName = commitName;
+    }
+
+    @Schema(description = "The path where the backup will be created")
+    @JsonProperty
+    public String location;
+
+    @Schema(description = "The backup will be created in a directory called snapshot.<name>")
+    @JsonProperty
+    public String name;
+
+    @Schema(description = "The number of backups to keep.")
+    @JsonProperty
+    public int numberToKeep;
+
+    @Schema(description = "The name of the repository to be used for e backup.")
+    @JsonProperty
+    public String repository;
+
+    @Schema(
+        description =
+            "The name of the commit which was used while taking a snapshot using the CREATESNAPSHOT command.")
+    @JsonProperty
+    public String commitName;
+  }
+
+  /** Response for {@link SnapshotBackupAPI#createBackup(BackupReplicationRequestBody)}. */
+  public static class BackupReplicationResponse extends SolrJerseyResponse {
+
+    @JsonProperty("result")
+    public NamedList<?> result;
+
+    @JsonProperty("status")
+    public String status;
+
+    @JsonProperty("message")
+    public String message;
+
+    @JsonProperty("exception")
+    public Exception exception;
+
+    public BackupReplicationResponse() {}
+  }
+
+  private static void reportErrorOnResponse(
+      BackupReplicationResponse response, String message, Exception e) {
+    response.status = ERR_STATUS;
+    response.message = message;
+    if (e != null) {
+      response.exception = e;
+    }
+  }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/APIConfigProvider.java b/solr/core/src/java/org/apache/solr/jersey/APIConfigProvider.java
index fd250949ffd..cd6a2f6f12b 100644
--- a/solr/core/src/java/org/apache/solr/jersey/APIConfigProvider.java
+++ b/solr/core/src/java/org/apache/solr/jersey/APIConfigProvider.java
@@ -17,16 +17,14 @@
 package org.apache.solr.jersey;
 
 import org.apache.solr.jersey.APIConfigProvider.APIConfig;
-import org.glassfish.hk2.api.Factory;
 
 /**
  * Interface to be implemented by the Request Handlers that need to provide some custom
  * configuration to the V2 APIs
  */
-public interface APIConfigProvider<T extends APIConfig> extends Factory<T> {
+public interface APIConfigProvider<T extends APIConfig> {
 
-  @Override
-  default void dispose(T instance) {}
+  T provide();
 
   Class<T> getConfigClass();
 
diff --git a/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java b/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java
index 8e4258aa43d..d17ea7ded13 100644
--- a/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java
+++ b/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.jersey;
 
+import javax.inject.Singleton;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
 /** Jersey binder for APIConfigProvider */
@@ -29,6 +30,8 @@ public APIConfigProviderBinder(APIConfigProvider<?> cfgProvider) {
 
   @Override
   protected void configure() {
-    bindFactory(cfgProvider).to(cfgProvider.getConfigClass());
+    bindFactory(new InjectionFactories.SingletonFactory<>(cfgProvider.provide()))
+        .to(cfgProvider.getConfigClass())
+        .in(Singleton.class);
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java
new file mode 100644
index 00000000000..84bba8148b0
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.handler.admin.api;
+
+import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import javax.inject.Inject;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.ReplicationHandler.ReplicationHandlerConfig;
+import org.apache.solr.jersey.InjectionFactories;
+import org.apache.solr.jersey.SolrJacksonMapper;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.process.internal.RequestScoped;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Unit tests for {@link SnapshotBackupAPI}. */
+public class SnapshotBackupAPITest extends JerseyTest {
+
+  private SolrCore solrCore;
+  private ReplicationHandlerConfig replicationHandlerConfig;
+
+  @BeforeClass
+  public static void ensureWorkingMockito() {
+    assumeWorkingMockito();
+  }
+
+  @Override
+  protected Application configure() {
+    resetMocks();
+    final ResourceConfig config = new ResourceConfig();
+    config.register(TestSnapshotBackupAPI.class);
+    config.register(SolrJacksonMapper.class);
+    config.register(SolrExceptionTestMapper.class);
+    config.register(
+        new AbstractBinder() {
+          @Override
+          protected void configure() {
+            bindFactory(new InjectionFactories.SingletonFactory<>(solrCore))
+                .to(SolrCore.class)
+                .in(RequestScoped.class);
+          }
+        });
+    config.register(
+        new AbstractBinder() {
+          @Override
+          protected void configure() {
+            bindFactory(new InjectionFactories.SingletonFactory<>(replicationHandlerConfig))
+                .to(ReplicationHandlerConfig.class)
+                .in(RequestScoped.class);
+          }
+        });
+    return config;
+  }
+
+  @Test
+  public void testMissingBody() throws Exception {
+    final Response response = target("/cores/demo/replication/backups").request().post(null);
+    var status = response.getStatusInfo();
+    assertEquals(400, status.getStatusCode());
+    assertEquals("Required request-body is missing", status.getReasonPhrase());
+  }
+
+  @Test
+  public void testSuccessfulBackupCommand() throws Exception {
+    int numberToKeep = 7;
+    int numberBackupsToKeep = 11;
+
+    when(replicationHandlerConfig.getNumberBackupsToKeep()).thenReturn(numberBackupsToKeep);
+    final Response response =
+        target("/cores/demo/replication/backups")
+            .request()
+            .post(Entity.json("{\"name\": \"test\", \"numberToKeep\": " + numberToKeep + "}"));
+    System.err.println("RESP " + response);
+
+    assertEquals(numberToKeep, TestSnapshotBackupAPI.numberToKeep.get());
+    assertEquals(numberBackupsToKeep, TestSnapshotBackupAPI.numberBackupsToKeep.get());
+    assertEquals(200, response.getStatus());
+  }
+
+  private void resetMocks() {
+    solrCore = mock(SolrCore.class);
+    replicationHandlerConfig = mock(ReplicationHandlerConfig.class);
+    when(replicationHandlerConfig.getNumberBackupsToKeep()).thenReturn(5);
+  }
+
+  public static class SolrExceptionTestMapper implements ExceptionMapper<SolrException> {
+    @Override
+    public Response toResponse(SolrException e) {
+      return Response.status(e.code(), e.getMessage()).build();
+    }
+  }
+
+  private static class TestSnapshotBackupAPI extends SnapshotBackupAPI {
+
+    private static final AtomicInteger numberToKeep = new AtomicInteger();
+    private static final AtomicInteger numberBackupsToKeep = new AtomicInteger();
+
+    @Inject
+    public TestSnapshotBackupAPI(
+        SolrCore solrCore, ReplicationHandlerConfig replicationHandlerConfig) {
+      super(solrCore, replicationHandlerConfig);
+    }
+
+    @Override
+    protected void doSnapShoot(
+        int numberToKeep,
+        int numberBackupsToKeep,
+        String location,
+        String repoName,
+        String commitName,
+        String name,
+        SolrCore solrCore,
+        Consumer<NamedList<?>> resultConsumer)
+        throws IOException {
+      TestSnapshotBackupAPI.numberToKeep.set(numberToKeep);
+      TestSnapshotBackupAPI.numberBackupsToKeep.set(numberBackupsToKeep);
+    }
+  }
+}

From 901e0debc381f988373a6d9c09ca47341dda05fb Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Wed, 13 Sep 2023 12:00:36 -0400
Subject: [PATCH 075/160] SOLR-16963: Fix usage of clientHostnameVerification
 (#1916)

- It no longer overrides the checkPeerName option
- It once again acts as a server setting to check the client
  hostname against the client certificate
---
 solr/CHANGES.txt                              |  3 +
 solr/bin/solr                                 |  4 +-
 solr/bin/solr.cmd                             |  4 +-
 solr/packaging/test/test_ssl.bats             | 90 ++++++++++++-------
 solr/server/etc/jetty-ssl.xml                 |  1 +
 .../deployment-guide/pages/enabling-ssl.adoc  |  2 +-
 .../pages/major-changes-in-solr-9.adoc        |  5 ++
 .../client/solrj/impl/Http2SolrClient.java    |  6 --
 .../solrj/impl/Http2SolrClientTest.java       |  8 +-
 9 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c608bf4f314..40aead39789 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -179,6 +179,9 @@ Bug Fixes
 
 * SOLR-16899: CoreAdminOp are statically registered in CoreAdminHandler, preventing more than one Solr instance in the same JVM (Vincent Primault via Alex Deparvu)
 
+* SOLR-16963: The "solr.jetty.ssl.verifyClientHostName" sysProp and "SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION" envVar have been fixed,
+  and the setting once again tells the server to check the originating client hostname against the client certificate when doing mTLS. (Houston Putman, Tomás Fernández Löbbe)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index 32a2465eccb..cc72f621094 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -229,8 +229,8 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
     SOLR_SSL_OPTS+=" -Dsolr.jetty.truststore.type=$SOLR_SSL_TRUST_STORE_TYPE"
   fi
 
-  if [ "${SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION:-true}" == "false" ]; then
-    SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.verifyClientHostName=false"
+  if [ "${SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION:true}" == "true" ] ; then
+    SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"
   fi
 
   if [ -n "$SOLR_SSL_NEED_CLIENT_AUTH" ]; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index bb297a64d62..d10ac598057 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -105,8 +105,8 @@ IF "%SOLR_SSL_ENABLED%"=="true" (
   IF NOT DEFINED SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION (
     set SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
   )
-  IF "%SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION%"=="false" (
-    set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.verifyClientHostName=false"
+  IF "%SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION%"=="true" (
+    set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"
   )
 
   IF DEFINED SOLR_SSL_NEED_CLIENT_AUTH (
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 9fdcbd43a59..85e0e32cc2a 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -48,7 +48,6 @@ teardown() {
   export SOLR_SSL_TRUST_STORE_PASSWORD=secret
   export SOLR_SSL_NEED_CLIENT_AUTH=false
   export SOLR_SSL_WANT_CLIENT_AUTH=false
-  export SOLR_SSL_CHECK_PEER_NAME=true
   export SOLR_HOST=localhost
 
   solr start -c
@@ -57,7 +56,7 @@ teardown() {
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://127.0.0.1:8983/solr/test/select?q=*:*'
+  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*'
   assert_output --partial '"numFound":0'
 }
 
@@ -82,8 +81,6 @@ teardown() {
   export SOLR_SSL_NEED_CLIENT_AUTH=false
   export SOLR_SSL_WANT_CLIENT_AUTH=false
   export SOLR_SSL_CHECK_PEER_NAME=false
-  # Remove later when SOLR-16963 is resolved
-  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
   export SOLR_HOST=localhost
 
   solr start -c
@@ -92,12 +89,15 @@ teardown() {
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
+  # Just test that curl can connect via insecure or via a custom host header
   run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -k 'https://localhost:8983/solr/test/select?q=*:*'
   assert_output --partial '"numFound":0'
 
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -H "Host: test.solr.apache.org" 'https://127.0.0.1:8983/solr/test/select?q=*:*'
+  assert_output --partial '"numFound":0'
+
+  # This is a client setting, so we don't need to restart Solr to make sure that it fails
   export SOLR_SSL_CHECK_PEER_NAME=true
-  # Remove later when SOLR-16963 is resolved
-  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
 
   # This should fail the peername check
   run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*'
@@ -207,6 +207,7 @@ teardown() {
 
   export SOLR_SECURITY_MANAGER_ENABLED=true
   export SOLR_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"
+  export SOLR_LOG_LEVEL="DEBUG"
   export SOLR_TOOL_OPTS="-Djava.io.tmpdir=${test_tmp_dir} -Djavax.net.debug=SSL,keymanager,trustmanager,ssl:handshake"
 
   export ssl_dir="${BATS_TEST_TMPDIR}/ssl"
@@ -243,7 +244,7 @@ teardown() {
     # Trust the keystore cert with the CA
     keytool -storepass server-key -keystore solr-server.keystore.p12 -storetype PKCS12 -certreq -alias server | \
         keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
-        -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
+        -ext "SAN=DNS:localhost,IP:127.0.0.1" -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias server -file server.pem
@@ -253,18 +254,19 @@ teardown() {
     keytool -keystore solr-server.truststore.p12 -storetype PKCS12 -keypass server-trust -storepass server-trust -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
   )
   # Create a client keystore & truststore
+  # The client cert will have a bogus DNS name and IP address, as we want the clientHostnameVerification to fail
   mkdir -p "$client_ssl_dir"
   (
     cd "$client_ssl_dir"
     rm -f solr-client.keystore.p12 client.pem solr-client.truststore.p12
 
     # Create a keystore and certificate
-    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext SAN=DNS:test.solr.apache.org,IP:127.0.0.2 -dname "CN=test.solr.apache.org, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
 
     # Trust the keystore cert with the CA
     keytool -storepass client-key -keystore solr-client.keystore.p12 -storetype PKCS12 -certreq -alias client | \
         keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
-        -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
+        -ext "SAN=DNS:test.solr.apache.org,IP:127.0.0.2" -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias client -file client.pem
@@ -291,33 +293,51 @@ teardown() {
   export SOLR_SSL_NEED_CLIENT_AUTH=true
   export SOLR_SSL_WANT_CLIENT_AUTH=false
   export SOLR_SSL_CHECK_PEER_NAME=true
-  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
+  # Cannot set this to true, because the client certificate does not have the right hostname ("localhost") or IP
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
   export SOLR_HOST=localhost
 
   solr start -c
   solr start -c -z localhost:9983 -p 8984
 
-  export SOLR_SSL_KEY_STORE=
-  export SOLR_SSL_KEY_STORE_PASSWORD=
-  export SOLR_SSL_TRUST_STORE=
-  export SOLR_SSL_TRUST_STORE_PASSWORD=
+  # Test Client connections, which do not need the server keystore/truststore
+  (
+    export SOLR_SSL_KEY_STORE=
+    export SOLR_SSL_KEY_STORE_PASSWORD=
+    export SOLR_SSL_TRUST_STORE=
+    export SOLR_SSL_TRUST_STORE_PASSWORD=
 
-  solr assert --started https://localhost:8983/solr --timeout 5000
-  solr assert --started https://localhost:8984/solr --timeout 5000
+    solr assert --started https://localhost:8983/solr --timeout 5000
+    solr assert --started https://localhost:8984/solr --timeout 5000
 
-  run solr create -c test -s 2
-  assert_output --partial "Created collection 'test'"
+    run solr create -c test -s 2
+    assert_output --partial "Created collection 'test'"
 
-  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
-  assert_output --partial '"urlScheme":"https"'
+    run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+    assert_output --partial '"urlScheme":"https"'
 
-  run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
-  assert_output --partial '"numFound":0'
+    run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
+    assert_output --partial '"numFound":0'
 
-  export SOLR_SSL_CLIENT_KEY_STORE=
-  export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
+    (
+      # Try connecting with just the client truststore, which should fail because mTLS requires a keystore and mTLS is needed
+      export SOLR_SSL_CLIENT_KEY_STORE=
+      export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
+
+      run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+      assert_output --partial 'Server refused connection'
+    )
+  )
+
+  # Turn on client hostname verification, and start a new Solr node since the property is a server setting.
+  # Test that it fails because the client cert does not use "localhost"
+  export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
+  solr start -c -z localhost:9983 -p 8985
 
-  run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  # We can't check if the server has come up, because we can't connect to it, so just wait
+  sleep 5
+
+  run ! solr api -get 'https://localhost:8985/solr/test/select?q=*:*&rows=0'
   assert_output --partial 'Server refused connection'
 }
 
@@ -342,8 +362,8 @@ teardown() {
     cd "$ssl_dir"
     rm -f root.p12 root.pem ca.p12 ca.pem
 
-    keytool -genkeypair -keystore root.p12 -storetype PKCS12 -keypass secret -storepass secret -alias root -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
-    keytool -genkeypair -keystore ca.p12 -storetype PKCS12 -keypass secret -storepass secret -alias ca -ext bc:c -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore root.p12 -storetype PKCS12 -keypass secret -storepass secret -alias root -ext bc:c -ext "SAN=DNS:localhost,IP:127.0.0.1" -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore ca.p12 -storetype PKCS12 -keypass secret -storepass secret -alias ca -ext bc:c -ext "SAN=DNS:localhost,IP:127.0.0.1" -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
 
     keytool -keystore root.p12 -storetype PKCS12 -storepass secret -alias root -exportcert -rfc > root.pem
 
@@ -360,12 +380,12 @@ teardown() {
     rm -f solr-server.keystore.p12 server.pem solr-server.truststore.p12
 
     # Create a keystore and certificate
-    keytool -genkeypair -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -alias server -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -alias server -ext "SAN=DNS:localhost,IP:127.0.0.1" -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
 
     # Trust the keystore cert with the CA
     keytool -storepass server-key -keystore solr-server.keystore.p12 -storetype PKCS12 -certreq -alias server | \
      keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
-     -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
+     -ext "SAN=DNS:localhost,IP:127.0.0.1" -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=serverAuth -rfc > server.pem
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
     keytool -keystore solr-server.keystore.p12 -storetype PKCS12 -keypass server-key -storepass server-key -importcert -alias server -file server.pem
@@ -381,12 +401,12 @@ teardown() {
     rm -f solr-client.keystore.p12 client.pem solr-client.truststore.p12
 
     # Create a keystore and certificate
-    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
+    keytool -genkeypair -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -alias client -ext "SAN=DNS:localhost,IP:127.0.0.1" -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country" -keyalg rsa
 
     # Trust the keystore cert with the CA
     keytool -storepass client-key -keystore solr-client.keystore.p12 -storetype PKCS12 -certreq -alias client | \
      keytool -storepass secret -keystore "$ssl_dir/ca.p12" -storetype PKCS12 -gencert -alias ca \
-     -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
+     -ext "SAN=DNS:localhost,IP:127.0.0.1" -ext "ku:c=nonRepudiation,digitalSignature,keyEncipherment" -ext eku:c=clientAuth -rfc > client.pem
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias root -file "$ssl_dir/root.pem"  -noprompt
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias ca -file "$ssl_dir/ca.pem"  -noprompt
     keytool -keystore solr-client.keystore.p12 -storetype PKCS12 -keypass client-key -storepass client-key -importcert -alias client -file client.pem
@@ -439,6 +459,14 @@ teardown() {
   export SOLR_SSL_CLIENT_KEY_STORE=
   export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
 
+  # mTLS requires a keyStore, so just using the truststore would fail if mTLS was "NEED"ed, however it is only "WANT"ed, so its ok
   run solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
   assert_output --partial '"numFound":0'
+
+  export SOLR_SSL_CLIENT_TRUST_STORE=
+  export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=
+
+  # TLS cannot work if a truststore and keystore are not provided (either Server or Client)
+  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  assert_output --partial 'Server refused connection'
 }
diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xml
index 878f9386720..90cbc13c257 100644
--- a/solr/server/etc/jetty-ssl.xml
+++ b/solr/server/etc/jetty-ssl.xml
@@ -22,6 +22,7 @@
   <Set name="WantClientAuth"><Property name="solr.jetty.ssl.wantClientAuth" default="false"/></Set>
   <Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="PKCS12"/></Set>
   <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="PKCS12"/></Set>
+  <Set name="EndpointIdentificationAlgorithm"><Property name="solr.jetty.ssl.verifyClientHostName"/></Set>
 
   <!-- =========================================================== -->
   <!-- Create a TLS specific HttpConfiguration based on the        -->
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
index 1177f423c62..685acdb5da4 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
@@ -125,7 +125,7 @@ set SOLR_SSL_CHECK_PEER_NAME=true
 .Client Authentication Settings
 WARNING: Enable either `SOLR_SSL_NEED_CLIENT_AUTH` or `SOLR_SSL_WANT_CLIENT_AUTH` but not both at the same time.
 They are mutually exclusive and Jetty will select one of them which may not be what you expect.
-`SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION` should be set to false if you want to disable hostname verification.
+`SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION` should be set to false if you want to disable hostname verification for client certificates.
 
 When you start Solr, the `bin/solr` script includes these settings and will pass them as system properties to the JVM.
 
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index cfe1d8b9b7f..0824107a91f 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -81,6 +81,11 @@ Therefore, when using the default settings, nodes that were previously excluded
 see the  xref:deployment-guide:securing-solr.adoc#network-configuration[Network Configuration documentation] for more information.
 
 === Security
+* Since Solr 8.4.1/8.5.0, the `solr.jetty.ssl.verifyClientHostName` sysProp and `SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION` envVar have been used incorrectly.
+It has instead been used to override the `solr.ssl.checkPeerName` sysProp in the `HTTP2SolrClient`.
+This has been fixed, and the setting once again tells the server to check the originating client hostname against the client certificate when doing mTLS.
+This option is still enabled by default.
+
 * The `solr.jetty.ssl.sniHostCheck` option now defaults to the value of `SOLR_SSL_CHECK_PEER_NAME`, if it is provided.
 This will enable client and server hostName check settings to be governed by the same environment variable.
 If users want separate client/server settings, they can manually override the `solr.jetty.ssl.sniHostCheck` option in `SOLR_OPTS`.
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 73001f7685f..2d6a993be7c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -1386,12 +1386,6 @@ static SslContextFactory.Client getDefaultSslContextFactory() {
       sslContextFactory.setTrustStoreType(System.getProperty("javax.net.ssl.trustStoreType"));
     }
 
-    if (Boolean.parseBoolean(System.getProperty("solr.jetty.ssl.verifyClientHostName", "true"))) {
-      sslContextFactory.setEndpointIdentificationAlgorithm("HTTPS");
-    } else {
-      sslContextFactory.setEndpointIdentificationAlgorithm(null);
-    }
-
     return sslContextFactory;
   }
 
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index 263f9aa93e1..3657906ec41 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -769,25 +769,25 @@ public void testGetDefaultSslContextFactory() {
     System.clearProperty("javax.net.ssl.keyStoreType");
     System.clearProperty("javax.net.ssl.trustStoreType");
 
-    System.setProperty("solr.jetty.ssl.verifyClientHostName", "true");
+    System.setProperty("solr.ssl.checkPeerName", "true");
     System.setProperty("javax.net.ssl.keyStoreType", "foo");
     System.setProperty("javax.net.ssl.trustStoreType", "bar");
     SslContextFactory.Client sslContextFactory2 = Http2SolrClient.getDefaultSslContextFactory();
     assertEquals("HTTPS", sslContextFactory2.getEndpointIdentificationAlgorithm());
     assertEquals("foo", sslContextFactory2.getKeyStoreType());
     assertEquals("bar", sslContextFactory2.getTrustStoreType());
-    System.clearProperty("solr.jetty.ssl.verifyClientHostName");
+    System.clearProperty("solr.ssl.checkPeerName");
     System.clearProperty("javax.net.ssl.keyStoreType");
     System.clearProperty("javax.net.ssl.trustStoreType");
 
-    System.setProperty("solr.jetty.ssl.verifyClientHostName", "false");
+    System.setProperty("solr.ssl.checkPeerName", "false");
     System.setProperty("javax.net.ssl.keyStoreType", "foo");
     System.setProperty("javax.net.ssl.trustStoreType", "bar");
     SslContextFactory.Client sslContextFactory3 = Http2SolrClient.getDefaultSslContextFactory();
     assertNull(sslContextFactory3.getEndpointIdentificationAlgorithm());
     assertEquals("foo", sslContextFactory3.getKeyStoreType());
     assertEquals("bar", sslContextFactory3.getTrustStoreType());
-    System.clearProperty("solr.jetty.ssl.verifyClientHostName");
+    System.clearProperty("solr.ssl.checkPeerName");
     System.clearProperty("javax.net.ssl.keyStoreType");
     System.clearProperty("javax.net.ssl.trustStoreType");
   }

From e77e3dc80b7c78a31fbeab1010598f9734932de8 Mon Sep 17 00:00:00 2001
From: tizianodeg <65893913+tizianodeg@users.noreply.github.com>
Date: Wed, 13 Sep 2023 18:49:53 +0200
Subject: [PATCH 076/160] SOLR-16973: fix REMOTE_JMX_OPTS to delayed expansion
 (#1917)

* fix REMOTE_JMX_OPTS to delayed expansion
* Update CHANGES.txt

---------

Co-authored-by: Colvin Cowie <colvin.cowie.dev@gmail.com>
---
 solr/CHANGES.txt  | 2 ++
 solr/bin/solr.cmd | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 40aead39789..93648908345 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -182,6 +182,8 @@ Bug Fixes
 * SOLR-16963: The "solr.jetty.ssl.verifyClientHostName" sysProp and "SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION" envVar have been fixed,
   and the setting once again tells the server to check the originating client hostname against the client certificate when doing mTLS. (Houston Putman, Tomás Fernández Löbbe)
 
+* SOLR-16973: fix REMOTE_JMX_OPTS to delayed expansion (Tiziano Degaetano via Colvin Cowie)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index d10ac598057..6396646355e 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1072,7 +1072,7 @@ IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
 -Dcom.sun.management.jmxremote.port=!RMI_PORT! ^
 -Dcom.sun.management.jmxremote.rmi.port=!RMI_PORT!
 
-  IF NOT "%SOLR_HOST%"=="" set REMOTE_JMX_OPTS=%REMOTE_JMX_OPTS% -Djava.rmi.server.hostname=%SOLR_HOST%
+  IF NOT "%SOLR_HOST%"=="" set REMOTE_JMX_OPTS=!REMOTE_JMX_OPTS! -Djava.rmi.server.hostname=%SOLR_HOST%
 ) ELSE (
   set REMOTE_JMX_OPTS=
 )
@@ -1210,7 +1210,7 @@ set START_OPTS=%START_OPTS% !GC_TUNE! %GC_LOG_OPTS%
 set START_OPTS=%START_OPTS% -DdisableAdminUI=%DISABLE_ADMIN_UI%
 IF NOT "!CLOUD_MODE_OPTS!"=="" set "START_OPTS=%START_OPTS% !CLOUD_MODE_OPTS!"
 IF NOT "!IP_ACL_OPTS!"=="" set "START_OPTS=%START_OPTS% !IP_ACL_OPTS!"
-IF NOT "%REMOTE_JMX_OPTS%"=="" set "START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%"
+IF NOT "!REMOTE_JMX_OPTS!"=="" set "START_OPTS=%START_OPTS% !REMOTE_JMX_OPTS!"
 IF NOT "%SOLR_ADDL_ARGS%"=="" set "START_OPTS=%START_OPTS% %SOLR_ADDL_ARGS%"
 IF NOT "%SOLR_HOST_ARG%"=="" set "START_OPTS=%START_OPTS% %SOLR_HOST_ARG%"
 IF NOT "%SCRIPT_SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SCRIPT_SOLR_OPTS%"

From 086dcbe960ff6cd8f604e5b988972f8cfc1ef0b8 Mon Sep 17 00:00:00 2001
From: Lamine <104593675+laminelam@users.noreply.github.com>
Date: Wed, 13 Sep 2023 17:04:22 -0500
Subject: [PATCH 077/160] add support of OAuth 2.0/OIDC 'code with PKCE' flow
 (front-end) (#1791)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lamine Idjeraoui <lidjeraoui@apple.com>
Co-authored-by: Jan Høydahl <janhoy@users.noreply.github.com>
---
 NOTICE.txt                                    |   7 +
 solr/CHANGES.txt                              |   2 +-
 solr/webapp/web/index.html                    |   1 +
 .../web/js/angular/controllers/login.js       | 267 ++++++++++++------
 solr/webapp/web/js/angular/services.js        |  78 ++++-
 .../webapp/web/libs/jssha-3.3.1-sha256.min.js |  24 ++
 6 files changed, 291 insertions(+), 88 deletions(-)
 create mode 100644 solr/webapp/web/libs/jssha-3.3.1-sha256.min.js

diff --git a/NOTICE.txt b/NOTICE.txt
index 396db11e6cb..0fa2229e28a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -618,6 +618,13 @@ https://github.com/yonik/noggit
 This product includes the Angular UI UI Grid JavaScript library.
 Copyright (c) 2015 the AngularUI Team, http://angular-ui.github.com
 
+=========================================================================
+==         jsSHA notice                                                ==
+=========================================================================
+
+This product includes the jsSHA library.
+Copyright (c) 2008-2023 Brian Turek, 1998-2009 Paul Johnston & Contributors
+https://github.com/Caligatio/jsSHA
 
 =========================================================================
 ==         grpc notice                                                 ==
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 93648908345..7d5c3776f5c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -111,7 +111,7 @@ Improvements
 
 * SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
 
-* SOLR-16896, SOLR-16897: Add support of OAuth 2.0/OIDC 'code with PKCE' flow (Lamine Idjeraoui, janhoy, Kevin Risden)
+* SOLR-16896, SOLR-16897: Add support of OAuth 2.0/OIDC 'code with PKCE' flow (Lamine Idjeraoui, janhoy, Kevin Risden, Anshum Gupta)
 
 * SOLR-16879: Limit the number of concurrent expensive core admin operations by running them in a
   dedicated thread pool. Backup, Restore and Split are expensive operations.
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index afffe67f764..35b1d664860 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/index.html
@@ -70,6 +70,7 @@
   <script src="libs/ui-grid.min.js?_=${version}"></script>
   <script src="libs/jquery-ui.min.js?_=${version}"></script>
   <script src="libs/angular-utf8-base64.min.js?_=${version}"></script>
+  <script src="libs/jssha-3.3.1-sha256.min.js?_=${version}"></script>
   <script src="js/angular/app.js?_=${version}"></script>
   <script src="js/angular/services.js?_=${version}"></script>
   <script src="js/angular/permissions.js?_=${version}"></script>
diff --git a/solr/webapp/web/js/angular/controllers/login.js b/solr/webapp/web/js/angular/controllers/login.js
index b76ec1f4a8a..0e22100c306 100644
--- a/solr/webapp/web/js/angular/controllers/login.js
+++ b/solr/webapp/web/js/angular/controllers/login.js
@@ -60,92 +60,166 @@ solrAdminApp.controller('LoginController',
             var hp = AuthenticationService.decodeHashParams(hash);
             var expectedState = sessionStorage.getItem("auth.stateRandom") + "_" + sessionStorage.getItem("auth.location");
             sessionStorage.setItem("auth.state", "error");
-            if (hp['access_token'] && hp['token_type'] && hp['state']) {
-              // Validate state
-              if (hp['state'] !== expectedState) {
-                $scope.error = "Problem with auth callback";
-                console.log("Expected state param " + expectedState + " but got " + hp['state']);
-                errorText += "Invalid values in state parameter. ";
-              }
-              // Validate token type
-              if (hp['token_type'].toLowerCase() !== "bearer") {
-                console.log("Expected token_type param 'bearer', but got " + hp['token_type']);
-                errorText += "Invalid values in token_type parameter. ";
-              }
-              // Unpack ID token and validate nonce, get username
-              if (hp['id_token']) {
-                var idToken = hp['id_token'].split(".");
-                if (idToken.length === 3) {
-                  var payload = AuthenticationService.decodeJwtPart(idToken[1]);
-                  if (!payload['nonce'] || payload['nonce'] !== sessionStorage.getItem("auth.nonce")) {
-                    errorText += "Invalid 'nonce' value, possible attack detected. Please log in again. ";
-                  }
+            $scope.authData = AuthenticationService.getAuthDataHeader();
+            if (!validateState(hp['state'], expectedState)) {
+              $scope.error = "Problems with OpenID callback";
+              $scope.errorDescription = errorText;
+              $scope.http401 = "true";
+              sessionStorage.setItem("auth.state", "error");
+            }
+            else {
+              var flow = $scope.authData ? $scope.authData['authorization_flow'] : undefined;
+              console.log("Callback: authorization_flow : " +flow);
+              var isCodePKCE = flow == 'code_pkce';
+              if (isCodePKCE) {
+                // code flow with PKCE
+                var code = hp['code'];
+                var tokenEndpoint = $scope.authData['tokenEndpoint'];
+                // concurrent Solr API calls will trigger 401 and erase session's "auth.realm" in app.js
+                // save it before it's erased
+                var authRealm = sessionStorage.getItem("auth.realm");
+
+                var data = {
+                  'grant_type': 'authorization_code',
+                  'code': code,
+                  'redirect_uri': $window.location.href.split('#')[0],
+                  'scope': "openid " + $scope.authData['scope'],
+                  'code_verifier': sessionStorage.getItem('codeVerifier'),
+                  "client_id": $scope.authData['client_id']
+                };
 
-                  if (errorText === "") {
-                    sessionStorage.setItem("auth.username", payload['sub']);
-                    sessionStorage.setItem("auth.header", "Bearer " + hp['access_token']);
-                    sessionStorage.removeItem("auth.statusText");
-                    sessionStorage.removeItem("auth.stateRandom");
-                    sessionStorage.removeItem("auth.wwwAuthHeader");
-                    console.log("User " + payload['sub'] + " is logged in");
-                    var redirectTo = sessionStorage.getItem("auth.location");
-                    console.log("Redirecting to stored location " + redirectTo);
-                    sessionStorage.setItem("auth.state", "authenticated");
-                    sessionStorage.removeItem("http401");
-                    $location.path(redirectTo).hash("");
+                console.debug(`Callback. Got code: ${code} \nCalling token endpoint:: ${tokenEndpoint} `);
+                AuthenticationService.getOAuthTokens(tokenEndpoint, data).then(function(response) {
+                    var accessToken = response.access_token;
+                    var idToken = response.id_token;
+                    var tokenType = response.access_type;
+                    sessionStorage.setItem("auth.realm", authRealm);
+                    processTokensResponse(accessToken, idToken, tokenType, expectedState, hp);
+                }).catch(function (error) {
+                  errorText += "Error calling token endpoint. ";
+                  $scope.error = "Problems with OpenID callback";
+                  $scope.errorDescription = errorText;
+                  $scope.http401 = "true";
+                  sessionStorage.setItem("auth.state", "error");
+                  if (error && error.data) {
+                    console.error("Error getting tokens: " + JSON.stringify(error.data));
+                  } else {
+                    console.error("Error getting tokens: " + error);
                   }
-                } else {
-                  console.log("Expected JWT compact id_token param but got " + idToken);
-                  errorText += "Invalid values in id_token parameter. ";
-                }
-              } else {
-                console.log("Callback was missing the id_token parameter, could not validate nonce.");
-                errorText += "Callback was missing the id_token parameter, could not validate nonce. ";
-              }
-              if (hp['access_token'].split(".").length !== 3) {
-                console.log("Expected JWT compact access_token param but got " + hp['access_token']);
-                errorText += "Invalid values in access_token parameter. ";
-              }
-              if (errorText !== "") {
-                $scope.error = "Problems with OpenID callback";
-                $scope.errorDescription = errorText;
-                $scope.http401 = "true";
+                });
               }
-              // End callback processing
-            } else if (hp['error']) {
-              // The callback had errors
-              console.log("Error received from idp: " + hp['error']);
-              var errorDescriptions = {};
-              errorDescriptions['invalid_request'] = "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed.";
-              errorDescriptions['unauthorized_client'] = "The client is not authorized to request an access token using this method.";
-              errorDescriptions['access_denied'] = "The resource owner or authorization server denied the request.";
-              errorDescriptions['unsupported_response_type'] = "The authorization server does not support obtaining an access token using this method.";
-              errorDescriptions['invalid_scope'] = "The requested scope is invalid, unknown, or malformed.";
-              errorDescriptions['server_error'] = "The authorization server encountered an unexpected condition that prevented it from fulfilling the request.";
-              errorDescriptions['temporarily_unavailable'] = "The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.";
-              $scope.error = "Callback from Id Provider contained error. ";
-              if (hp['error_description']) {
-                $scope.errorDescription = decodeURIComponent(hp['error_description']);
-              } else {
-                $scope.errorDescription = errorDescriptions[hp['error']];
+              else {
+                // implicit flow
+                processTokensResponse(hp['access_token'], hp['id_token'], hp['token_type'], expectedState, hp);
               }
-              if (hp['error_uri']) {
-                $scope.errorDescription += " More information at " + hp['error_uri'] + ". ";
+            }
+        }
+      }
+
+      function validateState(state, expectedState) {
+        if (state !== expectedState) {
+          $scope.error = "Problem with auth callback";
+          console.error("Expected state param " + expectedState + " but got " + state);
+          errorText += "Invalid values in state parameter. ";
+          return false;
+        }
+        return true;
+      }
+
+      function processTokensResponse(accessToken, idToken, tokenType, expectedState, hp) {
+        if (accessToken && hp['state']) {
+          // Validate token type.
+          if (!tokenType) {
+            //Assume the type is 'bearer' if it's not returned. Most IdProviders support 'bearer' by default but don't always return the type.
+            tokenType = "bearer";
+          }
+          else if(tokenType.toLowerCase() !== "bearer") {
+            console.error("Expected token_type param 'bearer', but got " + tokenType);
+            errorText += "Invalid values in token_type parameter. ";
+          }
+          // Unpack ID token and validate nonce, get username
+          if (idToken) {
+            var idTokenArray = idToken.split(".");
+            if (idTokenArray.length === 3) {
+              var payload = AuthenticationService.decodeJwtPart(idTokenArray[1]);
+              if (!payload['nonce'] || payload['nonce'] !== sessionStorage.getItem("auth.nonce")) {
+                errorText += "Invalid 'nonce' value, possible attack detected. Please log in again. ";
               }
-              if (hp['state'] !== expectedState) {
-                $scope.errorDescription += "The state parameter returned from ID Provider did not match the one we sent.";
+
+              if (errorText === "") {
+                sessionStorage.setItem("auth.username", payload['sub']);
+                sessionStorage.setItem("auth.header", "Bearer " + accessToken);
+                sessionStorage.removeItem("auth.statusText");
+                sessionStorage.removeItem("auth.stateRandom");
+                sessionStorage.removeItem("auth.wwwAuthHeader");
+                console.log("User " + payload['sub'] + " is logged in");
+                var redirectTo = sessionStorage.getItem("auth.location");
+                console.log("Redirecting to stored location " + redirectTo);
+                sessionStorage.setItem("auth.state", "authenticated");
+                sessionStorage.removeItem("http401");
+                sessionStorage.setItem("auth.scheme", "Bearer");
+                $location.path(redirectTo).hash("");
               }
-              sessionStorage.setItem("auth.state", "error");
+            } else {
+              console.error("Expected JWT compact id_token param but got " + idTokenArray);
+              errorText += "Invalid values in id_token parameter. ";
             }
+          } else {
+            console.error("Callback was missing the id_token parameter, could not validate nonce.");
+            errorText += "Callback was missing the id_token parameter, could not validate nonce. ";
+          }
+          if (accessToken.split(".").length !== 3) {
+            console.error("Expected JWT compact access_token param but got " + accessToken);
+            errorText += "Invalid values in access_token parameter. ";
+          }
+          if (errorText !== "") {
+            $scope.error = "Problems with OpenID callback";
+            $scope.errorDescription = errorText;
+            $scope.http401 = "true";
+          }
+          // End callback processing
+        } else if (hp['error']) {
+          // The callback had errors
+          console.error("Error received from idp: " + hp['error']);
+          var errorDescriptions = {};
+          errorDescriptions['invalid_request'] = "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed.";
+          errorDescriptions['unauthorized_client'] = "The client is not authorized to request an access token using this method.";
+          errorDescriptions['access_denied'] = "The resource owner or authorization server denied the request.";
+          errorDescriptions['unsupported_response_type'] = "The authorization server does not support obtaining an access token using this method.";
+          errorDescriptions['invalid_scope'] = "The requested scope is invalid, unknown, or malformed.";
+          errorDescriptions['server_error'] = "The authorization server encountered an unexpected condition that prevented it from fulfilling the request.";
+          errorDescriptions['temporarily_unavailable'] = "The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.";
+          $scope.error = "Callback from Id Provider contained error. ";
+          if (hp['error_description']) {
+            $scope.errorDescription = decodeURIComponent(hp['error_description']);
+          } else {
+            $scope.errorDescription = errorDescriptions[hp['error']];
+          }
+          if (hp['error_uri']) {
+            $scope.errorDescription += " More information at " + hp['error_uri'] + ". ";
           }
+          if (hp['state'] !== expectedState) {
+            $scope.errorDescription += "The state parameter returned from ID Provider did not match the one we sent.";
+          }
+          sessionStorage.setItem("auth.state", "error");
+        }
+        else{
+          console.error(`Invalid data received from idp: accessToken: ${accessToken},
+                      idToken: ${idToken}, state: ${hp['state']}`);
+          errorText += "Invalid data received from the OpenID provider. ";
+          $scope.http401 = "true";
+          $scope.error = "Problems with OpenID callback.";
+          $scope.errorDescription = errorText;
+          sessionStorage.setItem("auth.state", "error");
         }
+      }
 
         if (errorText === "" && !$scope.error && authParams) {
           $scope.error = authParams['error'];
           $scope.errorDescription = authParams['error_description'];
           $scope.authData = AuthenticationService.getAuthDataHeader();
         }
-        
+
         $scope.authScheme = sessionStorage.getItem("auth.scheme");
         $scope.authRealm = sessionStorage.getItem("auth.realm");
         $scope.wwwAuthHeader = sessionStorage.getItem("auth.wwwAuthHeader");
@@ -165,20 +239,49 @@ solrAdminApp.controller('LoginController',
           $location.path("/");
         };
 
-        $scope.jwtLogin = function () {
+        $scope.jwtLogin = async function () {
           var stateRandom = Math.random().toString(36).substr(2);
           sessionStorage.setItem("auth.stateRandom", stateRandom);
           var authState = stateRandom + "_" + sessionStorage.getItem("auth.location");
           var authNonce = Math.random().toString(36).substr(2) + Math.random().toString(36).substr(2) + Math.random().toString(36).substr(2);
           sessionStorage.setItem("auth.nonce", authNonce);
-          var params = {
-            "response_type" : "id_token token",
-            "client_id" : $scope.authData['client_id'],
-            "redirect_uri" : $window.location.href.split('#')[0],
-            "scope" : "openid " + $scope.authData['scope'],
-            "state" : authState,
-            "nonce" : authNonce
-          };
+          var authData = AuthenticationService.getAuthDataHeader();
+          var flow = authData ? authData['authorization_flow'] : "implicit";
+          console.log("jwtLogin flow: "+ flow);
+          var isCodePKCE = flow == 'code_pkce';
+
+          var params = {};
+          if (isCodePKCE) {
+            console.debug("Login with 'Code PKCE' flow");
+            var codeVerifier = AuthenticationService.generateCodeVerifier();
+            var code_challenge = await AuthenticationService.generateCodeChallengeFromVerifier(codeVerifier);
+            var codeChallengeMethod = AuthenticationService.getCodeChallengeMethod();
+            sessionStorage.setItem('codeVerifier', codeVerifier);
+            params = {
+              "response_type": "code",
+              "client_id": $scope.authData['client_id'],
+              "redirect_uri": $window.location.href.split('#')[0],
+              "scope": "openid " + $scope.authData['scope'],
+              "state": authState,
+              "nonce": authNonce,
+              "response_mode": "fragment",
+              "code_challenge": code_challenge,
+              "code_challenge_method": codeChallengeMethod
+            };
+          }
+          else {
+            console.debug("Login with 'Implicit' flow");
+            params = {
+              "response_type": "id_token token",
+              "client_id": $scope.authData['client_id'],
+              "redirect_uri": $window.location.href.split('#')[0],
+              "scope": "openid " + $scope.authData['scope'],
+              "state": authState,
+              "nonce": authNonce,
+              "response_mode": 'fragment',
+              "grant_type": 'implicit'
+            };
+          }
 
           var endpointBaseUrl = $scope.authData['authorizationEndpoint'];
           var loc = endpointBaseUrl + "?" + paramsToString(params);
@@ -191,7 +294,7 @@ solrAdminApp.controller('LoginController',
             for (var p in params) {
                if( params.hasOwnProperty(p) ) {
                  arr.push(p + "=" + encodeURIComponent(params[p]));
-               } 
+               }
              }
              return arr.join("&");
           }
@@ -204,7 +307,7 @@ solrAdminApp.controller('LoginController',
             redirect.forEach(function(uri) { // Check that current node URL is among the configured callback URIs
               if ($window.location.href.startsWith(uri)) isLoginNode = true;
             });
-            return isLoginNode; 
+            return isLoginNode;
           } else {
             return true; // no redirect UIRs configured, all nodes are potential login nodes
           }
diff --git a/solr/webapp/web/js/angular/services.js b/solr/webapp/web/js/angular/services.js
index 1c0b702dbe1..2b870ab53ff 100644
--- a/solr/webapp/web/js/angular/services.js
+++ b/solr/webapp/web/js/angular/services.js
@@ -286,8 +286,75 @@ solrAdminServices.factory('System',
         })
 }])
 .factory('AuthenticationService',
-    ['base64', function (base64) {
-        var service = {};
+    ['base64', '$resource', function (base64, $resource) {
+      var service = {};
+
+      service.getOAuthTokens = function (url, data) {
+        var serializedData = serialize(data);
+        var resource = $resource(url, {}, {
+          getToken: {
+            method: 'POST',
+            timeout: 10000,
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'X-Requested-With': undefined // Set this header to undefined to prevent preflight requests
+            },
+            transformResponse: function (data) {
+              return angular.fromJson(data);
+            }
+          }
+        });
+        return resource.getToken({}, serializedData).$promise;
+      };
+
+      var codeChallengeMethod = "S256";
+      service.getCodeChallengeMethod = function getCodeChallengeMethod() {
+        return codeChallengeMethod;
+      }
+
+      service.generateCodeVerifier = function generateCodeVerifier() {
+        var codeVerifier = '';
+        var possibleChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~';
+        for (var i = 0; i < 96; i++) {
+          codeVerifier += possibleChars.charAt(Math.floor(Math.random() * possibleChars.length));
+        }
+        return codeVerifier;
+      }
+
+      service.generateCodeChallengeFromVerifier = async function generateCodeChallengeFromVerifier(v) {
+        var hashed = await sha256(v);
+        var base64encoded = base64urlencode(hashed);
+        return base64encoded;
+      }
+
+      function sha256(str) {
+        const shaObj = new jsSHA("SHA-256", "TEXT", { encoding: "UTF8" });
+        shaObj.update(str);
+        return shaObj.getHash("UINT8ARRAY");
+      }
+
+      function base64urlencode(a) {
+        var str = "";
+        var bytes = new Uint8Array(a);
+        var len = bytes.byteLength;
+        for (var i = 0; i < len; i++) {
+          str += String.fromCharCode(bytes[i]);
+        }
+        return btoa(str)
+          .replace(/\+/g, "-")
+          .replace(/\//g, "_")
+          .replace(/=+$/, "");
+      }
+
+      var serialize = function (obj) {
+        var str = [];
+        for (var p in obj) {
+          if (obj.hasOwnProperty(p)) {
+            str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+          }
+        }
+        return str.join("&");
+      };
 
         service.SetCredentials = function (username, password) {
           var authdata = base64.encode(username + ':' + password);
@@ -305,6 +372,7 @@ solrAdminServices.factory('System',
           sessionStorage.removeItem("auth.statusText");
           localStorage.removeItem("auth.stateRandom");
           sessionStorage.removeItem("auth.nonce");
+          sessionStorage.removeItem("auth.flow");
         };
 
         service.getAuthDataHeader = function () {
@@ -330,11 +398,11 @@ solrAdminServices.factory('System',
         service.isJwtCallback = function (hash) {
           var hp = this.decodeHashParams(hash);
           // console.log("Decoded hash as " + JSON.stringify(hp, undefined, 2)); // For debugging callbacks
-          return (hp['access_token'] && hp['token_type'] && hp['state']) || hp['error'];
+          return (hp['access_token'] && hp['token_type'] && hp['state']) || (hp['code'] && hp['state'])|| hp['error'];
         };
-        
+
         service.decodeHashParams = function(hash) {
-          // access_token, token_type, expires_in, state
+          // access_token, token_type, expires_in, state, code
           if (hash == null || hash.length === 0) {
             return {};
           }
diff --git a/solr/webapp/web/libs/jssha-3.3.1-sha256.min.js b/solr/webapp/web/libs/jssha-3.3.1-sha256.min.js
new file mode 100644
index 00000000000..697ee447f4c
--- /dev/null
+++ b/solr/webapp/web/libs/jssha-3.3.1-sha256.min.js
@@ -0,0 +1,24 @@
+/*
+
+ * A JavaScript implementation of the SHA family of hashes - defined in FIPS PUB 180-4, FIPS PUB 202,
+ * and SP 800-185 - as well as the corresponding HMAC implementation as defined in FIPS PUB 198-1.
+ *
+ * Copyright 2008-2023 Brian Turek, 1998-2009 Paul Johnston & Contributors
+ * Distributed under the BSD License
+ * See http://caligatio.github.com/jsSHA/ for more information
+ *
+ * Two ECMAScript polyfill functions carry the following license:
+ *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed 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
+ *
+ * THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+ * INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+ * MERCHANTABLITY OR NON-INFRINGEMENT.
+ *
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
+
+ */
+
+!function(t,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define(r):(t="undefined"!=typeof globalThis?globalThis:t||self).jsSHA=r()}(this,function(){"use strict";var n=function(t,r){return(n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,r){t.__proto__=r}||function(t,r){for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(t[n]=r[n])})(t,r)},v="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",r="ARRAYBUFFER not supported by this environment",e="UINT8ARRAY not supported by this environment";function o(t,r,n,e){for(var o,i,s=r||[0],u=(n=n||0)>>>3,h=-1===e?3:0,a=0;a<t.length;a+=1)o=(i=a+u)>>>2,s.length<=o&&s.push(0),s[o]|=t[a]<<8*(h+e*(i%4));return{value:s,binLen:8*t.length+n}}function i(t,A,g){switch(A){case"UTF8":case"UTF16BE":case"UTF16LE":break;default:throw new Error("encoding must be UTF8, UTF16BE, or UTF16LE")}switch(t){case"HEX":return function(t,r,n){var e,o,i,s=t,t=r,r=n,u=g;if(0!=s.length%2)throw new Error("String of HEX type must be in byte increments");for(var h=t||[0],a=(r=r||0)>>>3,f=-1===u?3:0,c=0;c<s.length;c+=2){if(e=parseInt(s.substr(c,2),16),isNaN(e))throw new Error("String of HEX type contains invalid characters");for(o=(i=(c>>>1)+a)>>>2;h.length<=o;)h.push(0);h[o]|=e<<8*(f+u*(i%4))}return{value:h,binLen:4*s.length+r}};case"TEXT":return function(t,r,n){var e,o,i,s,u,h,a,f,c=t,t=A,p=0,l=g,w=0,d=r||[0],v=(p=n||0)>>>3;if("UTF8"===t)for(a=-1===l?3:0,i=0;i<c.length;i+=1)for(o=[],(e=c.charCodeAt(i))<128?o.push(e):e<2048?(o.push(192|e>>>6),o.push(128|63&e)):e<55296||57344<=e?o.push(224|e>>>12,128|e>>>6&63,128|63&e):(e=65536+((1023&e)<<10|1023&c.charCodeAt(i+=1)),o.push(240|e>>>18,128|e>>>12&63,128|e>>>6&63,128|63&e)),s=0;s<o.length;s+=1){for(u=(h=w+v)>>>2;d.length<=u;)d.push(0);d[u]|=o[s]<<8*(a+l*(h%4)),w+=1}else for(a=-1===l?2:0,f="UTF16LE"===t&&1!==l||"UTF16LE"!==t&&1===l,i=0;i<c.length;i+=1){for(e=c.charCodeAt(i),!0==f&&(e=(s=255&e)<<8|e>>>8),u=(h=w+v)>>>2;d.length<=u;)d.push(0);d[u]|=e<<8*(a+l*(h%4)),w+=2}return{value:d,binLen:8*w+p}};case"B64":return function(t,r,n){var e,o,i,s,u,h,a=t,t=0,f=g,c=0,p=r||[0],l=(t=n||0)>>>3,w=-1===f?3:0,r=a.indexOf("=");if(-1===a.search(/^[a-zA-Z0-9=+/]+$/))throw new Error("Invalid character in base-64 string");if(a=a.replace(/=/g,""),-1!==r&&r<a.length)throw new Error("Invalid '=' found in base-64 string");for(e=0;e<a.length;e+=4){for(s=a.substr(e,4),o=i=0;o<s.length;o+=1)i|=v.indexOf(s.charAt(o))<<18-6*o;for(o=0;o<s.length-1;o+=1){for(u=(h=c+l)>>>2;p.length<=u;)p.push(0);p[u]|=(i>>>16-8*o&255)<<8*(w+f*(h%4)),c+=1}}return{value:p,binLen:8*c+t}};case"BYTES":return function(t,r,n){for(var e,o,i,s=t,t=0,u=g,h=r||[0],a=(t=n||0)>>>3,f=-1===u?3:0,c=0;c<s.length;c+=1)e=s.charCodeAt(c),o=(i=c+a)>>>2,h.length<=o&&h.push(0),h[o]|=e<<8*(f+u*(i%4));return{value:h,binLen:8*s.length+t}};case"ARRAYBUFFER":try{new ArrayBuffer(0)}catch(t){throw new Error(r)}return function(t,r,n){return r=r,n=n,e=g,o(new Uint8Array(t),r,n,e);var e};case"UINT8ARRAY":try{new Uint8Array(0)}catch(t){throw new Error(e)}return function(t,r,n){return o(t,r,n,g)};default:throw new Error("format must be HEX, TEXT, B64, BYTES, ARRAYBUFFER, or UINT8ARRAY")}}function s(t,l,w,d){switch(t){case"HEX":return function(t){for(var r,n=t,e=w,t=d,o="0123456789abcdef",i="",s=l/8,u=-1===e?3:0,h=0;h<s;h+=1)r=n[h>>>2]>>>8*(u+e*(h%4)),i+=o.charAt(r>>>4&15)+o.charAt(15&r);return t.outputUpper?i.toUpperCase():i};case"B64":return function(t){for(var r,n,e,o,i=t,s=l,u=w,h=d,a="",f=s/8,c=-1===u?3:0,p=0;p<f;p+=3)for(e=p+1<f?i[p+1>>>2]:0,o=p+2<f?i[p+2>>>2]:0,n=(i[p>>>2]>>>8*(c+u*(p%4))&255)<<16|(e>>>8*(c+u*((p+1)%4))&255)<<8|o>>>8*(c+u*((p+2)%4))&255,r=0;r<4;r+=1)a+=8*p+6*r<=s?v.charAt(n>>>6*(3-r)&63):h.b64Pad;return a};case"BYTES":return function(t){for(var r,n=t,e=w,o="",i=l/8,s=-1===e?3:0,u=0;u<i;u+=1)r=n[u>>>2]>>>8*(s+e*(u%4))&255,o+=String.fromCharCode(r);return o};case"ARRAYBUFFER":try{new ArrayBuffer(0)}catch(t){throw new Error(r)}return function(t){for(var r=t,n=w,e=l/8,t=new ArrayBuffer(e),o=new Uint8Array(t),i=-1===n?3:0,s=0;s<e;s+=1)o[s]=r[s>>>2]>>>8*(i+n*(s%4))&255;return t};case"UINT8ARRAY":try{new Uint8Array(0)}catch(t){throw new Error(e)}return function(t){for(var r=t,n=w,e=l/8,o=-1===n?3:0,i=new Uint8Array(e),s=0;s<e;s+=1)i[s]=r[s>>>2]>>>8*(o+n*(s%4))&255;return i};default:throw new Error("format must be HEX, B64, BYTES, ARRAYBUFFER, or UINT8ARRAY")}}var E=[1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298],u=[3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428],h=[1779033703,3144134277,1013904242,2773480762,1359893119,2600822924,528734635,1541459225];function a(t){var r={outputUpper:!1,b64Pad:"=",outputLen:-1},t=t||{},n="Output length must be a multiple of 8";if(r.outputUpper=t.outputUpper||!1,t.b64Pad&&(r.b64Pad=t.b64Pad),t.outputLen){if(t.outputLen%8!=0)throw new Error(n);r.outputLen=t.outputLen}else if(t.shakeLen){if(t.shakeLen%8!=0)throw new Error(n);r.outputLen=t.shakeLen}if("boolean"!=typeof r.outputUpper)throw new Error("Invalid outputUpper formatting option");if("string"!=typeof r.b64Pad)throw new Error("Invalid b64Pad formatting option");return r}function y(t,r){return t>>>r|t<<32-r}function m(t,r){var n=(65535&t)+(65535&r);return(65535&(t>>>16)+(r>>>16)+(n>>>16))<<16|65535&n}function f(t){return("SHA-224"==t?u:h).slice()}function c(t,r){for(var n,e,o,i,s,u,h,a=[],f=r[0],c=r[1],p=r[2],l=r[3],w=r[4],d=r[5],v=r[6],A=r[7],g=0;g<64;g+=1)a[g]=g<16?t[g]:(o=y(o=a[g-2],17)^y(o,19)^o>>>10,i=a[g-7],h=a[g-15],h=y(h,7)^y(h,18)^h>>>3,s=a[g-16],u=void 0,(65535&(o>>>16)+(i>>>16)+(h>>>16)+(s>>>16)+((u=(65535&o)+(65535&i)+(65535&h)+(65535&s))>>>16))<<16|65535&u),o=A,i=y(w,6)^y(w,11)^y(w,25),h=w&d^~w&v,s=E[g],u=a[g],e=void 0,n=m(y(f,2)^y(f,13)^y(f,22),f&c^f&p^c&p),A=v,v=d,d=w,w=m(l,e=(65535&(o>>>16)+(i>>>16)+(h>>>16)+(s>>>16)+(u>>>16)+((e=(65535&o)+(65535&i)+(65535&h)+(65535&s)+(65535&u))>>>16))<<16|65535&e),l=p,p=c,c=f,f=m(e,n);return r[0]=m(f,r[0]),r[1]=m(c,r[1]),r[2]=m(p,r[2]),r[3]=m(l,r[3]),r[4]=m(w,r[4]),r[5]=m(d,r[5]),r[6]=m(v,r[6]),r[7]=m(A,r[7]),r}A.prototype.update=function(t){for(var r=0,n=this.m>>>5,t=this.h(t,this.H,this.Y),e=t.binLen,o=t.value,i=e>>>5,s=0;s<i;s+=n)r+this.m<=e&&(this.R=this.p(o.slice(s,s+n),this.R),r+=this.m);return this.I+=r,this.H=o.slice(r>>>5),this.Y=e%this.m,this.C=!0,this},A.prototype.getHash=function(t,r){var n,e,o=this.F,r=a(r);if(this.g){if(-1===r.outputLen)throw new Error("Output length must be specified in options");o=r.outputLen}t=s(t,o,this.u,r);if(this.L&&this.t)return t(this.t(r));for(e=this.T(this.H.slice(),this.Y,this.I,this.A(this.R),o),n=1;n<this.numRounds;n+=1)this.g&&o%32!=0&&(e[e.length-1]&=16777215>>>24-o%32),e=this.T(e,o,0,this.U(this.S),o);return t(e)},A.prototype.setHMACKey=function(t,r,n){if(!this.o)throw new Error("Variant does not support HMAC");if(this.C)throw new Error("Cannot set MAC key after calling update");r=i(r,(n||{}).encoding||"UTF8",this.u);this.B(r(t))},A.prototype.B=function(t){var r,n=this.m>>>3,e=n/4-1;if(1!==this.numRounds)throw new Error("Cannot set numRounds with MAC");if(this.L)throw new Error("MAC key already set");for(n<t.binLen/8&&(t.value=this.T(t.value,t.binLen,0,this.U(this.S),this.F));t.value.length<=e;)t.value.push(0);for(r=0;r<=e;r+=1)this.N[r]=909522486^t.value[r],this.X[r]=1549556828^t.value[r];this.R=this.p(this.N,this.R),this.I=this.m,this.L=!0},A.prototype.getHMAC=function(t,r){r=a(r);return s(t,this.F,this.u,r)(this.i())},A.prototype.i=function(){if(!this.L)throw new Error("Cannot call getHMAC without first setting MAC key");var t=this.T(this.H.slice(),this.Y,this.I,this.A(this.R),this.F),r=this.p(this.X,this.U(this.S));return this.T(t,this.F,this.m,r,this.F)};var p=A;function t(h,t,r){var n=this;if("SHA-224"!==h&&"SHA-256"!==h)throw new Error("Chosen SHA variant is not supported");var e=r||{};return(n=p.call(this,h,t,r)||this).t=n.i,n.o=!0,n.u=-1,n.h=i(n.v,n.l,n.u),n.p=c,n.A=function(t){return t.slice()},n.U=f,n.T=function(t,r,n,e){for(var o,i=t,t=r,s=e,r=h,u=15+(t+65>>>9<<4),e=t+n;i.length<=u;)i.push(0);for(i[t>>>5]|=128<<24-t%32,i[u]=4294967295&e,i[u-1]=e/4294967296|0,o=0;o<i.length;o+=16)s=c(i.slice(o,o+16),s);return"SHA-224"===r?[s[0],s[1],s[2],s[3],s[4],s[5],s[6]]:s},n.R=f(h),n.m=512,n.F="SHA-224"===h?224:256,n.g=!1,e.hmacKey&&n.B(function(t,r){var n="hmacKey must include a value and format";if(!t)throw new Error(n);if(void 0!==t.value&&t.format)return i(t.format,t.encoding||"UTF8",r)(t.value);throw new Error(n)}(e.hmacKey,n.u)),n}var l=t,w=p;if("function"!=typeof w&&null!==w)throw new TypeError("Class extends value "+String(w)+" is not a constructor or null");function d(){this.constructor=l}return n(l,w),l.prototype=null===w?Object.create(w):(d.prototype=w.prototype,new d),t;function A(t,r,n){n=n||{};if(this.v=r,this.l=n.encoding||"UTF8",this.numRounds=n.numRounds||1,isNaN(this.numRounds)||this.numRounds!==parseInt(this.numRounds,10)||this.numRounds<1)throw new Error("numRounds must a integer >= 1");this.S=t,this.H=[],this.Y=0,this.C=!1,this.I=0,this.L=!1,this.N=[],this.X=[]}});
\ No newline at end of file

From 729b4979a395e48f9e171281ecf4db67a0493e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Thu, 14 Sep 2023 09:02:04 +0200
Subject: [PATCH 078/160] SOLR-16954: Fix test failures caused by update
 circuit breaker (#1918)

---
 .../src/test/org/apache/solr/util/BaseTestCircuitBreaker.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 025db34ed76..68ee7f4ae3a 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -43,6 +43,7 @@ public abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   protected static void indexDocs() {
+    removeAllExistingCircuitBreakers();
     for (int i = 0; i < 20; i++) {
       assertU(adoc("name", "john smith", "id", "1"));
       assertU(adoc("name", "johathon smith", "id", "2"));
@@ -269,7 +270,7 @@ public void testErrorCode() {
         CircuitBreaker.getErrorCode(List.of(new MemoryCircuitBreaker())));
   }
 
-  private void removeAllExistingCircuitBreakers() {
+  private static void removeAllExistingCircuitBreakers() {
     h.getCore().getCircuitBreakerRegistry().deregisterAll();
   }
 

From 5f25f09de4652c1c48095e45f68c2f0e28f8a464 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 14 Sep 2023 13:22:32 -0700
Subject: [PATCH 079/160] =?UTF-8?q?SOLR-16938=20Auto=20configure=20tracer?=
 =?UTF-8?q?=20without=20a=20<tracerConfig>=20tag=20in=20solr=E2=80=A6=20(#?=
 =?UTF-8?q?1922)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 solr/CHANGES.txt                              |  2 +
 .../apache/solr/core/TracerConfigurator.java  | 77 ++++++++++++++++++-
 .../solr/util/tracing/SimplePropagator.java   |  2 +-
 .../apache/solr/util/tracing/TraceUtils.java  |  6 +-
 .../solr/core/TestTracerConfigurator.java     | 53 +++++++++++++
 .../opentelemetry/OtelTracerConfigurator.java | 41 +++++-----
 .../CustomTestOtelTracerConfigurator.java     |  2 +-
 .../OtelTracerConfiguratorTest.java           | 13 +++-
 solr/server/resources/log4j2.xml              |  6 +-
 .../pages/distributed-tracing.adoc            |  2 +
 .../solr/cloud/MiniSolrCloudCluster.java      |  7 ++
 11 files changed, 177 insertions(+), 34 deletions(-)
 create mode 100644 solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7d5c3776f5c..4e46e13a900 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -128,6 +128,8 @@ Improvements
 * SOLR-16461: `/solr/coreName/replication?command=backup` now has a v2 equivalent, available at
   `/api/cores/coreName/replication/backups` (Sanjay Dutt, Jason Gerlowski, Alex Deparvu)
 
+* SOLR-16938: Auto configure tracer without a <tracerConfig> tag in solr.xml (Alex Deparvu)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
index 633201db82f..47e5d32cb7b 100644
--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
@@ -18,9 +18,16 @@
 package org.apache.solr.core;
 
 import io.opentelemetry.api.trace.Tracer;
+import java.lang.invoke.MethodHandles;
+import java.util.Locale;
+import java.util.Map;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.NamedList;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
 import org.apache.solr.util.tracing.SimplePropagator;
 import org.apache.solr.util.tracing.TraceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Produces a {@link Tracer} from configuration. */
 public abstract class TracerConfigurator implements NamedListInitializedPlugin {
@@ -28,19 +35,81 @@ public abstract class TracerConfigurator implements NamedListInitializedPlugin {
   public static final boolean TRACE_ID_GEN_ENABLED =
       Boolean.parseBoolean(System.getProperty("solr.alwaysOnTraceId", "true"));
 
+  private static final String DEFAULT_CLASS_NAME =
+      System.getProperty(
+          "solr.otelDefaultConfigurator", "org.apache.solr.opentelemetry.OtelTracerConfigurator");
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   public static Tracer loadTracer(SolrResourceLoader loader, PluginInfo info) {
     if (info != null && info.isEnabled()) {
       TracerConfigurator configurator =
           loader.newInstance(info.className, TracerConfigurator.class);
       configurator.init(info.initArgs);
       return configurator.getTracer();
-
-    } else if (TRACE_ID_GEN_ENABLED) {
+    }
+    if (shouldAutoConfigOTEL()) {
+      return autoConfigOTEL(loader);
+    }
+    if (TRACE_ID_GEN_ENABLED) {
       return SimplePropagator.load();
-    } else {
-      return TraceUtils.noop();
     }
+    return TraceUtils.getGlobalTracer();
   }
 
   protected abstract Tracer getTracer();
+
+  private static Tracer autoConfigOTEL(SolrResourceLoader loader) {
+    try {
+      TracerConfigurator configurator =
+          loader.newInstance(DEFAULT_CLASS_NAME, TracerConfigurator.class);
+      configurator.init(new NamedList<>());
+      return configurator.getTracer();
+    } catch (SolrException e) {
+      log.error(
+          "Unable to auto-config OpenTelemetry with class {}. Make sure you have enabled the 'opentelemetry' module",
+          DEFAULT_CLASS_NAME,
+          e);
+    }
+    return TraceUtils.getGlobalTracer();
+  }
+
+  /**
+   * Best effort way to determine if we should attempt to init OTEL from system properties.
+   *
+   * @return true if OTEL should be init
+   */
+  static boolean shouldAutoConfigOTEL() {
+    var env = System.getenv();
+    boolean isSdkDisabled = Boolean.parseBoolean(getConfig("OTEL_SDK_DISABLED", env));
+    if (isSdkDisabled) {
+      return false;
+    }
+    return getConfig("OTEL_SERVICE_NAME", env) != null;
+  }
+
+  /**
+   * Returns system property if found, else returns environment variable, or null if none found.
+   *
+   * @param envName the environment variable to look for
+   * @param env current env
+   * @return the resolved value
+   */
+  protected static String getConfig(String envName, Map<String, String> env) {
+    String sysName = envNameToSyspropName(envName);
+    String sysValue = System.getProperty(sysName);
+    String envValue = env.get(envName);
+    return sysValue != null ? sysValue : envValue;
+  }
+
+  /**
+   * In OTEL Java SDK there is a convention that the java property name for OTEL_FOO_BAR is
+   * otel.foo.bar
+   *
+   * @param envName the environmnet name to convert
+   * @return the corresponding sysprop name
+   */
+  protected static String envNameToSyspropName(String envName) {
+    return envName.toLowerCase(Locale.ROOT).replace("_", ".");
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
index aa029899347..e81657ca2ae 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/SimplePropagator.java
@@ -64,7 +64,7 @@ public static synchronized Tracer load() {
       GlobalOpenTelemetry.set(otel);
       loaded = true;
     }
-    return GlobalOpenTelemetry.getTracer("solr");
+    return TraceUtils.getGlobalTracer();
   }
 
   public static TextMapPropagator getInstance() {
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index e63d8c6cbde..4d305f373fd 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -22,7 +22,6 @@
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.util.List;
@@ -36,7 +35,6 @@ public class TraceUtils {
 
   private static final String REQ_ATTR_TRACING_SPAN = Span.class.getName();
   private static final String REQ_ATTR_TRACING_TRACER = Tracer.class.getName();
-  private static final Tracer NOOP_TRACER = TracerProvider.noop().get(null);
 
   public static final String DEFAULT_SPAN_NAME = "http.request";
   public static final String WRITE_QUERY_RESPONSE_SPAN_NAME = "writeQueryResponse";
@@ -66,8 +64,8 @@ public class TraceUtils {
 
   public static final String TAG_DB_TYPE_SOLR = "solr";
 
-  public static Tracer noop() {
-    return NOOP_TRACER;
+  public static Tracer getGlobalTracer() {
+    return GlobalOpenTelemetry.getTracer("solr");
   }
 
   public static TextMapPropagator getTextMapPropagator() {
diff --git a/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java b/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java
new file mode 100644
index 00000000000..4882a295dfa
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java
@@ -0,0 +1,53 @@
+/*
+ * 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.core;
+
+import io.opentelemetry.api.trace.TracerProvider;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.util.tracing.TraceUtils;
+import org.junit.Test;
+
+public class TestTracerConfigurator extends SolrTestCaseJ4 {
+
+  @Test
+  public void configuratorClassDoesNotExistTest() {
+    System.setProperty("otel.service.name", "something");
+    System.setProperty("solr.otelDefaultConfigurator", "configuratorClassDoesNotExistTest");
+    try {
+      assertTrue(TracerConfigurator.shouldAutoConfigOTEL());
+      SolrResourceLoader loader = new SolrResourceLoader(TEST_PATH().resolve("collection1"));
+      TracerConfigurator.loadTracer(loader, null);
+      assertEquals(
+          "Expecting noop otel after failure to auto-init",
+          TracerProvider.noop().get(null),
+          TraceUtils.getGlobalTracer());
+    } finally {
+      System.clearProperty("solr.otelDefaultConfigurator");
+      System.clearProperty("otel.service.name");
+    }
+  }
+
+  @Test
+  public void otelDisabledByProperty() {
+    System.setProperty("OTEL_SDK_DISABLED", "true");
+    try {
+      assertFalse(TracerConfigurator.shouldAutoConfigOTEL());
+    } finally {
+      System.clearProperty("OTEL_SDK_DISABLED");
+    }
+  }
+}
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
index 25d819718dc..221cb571b7b 100644
--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
@@ -16,7 +16,6 @@
  */
 package org.apache.solr.opentelemetry;
 
-import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import java.lang.invoke.MethodHandles;
@@ -28,6 +27,7 @@
 import java.util.stream.Collectors;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.TracerConfigurator;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,17 +49,17 @@ public OtelTracerConfigurator() {
 
   @Override
   public Tracer getTracer() {
-    // TODO remove reliance on global
-    return GlobalOpenTelemetry.getTracer("solr");
+    return TraceUtils.getGlobalTracer();
   }
 
   @Override
   public void init(NamedList<?> args) {
-    prepareConfiguration();
+    prepareConfiguration(args);
     AutoConfiguredOpenTelemetrySdk.initialize();
   }
 
-  void prepareConfiguration() {
+  void prepareConfiguration(NamedList<?> args) {
+    injectPluginSettingsIfNotConfigured(args);
     setDefaultIfNotConfigured("OTEL_SERVICE_NAME", "solr");
     setDefaultIfNotConfigured("OTEL_TRACES_EXPORTER", "otlp");
     setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
@@ -82,6 +82,20 @@ void prepareConfiguration() {
     System.setProperty("otel.logs.exporter", "none");
   }
 
+  /**
+   * Will inject plugin configuration values into system properties if not already setup (existing
+   * system properties take precedence)
+   */
+  private void injectPluginSettingsIfNotConfigured(NamedList<?> args) {
+    args.forEach(
+        (k, v) -> {
+          var asSysName = envNameToSyspropName(k);
+          if (asSysName.startsWith("otel.")) {
+            setDefaultIfNotConfigured(asSysName, v.toString());
+          }
+        });
+  }
+
   /**
    * Add explicit tags statically to all traces, independent of request. Attributes with same name
    * supplied in ENV or SysProp will take precedence over attributes added in code.
@@ -138,24 +152,11 @@ Map<String, String> getCurrentOtelConfig() {
   /**
    * Returns system property if found, else returns environment variable, or null if none found.
    *
-   * @param envName the environment to look for
+   * @param envName the environment variable to look for
    * @return the resolved value
    */
   String getEnvOrSysprop(String envName) {
-    String envValue = currentEnv.get(envName);
-    String propValue = System.getProperty(envNameToSyspropName(envName));
-    return propValue != null ? propValue : envValue;
-  }
-
-  /**
-   * In OTEL Java SDK there is a convention that the java property name for OTEL_FOO_BAR is
-   * otel.foo.bar
-   *
-   * @param envName the environmnet name to convert
-   * @return the corresponding sysprop name
-   */
-  static String envNameToSyspropName(String envName) {
-    return envName.toLowerCase(Locale.ROOT).replace("_", ".");
+    return getConfig(envName, currentEnv);
   }
 
   /**
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
index bad6cce7d9f..cf7723f89ed 100644
--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/CustomTestOtelTracerConfigurator.java
@@ -62,7 +62,7 @@ public static synchronized void prepareForTest() {
 
     // force early init
     CustomTestOtelTracerConfigurator tracer = new CustomTestOtelTracerConfigurator();
-    tracer.prepareConfiguration();
+    tracer.prepareConfiguration(new NamedList<>());
 
     bootOtel();
   }
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
index b4825c4e7fd..c33db57d28f 100644
--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.util.NamedList;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -88,9 +89,19 @@ public void testSetDefaultIfNotConfigured() {
   @Test
   public void testResourceAttributes() throws Exception {
     System.setProperty("otel.resource.attributes", "foo=bar,ILLEGAL-LACKS-VALUE,");
-    instance.prepareConfiguration();
+    instance.prepareConfiguration(new NamedList<>());
     assertEquals(
         List.of("host.name=my.solr.host", "foo=bar"),
         List.of(System.getProperty("otel.resource.attributes").split(",")));
   }
+
+  @Test
+  public void testPluginConfig() throws Exception {
+    NamedList<String> conf = new NamedList<>();
+    conf.add("OTEL_K1", "conf-k1"); // will be replaced by sys prop
+    conf.add("otel.k7", "conf-k7"); // will be kept
+    instance.prepareConfiguration(conf);
+    assertEquals("prop-k1", instance.getCurrentOtelConfig().get("OTEL_K1"));
+    assertEquals("conf-k7", instance.getCurrentOtelConfig().get("OTEL_K7"));
+  }
 }
diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xml
index 752c740514a..006de0c965c 100644
--- a/solr/server/resources/log4j2.xml
+++ b/solr/server/resources/log4j2.xml
@@ -23,7 +23,7 @@
     <Console name="STDOUT" target="SYSTEM_OUT">
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
     </Console>
@@ -34,7 +34,7 @@
         filePattern="${sys:solr.log.dir}/solr.log.%i" >
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
       <Policies>
@@ -50,7 +50,7 @@
         filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i" >
       <PatternLayout>
         <Pattern>
-          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+          %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
         </Pattern>
       </PatternLayout>
       <Policies>
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
index 18cac7c8695..92fe6c894a1 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
@@ -62,6 +62,8 @@ This module brings support for the industry standard https://opentelemetry.io[Op
 <tracerConfig name="tracerConfig" class="org.apache.solr.opentelemetry.OtelTracerConfigurator"/>
 ----
 
+As an alternative to changing the `solr.xml` file, the `OTEL` tracer will be enabled if the system property `otel.service.name` or environment variable `OTEL_SERVICE_NAME` is present. The `opentelemetry` module still needs to be enabled for the tracer to work.
+
 Enable the module with either system property `-Dsolr.modules=opentelemetry` or environment variable `SOLR_MODULES=opentelemetry`.
 
 === Configuration
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 fdc64237a80..3da6dd7a23e 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
@@ -1288,6 +1288,13 @@ public Builder withDefaultClusterProperty(String key, String value) {
       return this;
     }
 
+    /**
+     * Disables the default/built-in simple trace ID generation/propagation.
+     *
+     * <p>Tracers are registered as global singletons and if for example a test needs to use a
+     * MockTracer or a "real" Tracer, it needs to call this method so that the test setup doesn't
+     * accidentally reset the Tracer it wants to use.
+     */
     public Builder withTraceIdGenerationDisabled() {
       this.disableTraceIdGeneration = true;
       return this;

From e9551f27bce2fba7ada40926629a0d57e5d674b1 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 14 Sep 2023 16:07:42 -0700
Subject: [PATCH 080/160] SOLR-16938 Auto configure tracer without a
 <tracerConfig> tag in solr.xml (#1927)

- fixed test
---
 .../solr/core/TestTracerConfigurator.java     | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java b/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java
index 4882a295dfa..bb30a6e8f2d 100644
--- a/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java
+++ b/solr/core/src/test/org/apache/solr/core/TestTracerConfigurator.java
@@ -19,35 +19,42 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.util.tracing.TraceUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestTracerConfigurator extends SolrTestCaseJ4 {
 
-  @Test
-  public void configuratorClassDoesNotExistTest() {
+  @BeforeClass
+  public static void setUpProperties() throws Exception {
     System.setProperty("otel.service.name", "something");
     System.setProperty("solr.otelDefaultConfigurator", "configuratorClassDoesNotExistTest");
-    try {
-      assertTrue(TracerConfigurator.shouldAutoConfigOTEL());
-      SolrResourceLoader loader = new SolrResourceLoader(TEST_PATH().resolve("collection1"));
-      TracerConfigurator.loadTracer(loader, null);
-      assertEquals(
-          "Expecting noop otel after failure to auto-init",
-          TracerProvider.noop().get(null),
-          TraceUtils.getGlobalTracer());
-    } finally {
-      System.clearProperty("solr.otelDefaultConfigurator");
-      System.clearProperty("otel.service.name");
-    }
+  }
+
+  @AfterClass
+  public static void clearProperties() throws Exception {
+    System.clearProperty("solr.otelDefaultConfigurator");
+    System.clearProperty("otel.service.name");
+  }
+
+  @Test
+  public void configuratorClassDoesNotExistTest() {
+    assertTrue(TracerConfigurator.shouldAutoConfigOTEL());
+    SolrResourceLoader loader = new SolrResourceLoader(TEST_PATH().resolve("collection1"));
+    TracerConfigurator.loadTracer(loader, null);
+    assertEquals(
+        "Expecting noop otel after failure to auto-init",
+        TracerProvider.noop().get(null),
+        TraceUtils.getGlobalTracer());
   }
 
   @Test
   public void otelDisabledByProperty() {
-    System.setProperty("OTEL_SDK_DISABLED", "true");
+    System.setProperty("otel.sdk.disabled", "true");
     try {
       assertFalse(TracerConfigurator.shouldAutoConfigOTEL());
     } finally {
-      System.clearProperty("OTEL_SDK_DISABLED");
+      System.clearProperty("otel.sdk.disabled");
     }
   }
 }

From 6d7b68af6349e7e72754b7a64442e41c3736b084 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 14 Sep 2023 19:07:38 -0700
Subject: [PATCH 081/160] SOLR-16950 SimpleTracer propagation for manual
 transaction ids (#1906)

---
 solr/CHANGES.txt                              |   2 +
 ...estSimplePropagatorDistributedTracing.java | 141 +++++++++++++-----
 .../apache/solr/client/solrj/SolrRequest.java |  10 ++
 .../client/solrj/request/UpdateRequest.java   |   1 +
 4 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4e46e13a900..67ddcdd211d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -130,6 +130,8 @@ Improvements
 
 * SOLR-16938: Auto configure tracer without a <tracerConfig> tag in solr.xml (Alex Deparvu)
 
+* SOLR-16950: SimpleTracer propagation for manual transaction ids
+
 Optimizations
 ---------------------
 
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 0213fce7b9a..86693edf12d 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
@@ -20,11 +20,17 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.TracerProvider;
 import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
+import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.apache.solr.core.SolrCore;
@@ -55,49 +61,95 @@ public static void setupCluster() throws Exception {
   }
 
   @Test
-  public void test() throws IOException, SolrServerException {
+  public void testQueryRequest() throws IOException, SolrServerException {
     CloudSolrClient cloudClient = cluster.getSolrClient();
+    cloudClient.add(COLLECTION, sdoc("id", "1"));
+    cloudClient.add(COLLECTION, sdoc("id", "2"));
+    cloudClient.add(COLLECTION, sdoc("id", "3"));
 
-    // Indexing has trace ids
-    try (LogListener reqLog = LogListener.info(LogUpdateProcessorFactory.class.getName())) {
-      // verify all indexing events have trace id present
-      cloudClient.add(COLLECTION, sdoc("id", "1"));
-      cloudClient.add(COLLECTION, sdoc("id", "2"));
-      cloudClient.add(COLLECTION, sdoc("id", "3"));
-      var queue = reqLog.getQueue();
-      assertFalse(queue.isEmpty());
-      while (!queue.isEmpty()) {
-        var reqEvent = queue.poll();
-        String evTraceId = reqEvent.getContextData().getValue(MDCLoggingContext.TRACE_ID);
-        assertNotNull(evTraceId);
+    try (LogListener reqLog = LogListener.info(SolrCore.class.getName() + ".Request")) {
+
+      try (SolrClient testClient = newCloudLegacySolrClient()) {
+        // verify all query events have the same auto-generated trace id
+        var r1 = testClient.query(COLLECTION, new SolrQuery("*:*"));
+        assertEquals(0, r1.getStatus());
+        assertSameTraceId(reqLog, null);
+
+        // verify all query events have the same 'custom' trace id
+        String traceId = "tidTestQueryRequest1";
+        var q = new QueryRequest(new SolrQuery("*:*"));
+        q.addHeader(SimplePropagator.TRACE_ID, traceId);
+        var r2 = q.process(testClient, COLLECTION);
+        assertEquals(0, r2.getStatus());
+        assertSameTraceId(reqLog, traceId);
       }
 
-      // TODO this doesn't work due to solr client creating the UpdateRequest without headers
-      //      // verify all events have the same 'custom' traceid
-      //      String traceId = "tidTestSimplePropagatorDistributedTracing0";
-      //      var doc = sdoc("id", "4");
-      //      UpdateRequest u = new UpdateRequest();
-      //      u.add(doc);
-      //      u.addHeader(SimplePropagator.TRACE_ID, traceId);
-      //      var r1 = u.process(cloudClient, COLLECTION);
-      //      assertEquals(0, r1.getStatus());
-      //      assertSameTraceId(reqLog, traceId);
+      try (SolrClient testClient = newCloudHttp2SolrClient()) {
+        // verify all query events have the same auto-generated trace id
+        var r1 = testClient.query(COLLECTION, new SolrQuery("*:*"));
+        assertEquals(0, r1.getStatus());
+        assertSameTraceId(reqLog, null);
+
+        // verify all query events have the same 'custom' trace id
+        String traceId = "tidTestQueryRequest2";
+        var q = new QueryRequest(new SolrQuery("*:*"));
+        q.addHeader(SimplePropagator.TRACE_ID, traceId);
+        var r2 = q.process(testClient, COLLECTION);
+        assertEquals(0, r2.getStatus());
+        assertSameTraceId(reqLog, traceId);
+      }
     }
+  }
 
-    // Searching has trace ids
-    try (LogListener reqLog = LogListener.info(SolrCore.class.getName() + ".Request")) {
-      // verify all query events have the same auto-generated traceid
-      var r1 = cloudClient.query(COLLECTION, new SolrQuery("*:*"));
-      assertEquals(0, r1.getStatus());
-      assertSameTraceId(reqLog, null);
-
-      // verify all query events have the same 'custom' traceid
-      String traceId = "tidTestSimplePropagatorDistributedTracing1";
-      var q = new QueryRequest(new SolrQuery("*:*"));
-      q.addHeader(SimplePropagator.TRACE_ID, traceId);
-      var r2 = q.process(cloudClient, COLLECTION);
-      assertEquals(0, r2.getStatus());
-      assertSameTraceId(reqLog, traceId);
+  @Test
+  public void testUpdateRequest() throws IOException, SolrServerException {
+    try (LogListener reqLog = LogListener.info(LogUpdateProcessorFactory.class.getName())) {
+
+      try (SolrClient testClient = newCloudLegacySolrClient()) {
+        // verify all indexing events have trace id present
+        testClient.add(COLLECTION, sdoc("id", "1"));
+        testClient.add(COLLECTION, sdoc("id", "3"));
+        var queue = reqLog.getQueue();
+        assertFalse(queue.isEmpty());
+        while (!queue.isEmpty()) {
+          var reqEvent = queue.poll();
+          String evTraceId = reqEvent.getContextData().getValue(MDCLoggingContext.TRACE_ID);
+          assertNotNull(evTraceId);
+        }
+
+        // verify all events have the same 'custom' trace id
+        String traceId = "tidTestUpdateRequest1";
+        UpdateRequest u = new UpdateRequest();
+        u.add(sdoc("id", "5"));
+        u.add(sdoc("id", "7"));
+        u.addHeader(SimplePropagator.TRACE_ID, traceId);
+        var r1 = u.process(testClient, COLLECTION);
+        assertEquals(0, r1.getStatus());
+        assertSameTraceId(reqLog, traceId);
+      }
+
+      try (SolrClient testClient = newCloudHttp2SolrClient()) {
+        // verify all indexing events have trace id present
+        testClient.add(COLLECTION, sdoc("id", "2"));
+        testClient.add(COLLECTION, sdoc("id", "4"));
+        var queue = reqLog.getQueue();
+        assertFalse(queue.isEmpty());
+        while (!queue.isEmpty()) {
+          var reqEvent = queue.poll();
+          String evTraceId = reqEvent.getContextData().getValue(MDCLoggingContext.TRACE_ID);
+          assertNotNull(evTraceId);
+        }
+
+        // verify all events have the same 'custom' trace id
+        String traceId = "tidTestUpdateRequest2";
+        UpdateRequest u = new UpdateRequest();
+        u.add(sdoc("id", "6"));
+        u.add(sdoc("id", "8"));
+        u.addHeader(SimplePropagator.TRACE_ID, traceId);
+        var r1 = u.process(testClient, COLLECTION);
+        assertEquals(0, r1.getStatus());
+        assertSameTraceId(reqLog, traceId);
+      }
     }
   }
 
@@ -114,4 +166,19 @@ private void assertSameTraceId(LogListener reqLog, String traceId) {
       assertEquals(traceId, evTraceId);
     }
   }
+
+  private CloudSolrClient newCloudLegacySolrClient() {
+    return new CloudLegacySolrClient.Builder(
+            List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
+        .build();
+  }
+
+  private CloudHttp2SolrClient newCloudHttp2SolrClient() {
+    var builder =
+        new CloudHttp2SolrClient.Builder(
+            List.of(cluster.getZkServer().getZkAddress()), Optional.empty());
+    var client = builder.build();
+    client.connect();
+    return client;
+  }
 }
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 269c74ff04e..f433b6c34d0 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
@@ -270,6 +270,16 @@ public void addHeader(String key, String value) {
     headers.put(key, value);
   }
 
+  public void addHeaders(Map<String, String> headers) {
+    if (headers == null) {
+      return;
+    }
+    if (this.headers == null) {
+      this.headers = new HashMap<>();
+    }
+    this.headers.putAll(headers);
+  }
+
   public Map<String, String> getHeaders() {
     if (headers == null) return null;
     return Collections.unmodifiableMap(headers);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
index 3534558bba2..c04990accee 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
@@ -271,6 +271,7 @@ private <T extends LBSolrClient.Req> Map<String, T> getRoutes(
           updateRequest.setPath(getPath());
           updateRequest.setBasicAuthCredentials(getBasicAuthUser(), getBasicAuthPassword());
           updateRequest.setResponseParser(getResponseParser());
+          updateRequest.addHeaders(getHeaders());
           request = reqSupplier.get(updateRequest, urls);
           routes.put(leaderUrl, request);
         }

From e3945de0c9f63438e67ec160ec80b6591a116f13 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:47:34 +0200
Subject: [PATCH 082/160] Update dependency org.hsqldb:hsqldb to v2.7.2 (#1742)

---
 solr/licenses/hsqldb-2.7.1.jar.sha1 | 1 -
 solr/licenses/hsqldb-2.7.2.jar.sha1 | 1 +
 versions.lock                       | 2 +-
 versions.props                      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/hsqldb-2.7.1.jar.sha1
 create mode 100644 solr/licenses/hsqldb-2.7.2.jar.sha1

diff --git a/solr/licenses/hsqldb-2.7.1.jar.sha1 b/solr/licenses/hsqldb-2.7.1.jar.sha1
deleted file mode 100644
index b7c99a1a573..00000000000
--- a/solr/licenses/hsqldb-2.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ffb617125371538a32eb9ba1cb2fa743b2c993b
diff --git a/solr/licenses/hsqldb-2.7.2.jar.sha1 b/solr/licenses/hsqldb-2.7.2.jar.sha1
new file mode 100644
index 00000000000..7685e883ed7
--- /dev/null
+++ b/solr/licenses/hsqldb-2.7.2.jar.sha1
@@ -0,0 +1 @@
+d92d4d2aa515714da2165c9d640d584c2896c9df
diff --git a/versions.lock b/versions.lock
index d82e118dee1..10227afe2d1 100644
--- a/versions.lock
+++ b/versions.lock
@@ -432,7 +432,7 @@ org.glassfish.jersey.media:jersey-media-jaxb:2.35 (1 constraints: e11958ca)
 org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constraints: 062875af)
 org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
-org.hsqldb:hsqldb:2.7.1 (1 constraints: 0c050b36)
+org.hsqldb:hsqldb:2.7.2 (1 constraints: 0d050c36)
 org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
 org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
 org.mockito:mockito-core:5.3.1 (2 constraints: d41145fd)
diff --git a/versions.props b/versions.props
index 334ed14d0be..aec04d7a62b 100644
--- a/versions.props
+++ b/versions.props
@@ -59,7 +59,7 @@ org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
 org.glassfish.hk2*:*=2.6.1
 org.glassfish.jersey*:*=2.35
 org.hamcrest:*=2.2
-org.hsqldb:hsqldb=2.7.1
+org.hsqldb:hsqldb=2.7.2
 org.immutables:value-annotations=2.9.3
 org.jctools:jctools-core=4.0.1
 org.mockito:mockito*=5.3.1

From 0f63438f1ecb6fddade9cdf15893a8a2a27a5b0b Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:48:39 +0200
Subject: [PATCH 083/160] Update org.mockito:mockito* to v5.5.0 (#1746)

---
 solr/licenses/byte-buddy-1.14.4.jar.sha1      | 1 -
 solr/licenses/byte-buddy-1.14.6.jar.sha1      | 1 +
 solr/licenses/mockito-core-5.3.1.jar.sha1     | 1 -
 solr/licenses/mockito-core-5.5.0.jar.sha1     | 1 +
 solr/licenses/mockito-subclass-5.3.1.jar.sha1 | 1 -
 solr/licenses/mockito-subclass-5.5.0.jar.sha1 | 1 +
 versions.lock                                 | 6 +++---
 versions.props                                | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 solr/licenses/byte-buddy-1.14.4.jar.sha1
 create mode 100644 solr/licenses/byte-buddy-1.14.6.jar.sha1
 delete mode 100644 solr/licenses/mockito-core-5.3.1.jar.sha1
 create mode 100644 solr/licenses/mockito-core-5.5.0.jar.sha1
 delete mode 100644 solr/licenses/mockito-subclass-5.3.1.jar.sha1
 create mode 100644 solr/licenses/mockito-subclass-5.5.0.jar.sha1

diff --git a/solr/licenses/byte-buddy-1.14.4.jar.sha1 b/solr/licenses/byte-buddy-1.14.4.jar.sha1
deleted file mode 100644
index ebe20ed9c8b..00000000000
--- a/solr/licenses/byte-buddy-1.14.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20498aaec9b00a5cfdb831e7bf68feafa833ce4b
diff --git a/solr/licenses/byte-buddy-1.14.6.jar.sha1 b/solr/licenses/byte-buddy-1.14.6.jar.sha1
new file mode 100644
index 00000000000..f6721f5ecd7
--- /dev/null
+++ b/solr/licenses/byte-buddy-1.14.6.jar.sha1
@@ -0,0 +1 @@
+0316c1b1f3208a9d716c4419ed2080443235f7d1
diff --git a/solr/licenses/mockito-core-5.3.1.jar.sha1 b/solr/licenses/mockito-core-5.3.1.jar.sha1
deleted file mode 100644
index 20fbd7b9134..00000000000
--- a/solr/licenses/mockito-core-5.3.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cac313592a29ae5e29c52c22b15c3ae5ab561b2
diff --git a/solr/licenses/mockito-core-5.5.0.jar.sha1 b/solr/licenses/mockito-core-5.5.0.jar.sha1
new file mode 100644
index 00000000000..7dd5bf8b75e
--- /dev/null
+++ b/solr/licenses/mockito-core-5.5.0.jar.sha1
@@ -0,0 +1 @@
+1660ec3ce0af7f713af923817b225a37cc5cf965
diff --git a/solr/licenses/mockito-subclass-5.3.1.jar.sha1 b/solr/licenses/mockito-subclass-5.3.1.jar.sha1
deleted file mode 100644
index 2ac9df036e3..00000000000
--- a/solr/licenses/mockito-subclass-5.3.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52e60962a0eec67bfc5bcb5ae3a04c51f4589cc9
diff --git a/solr/licenses/mockito-subclass-5.5.0.jar.sha1 b/solr/licenses/mockito-subclass-5.5.0.jar.sha1
new file mode 100644
index 00000000000..34df0843398
--- /dev/null
+++ b/solr/licenses/mockito-subclass-5.5.0.jar.sha1
@@ -0,0 +1 @@
+fb600177a19437fb739e49bb44150ba201816fff
diff --git a/versions.lock b/versions.lock
index 10227afe2d1..85ae2c21be2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -405,7 +405,7 @@ io.opentelemetry:opentelemetry-sdk-testing:1.29.0 (1 constraints: 990ff983)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
 javax.inject:javax.inject:1 (1 constraints: 7a0df617)
-net.bytebuddy:byte-buddy:1.14.4 (1 constraints: 440b42de)
+net.bytebuddy:byte-buddy:1.14.6 (1 constraints: 460b44de)
 net.minidev:accessors-smart:2.4.7 (1 constraints: 4e0a90b8)
 net.minidev:json-smart:2.4.7 (1 constraints: 160e936e)
 no.nav.security:mock-oauth2-server:0.4.3 (1 constraints: 0905fa35)
@@ -435,8 +435,8 @@ org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
 org.hsqldb:hsqldb:2.7.2 (1 constraints: 0d050c36)
 org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
 org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
-org.mockito:mockito-core:5.3.1 (2 constraints: d41145fd)
-org.mockito:mockito-subclass:5.3.1 (1 constraints: 0b050e36)
+org.mockito:mockito-core:5.5.0 (2 constraints: d61174fd)
+org.mockito:mockito-subclass:5.5.0 (1 constraints: 0c051336)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
 org.springframework:spring-aop:5.3.27 (2 constraints: dc1e629a)
 org.springframework:spring-beans:5.3.27 (4 constraints: ac3ac2c8)
diff --git a/versions.props b/versions.props
index aec04d7a62b..49792da4fa7 100644
--- a/versions.props
+++ b/versions.props
@@ -62,7 +62,7 @@ org.hamcrest:*=2.2
 org.hsqldb:hsqldb=2.7.2
 org.immutables:value-annotations=2.9.3
 org.jctools:jctools-core=4.0.1
-org.mockito:mockito*=5.3.1
+org.mockito:mockito*=5.5.0
 org.openjdk.jmh:*=1.37
 org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26

From 443cd92450703775af9399919ae5ee622619148d Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:49:37 +0200
Subject: [PATCH 084/160] Update dependency com.google.guava:guava to
 v32.1.2-jre (#1770)

---
 solr/licenses/guava-32.0.1-jre.jar.sha1 | 1 -
 solr/licenses/guava-32.1.2-jre.jar.sha1 | 1 +
 versions.lock                           | 9 +++++----
 versions.props                          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 solr/licenses/guava-32.0.1-jre.jar.sha1
 create mode 100644 solr/licenses/guava-32.1.2-jre.jar.sha1

diff --git a/solr/licenses/guava-32.0.1-jre.jar.sha1 b/solr/licenses/guava-32.0.1-jre.jar.sha1
deleted file mode 100644
index f9a5b552c4e..00000000000
--- a/solr/licenses/guava-32.0.1-jre.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6e5d51a72d142f2d40a57dfb897188b36a95b489
diff --git a/solr/licenses/guava-32.1.2-jre.jar.sha1 b/solr/licenses/guava-32.1.2-jre.jar.sha1
new file mode 100644
index 00000000000..787d67061c2
--- /dev/null
+++ b/solr/licenses/guava-32.1.2-jre.jar.sha1
@@ -0,0 +1 @@
+5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318
diff --git a/versions.lock b/versions.lock
index 85ae2c21be2..6e49dd1122a 100644
--- a/versions.lock
+++ b/versions.lock
@@ -42,16 +42,17 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
 com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: 0487ebc0)
+com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: bb893df4)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.0.1-jre (25 constraints: 346ecb71)
+com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
+com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
 com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620e575)
 com.google.http-client:google-http-client-appengine:1.43.1 (2 constraints: da207181)
 com.google.http-client:google-http-client-gson:1.43.1 (7 constraints: 5a70c647)
 com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)
-com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 833aea56)
+com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 3a3da718)
 com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
 com.google.protobuf:protobuf-java:3.23.1 (11 constraints: d095caae)
 com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)
@@ -269,7 +270,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.33.0 (5 constraints: 57468bea)
+org.checkerframework:checker-qual:3.33.0 (5 constraints: 0e494d11)
 org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
 org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
diff --git a/versions.props b/versions.props
index 49792da4fa7..6ab64b6efba 100644
--- a/versions.props
+++ b/versions.props
@@ -11,7 +11,7 @@ com.github.spotbugs:*=4.7.3
 com.github.stephenc.jcip:jcip-annotations=1.0-1
 com.google.cloud:google-cloud-bom=0.197.0
 com.google.errorprone:*=2.18.0
-com.google.guava:guava=32.0.1-jre
+com.google.guava:guava=32.1.2-jre
 com.google.re2j:re2j=1.7
 com.jayway.jsonpath:json-path=2.8.0
 com.lmax:disruptor=3.4.4

From 47b92c4d1bd85f95bb51d144bd337cb7392a5b92 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:50:19 +0200
Subject: [PATCH 085/160] Update dependency
 io.swagger.core.v3:swagger-annotations to v2.2.15 (#1747)

---
 solr/licenses/swagger-annotations-2.2.12.jar.sha1 | 1 -
 solr/licenses/swagger-annotations-2.2.15.jar.sha1 | 1 +
 versions.lock                                     | 2 +-
 versions.props                                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/swagger-annotations-2.2.12.jar.sha1
 create mode 100644 solr/licenses/swagger-annotations-2.2.15.jar.sha1

diff --git a/solr/licenses/swagger-annotations-2.2.12.jar.sha1 b/solr/licenses/swagger-annotations-2.2.12.jar.sha1
deleted file mode 100644
index 8b3c62aa758..00000000000
--- a/solr/licenses/swagger-annotations-2.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-276a6d67bd66f74865e9ce59aaa42fcd42d3a197
diff --git a/solr/licenses/swagger-annotations-2.2.15.jar.sha1 b/solr/licenses/swagger-annotations-2.2.15.jar.sha1
new file mode 100644
index 00000000000..227c8839b8e
--- /dev/null
+++ b/solr/licenses/swagger-annotations-2.2.15.jar.sha1
@@ -0,0 +1 @@
+35779fede334507bc368392051b8a89ed42c0784
diff --git a/versions.lock b/versions.lock
index 6e49dd1122a..c32edd77134 100644
--- a/versions.lock
+++ b/versions.lock
@@ -149,7 +149,7 @@ io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
 io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
 io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
 io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
-io.swagger.core.v3:swagger-annotations:2.2.12 (1 constraints: 3905353b)
+io.swagger.core.v3:swagger-annotations:2.2.15 (1 constraints: 3c05383b)
 jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe)
 jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
 jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
diff --git a/versions.props b/versions.props
index 6ab64b6efba..293cb93eb9d 100644
--- a/versions.props
+++ b/versions.props
@@ -25,7 +25,7 @@ io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.96.Final
 io.opentelemetry:opentelemetry-bom=1.29.0
 io.prometheus:*=0.16.0
-io.swagger.core.v3:*=2.2.12
+io.swagger.core.v3:*=2.2.15
 jakarta.ws.rs:jakarta.ws.rs-api=2.1.6
 junit:junit=4.13.2
 net.sourceforge.argparse4j:argparse4j=0.9.0

From cd689747df9e68205e2a7162dd6a9f13c6686fd9 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:52:11 +0200
Subject: [PATCH 086/160] Update org.slf4j:* to v2.0.9 (#1909)

---
 solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1 | 1 -
 solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1 | 1 +
 solr/licenses/jul-to-slf4j-2.0.7.jar.sha1   | 1 -
 solr/licenses/jul-to-slf4j-2.0.9.jar.sha1   | 1 +
 solr/licenses/slf4j-api-2.0.7.jar.sha1      | 1 -
 solr/licenses/slf4j-api-2.0.9.jar.sha1      | 1 +
 versions.lock                               | 6 +++---
 versions.props                              | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1
 create mode 100644 solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1
 delete mode 100644 solr/licenses/jul-to-slf4j-2.0.7.jar.sha1
 create mode 100644 solr/licenses/jul-to-slf4j-2.0.9.jar.sha1
 delete mode 100644 solr/licenses/slf4j-api-2.0.7.jar.sha1
 create mode 100644 solr/licenses/slf4j-api-2.0.9.jar.sha1

diff --git a/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1
deleted file mode 100644
index 53b9f52d334..00000000000
--- a/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f127fe5ee53404a8b3697cdd032dd1dd6a29dd77
diff --git a/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1
new file mode 100644
index 00000000000..f83ae3d65d6
--- /dev/null
+++ b/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1
@@ -0,0 +1 @@
+89eb336cf1183ce075253c7c3788aa196d56f71a
diff --git a/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1
deleted file mode 100644
index e10691c491c..00000000000
--- a/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a48f44aeaa8a5ddc347007298a28173ac1fbbd8b
diff --git a/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1
new file mode 100644
index 00000000000..37d41afc3d3
--- /dev/null
+++ b/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1
@@ -0,0 +1 @@
+09ef7c70b248185845f013f49a33ff9ca65b7975
diff --git a/solr/licenses/slf4j-api-2.0.7.jar.sha1 b/solr/licenses/slf4j-api-2.0.7.jar.sha1
deleted file mode 100644
index bed0f0b9a1c..00000000000
--- a/solr/licenses/slf4j-api-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41eb7184ea9d556f23e18b5cb99cad1f8581fc00
diff --git a/solr/licenses/slf4j-api-2.0.9.jar.sha1 b/solr/licenses/slf4j-api-2.0.9.jar.sha1
new file mode 100644
index 00000000000..378a2a8226d
--- /dev/null
+++ b/solr/licenses/slf4j-api-2.0.9.jar.sha1
@@ -0,0 +1 @@
+7cf2726fdcfbc8610f9a71fb3ed639871f315340
diff --git a/versions.lock b/versions.lock
index c32edd77134..ac3195be56b 100644
--- a/versions.lock
+++ b/versions.lock
@@ -345,9 +345,9 @@ org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
 org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
 org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
-org.slf4j:jcl-over-slf4j:2.0.7 (3 constraints: cd1757a6)
-org.slf4j:jul-to-slf4j:2.0.7 (3 constraints: 27289948)
-org.slf4j:slf4j-api:2.0.7 (59 constraints: 0d112d8b)
+org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
+org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
+org.slf4j:slf4j-api:2.0.9 (59 constraints: 131131a0)
 org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
 org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
 org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index 293cb93eb9d..47c46e6ad0f 100644
--- a/versions.props
+++ b/versions.props
@@ -67,6 +67,6 @@ org.openjdk.jmh:*=1.37
 org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=5.1.0
-org.slf4j:*=2.0.7
+org.slf4j:*=2.0.9
 org.xerial.snappy:snappy-java=1.1.10.1
 software.amazon.awssdk:*=2.20.128

From 55a3908850e86a1aa9a5af333506937a80eb46be Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:53:52 +0200
Subject: [PATCH 087/160] Update io.netty:* to v4.1.97.Final (#1887)

---
 .../netty-buffer-4.1.96.Final.jar.sha1        |  1 -
 .../netty-buffer-4.1.97.Final.jar.sha1        |  1 +
 .../netty-codec-4.1.96.Final.jar.sha1         |  1 -
 .../netty-codec-4.1.97.Final.jar.sha1         |  1 +
 .../netty-codec-http-4.1.96.Final.jar.sha1    |  1 -
 .../netty-codec-http-4.1.97.Final.jar.sha1    |  1 +
 .../netty-codec-http2-4.1.96.Final.jar.sha1   |  1 -
 .../netty-codec-http2-4.1.97.Final.jar.sha1   |  1 +
 .../netty-codec-socks-4.1.96.Final.jar.sha1   |  1 -
 .../netty-codec-socks-4.1.97.Final.jar.sha1   |  1 +
 .../netty-common-4.1.96.Final.jar.sha1        |  1 -
 .../netty-common-4.1.97.Final.jar.sha1        |  1 +
 .../netty-handler-4.1.96.Final.jar.sha1       |  1 -
 .../netty-handler-4.1.97.Final.jar.sha1       |  1 +
 .../netty-handler-proxy-4.1.96.Final.jar.sha1 |  1 -
 .../netty-handler-proxy-4.1.97.Final.jar.sha1 |  1 +
 .../netty-resolver-4.1.96.Final.jar.sha1      |  1 -
 .../netty-resolver-4.1.97.Final.jar.sha1      |  1 +
 .../netty-transport-4.1.96.Final.jar.sha1     |  1 -
 .../netty-transport-4.1.97.Final.jar.sha1     |  1 +
 ...nsport-classes-epoll-4.1.96.Final.jar.sha1 |  1 -
 ...nsport-classes-epoll-4.1.97.Final.jar.sha1 |  1 +
 ...e-epoll-4.1.96.Final-linux-x86_64.jar.sha1 |  1 -
 ...e-epoll-4.1.97.Final-linux-x86_64.jar.sha1 |  1 +
 ...t-native-unix-common-4.1.96.Final.jar.sha1 |  1 -
 ...t-native-unix-common-4.1.97.Final.jar.sha1 |  1 +
 versions.lock                                 | 26 +++++++++----------
 versions.props                                |  2 +-
 28 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1

diff --git a/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
deleted file mode 100644
index c2e6b557029..00000000000
--- a/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b80fffbe77485b457bf844289bf1801f61b9e91
diff --git a/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..31cefc05102
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
diff --git a/solr/licenses/netty-codec-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
deleted file mode 100644
index 2b1de703195..00000000000
--- a/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0
diff --git a/solr/licenses/netty-codec-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..25a34c88211
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+384ba4d75670befbedb45c4d3b497a93639c206d
diff --git a/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
deleted file mode 100644
index dbcc61d860e..00000000000
--- a/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d0d95df5026965c454902ef3d6d84b81f89626
diff --git a/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..03518cdaa81
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+af78acec783ffd77c63d8aeecc21041fd39ac54f
diff --git a/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
deleted file mode 100644
index 226c1b7d206..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6
diff --git a/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..670f254bd80
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+893888d09a7bef0d0ba973d7471943e765d0fd08
diff --git a/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
deleted file mode 100644
index 7928c87eeb5..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f53c52dbddaa4a02a51430405792d3f30a89b147
diff --git a/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..e0fa273a8f6
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+30e8fa29a349db5a933225d61891b8802836bb79
diff --git a/solr/licenses/netty-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-common-4.1.96.Final.jar.sha1
deleted file mode 100644
index cb5590c8416..00000000000
--- a/solr/licenses/netty-common-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d10c167623cbc471753f950846df241d1021655c
diff --git a/solr/licenses/netty-common-4.1.97.Final.jar.sha1 b/solr/licenses/netty-common-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..5d1fecee719
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+7cceacaf11df8dc63f23d0fb58e9d4640fc88404
diff --git a/solr/licenses/netty-handler-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
deleted file mode 100644
index a1f0cd55210..00000000000
--- a/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7840d7523d709e02961b647546f9d9dde1699306
diff --git a/solr/licenses/netty-handler-4.1.97.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..97d7df5d06b
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
diff --git a/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
deleted file mode 100644
index aa3d220477a..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38
diff --git a/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..c64fc038ff4
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+a99ecef0e1d86a92e40a7c89805c236d9cd7493e
diff --git a/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
deleted file mode 100644
index 9f0e6ac60de..00000000000
--- a/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e51db5568a881e0f9b013b35617c597dc32f130
diff --git a/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..2ff3f5b0501
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+cec8348108dc76c47cf87c669d514be52c922144
diff --git a/solr/licenses/netty-transport-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
deleted file mode 100644
index 7d0cc889525..00000000000
--- a/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbd15ca244be28e1a98ed29b9d755edbfa737e02
diff --git a/solr/licenses/netty-transport-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..3684e33df42
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f37380d23c9bb079bc702910833b2fd532c9abd0
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
deleted file mode 100644
index a05cc215dcc..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b0369501645f6e71f89ff7f77b5c5f52510a2e31
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..298772c96c7
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+795da37ded759e862457a82d9d92c4d39ce8ecee
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
deleted file mode 100644
index 04eae401ac3..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3f8904e072cfc9a8d67c6fe567c39bcbce5c9c55
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
new file mode 100644
index 00000000000..8b48e808dd0
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+54188f271e388e7f313aea995e82f58ce2cdb809
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
deleted file mode 100644
index 72071232dfb..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-daf8578cade63a01525ee9d70371fa78e6e91094
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000000..28b685bdafd
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+d469d84265ab70095b01b40886cabdd433b6e664
diff --git a/versions.lock b/versions.lock
index ac3195be56b..2f1d2acdd74 100644
--- a/versions.lock
+++ b/versions.lock
@@ -109,21 +109,21 @@ io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)
 io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)
-io.netty:netty-buffer:4.1.96.Final (10 constraints: c0990f02)
-io.netty:netty-codec:4.1.96.Final (5 constraints: 6a45dc83)
-io.netty:netty-codec-http:4.1.96.Final (3 constraints: 582436ee)
-io.netty:netty-codec-http2:4.1.96.Final (1 constraints: ed0a94cb)
-io.netty:netty-codec-socks:4.1.96.Final (1 constraints: 160fb96c)
-io.netty:netty-common:4.1.96.Final (12 constraints: 3cb3817d)
-io.netty:netty-handler:4.1.96.Final (3 constraints: 722b4f3d)
-io.netty:netty-handler-proxy:4.1.96.Final (1 constraints: ed0a94cb)
-io.netty:netty-resolver:4.1.96.Final (2 constraints: 5c1a8332)
+io.netty:netty-buffer:4.1.97.Final (10 constraints: ca99e90a)
+io.netty:netty-codec:4.1.97.Final (5 constraints: 6f459f85)
+io.netty:netty-codec-http:4.1.97.Final (3 constraints: 5b24cdee)
+io.netty:netty-codec-http2:4.1.97.Final (1 constraints: ed0a94cb)
+io.netty:netty-codec-socks:4.1.97.Final (1 constraints: 170fc06c)
+io.netty:netty-common:4.1.97.Final (12 constraints: 48b3098a)
+io.netty:netty-handler:4.1.97.Final (3 constraints: 742be33d)
+io.netty:netty-handler-proxy:4.1.97.Final (1 constraints: ed0a94cb)
+io.netty:netty-resolver:4.1.97.Final (2 constraints: 5e1ab932)
 io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)
 io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)
-io.netty:netty-transport:4.1.96.Final (9 constraints: 0b8c6f3f)
-io.netty:netty-transport-classes-epoll:4.1.96.Final (1 constraints: b312061f)
-io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: da0f128f)
-io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d1997)
+io.netty:netty-transport:4.1.97.Final (9 constraints: 148cac46)
+io.netty:netty-transport-classes-epoll:4.1.97.Final (1 constraints: b4120d1f)
+io.netty:netty-transport-native-epoll:4.1.97.Final (1 constraints: da0f128f)
+io.netty:netty-transport-native-unix-common:4.1.97.Final (4 constraints: 613dce97)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index 47c46e6ad0f..8c9d94bda53 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
-io.netty:*=4.1.96.Final
+io.netty:*=4.1.97.Final
 io.opentelemetry:opentelemetry-bom=1.29.0
 io.prometheus:*=0.16.0
 io.swagger.core.v3:*=2.2.15

From ee5e70a49eb69c8eec729aa4e5ac6eeb1a272124 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 15 Sep 2023 10:57:00 +0100
Subject: [PATCH 088/160] NO JIRA: remove unused CircuitBreaker.getDebugInfo()
 methods (#1890)

---
 .../util/circuitbreaker/CPUCircuitBreaker.java    | 12 ------------
 .../solr/util/circuitbreaker/CircuitBreaker.java  |  3 ---
 .../circuitbreaker/CircuitBreakerManager.java     | 15 ---------------
 .../util/circuitbreaker/MemoryCircuitBreaker.java | 11 -----------
 .../apache/solr/util/BaseTestCircuitBreaker.java  |  5 -----
 5 files changed, 46 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 262bd80444d..90c86499b3c 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -40,8 +40,6 @@ public class CPUCircuitBreaker extends CircuitBreaker {
 
   private double cpuUsageThreshold;
 
-  // Assumption -- the value of these parameters will be set correctly before invoking
-  // getDebugInfo()
   private static final ThreadLocal<Double> seenCPUUsage = ThreadLocal.withInitial(() -> 0.0);
 
   private static final ThreadLocal<Double> allowedCPUUsage = ThreadLocal.withInitial(() -> 0.0);
@@ -77,16 +75,6 @@ public boolean isTripped() {
     return (localSeenCPUUsage >= localAllowedCPUUsage);
   }
 
-  @Override
-  public String getDebugInfo() {
-
-    if (seenCPUUsage.get() == 0.0 || allowedCPUUsage.get() == 0.0) {
-      log.warn("CPUCircuitBreaker's monitored values (seenCPUUSage, allowedCPUUsage) not set");
-    }
-
-    return "seenCPUUSage=" + seenCPUUsage.get() + " allowedCPUUsage=" + allowedCPUUsage.get();
-  }
-
   @Override
   public String getErrorMessage() {
     return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold. "
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
index 3082bf82e4a..4b9d24bb694 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
@@ -57,9 +57,6 @@ public CircuitBreaker() {}
   /** Check if circuit breaker is tripped. */
   public abstract boolean isTripped();
 
-  /** Get debug useful info. */
-  public abstract String getDebugInfo();
-
   /** Get error message when the circuit breaker triggers */
   public abstract String getErrorMessage();
 
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index 201b1ffaa73..5b39217b33b 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -47,21 +47,6 @@ public boolean isTripped() {
     return (memEnabled && memCB.isTripped()) || (cpuEnabled && cpuCB.isTripped());
   }
 
-  @Override
-  public String getDebugInfo() {
-    StringBuilder sb = new StringBuilder();
-    if (memEnabled) {
-      sb.append(memCB.getDebugInfo());
-    }
-    if (memEnabled && cpuEnabled) {
-      sb.append("\n");
-    }
-    if (cpuEnabled) {
-      sb.append(cpuCB.getDebugInfo());
-    }
-    return sb.toString();
-  }
-
   @Override
   public String getErrorMessage() {
     StringBuilder sb = new StringBuilder();
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
index 0a568e5bf9e..3004d732e4d 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
@@ -38,8 +38,6 @@ public class MemoryCircuitBreaker extends CircuitBreaker {
 
   private long heapMemoryThreshold;
 
-  // Assumption -- the value of these parameters will be set correctly before invoking
-  // getDebugInfo()
   private static final ThreadLocal<Long> seenMemory = ThreadLocal.withInitial(() -> 0L);
   private static final ThreadLocal<Long> allowedMemory = ThreadLocal.withInitial(() -> 0L);
 
@@ -78,15 +76,6 @@ public boolean isTripped() {
     return (localSeenMemory >= localAllowedMemory);
   }
 
-  @Override
-  public String getDebugInfo() {
-    if (seenMemory.get() == 0L || allowedMemory.get() == 0L) {
-      log.warn("MemoryCircuitBreaker's monitored values (seenMemory, allowedMemory) not set");
-    }
-
-    return "seenMemory=" + seenMemory.get() + " allowedMemory=" + allowedMemory.get();
-  }
-
   @Override
   public String getErrorMessage() {
     return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold. "
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 68ee7f4ae3a..607bf31c617 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -286,11 +286,6 @@ public MockCircuitBreaker(boolean tripped) {
     public boolean isTripped() {
       return this.tripped;
     }
-
-    @Override
-    public String getDebugInfo() {
-      return "MockCircuitBreaker";
-    }
   }
 
   private static class FakeMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {

From 6f4cf56c83f563deb6d03e47223c3a7bbcc31a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Fri, 15 Sep 2023 13:07:43 +0200
Subject: [PATCH 089/160] SOLR-16981: bin/solr stop withuot argument should
 behave the same even if SOLR_PORT is set (#1924)

---
 solr/bin/solr | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
 mode change 100644 => 100755 solr/bin/solr

diff --git a/solr/bin/solr b/solr/bin/solr
old mode 100644
new mode 100755
index cc72f621094..a532fc7ca58
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -147,8 +147,6 @@ fi
 : "${SOLR_STOP_WAIT:=180}"
 : "${SOLR_START_WAIT:=$SOLR_STOP_WAIT}" # defaulting to $SOLR_STOP_WAIT for backwards compatibility reasons
 
-# Store whether a solr port was explicitly provided, for the "solr stop" command.
-PROVIDED_SOLR_PORT="${SOLR_PORT:-}"
 : "${SOLR_PORT:=8983}"
 export SOLR_PORT
 
@@ -412,7 +410,7 @@ function print_usage() {
     echo ""
   elif [ "$CMD" == "stop" ]; then
     echo ""
-    echo "Usage: solr stop [-k key] [-p port] [-V]"
+    echo "Usage: solr stop [-k key] [-p port] [-all] [-V]"
     echo ""
     echo "  -k <key>      Stop key; default is solrrocks"
     echo ""

From a52c849e9d4a17452eea29ee224fd0ac2af669c9 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 15 Sep 2023 12:32:41 +0100
Subject: [PATCH 090/160] SOLR-15440: FieldValueFeature now uses DocValues when
 docValues=true and stored=true are combined. (#1883)

Co-authored-by: tomglk <>
---
 solr/CHANGES.txt                              |   2 +
 .../solr/ltr/feature/FieldValueFeature.java   |  20 +--
 .../ltr/feature/LegacyFieldValueFeature.java  |  58 +++++++++
 .../solr/collection1/conf/schema.xml          |   2 +
 .../ltr/feature/TestFieldValueFeature.java    | 116 +++++++++++-------
 .../feature/TestLegacyFieldValueFeature.java  |  84 +++++++++++++
 .../pages/major-changes-in-solr-9.adoc        |   3 +
 7 files changed, 234 insertions(+), 51 deletions(-)
 create mode 100644 solr/modules/ltr/src/java/org/apache/solr/ltr/feature/LegacyFieldValueFeature.java
 create mode 100644 solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestLegacyFieldValueFeature.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 67ddcdd211d..138ca224e11 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -132,6 +132,8 @@ Improvements
 
 * SOLR-16950: SimpleTracer propagation for manual transaction ids
 
+* SOLR-15440: The Learning To Rank FieldValueFeature now uses DocValues when docValues=true and stored=true are combined. (Christine Poerschke, Tom Gilke)
+
 Optimizations
 ---------------------
 
diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
index 65980018067..bab34fa8d3e 100644
--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
@@ -56,18 +56,22 @@
  * <p>There are 4 different types of FeatureScorers that a FieldValueFeatureWeight may use. The
  * chosen scorer depends on the field attributes.
  *
- * <p>FieldValueFeatureScorer (FVFS): used for stored=true, no matter if docValues=true or
- * docValues=false
+ * <p>FieldValueFeatureScorer (FVFS): used for stored=true if docValues=false
  *
- * <p>NumericDocValuesFVFS: used for stored=false and docValues=true, if docValueType == NUMERIC
+ * <p>NumericDocValuesFVFS: used for docValues=true, if docValueType == NUMERIC
  *
- * <p>SortedDocValuesFVFS: used for stored=false and docValues=true, if docValueType == SORTED
+ * <p>SortedDocValuesFVFS: used for docValues=true, if docValueType == SORTED
  *
- * <p>DefaultValueFVFS: used for stored=false and docValues=true, a fallback scorer that is used on
- * segments where no document has a value set in the field of this feature
+ * <p>DefaultValueFVFS: used for docValues=true, a fallback scorer that is used on segments where no
+ * document has a value set in the field of this feature
+ *
+ * <p>Use {@link LegacyFieldValueFeature} for the pre 9.4 behaviour of not using DocValues when
+ * docValues=true is combined with stored=true.
  */
 public class FieldValueFeature extends Feature {
 
+  protected boolean useDocValuesForStored = true;
+
   private String field;
   private Set<String> fieldAsSet;
 
@@ -134,7 +138,9 @@ public FieldValueFeatureWeight(
      */
     @Override
     public FeatureScorer scorer(LeafReaderContext context) throws IOException {
-      if (schemaField != null && !schemaField.stored() && schemaField.hasDocValues()) {
+      if (schemaField != null
+          && (!schemaField.stored() || useDocValuesForStored)
+          && schemaField.hasDocValues()) {
 
         final FieldInfo fieldInfo = context.reader().getFieldInfos().fieldInfo(field);
         final DocValuesType docValuesType =
diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/LegacyFieldValueFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/LegacyFieldValueFeature.java
new file mode 100644
index 00000000000..868059f6cc3
--- /dev/null
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/LegacyFieldValueFeature.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ltr.feature;
+
+import java.util.Map;
+
+/**
+ * This feature returns the value of a field in the current document. The field must have
+ * stored="true" or docValues="true" properties. Example configuration:
+ *
+ * <pre>
+ * {
+ *   "name":  "rawHits",
+ *   "class": "org.apache.solr.ltr.feature.LegacyFieldValueFeature",
+ *   "params": {
+ *     "field": "hits"
+ *   }
+ * }
+ * </pre>
+ *
+ * <p>There are 4 different types of FeatureScorers that a FieldValueFeatureWeight may use. The
+ * chosen scorer depends on the field attributes.
+ *
+ * <p>FieldValueFeatureScorer (FVFS): used for stored=true, no matter if docValues=true or
+ * docValues=false
+ *
+ * <p>NumericDocValuesFVFS: used for stored=false and docValues=true, if docValueType == NUMERIC
+ *
+ * <p>SortedDocValuesFVFS: used for stored=false and docValues=true, if docValueType == SORTED
+ *
+ * <p>DefaultValueFVFS: used for stored=false and docValues=true, a fallback scorer that is used on
+ * segments where no document has a value set in the field of this feature
+ *
+ * <p>Matches {@link FieldValueFeature} behaviour prior to 9.4 i.e. DocValues are not used when
+ * docValues=true is combined with stored=true.
+ */
+@Deprecated(since = "9.4")
+public class LegacyFieldValueFeature extends FieldValueFeature {
+
+  public LegacyFieldValueFeature(String name, Map<String, Object> params) {
+    super(name, params);
+    this.useDocValuesForStored = false;
+  }
+}
diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml
index 04f5c8e22f8..8291b9bc7d6 100644
--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml
@@ -35,6 +35,7 @@
     <field name="normHits" type="float" indexed="true" stored="true" />
 
     <field name="isTrendy" type="boolean" indexed="true" stored="true" />
+    <field name="storedDvIsTrendy" type="boolean" indexed="true" stored="true" docValues="true"/>
     <field name="dvIsTrendy" type="boolean" indexed="true" stored="false" docValues="true"/>
 
     <field name="dvIntField" type="int" indexed="false" docValues="true" stored="false" default="-1" multiValued="false"/>
@@ -67,6 +68,7 @@
   <copyField source="popularity" dest="dvDoublePopularity"/>
 
   <copyField source="isTrendy" dest="dvIsTrendy"/>
+  <copyField source="isTrendy" dest="storedDvIsTrendy"/>
 
   <types>
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index 5f102fb67a1..8bed4efe7ed 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -47,9 +47,18 @@ public class TestFieldValueFeature extends TestRerankBase {
     "dvDoublePopularity",
     "dvStringPopularity",
     "isTrendy",
-    "dvIsTrendy"
+    "dvIsTrendy",
+    "storedDvIsTrendy"
   };
 
+  protected String getFieldValueFeatureClassName() {
+    return FieldValueFeature.class.getName();
+  }
+
+  protected String getObservingFieldValueFeatureClassName() {
+    return ObservingFieldValueFeature.class.getName();
+  }
+
   @Before
   public void before() throws Exception {
     setuptest(false);
@@ -178,7 +187,7 @@ public void before() throws Exception {
     assertU(commit());
 
     for (String field : FIELDS) {
-      loadFeature(field, FieldValueFeature.class.getName(), "{\"field\":\"" + field + "\"}");
+      loadFeature(field, getFieldValueFeatureClassName(), "{\"field\":\"" + field + "\"}");
     }
     loadModel(
         "model",
@@ -186,7 +195,7 @@ public void before() throws Exception {
         FIELDS,
         "{\"weights\":{\"popularity\":1.0,\"dvIntPopularity\":1.0,\"dvLongPopularity\":1.0,"
             + "\"dvFloatPopularity\":1.0,\"dvDoublePopularity\":1.0,"
-            + "\"dvStringPopularity\":1.0,\"isTrendy\":1.0,\"dvIsTrendy\":1.0}}");
+            + "\"dvStringPopularity\":1.0,\"isTrendy\":1.0,\"dvIsTrendy\":1.0,\"storedDvIsTrendy\":1.0}}");
   }
 
   @After
@@ -253,7 +262,7 @@ public void testIfADocumentDoesntHaveAFieldDefaultValueIsReturned() throws Excep
         "/query" + query.toQueryString(),
         "/response/docs/[0]/=={'[fv]':'popularity=0.0,dvIntPopularity=0.0,dvLongPopularity=0.0,"
             + "dvFloatPopularity=0.0,dvDoublePopularity=0.0,"
-            + "dvStringPopularity=0.0,isTrendy=0.0,dvIsTrendy=0.0'}");
+            + "dvStringPopularity=0.0,isTrendy=0.0,dvIsTrendy=0.0,storedDvIsTrendy=0.0'}");
   }
 
   @Test
@@ -263,7 +272,7 @@ public void testIfADocumentDoesntHaveAFieldASetDefaultValueIsReturned() throws E
 
       loadFeature(
           field + "42",
-          FieldValueFeature.class.getName(),
+          getFieldValueFeatureClassName(),
           fstore,
           "{\"field\":\"" + field + "\",\"defaultValue\":\"42.0\"}");
 
@@ -310,8 +319,7 @@ public void testIfADocumentDoesntHaveAFieldTheDefaultValueFromSchemaIsReturned()
       assertU(adoc("id", "21"));
       assertU(commit());
 
-      loadFeature(
-          field, FieldValueFeature.class.getName(), fstore, "{\"field\":\"" + field + "\"}");
+      loadFeature(field, getFieldValueFeatureClassName(), fstore, "{\"field\":\"" + field + "\"}");
       loadModel(
           field + "-model",
           LinearModel.class.getName(),
@@ -339,7 +347,7 @@ public void testThatFieldValueFeatureScorerIsUsedAndDefaultIsReturned() throws E
     final String fstore = "testThatFieldValueFeatureScorerIsUsedAndDefaultIsReturned";
     loadFeature(
         "not-existing-field",
-        ObservingFieldValueFeature.class.getName(),
+        getObservingFieldValueFeatureClassName(),
         fstore,
         "{\"field\":\"cowabunga\"}");
 
@@ -375,10 +383,7 @@ public void testThatDefaultFieldValueScorerIsUsedAndDefaultIsReturned() throws E
       final String fstore = "testThatDefaultFieldValueScorerIsUsedAndDefaultIsReturned" + field;
 
       loadFeature(
-          field,
-          ObservingFieldValueFeature.class.getName(),
-          fstore,
-          "{\"field\":\"" + field + "\"}");
+          field, getObservingFieldValueFeatureClassName(), fstore, "{\"field\":\"" + field + "\"}");
 
       loadModel(
           field + "-model",
@@ -415,11 +420,16 @@ public void testBooleanValue_docValues() throws Exception {
     implTestBooleanValue("dvIsTrendy");
   }
 
+  @Test
+  public void testBooleanValue_stored_docValues() throws Exception {
+    implTestBooleanValue("storedDvIsTrendy");
+  }
+
   private void implTestBooleanValue(String isTrendyFieldName) throws Exception {
     final String fstore = "test_boolean_store";
     loadFeature(
         "trendy",
-        FieldValueFeature.class.getName(),
+        getFieldValueFeatureClassName(),
         fstore,
         "{\"field\":\"" + isTrendyFieldName + "\"}");
 
@@ -473,7 +483,7 @@ public void testThatExceptionIsThrownForUnsupportedType() throws Exception {
 
     loadFeature(
         "dvStringPopularities",
-        FieldValueFeature.class.getName(),
+        getFieldValueFeatureClassName(),
         fstore,
         "{\"field\":\"dvStringPopularities\"}");
 
@@ -493,6 +503,10 @@ public void testThatExceptionIsThrownForUnsupportedType() throws Exception {
         "/error/msg/=='java.lang.IllegalArgumentException: Doc values type SORTED_SET of field dvStringPopularities is not supported'");
   }
 
+  protected String storedDvIsTrendy_FieldValueFeatureScorer_className() {
+    return SortedDocValuesFieldValueFeatureScorer.class.getName();
+  }
+
   @Test
   public void testThatCorrectFieldValueFeatureIsUsedForDocValueTypes() throws Exception {
     final String[][] fieldsWithDifferentTypes = {
@@ -502,6 +516,8 @@ public void testThatCorrectFieldValueFeatureIsUsedForDocValueTypes() throws Exce
       new String[] {
         "dvStringPopularity", "T", SortedDocValuesFieldValueFeatureScorer.class.getName()
       },
+      new String[] {"dvIsTrendy", "1", SortedDocValuesFieldValueFeatureScorer.class.getName()},
+      new String[] {"storedDvIsTrendy", "1", storedDvIsTrendy_FieldValueFeatureScorer_className()},
       new String[] {"noDvFloatField", "1", FieldValueFeatureScorer.class.getName()},
       new String[] {"noDvStrNumField", "T", FieldValueFeatureScorer.class.getName()}
     };
@@ -510,37 +526,51 @@ public void testThatCorrectFieldValueFeatureIsUsedForDocValueTypes() throws Exce
       final String field = fieldAndScorerClass[0];
       final String fieldValue = fieldAndScorerClass[1];
       final String fstore = "testThatCorrectFieldValueFeatureIsUsedForDocValueTypes" + field;
+      final String modelName = field + "-model";
 
-      assertU(adoc("id", "21", field, fieldValue));
-      assertU(commit());
-
-      loadFeature(
-          field,
-          ObservingFieldValueFeature.class.getName(),
-          fstore,
-          "{\"field\":\"" + field + "\"}");
-      loadModel(
-          field + "-model",
-          LinearModel.class.getName(),
-          new String[] {field},
-          fstore,
-          "{\"weights\":{\"" + field + "\":1.0}}");
+      loadFeatureAndModel(getObservingFieldValueFeatureClassName(), field, fstore, modelName);
 
-      final SolrQuery query = new SolrQuery("id:21");
-      query.add("rq", "{!ltr model=" + field + "-model reRankDocs=4}");
-      query.add("fl", "[fv]");
+      final String usedScorerClass = addAndQueryId21(field, modelName, fieldValue);
 
-      ObservingFieldValueFeature.usedScorerClass = null; // to clear away any previous test's use
-      assertJQ("/query" + query.toQueryString(), "/response/numFound/==1");
-      assertJQ(
-          "/query" + query.toQueryString(),
-          "/response/docs/[0]/=={'[fv]':'"
-              + FeatureLoggerTestUtils.toFeatureVector(field, "1.0")
-              + "'}");
-      assertEquals(fieldAndScorerClass[2], ObservingFieldValueFeature.usedScorerClass);
+      assertEquals(fieldAndScorerClass[2], usedScorerClass);
     }
   }
 
+  protected void loadFeatureAndModel(
+      String featureClassName, String field, String fstore, String modelName) throws Exception {
+    loadFeature(field, featureClassName, fstore, "{\"field\":\"" + field + "\"}");
+
+    loadModel(
+        modelName,
+        LinearModel.class.getName(),
+        new String[] {field},
+        fstore,
+        "{\"weights\":{\"" + field + "\":1.0}}");
+  }
+
+  /**
+   * @return used scorer class
+   */
+  protected String addAndQueryId21(String field, String modelName, String fieldValue)
+      throws Exception {
+
+    assertU(adoc("id", "21", field, fieldValue));
+    assertU(commit());
+
+    final SolrQuery query = new SolrQuery("id:21");
+    query.add("rq", "{!ltr model=" + modelName + " reRankDocs=4}");
+    query.add("fl", "[fv]");
+
+    ObservingFieldValueFeature.usedScorerClass = null; // to clear away any previous test's use
+    assertJQ("/query" + query.toQueryString(), "/response/numFound/==1");
+    assertJQ(
+        "/query" + query.toQueryString(),
+        "/response/docs/[0]/=={'[fv]':'"
+            + FeatureLoggerTestUtils.toFeatureVector(field, "1.0")
+            + "'}");
+    return ObservingFieldValueFeature.usedScorerClass;
+  }
+
   @Test
   public void testParamsToMap() throws Exception {
     final LinkedHashMap<String, Object> params = new LinkedHashMap<>();
@@ -595,8 +625,7 @@ public void testThatStringValuesAreCorrectlyParsed() throws Exception {
       };
 
       final String fstore = "testThatStringValuesAreCorrectlyParsed" + field;
-      loadFeature(
-          field, FieldValueFeature.class.getName(), fstore, "{\"field\":\"" + field + "\"}");
+      loadFeature(field, getFieldValueFeatureClassName(), fstore, "{\"field\":\"" + field + "\"}");
       loadModel(
           field + "-model",
           LinearModel.class.getName(),
@@ -642,8 +671,7 @@ public void testThatDateValuesAreCorrectlyParsed() throws Exception {
       };
 
       final String fstore = "testThatDateValuesAreCorrectlyParsed" + field;
-      loadFeature(
-          field, FieldValueFeature.class.getName(), fstore, "{\"field\":\"" + field + "\"}");
+      loadFeature(field, getFieldValueFeatureClassName(), fstore, "{\"field\":\"" + field + "\"}");
       loadModel(
           field + "-model",
           LinearModel.class.getName(),
@@ -668,7 +696,7 @@ public void testThatDateValuesAreCorrectlyParsed() throws Exception {
    * This class is used to track which specific FieldValueFeature is used so that we can test,
    * whether the fallback mechanism works correctly.
    */
-  public static final class ObservingFieldValueFeature extends FieldValueFeature {
+  public static class ObservingFieldValueFeature extends FieldValueFeature {
     static String usedScorerClass;
 
     public ObservingFieldValueFeature(String name, Map<String, Object> params) {
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestLegacyFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestLegacyFieldValueFeature.java
new file mode 100644
index 00000000000..16374234af8
--- /dev/null
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestLegacyFieldValueFeature.java
@@ -0,0 +1,84 @@
+/*
+ * 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.ltr.feature;
+
+import java.util.Map;
+import org.junit.Test;
+
+@Deprecated
+public class TestLegacyFieldValueFeature extends TestFieldValueFeature {
+
+  @Override
+  protected String getFieldValueFeatureClassName() {
+    return LegacyFieldValueFeature.class.getName();
+  }
+
+  @Override
+  protected String getObservingFieldValueFeatureClassName() {
+    return LegacyObservingFieldValueFeature.class.getName();
+  }
+
+  @Deprecated
+  public static final class LegacyObservingFieldValueFeature
+      extends TestFieldValueFeature.ObservingFieldValueFeature {
+
+    public LegacyObservingFieldValueFeature(String name, Map<String, Object> params) {
+      super(name, params);
+      this.useDocValuesForStored = false;
+    }
+  }
+
+  @Override
+  protected String storedDvIsTrendy_FieldValueFeatureScorer_className() {
+    return FieldValueFeature.FieldValueFeatureWeight.FieldValueFeatureScorer.class.getName();
+  }
+
+  @Test
+  public void test_LegacyFieldValueFeature_behavesDifferentlyThan_FieldValueFeature()
+      throws Exception {
+    // the field storedDvIsTrendy has stored=true and docValues=true
+    final String field = "storedDvIsTrendy";
+
+    // demonstrate that & how the FieldValueFeature & LegacyFieldValueFeature implementations differ
+
+    // the LegacyFieldValueFeature does not use docValues
+    String usedScorerClass = loadAndQuery(getObservingFieldValueFeatureClassName(), field);
+    assertEquals(
+        FieldValueFeature.FieldValueFeatureWeight.FieldValueFeatureScorer.class.getName(),
+        usedScorerClass);
+
+    // the FieldValueFeature does use docValues
+    usedScorerClass = loadAndQuery(super.getObservingFieldValueFeatureClassName(), field);
+    assertEquals(
+        FieldValueFeature.FieldValueFeatureWeight.SortedDocValuesFieldValueFeatureScorer.class
+            .getName(),
+        usedScorerClass);
+  }
+
+  private String loadAndQuery(String featureClassName, String field) throws Exception {
+    final String modelName = field + "-model-" + featureClassName;
+    final String featureStoreName =
+        "test_LegacyFieldValueFeature_behavesDifferentlyThan_FieldValueFeature_"
+            + field
+            + "_"
+            + featureClassName;
+
+    loadFeatureAndModel(featureClassName, field, featureStoreName, modelName);
+
+    return addAndQueryId21(field, modelName, "1");
+  }
+}
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 0824107a91f..fd35533abe5 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -95,6 +95,9 @@ If users want separate client/server settings, they can manually override the `s
 To disable the `rid` generation set the system property `solr.disableRequestId` to `true`.
 To disable the always-on trace generation set the system property `solr.alwaysOnTraceId` to `false`.
 
+=== Learning To Rank
+* The FieldValueFeature class now always uses DocValues when docValues=true is set. A LegacyFieldValueFeature class provides the prior behaviour of not using DocValues when the docValues=true and stored=true field attributes are both set.
+
 == Solr 9.3
 === Binary Releases
 * Solr now comes with two xref:deployment-guide:installing-solr.adoc#available-solr-packages[binary releases] and xref:deployment-guide:solr-in-docker.adoc#available-images[docker images], **full** and **slim**.

From 330abd4be3cb6e12ca5034e37e78b78bc8a5c961 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Fri, 15 Sep 2023 12:31:39 -0700
Subject: [PATCH 091/160] SOLR-16971 RealTimeGet with Composite router throws
 NPE (#1914)

---
 solr/CHANGES.txt                              |  2 ++
 .../component/RealTimeGetComponent.java       |  5 ++-
 .../cloud/FullSolrCloudDistribCmdsTest.java   | 34 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 138ca224e11..f2e323839c9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -190,6 +190,8 @@ Bug Fixes
 
 * SOLR-16973: fix REMOTE_JMX_OPTS to delayed expansion (Tiziano Degaetano via Colvin Cowie)
 
+* SOLR-16971: RealTimeGet with Composite router throws NPE (Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index b845e050ae3..56aebd8e9d2 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1051,7 +1051,10 @@ public int createSubRequests(ResponseBuilder rb) throws IOException {
       for (String id : reqIds.allIds) {
         Slice slice =
             coll.getRouter()
-                .getTargetSlice(params.get(ShardParams._ROUTE_, id), null, null, params, coll);
+                .getTargetSlice(id, null, params.get(ShardParams._ROUTE_), params, coll);
+        if (slice == null) {
+          continue;
+        }
 
         List<String> idsForShard = sliceToId.get(slice.getName());
         if (idsForShard == null) {
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 6a9bf85a22c..0d5e05ded27 100644
--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
@@ -272,6 +272,40 @@ public void testDeleteByIdImplicitRouter() throws Exception {
     }
   }
 
+  public void testRTGCompositeRouterWithRouterField() throws Exception {
+    final CloudSolrClient cloudClient = cluster.getSolrClient();
+    final String testCollectionName =
+        "composite_collection_with_routerfield_" + NAME_COUNTER.getAndIncrement();
+    assertEquals(
+        RequestStatusState.COMPLETED,
+        CollectionAdminRequest.createCollection(testCollectionName, "_default", 2, 2)
+            .setRouterName("compositeId")
+            .setRouterField("routefield_s")
+            .setShards("shard1,shard2")
+            .processAndWait(cloudClient, DEFAULT_TIMEOUT));
+    ZkStateReader.from(cloudClient)
+        .waitForState(
+            testCollectionName,
+            DEFAULT_TIMEOUT,
+            TimeUnit.SECONDS,
+            (n, c1) -> DocCollection.isFullyActive(n, c1, 2, 2));
+
+    // Add a few documents with diff routes
+    cloudClient.add(testCollectionName, sdoc("id", "1", "routefield_s", "europe"));
+    cloudClient.add(testCollectionName, sdoc("id", "3", "routefield_s", "europe"));
+    cloudClient.add(testCollectionName, sdoc("id", "5", "routefield_s", "africa"));
+    cloudClient.add(testCollectionName, sdoc("id", "7", "routefield_s", "africa"));
+    cloudClient.commit(testCollectionName);
+
+    var docsNoRoute = cloudClient.getById(testCollectionName, List.of("3"));
+    assertEquals(0, docsNoRoute.getNumFound());
+
+    var params = new ModifiableSolrParams();
+    params.set("_route_", "europe");
+    var docsWRoute = cloudClient.getById(testCollectionName, List.of("3"), params);
+    assertEquals(1, docsWRoute.getNumFound());
+  }
+
   public void testDeleteByIdCompositeRouterWithRouterField() throws Exception {
     final CloudSolrClient cloudClient = cluster.getSolrClient();
     final String testCollectionName =

From 2d34a78337a32df7fe77de7cfa5af366d2e97803 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sat, 16 Sep 2023 13:56:15 -0400
Subject: [PATCH 092/160] Revert "SOLR-16981: bin/solr stop withuot argument
 should behave the same even if SOLR_PORT is set (#1924)" (#1929)

This reverts commit 6f4cf56c83f563deb6d03e47223c3a7bbcc31a5c.
---
 solr/bin/solr | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 solr/bin/solr

diff --git a/solr/bin/solr b/solr/bin/solr
old mode 100755
new mode 100644
index a532fc7ca58..cc72f621094
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -147,6 +147,8 @@ fi
 : "${SOLR_STOP_WAIT:=180}"
 : "${SOLR_START_WAIT:=$SOLR_STOP_WAIT}" # defaulting to $SOLR_STOP_WAIT for backwards compatibility reasons
 
+# Store whether a solr port was explicitly provided, for the "solr stop" command.
+PROVIDED_SOLR_PORT="${SOLR_PORT:-}"
 : "${SOLR_PORT:=8983}"
 export SOLR_PORT
 
@@ -410,7 +412,7 @@ function print_usage() {
     echo ""
   elif [ "$CMD" == "stop" ]; then
     echo ""
-    echo "Usage: solr stop [-k key] [-p port] [-all] [-V]"
+    echo "Usage: solr stop [-k key] [-p port] [-V]"
     echo ""
     echo "  -k <key>      Stop key; default is solrrocks"
     echo ""

From 7eda6a1d32f42e4052351a83670c636b983b561c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:08:58 +0200
Subject: [PATCH 093/160] SOLR-16979: Randomize port number of Solr in BATS
 tests (#1923)

---
 solr/CHANGES.txt                              |  2 +
 .../org/apache/solr/cli/RunExampleTool.java   | 11 +++-
 solr/packaging/build.gradle                   | 17 +++++-
 solr/packaging/test/README.md                 |  5 +-
 solr/packaging/test/bats_helper.bash          | 10 ++--
 solr/packaging/test/test_assert.bats          | 12 ++---
 solr/packaging/test/test_config.bats          |  4 +-
 .../test/test_create_collection.bats          | 28 +++++-----
 .../test/test_delete_collection.bats          |  2 +-
 .../packaging/test/test_example_noprompt.bats |  3 +-
 solr/packaging/test/test_export.bats          | 16 +++---
 solr/packaging/test/test_extraction.bats      | 18 +++----
 solr/packaging/test/test_modules.bats         |  4 +-
 solr/packaging/test/test_packages.bats        |  2 +-
 .../packaging/test/test_placement_plugin.bats |  4 +-
 solr/packaging/test/test_post.bats            | 36 ++++++-------
 solr/packaging/test/test_postlogs.bats        |  8 +--
 .../packaging/test/test_security_manager.bats |  4 +-
 solr/packaging/test/test_ssl.bats             | 54 +++++++++----------
 solr/packaging/test/test_start_solr.bats      | 18 +++----
 solr/packaging/test/test_status.bats          |  2 +-
 solr/packaging/test/test_zk.bats              | 18 +++----
 solr/packaging/test/test_zz_cleanup.bats      | 37 +++++++++++++
 23 files changed, 192 insertions(+), 123 deletions(-)
 create mode 100644 solr/packaging/test/test_zz_cleanup.bats

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f2e323839c9..c8a3a1dd63c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -212,6 +212,8 @@ Other Changes
 
 * SOLR-16623: new SolrJettyTestRule for tests needing HTTP or Jetty. (David Smiley, Joshua Ouma)
 
+* SOLR-16979: BATS integration tests now start solr instances on a randomly selected port (janhoy)
+
 ==================  9.3.0 ==================
 
 Upgrade Notes
diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
index 80dcdb41c72..4a6ad5d5351 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -253,7 +253,9 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
 
     boolean isCloudMode = cli.hasOption('c');
     String zkHost = cli.getOptionValue('z');
-    int port = Integer.parseInt(cli.getOptionValue('p', "8983"));
+    int port =
+        Integer.parseInt(
+            cli.getOptionValue('p', System.getenv().getOrDefault("SOLR_PORT", "8983")));
     Map<String, Object> nodeStatus =
         startSolr(new File(exDir, "solr"), isCloudMode, cli, port, zkHost, 30);
 
@@ -437,6 +439,13 @@ protected void runCloudExample(CommandLine cli) throws Exception {
     boolean prompt = !cli.hasOption("noprompt");
     int numNodes = 2;
     int[] cloudPorts = new int[] {8983, 7574, 8984, 7575};
+    int defaultPort =
+        Integer.parseInt(
+            cli.getOptionValue('p', System.getenv().getOrDefault("SOLR_PORT", "8983")));
+    if (defaultPort != 8983) {
+      // Override the old default port numbers if user has started the example overriding SOLR_PORT
+      cloudPorts = new int[] {defaultPort, defaultPort + 1, defaultPort + 2, defaultPort + 3};
+    }
     File cloudDir = new File(exampleDir, "cloud");
     if (!cloudDir.isDirectory()) cloudDir.mkdir();
 
diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
index aa366eaafd6..b028155985c 100644
--- a/solr/packaging/build.gradle
+++ b/solr/packaging/build.gradle
@@ -238,6 +238,15 @@ task integrationTests(type: BatsTask) {
   def integrationTestOutput = "$buildDir/test-output"
   def solrHome = "$integrationTestOutput/solr-home"
   def solrTestFailuresDir = "$integrationTestOutput/failure-snapshots"
+  var solrPort = Integer.parseInt((String) project.findProperty('bats.port') ?: System.getProperty("bats.port", "-1"))
+  while (solrPort > 64000 || solrPort < 0) { // We need room for +1000 for ZK
+    try (ServerSocket s = new ServerSocket(0)) {
+      solrPort = s.getLocalPort()
+    } catch (Exception e) {
+      println("WARN: Could not assign random port for Bats tests. Using default port 8983.")
+      solrPort = 8983
+    }
+  }
 
   inputs.dir(distDir)
   outputs.dir(integrationTestOutput)
@@ -250,11 +259,16 @@ task integrationTests(type: BatsTask) {
 
     // TODO - if quiet then don't tee
     standardOutput = new TeeOutputStream(System.out, new FileOutputStream("$integrationTestOutput/test-output.txt"))
-
+    println("Running BATS tests with Solr base port ${solrPort}")
   }
 
   environment SOLR_TIP: distDir.toString()
   environment SOLR_HOME: solrHome
+  environment SOLR_PID_DIR: solrHome
+  environment SOLR_PORT: solrPort
+  environment SOLR2_PORT: solrPort + 1
+  environment SOLR3_PORT: solrPort + 2
+  environment ZK_PORT: solrPort + 1000
   environment SOLR_LOGS_DIR: "$solrHome/logs"
   environment TEST_OUTPUT_DIR: integrationTestOutput
   environment TEST_FAILURE_DIR: solrTestFailuresDir
@@ -283,6 +297,7 @@ class BatsTask extends Exec {
     // Additional debugging output: -x, --verbose-run
     setArgs(['-T', '--print-output-on-failure'] + (testFiles.empty ? testDir : testFiles))
 
+
     super.exec()
   }
 }
diff --git a/solr/packaging/test/README.md b/solr/packaging/test/README.md
index 93599e3b3fe..bd73d494589 100644
--- a/solr/packaging/test/README.md
+++ b/solr/packaging/test/README.md
@@ -31,8 +31,9 @@ Individual test files can be selected by specifying the `--tests [test_file.bats
  The `--tests` option may be repeated to select multiple test files to run.
  Wildcarding or specifying individual test methods is currently not supported.
 
-Tests do not currently randomize ports or directories, so they cannot be run
- in parallel. They may also fail if you already have an external cluster up.
+Tests run Solr on a randomly assigned port number, so these tests should be able to run even if you have Solr
+running on the host already. To force tests to start Solr on a specific port, set the `bats.port` gradle
+property or system property, e.g. `./gradlew integrationTests -Pbats.port=8983`.
 
 ## Writing Tests
 
diff --git a/solr/packaging/test/bats_helper.bash b/solr/packaging/test/bats_helper.bash
index d3bd00b3c0f..56c743c8fb2 100644
--- a/solr/packaging/test/bats_helper.bash
+++ b/solr/packaging/test/bats_helper.bash
@@ -58,8 +58,12 @@ save_home_on_failure() {
     fi
 }
 
+shutdown_all() {
+  solr stop -all >/dev/null 2>&1
+}
+
 delete_all_collections() {
-  local collection_list="$(solr zk ls /collections -z localhost:9983)"
+  local collection_list="$(solr zk ls /collections -z localhost:${ZK_PORT})"
   for collection in $collection_list; do
     if [[ -n $collection ]]; then
       solr delete -c $collection >/dev/null 2>&1
@@ -69,7 +73,7 @@ delete_all_collections() {
 
 config_exists() {
   local config_name=$1
-  local config_list=$(solr zk ls /configs -z localhost:9983)
+  local config_list=$(solr zk ls /configs -z localhost:${ZK_PORT})
 
   for config in $config_list; do
     if [[ $(echo $config | tr -d " ") == $config_name ]]; then
@@ -82,7 +86,7 @@ config_exists() {
 
 collection_exists() {
   local coll_name=$1
-  local coll_list=$(solr zk ls /collections -z localhost:9983)
+  local coll_list=$(solr zk ls /collections -z localhost:${ZK_PORT})
 
   for coll in $coll_list; do
     if [[ $(echo $coll | tr -d " ") == $coll_name ]]; then
diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.bats
index 66905a39775..0fc8b5151b6 100644
--- a/solr/packaging/test/test_assert.bats
+++ b/solr/packaging/test/test_assert.bats
@@ -31,25 +31,25 @@ teardown() {
 @test "assert for non cloud mode" {
   run solr start
 
-  run solr assert --not-cloud http://localhost:8983/solr
+  run solr assert --not-cloud http://localhost:${SOLR_PORT}/solr
   assert_output --partial "needn't include Solr's context-root"
   refute_output --partial "ERROR"
 
-  run solr assert --cloud http://localhost:8983
+  run solr assert --cloud http://localhost:${SOLR_PORT}
   assert_output --partial "ERROR: Solr is not running in cloud mode"
 
-  run ! solr assert --cloud http://localhost:8983/solr -e
+  run ! solr assert --cloud http://localhost:${SOLR_PORT}/solr -e
 }
 
 @test "assert for cloud mode" {
   run solr start -c
 
-  run solr assert --cloud http://localhost:8983
+  run solr assert --cloud http://localhost:${SOLR_PORT}
   refute_output --partial "ERROR"
 
-  run solr assert --not-cloud http://localhost:8983/solr
+  run solr assert --not-cloud http://localhost:${SOLR_PORT}/solr
   assert_output --partial "needn't include Solr's context-root"
   assert_output --partial "ERROR: Solr is not running in standalone mode"
 
-  run ! solr assert --not-cloud http://localhost:8983 -e
+  run ! solr assert --not-cloud http://localhost:${SOLR_PORT} -e
 }
diff --git a/solr/packaging/test/test_config.bats b/solr/packaging/test/test_config.bats
index aff38d25eb9..84a6efb1a17 100644
--- a/solr/packaging/test/test_config.bats
+++ b/solr/packaging/test/test_config.bats
@@ -41,7 +41,7 @@ teardown() {
 @test "setting property" {
   solr create -c COLL_NAME
 
-  run solr config -c COLL_NAME -action set-property -property updateHandler.autoCommit.maxDocs -value 100 -solrUrl http://localhost:8983/solr
+  run solr config -c COLL_NAME -action set-property -property updateHandler.autoCommit.maxDocs -value 100 -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Successfully set-property updateHandler.autoCommit.maxDocs to 100"
 }
 
@@ -50,5 +50,5 @@ teardown() {
 
   run solr config -c COLL_NAME -property updateHandler.autoCommit.maxDocs -value 100
   assert_output --partial "Successfully set-property updateHandler.autoCommit.maxDocs to 100"
-  assert_output --partial "assuming solrUrl is http://localhost:8983."
+  assert_output --partial "assuming solrUrl is http://localhost:${SOLR_PORT}."
 }
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index 64c90f87087..9a683a89da3 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -41,34 +41,34 @@ teardown() {
 @test "create collection" {
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
-  assert_output --partial "assuming solrUrl is http://localhost:8983"
+  assert_output --partial "assuming solrUrl is http://localhost:${SOLR_PORT}"
 }
 
 @test "create collection using solrUrl" {
-  run solr create -c COLL_NAME -solrUrl http://localhost:8983
+  run solr create -c COLL_NAME -solrUrl http://localhost:${SOLR_PORT}
   assert_output --partial "Created collection 'COLL_NAME'"
-  refute_output --partial "assuming solrUrl is http://localhost:8983"
+  refute_output --partial "assuming solrUrl is http://localhost:${SOLR_PORT}"
 }
 
 @test "create collection using legacy solrUrl" {
-  run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
+  run solr create -c COLL_NAME -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
   assert_output --partial "needn't include Solr's context-root"
-  refute_output --partial "assuming solrUrl is http://localhost:8983"
+  refute_output --partial "assuming solrUrl is http://localhost:${SOLR_PORT}"
 }
 
 @test "create collection using Zookeeper" {
-  run solr create -c COLL_NAME -zkHost localhost:9983
+  run solr create -c COLL_NAME -zkHost localhost:${ZK_PORT}
   assert_output --partial "Created collection 'COLL_NAME'"
 }
 
 @test "reject d option with invalid config dir" {
-  run ! solr create -c COLL_NAME -d /asdf  -solrUrl http://localhost:8983/solr
+  run ! solr create -c COLL_NAME -d /asdf  -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Specified configuration directory /asdf not found!"
 }
 
 @test "accept d option with builtin config" {
-  run solr create -c COLL_NAME -d sample_techproducts_configs -solrUrl http://localhost:8983/solr
+  run solr create -c COLL_NAME -d sample_techproducts_configs -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
 }
 
@@ -78,34 +78,34 @@ teardown() {
   test -d $source_configset_dir
   cp -r "${source_configset_dir}" "${dest_configset_dir}"
 
-  run solr create -c COLL_NAME -d "${dest_configset_dir}" -solrUrl http://localhost:8983/solr
+  run solr create -c COLL_NAME -d "${dest_configset_dir}" -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
 }
 
 @test "accept n option as config name" {
-  run solr create -c COLL_NAME -n other_conf_name -solrUrl http://localhost:8983/solr
+  run solr create -c COLL_NAME -n other_conf_name -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
   assert_output --partial "config-set 'other_conf_name'"
 }
 
 @test "allow config reuse when n option specifies same config" {
-  run -0 solr create -c COLL_NAME_1 -n shared_config -solrUrl http://localhost:8983/solr
+  run -0 solr create -c COLL_NAME_1 -n shared_config -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME_1'"
   assert_output --partial "config-set 'shared_config'"
 
-  run -0 solr create -c COLL_NAME_2 -n shared_config -solrUrl http://localhost:8983/solr
+  run -0 solr create -c COLL_NAME_2 -n shared_config -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME_2'"
   assert_output --partial "config-set 'shared_config'"
 }
 
 @test "create multisharded collections when s provided" {
-  run -0 solr create -c COLL_NAME -s 2 -solrUrl http://localhost:8983/solr
+  run -0 solr create -c COLL_NAME -s 2 -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
   assert_output --partial "2 shard(s)"
 }
 
 @test "create replicated collections when rf provided" {
-  run -0 solr create -c COLL_NAME -rf 2 -solrUrl http://localhost:8983/solr
+  run -0 solr create -c COLL_NAME -rf 2 -solrUrl http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Created collection 'COLL_NAME'"
   assert_output --partial "2 replica(s)"
 }
diff --git a/solr/packaging/test/test_delete_collection.bats b/solr/packaging/test/test_delete_collection.bats
index bbef50dce10..b890888aa6d 100644
--- a/solr/packaging/test/test_delete_collection.bats
+++ b/solr/packaging/test/test_delete_collection.bats
@@ -50,7 +50,7 @@ teardown() {
   solr create -c "COLL_NAME"
   assert collection_exists "COLL_NAME"
 
-  solr delete -c "COLL_NAME" -solrUrl http://localhost:8983
+  solr delete -c "COLL_NAME" -solrUrl http://localhost:${SOLR_PORT}
   refute collection_exists "COLL_NAME"
 }
 
diff --git a/solr/packaging/test/test_example_noprompt.bats b/solr/packaging/test/test_example_noprompt.bats
index 959cdd9d5bc..e683cb4f0a6 100644
--- a/solr/packaging/test/test_example_noprompt.bats
+++ b/solr/packaging/test/test_example_noprompt.bats
@@ -30,5 +30,6 @@ teardown() {
 
 @test "SOLR-16755 test works with noprompt" {
   solr start -e cloud -noprompt
-  solr assert --started http://localhost:8983/solr --timeout 10000
+  solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 10000
+  solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 10000
 }
diff --git a/solr/packaging/test/test_export.bats b/solr/packaging/test/test_export.bats
index 6ddbe4d1880..5e7d337d609 100644
--- a/solr/packaging/test/test_export.bats
+++ b/solr/packaging/test/test_export.bats
@@ -30,32 +30,32 @@ teardown() {
 
 @test "Check export command" {
   run solr start -c -e techproducts
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}/output"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}/output"
 
   refute_output --partial 'Unrecognized option'
   assert_output --partial 'Export complete'
 
   assert [ -e ${BATS_TEST_TMPDIR}/output.json ]
 
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test"
   assert [ -e techproducts.json ]
   rm techproducts.json
 
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -format javabin
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -format javabin
   assert [ -e techproducts.javabin ]
   rm techproducts.javabin
 
   # old pattern of putting a suffix on the out that controlled the format no longer supported ;-).
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}/output.javabin"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}/output.javabin"
   assert [ -e ${BATS_TEST_TMPDIR}/output.javabin.json ]
 
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}"
   assert [ -e ${BATS_TEST_TMPDIR}/techproducts.json ]
 
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -format jsonl -out "${BATS_TEST_TMPDIR}/output"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -format jsonl -out "${BATS_TEST_TMPDIR}/output"
   assert [ -e ${BATS_TEST_TMPDIR}/output.jsonl ]
 
-  run solr export -url "http://localhost:8983/solr/techproducts" -query "*:* -id:test" -limit 10 -compress -format jsonl -out "${BATS_TEST_TMPDIR}/output"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -limit 10 -compress -format jsonl -out "${BATS_TEST_TMPDIR}/output"
   assert [ -e ${BATS_TEST_TMPDIR}/output.jsonl.gz ]
   assert_output --partial 'Total Docs exported: 10'
 
@@ -64,7 +64,7 @@ teardown() {
 @test "export fails on non cloud mode" {
   run solr start
   run solr create -c COLL_NAME
-  run solr export -url "http://localhost:8983/solr/COLL_NAME"
+  run solr export -url "http://localhost:${SOLR_PORT}/solr/COLL_NAME"
   refute_output --partial 'Export complete'
   assert_output --partial "ERROR: Couldn't initialize a HttpClusterStateProvider"
 }
diff --git a/solr/packaging/test/test_extraction.bats b/solr/packaging/test/test_extraction.bats
index def674b15d5..f090cfcdc5b 100644
--- a/solr/packaging/test/test_extraction.bats
+++ b/solr/packaging/test/test_extraction.bats
@@ -47,11 +47,11 @@ teardown() {
       "class": "solr.extraction.ExtractingRequestHandler",
       "defaults":{ "lowernames": "true", "captureAttr":"true"}
     }
-  }' 'http://localhost:8983/solr/gettingstarted/config'
+  }' "http://localhost:${SOLR_PORT}/solr/gettingstarted/config"
 
-  curl 'http://localhost:8983/solr/gettingstarted/update/extract?literal.id=doc1&commit=true' -F "myfile=@${SOLR_TIP}/example/exampledocs/solr-word.pdf"
+  curl "http://localhost:${SOLR_PORT}/solr/gettingstarted/update/extract?literal.id=doc1&commit=true" -F "myfile=@${SOLR_TIP}/example/exampledocs/solr-word.pdf"
   
-  run curl 'http://localhost:8983/solr/gettingstarted/select?q=id:doc1'
+  run curl "http://localhost:${SOLR_PORT}/solr/gettingstarted/select?q=id:doc1"
   assert_output --partial '"numFound":1'
 }
 
@@ -70,15 +70,15 @@ teardown() {
       "class": "solr.extraction.ExtractingRequestHandler",
       "defaults":{ "lowernames": "true", "captureAttr":"true"}
     }
-  }' 'http://localhost:8983/solr/content_extraction/config'
+  }' "http://localhost:${SOLR_PORT}/solr/content_extraction/config"
   
   # We filter to pdf to invoke the Extract handler.
-  run solr post -filetypes pdf -commit -url http://localhost:8983/solr/content_extraction/update ${SOLR_TIP}/example/exampledocs
+  run solr post -filetypes pdf -commit -url http://localhost:${SOLR_PORT}/solr/content_extraction/update ${SOLR_TIP}/example/exampledocs
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
   
-  run curl 'http://localhost:8983/solr/content_extraction/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/content_extraction/select?q=*:*"
   assert_output --partial '"numFound":1'
 }
 
@@ -97,14 +97,14 @@ teardown() {
       "class": "solr.extraction.ExtractingRequestHandler",
       "defaults":{ "lowernames": "true", "captureAttr":"true"}
     }
-  }' 'http://localhost:8983/solr/website_extraction/config'
+  }' "http://localhost:${SOLR_PORT}/solr/website_extraction/config"
   
   # Change to -recursive 1 to crawl multiple pages, but may be too slow.
-  run solr post -mode web -commit -url http://localhost:8983/solr/website_extraction/update -recursive 0 -delay 1 https://solr.apache.org/
+  run solr post -mode web -commit -url http://localhost:${SOLR_PORT}/solr/website_extraction/update -recursive 0 -delay 1 https://solr.apache.org/
 
   assert_output --partial 'POSTed web resource https://solr.apache.org (depth: 0)'
   refute_output --partial 'ERROR'
   
-  run curl 'http://localhost:8983/solr/website_extraction/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/website_extraction/select?q=*:*"
   assert_output --partial '"numFound":1'
 }
diff --git a/solr/packaging/test/test_modules.bats b/solr/packaging/test/test_modules.bats
index ca9cf32acba..4fb71925123 100644
--- a/solr/packaging/test/test_modules.bats
+++ b/solr/packaging/test/test_modules.bats
@@ -32,7 +32,7 @@ teardown() {
 @test "SQL Module" {
   run solr start -c -Dsolr.modules=sql
   run solr create -c COLL_NAME
-  run solr api -get http://localhost:8983/solr/COLL_NAME/sql?stmt=select+id+from+COLL_NAME+limit+10
+  run solr api -get http://localhost:${SOLR_PORT}/solr/COLL_NAME/sql?stmt=select+id+from+COLL_NAME+limit+10
   assert_output --partial '"docs":'
   assert_output --partial '"EOF":true'
   assert_output --partial '"RESPONSE_TIME":'
@@ -52,7 +52,7 @@ teardown() {
     -Dsolr.kerberos.cookie.domain=test
 
   # Upload the custom security.json and wait for Solr to try to load it
-  solr zk cp "${security_json}" zk:security.json -z localhost:9983
+  solr zk cp "${security_json}" zk:security.json -z localhost:${ZK_PORT}
   sleep 1
 
   run cat "${SOLR_LOGS_DIR}/solr.log"
diff --git a/solr/packaging/test/test_packages.bats b/solr/packaging/test/test_packages.bats
index 3dda0e718e8..392729ad28b 100644
--- a/solr/packaging/test/test_packages.bats
+++ b/solr/packaging/test/test_packages.bats
@@ -84,5 +84,5 @@ teardown() {
 #  run solr package deploy solr-splainer -y -cluster
 #  assert_output --partial "Deployment successful"
   
-#  run -0 curl --fail http://localhost:8983/v2/splainer/index.html
+#  run -0 curl --fail http://localhost:${SOLR_PORT}/v2/splainer/index.html
 # }
diff --git a/solr/packaging/test/test_placement_plugin.bats b/solr/packaging/test/test_placement_plugin.bats
index 375d8b4afc0..8b18f830bd8 100644
--- a/solr/packaging/test/test_placement_plugin.bats
+++ b/solr/packaging/test/test_placement_plugin.bats
@@ -31,7 +31,7 @@ teardown() {
 
 @test "Affinity placement plugin using sysprop" {
   run solr start -c -Dsolr.placementplugin.default=affinity
-  solr assert -c http://localhost:8983/solr -t 3000
+  solr assert -c http://localhost:${SOLR_PORT}/solr -t 3000
   run solr create -c COLL_NAME
   collection_exists COLL_NAME
   assert_file_contains "${SOLR_LOGS_DIR}/solr.log" 'Default replica placement plugin set in solr\.placementplugin\.default to affinity'
@@ -40,7 +40,7 @@ teardown() {
 @test "Random placement plugin using ENV" {
   export SOLR_PLACEMENTPLUGIN_DEFAULT=random
   run solr start -c
-  solr assert -c http://localhost:8983/solr -t 3000
+  solr assert -c http://localhost:${SOLR_PORT}/solr -t 3000
   run solr create -c COLL_NAME
   collection_exists COLL_NAME
   assert_file_contains "${SOLR_LOGS_DIR}/solr.log" 'Default replica placement plugin set in solr\.placementplugin\.default to random'
diff --git a/solr/packaging/test/test_post.bats b/solr/packaging/test/test_post.bats
index 4a59d8c7aa8..1e7651c2f30 100644
--- a/solr/packaging/test/test_post.bats
+++ b/solr/packaging/test/test_post.bats
@@ -57,7 +57,7 @@ teardown() {
   run solr create -c monitors -d _default
   assert_output --partial "Created collection 'monitors'"
   
-  run solr post -type application/xml -url http://localhost:8983/solr/monitors/update ${SOLR_TIP}/example/exampledocs/monitor.xml
+  run solr post -type application/xml -url http://localhost:${SOLR_PORT}/solr/monitors/update ${SOLR_TIP}/example/exampledocs/monitor.xml
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
@@ -67,29 +67,29 @@ teardown() {
   
   solr create -c monitors_no_type -d _default
   
-  run solr post -url http://localhost:8983/solr/monitors_no_type/update -commit ${SOLR_TIP}/example/exampledocs/monitor.xml
+  run solr post -url http://localhost:${SOLR_PORT}/solr/monitors_no_type/update -commit ${SOLR_TIP}/example/exampledocs/monitor.xml
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
-  run curl 'http://localhost:8983/solr/monitors_no_type/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/monitors_no_type/select?q=*:*"
   assert_output --partial '"numFound":1'
   
   solr create -c books_no_type -d _default
   
-  run solr post -url http://localhost:8983/solr/books_no_type/update -commit ${SOLR_TIP}/example/exampledocs/books.json
+  run solr post -url http://localhost:${SOLR_PORT}/solr/books_no_type/update -commit ${SOLR_TIP}/example/exampledocs/books.json
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
-  run curl 'http://localhost:8983/solr/books_no_type/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/books_no_type/select?q=*:*"
   assert_output --partial '"numFound":4'
   
   solr create -c books_csv_no_type -d _default
   
-  run solr post -url http://localhost:8983/solr/books_csv_no_type/update -commit ${SOLR_TIP}/example/exampledocs/books.csv
+  run solr post -url http://localhost:${SOLR_PORT}/solr/books_csv_no_type/update -commit ${SOLR_TIP}/example/exampledocs/books.csv
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
-  run curl 'http://localhost:8983/solr/books_csv_no_type/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/books_csv_no_type/select?q=*:*"
   assert_output --partial '"numFound":10'  
 }
 
@@ -98,11 +98,11 @@ teardown() {
   solr create -c mixed_content -d _default
   
   # We filter to xml,json,and csv as we don't want to invoke the Extract handler.
-  run solr post -filetypes xml,json,csv -url http://localhost:8983/solr/mixed_content/update -commit ${SOLR_TIP}/example/exampledocs
+  run solr post -filetypes xml,json,csv -url http://localhost:${SOLR_PORT}/solr/mixed_content/update -commit ${SOLR_TIP}/example/exampledocs
 
   assert_output --partial '16 files indexed.'
   refute_output --partial 'ERROR'
-  run curl 'http://localhost:8983/solr/mixed_content/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/mixed_content/select?q=*:*"
   assert_output --partial '"numFound":46'
 }
 
@@ -116,9 +116,9 @@ teardown() {
       "class": "solr.extraction.ExtractingRequestHandler",
       "defaults":{ "lowernames": "true", "captureAttr":"true"}
     }
-  }' 'http://localhost:8983/solr/webcrawl/config'
+  }' "http://localhost:${SOLR_PORT}/solr/webcrawl/config"
   
-  run solr post -mode web -url http://localhost:8983/webcrawl/update -recursive 1 -delay 1 https://solr.apache.org
+  run solr post -mode web -url http://localhost:${SOLR_PORT}/webcrawl/update -recursive 1 -delay 1 https://solr.apache.org
   assert_output --partial 'Entering crawl at level 0'
 }
 
@@ -127,7 +127,7 @@ teardown() {
   run solr create -c monitors2 -d _default
   assert_output --partial "Created collection 'monitors2'"
   
-  run solr post -url http://localhost:8983/solr/monitors2/update -type application/xml -commit -optimize ${SOLR_TIP}/example/exampledocs/monitor.xml
+  run solr post -url http://localhost:${SOLR_PORT}/solr/monitors2/update -type application/xml -commit -optimize ${SOLR_TIP}/example/exampledocs/monitor.xml
 
   assert_output --partial '1 files indexed.'
   assert_output --partial 'COMMITting Solr index'
@@ -141,26 +141,26 @@ teardown() {
   run solr create -c test_args -d _default
   assert_output --partial "Created collection 'test_args'"
   
-  run solr post -url http://localhost:8983/solr/test_args/update -mode args -type application/xml -out -commit "<delete><query>*:*</query></delete>"
+  run solr post -url http://localhost:${SOLR_PORT}/solr/test_args/update -mode args -type application/xml -out -commit "<delete><query>*:*</query></delete>"
   assert_output --partial '<int name="status">0</int>'
   
   # confirm default type
-  run solr post -url http://localhost:8983/solr/test_args/update -mode args -out -commit "{'delete': {'query': '*:*'}}"
+  run solr post -url http://localhost:${SOLR_PORT}/solr/test_args/update -mode args -out -commit "{'delete': {'query': '*:*'}}"
   assert_output --partial '"status":0'
   
   # confirm we don't get back output without -out
-  run solr post -url http://localhost:8983/solr/test_args/update -mode args -commit "{'delete': {'query': '*:*'}}"
+  run solr post -url http://localhost:${SOLR_PORT}/solr/test_args/update -mode args -commit "{'delete': {'query': '*:*'}}"
   refute_output --partial '"status":0'
   
-  run solr post -url http://localhost:8983/solr/test_args/update -mode args -commit -type text/csv -out $'id,value\nROW1,0.47' 
+  run solr post -url http://localhost:${SOLR_PORT}/solr/test_args/update -mode args -commit -type text/csv -out $'id,value\nROW1,0.47'
   assert_output --partial '"status":0'
-  run curl 'http://localhost:8983/solr/test_args/select?q=id:ROW1'
+  run curl "http://localhost:${SOLR_PORT}/solr/test_args/select?q=id:ROW1"
   assert_output --partial '"numFound":1'
 }
 
 # function used because run echo | solr ends up being (run echo) | solr and we loose the output capture.
 capture_echo_to_solr() {
-    echo "{'commit': {}}" | solr post -url http://localhost:8983/solr/test_stdin/update -mode stdin -type application/json -out
+    echo "{'commit': {}}" | solr post -url http://localhost:${SOLR_PORT}/solr/test_stdin/update -mode stdin -type application/json -out
 }
 
 @test "stdin mode" {
diff --git a/solr/packaging/test/test_postlogs.bats b/solr/packaging/test/test_postlogs.bats
index 36c5941c80e..05b5db19b75 100644
--- a/solr/packaging/test/test_postlogs.bats
+++ b/solr/packaging/test/test_postlogs.bats
@@ -42,11 +42,11 @@ teardown() {
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 
-  run postlogs http://localhost:8983/solr/COLL_NAME ${SOLR_LOGS_DIR}/solr.log
+  run postlogs http://localhost:${SOLR_PORT}/solr/COLL_NAME ${SOLR_LOGS_DIR}/solr.log
   assert_output --partial 'Sending last batch'
   assert_output --partial 'Committed'
 
-  run curl 'http://localhost:8983/solr/COLL_NAME/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/COLL_NAME/select?q=*:*"
   refute_output --partial '"numFound":0'
 }
 
@@ -54,10 +54,10 @@ teardown() {
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 
-  run solr postlogs -url http://localhost:8983/solr/COLL_NAME -rootdir ${SOLR_LOGS_DIR}/solr.log
+  run solr postlogs -url http://localhost:${SOLR_PORT}/solr/COLL_NAME -rootdir ${SOLR_LOGS_DIR}/solr.log
   assert_output --partial 'Sending last batch'
   assert_output --partial 'Committed'
 
-  run curl 'http://localhost:8983/solr/COLL_NAME/select?q=*:*'
+  run curl "http://localhost:${SOLR_PORT}/solr/COLL_NAME/select?q=*:*"
   refute_output --partial '"numFound":0'
 }
diff --git a/solr/packaging/test/test_security_manager.bats b/solr/packaging/test/test_security_manager.bats
index 606d2d33d25..2de50797ccd 100644
--- a/solr/packaging/test/test_security_manager.bats
+++ b/solr/packaging/test/test_security_manager.bats
@@ -43,12 +43,12 @@ teardown() {
   export SOLR_OPTS="-Dsolr.allowPaths=${backup_dir} -Djava.io.tmpdir=${test_tmp_dir}"
   run solr start -c
   run solr create -c COLL_NAME
-  run solr api -get "http://localhost:8983/solr/admin/collections?action=BACKUP&name=test&collection=COLL_NAME&location=file://${backup_dir}"
+  run solr api -get "http://localhost:${SOLR_PORT}/solr/admin/collections?action=BACKUP&name=test&collection=COLL_NAME&location=file://${backup_dir}"
   assert_output --partial '"status":0'
 
   # Solr is not permissioned for this directory, so it should fail
   backup_dir_other="${backup_dir}-other"
   mkdir -p "${backup_dir_other}"
-  run solr api -get "http://localhost:8983/solr/admin/collections?action=BACKUP&name=test-fail&collection=COLL_NAME&location=file://${backup_dir_other}"
+  run solr api -get "http://localhost:${SOLR_PORT}/solr/admin/collections?action=BACKUP&name=test-fail&collection=COLL_NAME&location=file://${backup_dir_other}"
   assert_output --partial 'access denied'
 }
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 85e0e32cc2a..2e9b01e263d 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -51,12 +51,12 @@ teardown() {
   export SOLR_HOST=localhost
 
   solr start -c
-  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
 
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
-  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*'
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 }
 
@@ -84,23 +84,23 @@ teardown() {
   export SOLR_HOST=localhost
 
   solr start -c
-  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
 
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
   # Just test that curl can connect via insecure or via a custom host header
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -k 'https://localhost:8983/solr/test/select?q=*:*'
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -k "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -H "Host: test.solr.apache.org" 'https://127.0.0.1:8983/solr/test/select?q=*:*'
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -H "Host: test.solr.apache.org" "https://127.0.0.1:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 
   # This is a client setting, so we don't need to restart Solr to make sure that it fails
   export SOLR_SSL_CHECK_PEER_NAME=true
 
   # This should fail the peername check
-  run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*'
+  run ! solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial 'Server refused connection'
 }
 
@@ -128,16 +128,16 @@ teardown() {
 
   solr start -c
   solr auth enable -type basicAuth -credentials name:password
-  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
 
-  run curl -u name:password --basic --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json'
+  run curl -u name:password --basic --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json"
   assert_output --partial '"status":0'
 
-  run curl -u name:password --basic --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
+  run curl -u name:password --basic --http2 --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 
   # When the Jenkins box "curl" supports --fail-with-body, add "--fail-with-body" and change "run" to "run !", to expect a failure
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial 'Error 401 Authentication'
 }
 
@@ -190,12 +190,12 @@ teardown() {
   export SOLR_SSL_TRUST_STORE=
   export SOLR_SSL_TRUST_STORE_PASSWORD=
 
-  solr assert --started https://localhost:8983/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
 
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
-  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"
   assert_output --partial '"urlScheme":"https"'
 }
 
@@ -298,7 +298,7 @@ teardown() {
   export SOLR_HOST=localhost
 
   solr start -c
-  solr start -c -z localhost:9983 -p 8984
+  solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT}
 
   # Test Client connections, which do not need the server keystore/truststore
   (
@@ -307,16 +307,16 @@ teardown() {
     export SOLR_SSL_TRUST_STORE=
     export SOLR_SSL_TRUST_STORE_PASSWORD=
 
-    solr assert --started https://localhost:8983/solr --timeout 5000
-    solr assert --started https://localhost:8984/solr --timeout 5000
+    solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
+    solr assert --started https://localhost:${SOLR2_PORT}/solr --timeout 5000
 
     run solr create -c test -s 2
     assert_output --partial "Created collection 'test'"
 
-    run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+    run solr api -get "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"
     assert_output --partial '"urlScheme":"https"'
 
-    run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
+    run solr api -get "https://localhost:${SOLR2_PORT}/solr/test/select?q=*:*&rows=0"
     assert_output --partial '"numFound":0'
 
     (
@@ -324,7 +324,7 @@ teardown() {
       export SOLR_SSL_CLIENT_KEY_STORE=
       export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
 
-      run ! solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+      run ! solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*&rows=0"
       assert_output --partial 'Server refused connection'
     )
   )
@@ -332,12 +332,12 @@ teardown() {
   # Turn on client hostname verification, and start a new Solr node since the property is a server setting.
   # Test that it fails because the client cert does not use "localhost"
   export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
-  solr start -c -z localhost:9983 -p 8985
+  solr start -c -z localhost:${ZK_PORT} -p ${SOLR3_PORT}
 
   # We can't check if the server has come up, because we can't connect to it, so just wait
   sleep 5
 
-  run ! solr api -get 'https://localhost:8985/solr/test/select?q=*:*&rows=0'
+  run ! solr api -get "https://localhost:${SOLR3_PORT}/solr/test/select?q=*:*&rows=0"
   assert_output --partial 'Server refused connection'
 }
 
@@ -437,36 +437,36 @@ teardown() {
   export SOLR_HOST=localhost
 
   solr start -c
-  solr start -c -z localhost:9983 -p 8984
+  solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT}
 
   export SOLR_SSL_KEY_STORE=
   export SOLR_SSL_KEY_STORE_PASSWORD=
   export SOLR_SSL_TRUST_STORE=
   export SOLR_SSL_TRUST_STORE_PASSWORD=
 
-  solr assert --started https://localhost:8983/solr --timeout 5000
-  solr assert --started https://localhost:8984/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
+  solr assert --started https://localhost:${SOLR2_PORT}/solr --timeout 5000
 
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
-  run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"
   assert_output --partial '"urlScheme":"https"'
 
-  run solr api -get 'https://localhost:8984/solr/test/select?q=*:*&rows=0'
+  run solr api -get "https://localhost:${SOLR2_PORT}/solr/test/select?q=*:*&rows=0"
   assert_output --partial '"numFound":0'
 
   export SOLR_SSL_CLIENT_KEY_STORE=
   export SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
 
   # mTLS requires a keyStore, so just using the truststore would fail if mTLS was "NEED"ed, however it is only "WANT"ed, so its ok
-  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*&rows=0"
   assert_output --partial '"numFound":0'
 
   export SOLR_SSL_CLIENT_TRUST_STORE=
   export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=
 
   # TLS cannot work if a truststore and keystore are not provided (either Server or Client)
-  run solr api -get 'https://localhost:8983/solr/test/select?q=*:*&rows=0'
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*&rows=0"
   assert_output --partial 'Server refused connection'
 }
diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.bats
index 3b664759da4..9b9e24a45aa 100644
--- a/solr/packaging/test/test_start_solr.bats
+++ b/solr/packaging/test/test_start_solr.bats
@@ -30,9 +30,9 @@ teardown() {
 
 @test "SOLR-11740 check 'solr stop' connection" {
   solr start
-  solr start -p 7574
-  solr assert --started http://localhost:8983/solr --timeout 5000
-  solr assert --started http://localhost:7574/solr --timeout 5000
+  solr start -p ${SOLR2_PORT}
+  solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
+  solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 5000
   run bash -c 'solr stop -all 2>&1'
   refute_output --partial 'forcefully killing'
 }
@@ -40,12 +40,12 @@ teardown() {
 @test "stop command for single port" {
 
   solr start
-  solr start -p 7574
-  solr assert --started http://localhost:8983/solr --timeout 5000
-  solr assert --started http://localhost:7574/solr --timeout 5000
+  solr start -p ${SOLR2_PORT}
+  solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
+  solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 5000
   
-  run solr stop -p 7574
-  solr assert --not-started http://localhost:7574/solr --timeout 5000
-  solr assert --started http://localhost:8983/solr --timeout 5000
+  run solr stop -p ${SOLR2_PORT}
+  solr assert --not-started http://localhost:${SOLR2_PORT}/solr --timeout 5000
+  solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
 
 }
diff --git a/solr/packaging/test/test_status.bats b/solr/packaging/test/test_status.bats
index 292de5ca008..e8c9bb9efd1 100644
--- a/solr/packaging/test/test_status.bats
+++ b/solr/packaging/test/test_status.bats
@@ -45,7 +45,7 @@ teardown() {
   run solr status -solrUrl http://localhost:9999/solr
   assert_output --partial "needn't include Solr's context-root"
   assert_output --partial "Found 1 Solr nodes:"
-  assert_output --partial "running on port 8983"
+  assert_output --partial "running on port ${SOLR_PORT}"
 }
 
 @test "status help flag outputs message highlighting not to use solrUrl." {
diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.bats
index 686437d914e..06c0d75012d 100644
--- a/solr/packaging/test/test_zk.bats
+++ b/solr/packaging/test/test_zk.bats
@@ -38,24 +38,24 @@ teardown() {
 
 @test "listing out files" {
   sleep 1
-  run solr zk ls / -z localhost:9983
+  run solr zk ls / -z localhost:${ZK_PORT}
   assert_output --partial "aliases.json"
 }
 
 @test "copying files around" {
   touch myfile.txt
   # Umm, what is solr cp?  It's like bin/solr zk cp but not?
-  run solr cp -src myfile.txt -dst zk:/myfile.txt -z localhost:9983
-  assert_output --partial "Copying from 'myfile.txt' to 'zk:/myfile.txt'. ZooKeeper at localhost:9983"
+  run solr cp -src myfile.txt -dst zk:/myfile.txt -z localhost:${ZK_PORT}
+  assert_output --partial "Copying from 'myfile.txt' to 'zk:/myfile.txt'. ZooKeeper at localhost:${ZK_PORT}"
   sleep 1
-  run solr zk ls / -z localhost:9983
+  run solr zk ls / -z localhost:${ZK_PORT}
   assert_output --partial "myfile.txt"
 
   touch myfile2.txt
-  run solr zk cp myfile2.txt zk:myfile2.txt -z localhost:9983
-  assert_output --partial "Copying from 'myfile2.txt' to 'zk:myfile2.txt'. ZooKeeper at localhost:9983"
+  run solr zk cp myfile2.txt zk:myfile2.txt -z localhost:${ZK_PORT}
+  assert_output --partial "Copying from 'myfile2.txt' to 'zk:myfile2.txt'. ZooKeeper at localhost:${ZK_PORT}"
   sleep 1
-  run solr zk ls / -z localhost:9983
+  run solr zk ls / -z localhost:${ZK_PORT}
   assert_output --partial "myfile2.txt"
 
   rm myfile.txt
@@ -66,12 +66,12 @@ teardown() {
   local source_configset_dir="${SOLR_TIP}/server/solr/configsets/sample_techproducts_configs"
   test -d $source_configset_dir
 
-  run solr zk upconfig -d ${source_configset_dir} -n techproducts2 -z localhost:9983
+  run solr zk upconfig -d ${source_configset_dir} -n techproducts2 -z localhost:${ZK_PORT}
   assert_output --partial "Uploading"
   refute_output --partial "ERROR"
 
   sleep 1
-  run curl "http://localhost:8983/api/cluster/configs?omitHeader=true"
+  run curl "http://localhost:${SOLR_PORT}/api/cluster/configs?omitHeader=true"
   assert_output --partial '"configSets":["_default","techproducts2"]'
 
 }
diff --git a/solr/packaging/test/test_zz_cleanup.bats b/solr/packaging/test/test_zz_cleanup.bats
new file mode 100644
index 00000000000..1700f53e53a
--- /dev/null
+++ b/solr/packaging/test/test_zz_cleanup.bats
@@ -0,0 +1,37 @@
+#!/usr/bin/env bats
+
+# 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.
+
+load bats_helper
+
+setup_file() {
+  common_clean_setup
+}
+
+teardown_file() {
+  common_setup
+}
+
+setup() {
+  common_setup
+}
+
+@test "Cleanup" {
+  sleep 1
+  run solr stop -all
+  run solr status -maxWaitSecs 10
+  assert_output --partial "No Solr nodes are running"
+}

From b33dd14b60b237980044d406dc7911f20c605530 Mon Sep 17 00:00:00 2001
From: patsonluk <patsonluk@users.noreply.github.com>
Date: Mon, 18 Sep 2023 12:41:08 -0700
Subject: [PATCH 094/160] More test cases for Coordinator node role (#1782)

---
 .../configsets/cache-control/conf/schema.xml  |  27 ++
 .../cache-control/conf/solrconfig.xml         |  54 ++++
 .../solr/search/TestCoordinatorRole.java      | 260 ++++++++++++++++--
 3 files changed, 324 insertions(+), 17 deletions(-)
 create mode 100644 solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
 create mode 100644 solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml

diff --git a/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
new file mode 100644
index 00000000000..36d5cfd2588
--- /dev/null
+++ b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<schema name="minimal" version="1.1">
+    <fieldType name="string" class="solr.StrField"/>
+    <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <dynamicField name="*" type="string" indexed="true" stored="true"/>
+    <!-- for versioning -->
+    <field name="_version_" type="long" indexed="true" stored="true"/>
+    <field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+    <field name="id" type="string" indexed="true" stored="true"/>
+    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" />
+    <uniqueKey>id</uniqueKey>
+</schema>
\ No newline at end of file
diff --git a/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml
new file mode 100644
index 00000000000..bd27a88952a
--- /dev/null
+++ b/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Minimal solrconfig.xml with /select, /admin and /update only -->
+
+<config>
+
+    <dataDir>${solr.data.dir:}</dataDir>
+
+    <directoryFactory name="DirectoryFactory"
+                      class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+    <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+    <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+
+    <updateHandler class="solr.DirectUpdateHandler2">
+        <commitWithin>
+            <softCommit>${solr.commitwithin.softcommit:true}</softCommit>
+        </commitWithin>
+        <updateLog class="${solr.ulog:solr.UpdateLog}"></updateLog>
+    </updateHandler>
+
+    <requestDispatcher>
+        <httpCaching>
+            <cacheControl>max-age=30, public</cacheControl>
+        </httpCaching>
+    </requestDispatcher>
+
+    <requestHandler name="/select" class="solr.SearchHandler">
+        <lst name="defaults">
+            <str name="echoParams">explicit</str>
+            <str name="indent">true</str>
+            <str name="df">text</str>
+        </lst>
+
+    </requestHandler>
+    <indexConfig>
+        <mergeScheduler class="${solr.mscheduler:org.apache.lucene.index.ConcurrentMergeScheduler}"/>
+        :  </indexConfig>
+</config>
\ No newline at end of file
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 538c6b44703..581f048785d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
@@ -21,6 +21,8 @@
 import static org.apache.solr.common.params.CommonParams.TRUE;
 
 import java.lang.invoke.MethodHandles;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.EnumSet;
@@ -51,6 +53,7 @@
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.cloud.ZkStateReaderAccessor;
 import org.apache.solr.common.params.CommonParams;
@@ -585,18 +588,70 @@ public void testConcurrentAccess() throws Exception {
     }
   }
 
+  public void testConfigset() throws Exception {
+    final int DATA_NODE_COUNT = 1;
+    MiniSolrCloudCluster cluster =
+        configureCluster(DATA_NODE_COUNT)
+            .addConfig("conf1", configset("cloud-minimal"))
+            .addConfig("conf2", configset("cache-control"))
+            .configure();
+
+    List<String> dataNodes =
+        cluster.getJettySolrRunners().stream()
+            .map(JettySolrRunner::getNodeName)
+            .collect(Collectors.toUnmodifiableList());
+
+    try {
+      CollectionAdminRequest.createCollection("c1", "conf1", 2, 1).process(cluster.getSolrClient());
+      cluster.waitForActiveCollection("c1", 2, 2);
+      CollectionAdminRequest.createCollection("c2", "conf2", 2, 1).process(cluster.getSolrClient());
+      cluster.waitForActiveCollection("c2", 2, 2);
+
+      System.setProperty(NodeRoles.NODE_ROLES_PROP, "coordinator:on");
+      JettySolrRunner coordinatorJetty;
+      try {
+        coordinatorJetty = cluster.startJettySolrRunner();
+      } finally {
+        System.clearProperty(NodeRoles.NODE_ROLES_PROP);
+      }
+
+      // Tricky to test configset, since operation such as collection status would direct it to the
+      // OS node.
+      // So we use query and check the cache response header which is determined by the
+      // solr-config.xml in the configset
+      // However using solr client would drop cache respons header hence we need to use plain java
+      // HttpURLConnection
+      URL url = new URL(coordinatorJetty.getBaseUrl() + "/c1/select?q=*:*");
+      HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+      urlConnection.connect();
+
+      // conf1 has no cache-control
+      assertNull(urlConnection.getHeaderField("cache-control"));
+
+      url = new URL(coordinatorJetty.getBaseUrl() + "/c2/select?q=*:*");
+      urlConnection = (HttpURLConnection) url.openConnection();
+      urlConnection.connect();
+
+      // conf2 has cache-control defined
+      assertTrue(urlConnection.getHeaderField("cache-control").contains("max-age=30"));
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
   public void testWatch() throws Exception {
-    final int DATA_NODE_COUNT = 2;
+    final int DATA_NODE_COUNT = 1;
     MiniSolrCloudCluster cluster =
         configureCluster(DATA_NODE_COUNT)
             .addConfig("conf1", configset("cloud-minimal"))
             .configure();
-    final String TEST_COLLECTION = "c1";
+    final String TEST_COLLECTION_1 = "c1";
+    final String TEST_COLLECTION_2 = "c2";
 
     try {
       CloudSolrClient client = cluster.getSolrClient();
-      CollectionAdminRequest.createCollection(TEST_COLLECTION, "conf1", 1, 2).process(client);
-      cluster.waitForActiveCollection(TEST_COLLECTION, 1, 2);
+      CollectionAdminRequest.createCollection(TEST_COLLECTION_1, "conf1", 1, 2).process(client);
+      cluster.waitForActiveCollection(TEST_COLLECTION_1, 1, 2);
       System.setProperty(NodeRoles.NODE_ROLES_PROP, "coordinator:on");
       JettySolrRunner coordinatorJetty;
       try {
@@ -610,26 +665,37 @@ public void testWatch() throws Exception {
       ZkStateReaderAccessor zkWatchAccessor = new ZkStateReaderAccessor(zkStateReader);
 
       // no watch at first
-      assertTrue(!zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION));
+      assertTrue(!zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_1));
       new QueryRequest(new SolrQuery("*:*"))
           .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
-          .process(client, TEST_COLLECTION); // ok no exception thrown
+          .process(client, TEST_COLLECTION_1); // ok no exception thrown
 
       // now it should be watching it after the query
-      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION));
+      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_1));
+
+      // add another collection
+      CollectionAdminRequest.createCollection(TEST_COLLECTION_2, "conf1", 1, 2).process(client);
+      cluster.waitForActiveCollection(TEST_COLLECTION_2, 1, 2);
+      new QueryRequest(new SolrQuery("*:*"))
+          .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
+          .process(client, TEST_COLLECTION_2);
+      // watch both collections
+      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_1));
+      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_2));
 
-      CollectionAdminRequest.deleteReplica(TEST_COLLECTION, "shard1", 1).process(client);
-      cluster.waitForActiveCollection(TEST_COLLECTION, 1, 1);
+      CollectionAdminRequest.deleteReplica(TEST_COLLECTION_1, "shard1", 1).process(client);
+      cluster.waitForActiveCollection(TEST_COLLECTION_1, 1, 1);
       new QueryRequest(new SolrQuery("*:*"))
           .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
-          .process(client, TEST_COLLECTION); // ok no exception thrown
+          .process(client, TEST_COLLECTION_1); // ok no exception thrown
 
       // still one replica left, should not remove the watch
-      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION));
+      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_1));
 
-      CollectionAdminRequest.deleteCollection(TEST_COLLECTION).process(client);
-      zkStateReader.waitForState(TEST_COLLECTION, 30, TimeUnit.SECONDS, Objects::isNull);
-      assertNull(zkStateReader.getCollection(TEST_COLLECTION)); // check the cluster state
+      // now delete c1 and ensure it's cleared from various logic
+      CollectionAdminRequest.deleteCollection(TEST_COLLECTION_1).process(client);
+      zkStateReader.waitForState(TEST_COLLECTION_1, 30, TimeUnit.SECONDS, Objects::isNull);
+      assertNull(zkStateReader.getCollection(TEST_COLLECTION_1)); // check the cluster state
 
       // ensure querying throws exception
       assertExceptionThrownWithMessageContaining(
@@ -638,10 +704,170 @@ public void testWatch() throws Exception {
           () ->
               new QueryRequest(new SolrQuery("*:*"))
                   .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
-                  .process(client, TEST_COLLECTION));
+                  .process(client, TEST_COLLECTION_1));
+
+      // watch should be removed after c1 deletion
+      assertTrue(!zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_1));
+      // still watching c2
+      assertTrue(zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION_2));
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
+  public void testSplitShard() throws Exception {
+    final int DATA_NODE_COUNT = 1;
+    MiniSolrCloudCluster cluster =
+        configureCluster(DATA_NODE_COUNT)
+            .addConfig("conf1", configset("cloud-minimal"))
+            .configure();
+
+    try {
+
+      final String COLLECTION_NAME = "c1";
+      CollectionAdminRequest.createCollection(COLLECTION_NAME, "conf1", 1, 1)
+          .process(cluster.getSolrClient());
+      cluster.waitForActiveCollection(COLLECTION_NAME, 1, 1);
+
+      int DOC_PER_COLLECTION_COUNT = 1000;
+      UpdateRequest ur = new UpdateRequest();
+      for (int i = 0; i < DOC_PER_COLLECTION_COUNT; i++) {
+        SolrInputDocument doc = new SolrInputDocument();
+        doc.addField("id", COLLECTION_NAME + "-" + i);
+        ur.add(doc);
+      }
+      CloudSolrClient client = cluster.getSolrClient();
+      ur.commit(client, COLLECTION_NAME);
+
+      System.setProperty(NodeRoles.NODE_ROLES_PROP, "coordinator:on");
+      JettySolrRunner coordinatorJetty;
+      try {
+        coordinatorJetty = cluster.startJettySolrRunner();
+      } finally {
+        System.clearProperty(NodeRoles.NODE_ROLES_PROP);
+      }
+
+      QueryResponse response =
+          new QueryRequest(new SolrQuery("*:*"))
+              .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
+              .process(client, COLLECTION_NAME);
+
+      assertEquals(DOC_PER_COLLECTION_COUNT, response.getResults().getNumFound());
+
+      // now split the shard
+      CollectionAdminRequest.splitShard(COLLECTION_NAME).setShardName("shard1").process(client);
+      waitForState(
+          "Failed to wait for child shards after split",
+          COLLECTION_NAME,
+          (liveNodes, collectionState) ->
+              collectionState.getSlice("shard1_0") != null
+                  && collectionState.getSlice("shard1_0").getState() == Slice.State.ACTIVE
+                  && collectionState.getSlice("shard1_1") != null
+                  && collectionState.getSlice("shard1_1").getState() == Slice.State.ACTIVE);
+
+      // delete the parent shard
+      CollectionAdminRequest.deleteShard(COLLECTION_NAME, "shard1").process(client);
+      waitForState(
+          "Parent shard is not yet deleted after split",
+          COLLECTION_NAME,
+          (liveNodes, collectionState) -> collectionState.getSlice("shard1") == null);
+
+      response =
+          new QueryRequest(new SolrQuery("*:*"))
+              .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
+              .process(client, COLLECTION_NAME);
+
+      assertEquals(DOC_PER_COLLECTION_COUNT, response.getResults().getNumFound());
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
+  public void testMoveReplica() throws Exception {
+    final int DATA_NODE_COUNT = 2;
+    MiniSolrCloudCluster cluster =
+        configureCluster(DATA_NODE_COUNT)
+            .addConfig("conf1", configset("cloud-minimal"))
+            .configure();
+
+    List<String> dataNodes =
+        cluster.getJettySolrRunners().stream()
+            .map(JettySolrRunner::getNodeName)
+            .collect(Collectors.toUnmodifiableList());
+    try {
+
+      final String COLLECTION_NAME = "c1";
+      String fromNode = dataNodes.get(0); // put the shard on first data node
+      CollectionAdminRequest.createCollection(COLLECTION_NAME, "conf1", 1, 1)
+          .setCreateNodeSet(fromNode)
+          .process(cluster.getSolrClient());
+      // ensure replica is placed on the expected node
+      waitForState(
+          "Cannot find replica on first node yet",
+          COLLECTION_NAME,
+          (liveNodes, collectionState) -> {
+            if (collectionState.getReplicas().size() == 1) {
+              Replica replica = collectionState.getReplicas().get(0);
+              return fromNode.equals(replica.getNodeName())
+                  && replica.getState() == Replica.State.ACTIVE;
+            }
+            return false;
+          });
+
+      int DOC_PER_COLLECTION_COUNT = 1000;
+      UpdateRequest ur = new UpdateRequest();
+      for (int i = 0; i < DOC_PER_COLLECTION_COUNT; i++) {
+        SolrInputDocument doc = new SolrInputDocument();
+        doc.addField("id", COLLECTION_NAME + "-" + i);
+        ur.add(doc);
+      }
+      CloudSolrClient client = cluster.getSolrClient();
+      ur.commit(client, COLLECTION_NAME);
+
+      System.setProperty(NodeRoles.NODE_ROLES_PROP, "coordinator:on");
+      JettySolrRunner coordinatorJetty;
+      try {
+        coordinatorJetty = cluster.startJettySolrRunner();
+      } finally {
+        System.clearProperty(NodeRoles.NODE_ROLES_PROP);
+      }
+
+      QueryResponse response =
+          new QueryRequest(new SolrQuery("*:*"))
+              .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
+              .process(client, COLLECTION_NAME);
+
+      assertEquals(DOC_PER_COLLECTION_COUNT, response.getResults().getNumFound());
+
+      // now move the shard/replica
+      String replicaName = getCollectionState(COLLECTION_NAME).getReplicas().get(0).getName();
+      String toNodeName = dataNodes.get(1);
+      CollectionAdminRequest.moveReplica(COLLECTION_NAME, replicaName, toNodeName).process(client);
+      waitForState(
+          "Cannot find replica on second node yet after repliac move",
+          COLLECTION_NAME,
+          (liveNodes, collectionState) -> {
+            if (collectionState.getReplicas().size() == 1) {
+              Replica replica = collectionState.getReplicas().get(0);
+              return toNodeName.equals(replica.getNodeName())
+                  && replica.getState() == Replica.State.ACTIVE;
+            }
+            return false;
+          });
+
+      // We must stop the first node to ensure that query directs to the correct node from
+      // coordinator.
+      // In case if coordinator node has the wrong info (replica on first node), it might still
+      // return valid result if
+      // we do not stop the first node as first node might forward the query to second node.
+      cluster.getJettySolrRunners().get(0).stop();
+
+      response =
+          new QueryRequest(new SolrQuery("*:*"))
+              .setPreferredNodes(List.of(coordinatorJetty.getNodeName()))
+              .process(client, COLLECTION_NAME);
 
-      // watch should be removed after collection deletion
-      assertTrue(!zkWatchAccessor.getWatchedCollections().contains(TEST_COLLECTION));
+      assertEquals(DOC_PER_COLLECTION_COUNT, response.getResults().getNumFound());
     } finally {
       cluster.shutdown();
     }

From c05d09e0196d9c8d54a727ce71070fb0b8d2363a Mon Sep 17 00:00:00 2001
From: Tomas Eduardo Fernandez Lobbe <tflobbe@apache.org>
Date: Mon, 18 Sep 2023 16:53:02 -0700
Subject: [PATCH 095/160] No Jira: Reduce logging level for slice -> shard
 mapping in RTG (#1932)

---
 .../org/apache/solr/handler/component/RealTimeGetComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 56aebd8e9d2..7944f4840ce 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1115,7 +1115,7 @@ private String[] sliceToShards(ResponseBuilder rb, String collection, String sli
     // the mappings.
 
     for (int i = 0; i < rb.slices.length; i++) {
-      log.info("LOOKUP_SLICE:{}={}", rb.slices[i], rb.shards[i]);
+      log.trace("LOOKUP_SLICE:{}={}", rb.slices[i], rb.shards[i]);
       if (lookup.equals(rb.slices[i]) || slice.equals(rb.slices[i])) {
         return new String[] {rb.shards[i]};
       }

From 1c2ebe23403dc2f3dfde3ac7f8cfb176256f3e72 Mon Sep 17 00:00:00 2001
From: Joel Bernstein <jbernste@apache.org>
Date: Tue, 19 Sep 2023 10:38:41 -0400
Subject: [PATCH 096/160]  SOLR-16931: ReRankScaler explain breaks with
 debug=true and in distributed mode (#1936)

---
 .../handler/component/QueryComponent.java     |  32 +++++
 .../solr/search/ReRankQParserPlugin.java      |  17 +++
 .../search/DistributedReRankExplainTest.java  | 109 ++++++++++++++++++
 .../solr/search/TestReRankQParserPlugin.java  |   2 +-
 4 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java

diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index a2b46a30d46..e8457df3e08 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -88,6 +88,7 @@
 import org.apache.solr.search.QueryResult;
 import org.apache.solr.search.QueryUtils;
 import org.apache.solr.search.RankQuery;
+import org.apache.solr.search.ReRankQParserPlugin;
 import org.apache.solr.search.ReturnFields;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.search.SolrReturnFields;
@@ -757,6 +758,7 @@ protected void createMainQuery(ResponseBuilder rb) {
     boolean distribSinglePass = rb.req.getParams().getBool(ShardParams.DISTRIB_SINGLE_PASS, false);
 
     if (distribSinglePass
+        || singlePassExplain(rb.req.getParams())
         || (fields != null
             && fields.wantsField(keyFieldName)
             && fields.getRequestedFieldNames() != null
@@ -838,6 +840,36 @@ protected void createMainQuery(ResponseBuilder rb) {
     rb.addRequest(this, sreq);
   }
 
+  private boolean singlePassExplain(SolrParams params) {
+
+    /*
+     * Currently there is only one explain that requires a single pass
+     * and that is the reRank when scaling is used.
+     */
+
+    String rankQuery = params.get(CommonParams.RQ);
+    if (rankQuery != null) {
+      if (rankQuery.contains(ReRankQParserPlugin.RERANK_MAIN_SCALE)
+          || rankQuery.contains(ReRankQParserPlugin.RERANK_SCALE)) {
+        boolean debugQuery = params.getBool(CommonParams.DEBUG_QUERY, false);
+        if (debugQuery) {
+          return true;
+        } else {
+          String[] debugParams = params.getParams(CommonParams.DEBUG);
+          if (debugParams != null) {
+            for (String debugParam : debugParams) {
+              if (debugParam.equals("true")) {
+                return true;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return false;
+  }
+
   protected boolean addFL(StringBuilder fl, String field, boolean additionalAdded) {
     if (additionalAdded) fl.append(",");
     fl.append(field);
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
index 2ae72837218..e9597c3dd86 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -17,6 +17,7 @@
 package org.apache.solr.search;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryRescorer;
@@ -25,6 +26,8 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.request.SolrQueryRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  *
@@ -50,6 +53,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
 
   public static final String RERANK_SCALE = "reRankScale";
   public static final String RERANK_MAIN_SCALE = "reRankMainScale";
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
   public QParser createParser(
@@ -85,6 +89,19 @@ public Query parse() throws SyntaxError {
       String mainScale = localParams.get(RERANK_MAIN_SCALE);
       String reRankScale = localParams.get(RERANK_SCALE);
       boolean debugQuery = params.getBool(CommonParams.DEBUG_QUERY, false);
+
+      if (!debugQuery) {
+        String[] debugParams = params.getParams(CommonParams.DEBUG);
+        if (debugParams != null) {
+          for (String debugParam : debugParams) {
+            if ("true".equals(debugParam)) {
+              debugQuery = true;
+              break;
+            }
+          }
+        }
+      }
+
       double reRankScaleWeight = reRankWeight;
 
       ReRankScaler reRankScaler =
diff --git a/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java b/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java
new file mode 100644
index 00000000000..defe6fef4ff
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.lang.invoke.MethodHandles;
+import java.util.Map;
+import java.util.Random;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.cloud.SolrCloudTestCase;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SolrTestCaseJ4.SuppressSSL
+public class DistributedReRankExplainTest extends SolrCloudTestCase {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  private static final int numShards = 2;
+  private static final String COLLECTIONORALIAS = "collection1";
+
+  private static final int TIMEOUT = DEFAULT_TIMEOUT;
+  private static final String id = "id";
+
+  private static boolean useAlias;
+
+  @BeforeClass
+  public static void setupCluster() throws Exception {
+    System.setProperty("managed.schema.mutable", "true");
+    String collection = COLLECTIONORALIAS;
+    configureCluster(2)
+        .addConfig(
+            "conf1", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf"))
+        .configure();
+    CollectionAdminRequest.createCollection(collection, "conf1", 2, 1)
+        .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
+        .process(cluster.getSolrClient());
+
+    cluster.waitForActiveCollection(collection, 2, 2);
+  }
+
+  @Test
+  public void testReRankExplain() throws Exception {
+    CloudSolrClient client = cluster.getSolrClient();
+    UpdateRequest updateRequest = new UpdateRequest();
+    for (int i = 0; i < 100; i++) {
+      SolrInputDocument doc = new SolrInputDocument();
+      doc.addField(CommonParams.ID, Integer.toString(i));
+      doc.addField("test_s", "hello");
+      updateRequest.add(doc);
+    }
+    updateRequest.process(client, COLLECTIONORALIAS);
+    client.commit(COLLECTIONORALIAS);
+
+    String[] debugParams = {CommonParams.DEBUG, CommonParams.DEBUG_QUERY};
+    Random random = random();
+    ModifiableSolrParams solrParams = new ModifiableSolrParams();
+    String reRank = "{!rerank reRankDocs=10 reRankMainScale=0-10 reRankQuery='test_s:hello'}";
+    solrParams
+        .add("q", "test_s:hello")
+        .add(debugParams[random.nextInt(2)], "true")
+        .add(CommonParams.RQ, reRank);
+    QueryRequest queryRequest = new QueryRequest(solrParams);
+    QueryResponse queryResponse = queryRequest.process(client, COLLECTIONORALIAS);
+    Map<String, Object> debug = queryResponse.getDebugMap();
+    assertNotNull(debug);
+    String explain = debug.get("explain").toString();
+    assertTrue(
+        explain.contains("5.0101576 = combined scaled first and unscaled second pass score "));
+
+    solrParams = new ModifiableSolrParams();
+    reRank = "{!rerank reRankDocs=10 reRankScale=0-10 reRankQuery='test_s:hello'}";
+    solrParams
+        .add("q", "test_s:hello")
+        .add(debugParams[random.nextInt(2)], "true")
+        .add(CommonParams.RQ, reRank);
+    queryRequest = new QueryRequest(solrParams);
+    queryResponse = queryRequest.process(client, COLLECTIONORALIAS);
+    debug = queryResponse.getDebugMap();
+    assertNotNull(debug);
+    explain = debug.get("explain").toString();
+    assertTrue(
+        explain.contains("10.005078 = combined unscaled first and scaled second pass score "));
+  }
+}
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index f551ba82fca..5d769c4e57f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -1522,7 +1522,7 @@ public void testReRankScaleQueries() throws Exception {
     params.add("start", "0");
     params.add("rows", "6");
     params.add("df", "text");
-    params.add("debugQuery", "true");
+    params.add("debug", "true");
     assertQ(
         req(params),
         "*[count(//doc)=6]",

From ec8f23622b04de80c1dcb85638a73f9d9566d1bf Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Tue, 19 Sep 2023 11:21:35 -0400
Subject: [PATCH 097/160] Small TLS integration test improvements

---
 solr/packaging/test/test_ssl.bats | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 2e9b01e263d..7e50637eb34 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -58,6 +58,11 @@ teardown() {
 
   run solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
+
+  run curl --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
+  assert_output --partial '"numFound":0'
+
+  run ! curl "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
 }
 
 @test "use different hostname when not checking peer-name" {
@@ -81,7 +86,7 @@ teardown() {
   export SOLR_SSL_NEED_CLIENT_AUTH=false
   export SOLR_SSL_WANT_CLIENT_AUTH=false
   export SOLR_SSL_CHECK_PEER_NAME=false
-  export SOLR_HOST=localhost
+  export SOLR_HOST=127.0.0.1
 
   solr start -c
   solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
@@ -89,11 +94,18 @@ teardown() {
   run solr create -c test -s 2
   assert_output --partial "Created collection 'test'"
 
+  run solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
+  assert_output --partial '"numFound":0'
+
+  # Just test that curl can connect via insecure or via a custom host header
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
+  assert_output --partial 'no alternative certificate subject name matches target host name'
+
   # Just test that curl can connect via insecure or via a custom host header
   run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -k "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" -H "Host: test.solr.apache.org" "https://127.0.0.1:${SOLR_PORT}/solr/test/select?q=*:*"
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" --resolve "test.solr.apache.org:${SOLR_PORT}:127.0.0.1" "https://test.solr.apache.org:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":0'
 
   # This is a client setting, so we don't need to restart Solr to make sure that it fails
@@ -102,6 +114,18 @@ teardown() {
   # This should fail the peername check
   run ! solr api -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial 'Server refused connection'
+
+  # Restart the server enabling the SNI hostcheck
+  export SOLR_SSL_CHECK_PEER_NAME=false
+  export SOLR_OPTS="${SOLR_OPTS} -Dsolr.jetty.ssl.sniHostCheck=true"
+  solr restart -c
+  # This should fail the SNI Hostname check
+  run ! solr api -verbose -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
+  assert_output --partial 'Invalid SNI'
+
+  # Using the right hostname should not fail the SNI Hostname check
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" --resolve "test.solr.apache.org:${SOLR_PORT}:127.0.0.1" "https://test.solr.apache.org:${SOLR_PORT}/solr/test/select?q=*:*"
+  assert_output --partial '"numFound":0'
 }
 
 @test "start solr with ssl and auth" {

From 5caacd37f7908a89817e599a7fda41ccc789ad7d Mon Sep 17 00:00:00 2001
From: Joel Bernstein <jbernste@apache.org>
Date: Tue, 19 Sep 2023 11:49:55 -0400
Subject: [PATCH 098/160] SOLR-16931: Update CHANGES.txt

---
 solr/CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c8a3a1dd63c..7532d654af6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -192,6 +192,8 @@ Bug Fixes
 
 * SOLR-16971: RealTimeGet with Composite router throws NPE (Alex Deparvu)
 
+* SOLR-16931: ReRankScaler explain breaks with debug=true and in distributed mode (Joel Bernstein)
+
 Dependency Upgrades
 ---------------------
 

From 58554d68760f7d48dba0281da9b74796d60a0a42 Mon Sep 17 00:00:00 2001
From: Tomas Eduardo Fernandez Lobbe <tflobbe@apache.org>
Date: Tue, 19 Sep 2023 11:03:05 -0700
Subject: [PATCH 099/160] SOLR-16978: Be case insensitive when parsing booleans
 from text (#1931)

---
 solr/CHANGES.txt                              |   2 +
 .../api/collections/TestCollectionAPI.java    |  28 +++
 .../org/apache/solr/core/TestSolrXml.java     |   4 +-
 .../test/org/apache/solr/util/TestUtils.java  |  71 --------
 .../org/apache/solr/common/util/StrUtils.java |  10 +-
 .../apache/solr/common/util/StrUtilsTest.java | 167 ++++++++++++++++++
 6 files changed, 205 insertions(+), 77 deletions(-)
 create mode 100644 solr/solrj/src/test/org/apache/solr/common/util/StrUtilsTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7532d654af6..ed796ef648c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -216,6 +216,8 @@ Other Changes
 
 * SOLR-16979: BATS integration tests now start solr instances on a randomly selected port (janhoy)
 
+* SOLR-16978: Be case insensitive when parsing booleans from text (Tomás Fernández Löbbe)
+
 ==================  9.3.0 ==================
 
 Upgrade Notes
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
index 760d3b73d02..29c103cb9a3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
@@ -45,6 +45,7 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionAdminParams;
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.ShardParams;
@@ -1317,4 +1318,31 @@ public void testConfigCaching() throws Exception {
       cl.shutdown();
     }
   }
+
+  @Test
+  public void testCreateCollectionBooleanValues() throws Exception {
+    try (CloudSolrClient client = createCloudClient(null)) {
+      String collectionName = "testCreateCollectionBooleanValues";
+      ModifiableSolrParams params = new ModifiableSolrParams();
+      params.set("action", CollectionParams.CollectionAction.CREATE.toString());
+      params.set("name", collectionName);
+      params.set("collection.configName", "conf1");
+      params.set("numShards", "1");
+      params.set(CollectionAdminParams.PER_REPLICA_STATE, "False");
+      QueryRequest request = new QueryRequest(params);
+      request.setPath("/admin/collections");
+
+      try {
+        client.request(request);
+        waitForCollection(ZkStateReader.from(cloudClient), collectionName, 1);
+      } finally {
+        try {
+          CollectionAdminRequest.deleteCollection(collectionName).process(client);
+        } catch (Exception e) {
+          // Delete if possible, ignore otherwise. If the test failed, let the original exception
+          // bubble up
+        }
+      }
+    }
+  }
 }
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index 3445db478e4..c3761cd7b4b 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -303,11 +303,11 @@ public void testFailAtConfigParseTimeWhenIntTypeIsExpectedAndLongTypeIsGiven() {
 
   public void testFailAtConfigParseTimeWhenBoolTypeIsExpectedAndValueIsInvalidString() {
     String solrXml =
-        "<solr><solrcloud><bool name=\"genericCoreNodeNames\">NOT_A_BOOLEAN</bool></solrcloud></solr>";
+        "<solr><solrcloud><bool name=\"genericCoreNodeNames\">FOO</bool></solrcloud></solr>";
 
     SolrException thrown =
         assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
-    assertEquals("invalid boolean value: NOT_A_BOOLEAN", thrown.getMessage());
+    assertEquals("invalid boolean value: FOO", thrown.getMessage());
   }
 
   public void testFailAtConfigParseTimeWhenIntTypeIsExpectedAndBoolTypeIsGiven() {
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index 90b118b7f1c..949c2dc15fe 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -39,83 +39,12 @@
 import org.apache.solr.common.util.JavaBinCodec;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.common.util.Utils;
 import org.junit.Assert;
 
 /** */
 public class TestUtils extends SolrTestCaseJ4 {
 
-  public void testJoin() {
-    assertEquals("a|b|c", StrUtils.join(asList("a", "b", "c"), '|'));
-    assertEquals("a,b,c", StrUtils.join(asList("a", "b", "c"), ','));
-    assertEquals("a\\,b,c", StrUtils.join(asList("a,b", "c"), ','));
-    assertEquals("a,b|c", StrUtils.join(asList("a,b", "c"), '|'));
-
-    assertEquals("a\\\\b|c", StrUtils.join(asList("a\\b", "c"), '|'));
-  }
-
-  public void testEscapeTextWithSeparator() {
-    assertEquals("a", StrUtils.escapeTextWithSeparator("a", '|'));
-    assertEquals("a", StrUtils.escapeTextWithSeparator("a", ','));
-
-    assertEquals("a\\|b", StrUtils.escapeTextWithSeparator("a|b", '|'));
-    assertEquals("a|b", StrUtils.escapeTextWithSeparator("a|b", ','));
-    assertEquals("a,b", StrUtils.escapeTextWithSeparator("a,b", '|'));
-    assertEquals("a\\,b", StrUtils.escapeTextWithSeparator("a,b", ','));
-    assertEquals("a\\\\b", StrUtils.escapeTextWithSeparator("a\\b", ','));
-
-    assertEquals("a\\\\\\,b", StrUtils.escapeTextWithSeparator("a\\,b", ','));
-  }
-
-  public void testSplitEscaping() {
-    List<String> arr = StrUtils.splitSmart("\\r\\n:\\t\\f\\b", ":", true);
-    assertEquals(2, arr.size());
-    assertEquals("\r\n", arr.get(0));
-    assertEquals("\t\f\b", arr.get(1));
-
-    arr = StrUtils.splitSmart("\\r\\n:\\t\\f\\b", ":", false);
-    assertEquals(2, arr.size());
-    assertEquals("\\r\\n", arr.get(0));
-    assertEquals("\\t\\f\\b", arr.get(1));
-
-    arr = StrUtils.splitWS("\\r\\n \\t\\f\\b", true);
-    assertEquals(2, arr.size());
-    assertEquals("\r\n", arr.get(0));
-    assertEquals("\t\f\b", arr.get(1));
-
-    arr = StrUtils.splitWS("\\r\\n \\t\\f\\b", false);
-    assertEquals(2, arr.size());
-    assertEquals("\\r\\n", arr.get(0));
-    assertEquals("\\t\\f\\b", arr.get(1));
-
-    arr = StrUtils.splitSmart("\\:foo\\::\\:bar\\:", ":", true);
-    assertEquals(2, arr.size());
-    assertEquals(":foo:", arr.get(0));
-    assertEquals(":bar:", arr.get(1));
-
-    arr = StrUtils.splitWS("\\ foo\\  \\ bar\\ ", true);
-    assertEquals(2, arr.size());
-    assertEquals(" foo ", arr.get(0));
-    assertEquals(" bar ", arr.get(1));
-
-    arr = StrUtils.splitFileNames("/h/s,/h/\\,s,");
-    assertEquals(2, arr.size());
-    assertEquals("/h/s", arr.get(0));
-    assertEquals("/h/,s", arr.get(1));
-
-    arr = StrUtils.splitFileNames("/h/s");
-    assertEquals(1, arr.size());
-    assertEquals("/h/s", arr.get(0));
-  }
-
-  public void testToLower() {
-    assertEquals(List.of(), StrUtils.toLower(List.of()));
-    assertEquals(List.of(""), StrUtils.toLower(List.of("")));
-    assertEquals(List.of("foo"), StrUtils.toLower(List.of("foo")));
-    assertEquals(List.of("bar", "baz-123"), StrUtils.toLower(List.of("BAR", "Baz-123")));
-  }
-
   public void testNamedLists() {
     SimpleOrderedMap<Integer> map = new SimpleOrderedMap<>();
     map.add("test", 10);
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
index 9e813258cd3..6c209770e42 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
@@ -267,10 +267,11 @@ public static boolean parseBoolean(CharSequence s) {
    */
   public static boolean parseBool(String s) {
     if (s != null) {
-      if (s.startsWith("true") || s.startsWith("on") || s.startsWith("yes")) {
+      String lowerS = s.toLowerCase(Locale.ROOT);
+      if (lowerS.startsWith("true") || lowerS.startsWith("on") || lowerS.startsWith("yes")) {
         return true;
       }
-      if (s.startsWith("false") || s.startsWith("off") || s.equals("no")) {
+      if (lowerS.startsWith("false") || lowerS.startsWith("off") || lowerS.equals("no")) {
         return false;
       }
     }
@@ -285,10 +286,11 @@ public static boolean parseBool(String s) {
    */
   public static boolean parseBool(String s, boolean def) {
     if (s != null) {
-      if (s.startsWith("true") || s.startsWith("on") || s.startsWith("yes")) {
+      String lowerS = s.toLowerCase(Locale.ROOT);
+      if (lowerS.startsWith("true") || lowerS.startsWith("on") || lowerS.startsWith("yes")) {
         return true;
       }
-      if (s.startsWith("false") || s.startsWith("off") || s.equals("no")) {
+      if (lowerS.startsWith("false") || lowerS.startsWith("off") || lowerS.equals("no")) {
         return false;
       }
     }
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/StrUtilsTest.java b/solr/solrj/src/test/org/apache/solr/common/util/StrUtilsTest.java
new file mode 100644
index 00000000000..7b4b30b2895
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/common/util/StrUtilsTest.java
@@ -0,0 +1,167 @@
+/*
+ * 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.common.util;
+
+import static java.util.Arrays.asList;
+
+import java.util.List;
+import org.apache.solr.SolrTestCase;
+import org.apache.solr.common.SolrException;
+
+public class StrUtilsTest extends SolrTestCase {
+
+  public void testParseBool() {
+    assertTrue(StrUtils.parseBool("true"));
+    assertTrue(StrUtils.parseBool("True"));
+    assertTrue(StrUtils.parseBool("TRUE"));
+    assertTrue(StrUtils.parseBool("true  "));
+    assertTrue(StrUtils.parseBool("trueAbc"));
+
+    assertTrue(StrUtils.parseBool("on"));
+    assertTrue(StrUtils.parseBool("ON"));
+    assertTrue(StrUtils.parseBool("on   "));
+    assertTrue(StrUtils.parseBool("onABC"));
+
+    assertTrue(StrUtils.parseBool("yes"));
+    assertTrue(StrUtils.parseBool("YES"));
+    assertTrue(StrUtils.parseBool("yes   "));
+    assertTrue(StrUtils.parseBool("yesABC"));
+
+    assertFalse(StrUtils.parseBool("false"));
+    assertFalse(StrUtils.parseBool("False"));
+    assertFalse(StrUtils.parseBool("FALSE"));
+    assertFalse(StrUtils.parseBool("false  "));
+    assertFalse(StrUtils.parseBool("falseAbc"));
+
+    assertFalse(StrUtils.parseBool("off"));
+    assertFalse(StrUtils.parseBool("OFF"));
+    assertFalse(StrUtils.parseBool("off   "));
+    assertFalse(StrUtils.parseBool("offAbc"));
+
+    assertFalse(StrUtils.parseBool("no"));
+    assertFalse(StrUtils.parseBool("NO"));
+
+    assertThrows(SolrException.class, () -> StrUtils.parseBool("foo"));
+    assertThrows(SolrException.class, () -> StrUtils.parseBool(""));
+    assertThrows(SolrException.class, () -> StrUtils.parseBool(null));
+  }
+
+  public void testParseBoolWithDefault() {
+    assertTrue(StrUtils.parseBool("true", false));
+    assertTrue(StrUtils.parseBool("True", false));
+    assertTrue(StrUtils.parseBool("TRUE", false));
+    assertTrue(StrUtils.parseBool("true  ", false));
+    assertTrue(StrUtils.parseBool("trueAbc", false));
+
+    assertTrue(StrUtils.parseBool("on", false));
+    assertTrue(StrUtils.parseBool("ON", false));
+    assertTrue(StrUtils.parseBool("on   ", false));
+    assertTrue(StrUtils.parseBool("onABC", false));
+
+    assertTrue(StrUtils.parseBool("yes", false));
+    assertTrue(StrUtils.parseBool("YES", false));
+    assertTrue(StrUtils.parseBool("yes   ", false));
+    assertTrue(StrUtils.parseBool("yesABC", false));
+
+    assertFalse(StrUtils.parseBool("false", true));
+    assertFalse(StrUtils.parseBool("False", true));
+    assertFalse(StrUtils.parseBool("FALSE", true));
+    assertFalse(StrUtils.parseBool("false  ", true));
+    assertFalse(StrUtils.parseBool("falseAbc", true));
+
+    assertFalse(StrUtils.parseBool("off", true));
+    assertFalse(StrUtils.parseBool("OFF", true));
+    assertFalse(StrUtils.parseBool("off   ", true));
+    assertFalse(StrUtils.parseBool("offAbc", true));
+
+    assertFalse(StrUtils.parseBool("no", true));
+    assertFalse(StrUtils.parseBool("NO", true));
+    assertFalse(StrUtils.parseBool("foo", false));
+    assertFalse(StrUtils.parseBool("", false));
+    assertFalse(StrUtils.parseBool(null, false));
+  }
+
+  public void testJoin() {
+    assertEquals("a|b|c", StrUtils.join(asList("a", "b", "c"), '|'));
+    assertEquals("a,b,c", StrUtils.join(asList("a", "b", "c"), ','));
+    assertEquals("a\\,b,c", StrUtils.join(asList("a,b", "c"), ','));
+    assertEquals("a,b|c", StrUtils.join(asList("a,b", "c"), '|'));
+
+    assertEquals("a\\\\b|c", StrUtils.join(asList("a\\b", "c"), '|'));
+  }
+
+  public void testEscapeTextWithSeparator() {
+    assertEquals("a", StrUtils.escapeTextWithSeparator("a", '|'));
+    assertEquals("a", StrUtils.escapeTextWithSeparator("a", ','));
+
+    assertEquals("a\\|b", StrUtils.escapeTextWithSeparator("a|b", '|'));
+    assertEquals("a|b", StrUtils.escapeTextWithSeparator("a|b", ','));
+    assertEquals("a,b", StrUtils.escapeTextWithSeparator("a,b", '|'));
+    assertEquals("a\\,b", StrUtils.escapeTextWithSeparator("a,b", ','));
+    assertEquals("a\\\\b", StrUtils.escapeTextWithSeparator("a\\b", ','));
+
+    assertEquals("a\\\\\\,b", StrUtils.escapeTextWithSeparator("a\\,b", ','));
+  }
+
+  public void testSplitEscaping() {
+    List<String> arr = StrUtils.splitSmart("\\r\\n:\\t\\f\\b", ":", true);
+    assertEquals(2, arr.size());
+    assertEquals("\r\n", arr.get(0));
+    assertEquals("\t\f\b", arr.get(1));
+
+    arr = StrUtils.splitSmart("\\r\\n:\\t\\f\\b", ":", false);
+    assertEquals(2, arr.size());
+    assertEquals("\\r\\n", arr.get(0));
+    assertEquals("\\t\\f\\b", arr.get(1));
+
+    arr = StrUtils.splitWS("\\r\\n \\t\\f\\b", true);
+    assertEquals(2, arr.size());
+    assertEquals("\r\n", arr.get(0));
+    assertEquals("\t\f\b", arr.get(1));
+
+    arr = StrUtils.splitWS("\\r\\n \\t\\f\\b", false);
+    assertEquals(2, arr.size());
+    assertEquals("\\r\\n", arr.get(0));
+    assertEquals("\\t\\f\\b", arr.get(1));
+
+    arr = StrUtils.splitSmart("\\:foo\\::\\:bar\\:", ":", true);
+    assertEquals(2, arr.size());
+    assertEquals(":foo:", arr.get(0));
+    assertEquals(":bar:", arr.get(1));
+
+    arr = StrUtils.splitWS("\\ foo\\  \\ bar\\ ", true);
+    assertEquals(2, arr.size());
+    assertEquals(" foo ", arr.get(0));
+    assertEquals(" bar ", arr.get(1));
+
+    arr = StrUtils.splitFileNames("/h/s,/h/\\,s,");
+    assertEquals(2, arr.size());
+    assertEquals("/h/s", arr.get(0));
+    assertEquals("/h/,s", arr.get(1));
+
+    arr = StrUtils.splitFileNames("/h/s");
+    assertEquals(1, arr.size());
+    assertEquals("/h/s", arr.get(0));
+  }
+
+  public void testToLower() {
+    assertEquals(List.of(), StrUtils.toLower(List.of()));
+    assertEquals(List.of(""), StrUtils.toLower(List.of("")));
+    assertEquals(List.of("foo"), StrUtils.toLower(List.of("foo")));
+    assertEquals(List.of("bar", "baz-123"), StrUtils.toLower(List.of("BAR", "Baz-123")));
+  }
+}

From cebc3f0f479b2c40eb8161864cef7157fda36b16 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 19 Sep 2023 20:16:45 +0200
Subject: [PATCH 100/160] Update dependency io.opentelemetry:opentelemetry-bom
 to v1.30.1 (#1934)

---
 .../opentelemetry-api-1.29.0.jar.sha1         |  1 -
 .../opentelemetry-api-1.30.1.jar.sha1         |  1 +
 ...telemetry-api-events-1.29.0-alpha.jar.sha1 |  1 -
 ...telemetry-api-events-1.30.1-alpha.jar.sha1 |  1 +
 .../opentelemetry-context-1.29.0.jar.sha1     |  1 -
 .../opentelemetry-context-1.30.1.jar.sha1     |  1 +
 ...ntelemetry-exporter-common-1.29.0.jar.sha1 |  1 -
 ...ntelemetry-exporter-common-1.30.1.jar.sha1 |  1 +
 ...pentelemetry-exporter-otlp-1.29.0.jar.sha1 |  1 -
 ...pentelemetry-exporter-otlp-1.30.1.jar.sha1 |  1 +
 ...metry-exporter-otlp-common-1.29.0.jar.sha1 |  1 -
 ...metry-exporter-otlp-common-1.30.1.jar.sha1 |  1 +
 ...try-exporter-sender-okhttp-1.29.0.jar.sha1 |  1 -
 ...try-exporter-sender-okhttp-1.30.1.jar.sha1 |  1 +
 ...-extension-incubator-1.29.0-alpha.jar.sha1 |  1 -
 ...-extension-incubator-1.30.1-alpha.jar.sha1 |  1 +
 .../opentelemetry-sdk-1.29.0.jar.sha1         |  1 -
 .../opentelemetry-sdk-1.30.1.jar.sha1         |  1 +
 .../opentelemetry-sdk-common-1.29.0.jar.sha1  |  1 -
 .../opentelemetry-sdk-common-1.30.1.jar.sha1  |  1 +
 ...dk-extension-autoconfigure-1.29.0.jar.sha1 |  1 -
 ...dk-extension-autoconfigure-1.30.1.jar.sha1 |  1 +
 ...xtension-autoconfigure-spi-1.29.0.jar.sha1 |  1 -
 ...xtension-autoconfigure-spi-1.30.1.jar.sha1 |  1 +
 .../opentelemetry-sdk-logs-1.29.0.jar.sha1    |  1 -
 .../opentelemetry-sdk-logs-1.30.1.jar.sha1    |  1 +
 .../opentelemetry-sdk-metrics-1.29.0.jar.sha1 |  1 -
 .../opentelemetry-sdk-metrics-1.30.1.jar.sha1 |  1 +
 .../opentelemetry-sdk-testing-1.29.0.jar.sha1 |  1 -
 .../opentelemetry-sdk-testing-1.30.1.jar.sha1 |  1 +
 .../opentelemetry-sdk-trace-1.29.0.jar.sha1   |  1 -
 .../opentelemetry-sdk-trace-1.30.1.jar.sha1   |  1 +
 ...pentelemetry-semconv-1.29.0-alpha.jar.sha1 |  1 -
 versions.lock                                 | 35 +++++++++----------
 versions.props                                |  2 +-
 35 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 solr/licenses/opentelemetry-api-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-api-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-api-events-1.30.1-alpha.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-context-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-context-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-common-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-exporter-sender-okhttp-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-extension-incubator-1.30.1-alpha.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-common-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-logs-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-testing-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
 create mode 100644 solr/licenses/opentelemetry-sdk-trace-1.30.1.jar.sha1
 delete mode 100644 solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1

diff --git a/solr/licenses/opentelemetry-api-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.29.0.jar.sha1
deleted file mode 100644
index 7425920b87a..00000000000
--- a/solr/licenses/opentelemetry-api-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-45010687a1181dc886fd12403e48cf76e94c65b1
diff --git a/solr/licenses/opentelemetry-api-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-api-1.30.1.jar.sha1
new file mode 100644
index 00000000000..b21be2984d1
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-1.30.1.jar.sha1
@@ -0,0 +1 @@
+a32dfbd7f01de6711fd0e970f8d4b4c0405056d6
diff --git a/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
deleted file mode 100644
index 0b08d51c6f2..00000000000
--- a/solr/licenses/opentelemetry-api-events-1.29.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cdc6b637c6374d4ae4be5cad381f6a566fb4310e
diff --git a/solr/licenses/opentelemetry-api-events-1.30.1-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-events-1.30.1-alpha.jar.sha1
new file mode 100644
index 00000000000..1ec9a6f975e
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-events-1.30.1-alpha.jar.sha1
@@ -0,0 +1 @@
+fb5fec3cdd62b98d61d1648f0027ea0b9767758b
diff --git a/solr/licenses/opentelemetry-context-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.29.0.jar.sha1
deleted file mode 100644
index 7f8f3d28249..00000000000
--- a/solr/licenses/opentelemetry-context-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4cf6857f268b9637ea330fffc70c1e6421d1d55
diff --git a/solr/licenses/opentelemetry-context-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-context-1.30.1.jar.sha1
new file mode 100644
index 00000000000..5009f902e27
--- /dev/null
+++ b/solr/licenses/opentelemetry-context-1.30.1.jar.sha1
@@ -0,0 +1 @@
+58f665ff01ce6b964cdf0b8cb5cd1c196dfe94ce
diff --git a/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
deleted file mode 100644
index 2f7556109de..00000000000
--- a/solr/licenses/opentelemetry-exporter-common-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7fa947205c2e85383c5b24139325f36a9e474067
diff --git a/solr/licenses/opentelemetry-exporter-common-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.30.1.jar.sha1
new file mode 100644
index 00000000000..4e601b99c00
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-common-1.30.1.jar.sha1
@@ -0,0 +1 @@
+f299d336dba1039478497f37b273dfa764c6faef
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
deleted file mode 100644
index 7146545d1ea..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-471956f2773b5409355a09da6ef4cb8976c82db2
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.30.1.jar.sha1
new file mode 100644
index 00000000000..55848ca06a6
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-1.30.1.jar.sha1
@@ -0,0 +1 @@
+15692246539571c41180aff2b55abe527b939a7b
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
deleted file mode 100644
index fe86cf5eb9e..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-common-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-992edd4ba5d473abcd6b4ca126f11149b2bdba0c
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.30.1.jar.sha1
new file mode 100644
index 00000000000..609f1e9ee85
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.30.1.jar.sha1
@@ -0,0 +1 @@
+947cf43a6411c4a323e14594431040a476ad43e8
diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
deleted file mode 100644
index 1ea79b62365..00000000000
--- a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3a2848644687cfe541c8b2b4b05f5d4e58c2709
diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.30.1.jar.sha1
new file mode 100644
index 00000000000..b7bad990390
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.30.1.jar.sha1
@@ -0,0 +1 @@
+9f3a14515500e4df260ce7b10a668237a95ac791
diff --git a/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
deleted file mode 100644
index e781a342e63..00000000000
--- a/solr/licenses/opentelemetry-extension-incubator-1.29.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4af0adab426582e9acea130d39b11791ccf0b513
diff --git a/solr/licenses/opentelemetry-extension-incubator-1.30.1-alpha.jar.sha1 b/solr/licenses/opentelemetry-extension-incubator-1.30.1-alpha.jar.sha1
new file mode 100644
index 00000000000..d6483a14fe2
--- /dev/null
+++ b/solr/licenses/opentelemetry-extension-incubator-1.30.1-alpha.jar.sha1
@@ -0,0 +1 @@
+bfcea9bd71f97dd4e8a4f92c15ba5659fb07ff05
diff --git a/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
deleted file mode 100644
index 23cae568fb8..00000000000
--- a/solr/licenses/opentelemetry-sdk-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d3a0e83ab6a2849c5b4123d539f994a721ddcd5
diff --git a/solr/licenses/opentelemetry-sdk-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.30.1.jar.sha1
new file mode 100644
index 00000000000..918c08509ae
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-1.30.1.jar.sha1
@@ -0,0 +1 @@
+4d15a9ea26e8e6ea93287a9f4ee02d91e5a74392
diff --git a/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
deleted file mode 100644
index 4033aa6f1bf..00000000000
--- a/solr/licenses/opentelemetry-sdk-common-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4a84b83c226c91a54bd0e9244d49908875cea3a
diff --git a/solr/licenses/opentelemetry-sdk-common-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.30.1.jar.sha1
new file mode 100644
index 00000000000..5d133711ae5
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-common-1.30.1.jar.sha1
@@ -0,0 +1 @@
+8e437ba87004bb63069d04fb06beae65b98dd13a
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
deleted file mode 100644
index 635e3eada28..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-36bd08550cbdcc4f58a4949e0f97f97443220a2d
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.30.1.jar.sha1
new file mode 100644
index 00000000000..3a03d895bdb
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.30.1.jar.sha1
@@ -0,0 +1 @@
+7f27a7b5d80efb75c39cead75dc7ba795e92d9ad
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
deleted file mode 100644
index 299eb7083b6..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b810dedc1fc8b28892eca5fa945e1c82cb95be4f
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.30.1.jar.sha1
new file mode 100644
index 00000000000..20078e803d9
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.30.1.jar.sha1
@@ -0,0 +1 @@
+05778b81d9d704217c749f4c9e2a580c23143f49
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
deleted file mode 100644
index ff6a4151576..00000000000
--- a/solr/licenses/opentelemetry-sdk-logs-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68151d4465c12183db8edc4f9d8f0a878bada16b
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.30.1.jar.sha1
new file mode 100644
index 00000000000..98a559361d3
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-logs-1.30.1.jar.sha1
@@ -0,0 +1 @@
+5985d0950746ad12b49cc42c063f26ddfbcaaacb
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
deleted file mode 100644
index 813a65b66fc..00000000000
--- a/solr/licenses/opentelemetry-sdk-metrics-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bb59616f1180286bc2ccf40e34d636984581ba9
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.30.1.jar.sha1
new file mode 100644
index 00000000000..1d8b8f9ac96
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-metrics-1.30.1.jar.sha1
@@ -0,0 +1 @@
+b12825541c5dae52a0fb35045c1b36df3ca8f632
diff --git a/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
deleted file mode 100644
index 87fa435be2c..00000000000
--- a/solr/licenses/opentelemetry-sdk-testing-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3f36cd924e7631a6888d2280a3b368b3dce3acfc
diff --git a/solr/licenses/opentelemetry-sdk-testing-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.30.1.jar.sha1
new file mode 100644
index 00000000000..ce2ac546fdd
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-testing-1.30.1.jar.sha1
@@ -0,0 +1 @@
+99ca5001ea7afb4b3ef66436199c7726effef285
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
deleted file mode 100644
index 1a9ce5eb65d..00000000000
--- a/solr/licenses/opentelemetry-sdk-trace-1.29.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1008bf3794f6fc10238b1f63d0546ae817ad1783
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.30.1.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.30.1.jar.sha1
new file mode 100644
index 00000000000..c3a51a19506
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-trace-1.30.1.jar.sha1
@@ -0,0 +1 @@
+4c5531fbc44178a7bcfeb7021ae80e70a7c43458
diff --git a/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
deleted file mode 100644
index aa0f7608da5..00000000000
--- a/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ee51f51d9c1c959b537c8dba67d7a524204b974
diff --git a/versions.lock b/versions.lock
index 2f1d2acdd74..7dbb1578b25 100644
--- a/versions.lock
+++ b/versions.lock
@@ -127,23 +127,22 @@ io.netty:netty-transport-native-unix-common:4.1.97.Final (4 constraints: 613dce9
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
-io.opentelemetry:opentelemetry-api:1.29.0 (11 constraints: c3c8daff)
-io.opentelemetry:opentelemetry-api-events:1.29.0-alpha (2 constraints: 332f2380)
-io.opentelemetry:opentelemetry-bom:1.29.0 (1 constraints: 3e05483b)
-io.opentelemetry:opentelemetry-context:1.29.0 (2 constraints: 2d1f62b5)
-io.opentelemetry:opentelemetry-exporter-common:1.29.0 (3 constraints: 563d51ae)
-io.opentelemetry:opentelemetry-exporter-otlp:1.29.0 (1 constraints: 990ff983)
-io.opentelemetry:opentelemetry-exporter-otlp-common:1.29.0 (2 constraints: 5823eb1c)
-io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.29.0 (2 constraints: 5823eb1c)
-io.opentelemetry:opentelemetry-extension-incubator:1.29.0-alpha (1 constraints: f414ee96)
-io.opentelemetry:opentelemetry-sdk:1.29.0 (4 constraints: 755634c7)
-io.opentelemetry:opentelemetry-sdk-common:1.29.0 (6 constraints: 936c396e)
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.29.0 (1 constraints: 990ff983)
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.29.0 (3 constraints: a63c5427)
-io.opentelemetry:opentelemetry-sdk-logs:1.29.0 (3 constraints: f43275b4)
-io.opentelemetry:opentelemetry-sdk-metrics:1.29.0 (3 constraints: f43275b4)
-io.opentelemetry:opentelemetry-sdk-trace:1.29.0 (3 constraints: f43275b4)
-io.opentelemetry:opentelemetry-semconv:1.29.0-alpha (4 constraints: 0c5920ad)
+io.opentelemetry:opentelemetry-api:1.30.1 (10 constraints: 28b70389)
+io.opentelemetry:opentelemetry-api-events:1.30.1-alpha (2 constraints: 252f227e)
+io.opentelemetry:opentelemetry-bom:1.30.1 (1 constraints: 3705323b)
+io.opentelemetry:opentelemetry-context:1.30.1 (2 constraints: 1f1f02b4)
+io.opentelemetry:opentelemetry-exporter-common:1.30.1 (3 constraints: 413df2a8)
+io.opentelemetry:opentelemetry-exporter-otlp:1.30.1 (1 constraints: 920fe383)
+io.opentelemetry:opentelemetry-exporter-otlp-common:1.30.1 (2 constraints: 4a23451b)
+io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.30.1 (2 constraints: 4a23451b)
+io.opentelemetry:opentelemetry-extension-incubator:1.30.1-alpha (1 constraints: ed14ae96)
+io.opentelemetry:opentelemetry-sdk:1.30.1 (4 constraints: 5956ccbc)
+io.opentelemetry:opentelemetry-sdk-common:1.30.1 (6 constraints: 696c0959)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.30.1 (1 constraints: 920fe383)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.30.1 (3 constraints: 913ce021)
+io.opentelemetry:opentelemetry-sdk-logs:1.30.1 (3 constraints: df3251b0)
+io.opentelemetry:opentelemetry-sdk-metrics:1.30.1 (3 constraints: df3251b0)
+io.opentelemetry:opentelemetry-sdk-trace:1.30.1 (3 constraints: df3251b0)
 io.perfmark:perfmark-api:0.26.0 (3 constraints: 21212b16)
 io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
 io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
@@ -402,7 +401,7 @@ com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)
 io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
 io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
 io.micrometer:micrometer-core:1.9.11 (1 constraints: fd162819)
-io.opentelemetry:opentelemetry-sdk-testing:1.29.0 (1 constraints: 990ff983)
+io.opentelemetry:opentelemetry-sdk-testing:1.30.1 (1 constraints: 920fe383)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
 javax.inject:javax.inject:1 (1 constraints: 7a0df617)
diff --git a/versions.props b/versions.props
index 8c9d94bda53..a3853c76705 100644
--- a/versions.props
+++ b/versions.props
@@ -23,7 +23,7 @@ commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.97.Final
-io.opentelemetry:opentelemetry-bom=1.29.0
+io.opentelemetry:opentelemetry-bom=1.30.1
 io.prometheus:*=0.16.0
 io.swagger.core.v3:*=2.2.15
 jakarta.ws.rs:jakarta.ws.rs-api=2.1.6

From 26777cb0872e2ddb4dc05bcbcee7a1cfaa721901 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Tue, 19 Sep 2023 14:52:45 -0400
Subject: [PATCH 101/160] Fix occasional issue in SSL integration test

---
 solr/packaging/test/test_ssl.bats | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index 7e50637eb34..10266768b7e 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -120,12 +120,12 @@ teardown() {
   export SOLR_OPTS="${SOLR_OPTS} -Dsolr.jetty.ssl.sniHostCheck=true"
   solr restart -c
   # This should fail the SNI Hostname check
-  run ! solr api -verbose -get "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
+  run ! solr api -verbose -get "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"
   assert_output --partial 'Invalid SNI'
 
   # Using the right hostname should not fail the SNI Hostname check
-  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" --resolve "test.solr.apache.org:${SOLR_PORT}:127.0.0.1" "https://test.solr.apache.org:${SOLR_PORT}/solr/test/select?q=*:*"
-  assert_output --partial '"numFound":0'
+  run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" --resolve "test.solr.apache.org:${SOLR_PORT}:127.0.0.1" "https://test.solr.apache.org:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"
+  assert_output --partial '"urlScheme":"https"'
 }
 
 @test "start solr with ssl and auth" {

From 5ecb21e992a30b620b9248b677946847ee4bea1f Mon Sep 17 00:00:00 2001
From: Sanjay Dutt <sanjaydutt.unofficial@gmail.com>
Date: Wed, 20 Sep 2023 00:53:27 +0530
Subject: [PATCH 102/160] SOLR-16397: Convert reload-core API to JAX-RS (#1903)

The API is now available at `POST /api/cores/coreName/reload`

----
Co-authored-by: iamsanjay <sanjaydutt.india@yahoo.com>
Co-authored-by: Jason Gerlowski <gerlowskija@apache.org>
---
 solr/CHANGES.txt                              |  3 +
 .../solr/handler/admin/CoreAdminHandler.java  |  7 +-
 .../handler/admin/CoreAdminOperation.java     | 10 ++-
 .../solr/handler/admin/api/ReloadCoreAPI.java | 87 +++++++++++--------
 .../handler/admin/api/ReloadCoreAPITest.java  | 81 +++++++++++++++++
 .../admin/api/V2CoreAPIMappingTest.java       | 10 ---
 .../pages/coreadmin-api.adoc                  |  6 +-
 7 files changed, 151 insertions(+), 53 deletions(-)
 create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCoreAPITest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ed796ef648c..c2841865fa0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -380,6 +380,9 @@ Improvements
 
 * SOLR-16878: Use Log4J JUL manager when starting Java. This is necessary for Lucene logs to be included with Solr logs. (Houston Putman, Uwe Schindler)
 
+* SOLR-16397: Reload core v2 endpoints have been updated to be more REST-ful.
+  RELOAD is now available at `POST /api/cores/coreName/reload` (Sanjay Dutt via Jason Gerlowski)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 8ee1bf3254a..d928282df5c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -383,7 +383,6 @@ public Collection<Api> getApis() {
     apis.addAll(AnnotatedApi.getApis(new CreateCoreAPI(this)));
     apis.addAll(AnnotatedApi.getApis(new RejoinLeaderElectionAPI(this)));
     apis.addAll(AnnotatedApi.getApis(new OverseerOperationAPI(this)));
-    apis.addAll(AnnotatedApi.getApis(new ReloadCoreAPI(this)));
     apis.addAll(AnnotatedApi.getApis(new SwapCoresAPI(this)));
     apis.addAll(AnnotatedApi.getApis(new RenameCoreAPI(this)));
     apis.addAll(AnnotatedApi.getApis(new UnloadCoreAPI(this)));
@@ -403,7 +402,11 @@ public Collection<Api> getApis() {
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
     return List.of(
-        CoreSnapshotAPI.class, InstallCoreDataAPI.class, BackupCoreAPI.class, RestoreCoreAPI.class);
+        CoreSnapshotAPI.class,
+        InstallCoreDataAPI.class,
+        BackupCoreAPI.class,
+        RestoreCoreAPI.class,
+        ReloadCoreAPI.class);
   }
 
   public interface CoreAdminOp {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
index 31251759c76..987c79d376b 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
@@ -58,6 +58,7 @@
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Map;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
@@ -72,6 +73,7 @@
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.handler.admin.CoreAdminHandler.CoreAdminOp;
 import org.apache.solr.handler.admin.api.CoreSnapshotAPI;
+import org.apache.solr.handler.admin.api.ReloadCoreAPI;
 import org.apache.solr.handler.api.V2ApiUtils;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.update.UpdateLog;
@@ -133,7 +135,13 @@ public enum CoreAdminOperation implements CoreAdminOp {
         SolrParams params = it.req.getParams();
         String cname = params.required().get(CoreAdminParams.CORE);
 
-        it.handler.coreContainer.reload(cname);
+        ReloadCoreAPI reloadCoreAPI =
+            new ReloadCoreAPI(
+                it.req, it.rsp, it.handler.coreContainer, it.handler.getCoreAdminAsyncTracker());
+        ReloadCoreAPI.ReloadCoreRequestBody reloadCoreRequestBody =
+            new ReloadCoreAPI.ReloadCoreRequestBody();
+        SolrJerseyResponse response = reloadCoreAPI.reloadCore(cname, reloadCoreRequestBody);
+        V2ApiUtils.squashIntoSolrResponseWithoutHeader(it.rsp, response);
       }),
   STATUS_OP(STATUS, new StatusOp()),
   SWAP_OP(
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCoreAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCoreAPI.java
index e330d713340..b0252b83fa9 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCoreAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCoreAPI.java
@@ -17,52 +17,69 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;
-import static org.apache.solr.common.params.CommonParams.ACTION;
-import static org.apache.solr.handler.ClusterAPI.wrapParams;
+import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;
 
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import org.apache.solr.api.Command;
-import org.apache.solr.api.EndPoint;
-import org.apache.solr.api.PayloadObj;
-import org.apache.solr.common.params.CoreAdminParams;
-import org.apache.solr.common.util.ReflectMapWriter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import javax.inject.Inject;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CoreAdminHandler;
+import org.apache.solr.jersey.JacksonReflectMapWriter;
+import org.apache.solr.jersey.PermissionName;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
 
 /**
  * V2 API for reloading an individual core.
  *
- * <p>The new API (POST /v2/cores/coreName {'reload': {...}}) is equivalent to the v1
- * /admin/cores?action=reload command.
- *
- * @see ReloadCorePayload
+ * <p>The new API (POST /v2/cores/coreName/reload is analogous to the v1 /admin/cores?action=RELOAD
+ * command.
  */
-@EndPoint(
-    path = {"/cores/{core}"},
-    method = POST,
-    permission = CORE_EDIT_PERM)
-public class ReloadCoreAPI {
-  private static final String V2_RELOAD_CORE_CMD = "reload";
-
-  private final CoreAdminHandler coreHandler;
+@Path("/cores/{coreName}/reload")
+public class ReloadCoreAPI extends CoreAdminAPIBase {
 
-  public ReloadCoreAPI(CoreAdminHandler coreHandler) {
-    this.coreHandler = coreHandler;
+  @Inject
+  public ReloadCoreAPI(
+      SolrQueryRequest solrQueryRequest,
+      SolrQueryResponse solrQueryResponse,
+      CoreContainer coreContainer,
+      CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker) {
+    super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse);
   }
 
-  @Command(name = V2_RELOAD_CORE_CMD)
-  public void reloadCore(PayloadObj<ReloadCorePayload> obj) throws Exception {
-    final String coreName = obj.getRequest().getPathTemplateValues().get(CoreAdminParams.CORE);
-
-    final Map<String, Object> v1Params = new HashMap<>();
-    v1Params.put(ACTION, CoreAdminParams.CoreAdminAction.RELOAD.name().toLowerCase(Locale.ROOT));
-    v1Params.put(CoreAdminParams.CORE, coreName);
-
-    coreHandler.handleRequestBody(wrapParams(obj.getRequest(), v1Params), obj.getResponse());
+  @POST
+  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @PermissionName(CORE_EDIT_PERM)
+  public SolrJerseyResponse reloadCore(
+      @Parameter(description = "The name of the core to reload.", required = true)
+          @PathParam("coreName")
+          String coreName,
+      @Schema(description = "Additional parameters for reloading the core") @RequestBody
+          ReloadCoreAPI.ReloadCoreRequestBody reloadCoreRequestBody)
+      throws Exception {
+    SolrJerseyResponse solrJerseyResponse = instantiateJerseyResponse(SolrJerseyResponse.class);
+    return handlePotentiallyAsynchronousTask(
+        solrJerseyResponse,
+        coreName,
+        (reloadCoreRequestBody == null) ? null : reloadCoreRequestBody.async,
+        "reload",
+        () -> {
+          coreContainer.reload(coreName);
+          return solrJerseyResponse;
+        });
   }
 
-  public static class ReloadCorePayload implements ReflectMapWriter {}
+  public static class ReloadCoreRequestBody implements JacksonReflectMapWriter {
+    @Schema(description = "Request ID to track this action which will be processed asynchronously.")
+    @JsonProperty("async")
+    public String async;
+  }
 }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCoreAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCoreAPITest.java
new file mode 100644
index 00000000000..cd0fdc32324
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ReloadCoreAPITest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.handler.admin.api;
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.handler.admin.CoreAdminHandler;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ReloadCoreAPITest extends SolrTestCaseJ4 {
+
+  private ReloadCoreAPI reloadCoreAPI;
+  private static final String NON_EXISTENT_CORE = "non_existent_core";
+
+  @BeforeClass
+  public static void initializeCoreAndRequestFactory() throws Exception {
+    initCore("solrconfig.xml", "schema.xml");
+    lrf = h.getRequestFactory("/api", 0, 10);
+  }
+
+  @Before
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    SolrQueryRequest solrQueryRequest = req();
+    SolrQueryResponse solrQueryResponse = new SolrQueryResponse();
+    CoreContainer coreContainer = h.getCoreContainer();
+    CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker =
+        new CoreAdminHandler.CoreAdminAsyncTracker();
+    reloadCoreAPI =
+        new ReloadCoreAPI(
+            solrQueryRequest, solrQueryResponse, coreContainer, coreAdminAsyncTracker);
+  }
+
+  @Test
+  public void testValidReloadCoreAPIResponse() throws Exception {
+    SolrJerseyResponse response =
+        reloadCoreAPI.reloadCore(coreName, new ReloadCoreAPI.ReloadCoreRequestBody());
+    assertEquals(0, response.responseHeader.status);
+    assertNotNull(response.responseHeader.qTime);
+  }
+
+  @Test
+  public void testNonExistentCoreExceptionResponse() {
+    final SolrException solrException =
+        expectThrows(
+            SolrException.class,
+            () -> {
+              reloadCoreAPI.reloadCore(
+                  NON_EXISTENT_CORE, new ReloadCoreAPI.ReloadCoreRequestBody());
+            });
+    assertEquals(400, solrException.code());
+    assertTrue(solrException.getMessage().contains("No such core: " + NON_EXISTENT_CORE));
+  }
+
+  @AfterClass // unique core per test
+  public static void coreDestroy() {
+    deleteCore();
+  }
+}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
index e6ecf9fd903..a2a36af2c4f 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
@@ -67,7 +67,6 @@ public boolean isCoreSpecific() {
   @Override
   public void populateApiBag() {
     final CoreAdminHandler handler = getRequestHandler();
-    apiBag.registerObject(new ReloadCoreAPI(handler));
     apiBag.registerObject(new SwapCoresAPI(handler));
     apiBag.registerObject(new RenameCoreAPI(handler));
     apiBag.registerObject(new UnloadCoreAPI(handler));
@@ -81,15 +80,6 @@ public void populateApiBag() {
     apiBag.registerObject(new RequestCoreCommandStatusAPI(handler));
   }
 
-  @Test
-  public void testReloadCoreAllParams() throws Exception {
-    final SolrParams v1Params =
-        captureConvertedV1Params("/cores/coreName", "POST", "{\"reload\": {}}");
-
-    assertEquals("reload", v1Params.get(ACTION));
-    assertEquals("coreName", v1Params.get(CORE));
-  }
-
   @Test
   public void testSwapCoresAllParams() throws Exception {
     final SolrParams v1Params =
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc
index cd33ea975e6..a62e4288199 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc
@@ -318,11 +318,7 @@ http://localhost:8983/solr/admin/cores?action=RELOAD&core=techproducts
 
 [source,bash]
 ----
-curl -X POST http://localhost:8983/api/cores/techproducts -H 'Content-Type: application/json' -d '
-  {
-    "reload": {}
-  }
-'
+curl -X POST http://localhost:8983/api/cores/techproducts/reload
 ----
 ====
 --

From 757fa0f1145414871b0c636ac129c46d102f91ef Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Wed, 20 Sep 2023 01:26:34 -0400
Subject: [PATCH 103/160] QueryElevationComponent: declare some methods as
 protected (#1901)

Co-authored-by: Nazerke Seidan <nseidan@salesforce.com>
---
 .../solr/handler/component/QueryElevationComponent.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 3d5b7eb28af..61816a7c5f1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -329,8 +329,7 @@ protected <E extends Exception> ElevationProvider handleConfigLoadingException(E
    *
    * @return The cached or loaded {@link ElevationProvider}.
    */
-  @VisibleForTesting
-  ElevationProvider getElevationProvider(IndexReader reader, SolrCore core) {
+  protected ElevationProvider getElevationProvider(IndexReader reader, SolrCore core) {
     synchronized (LOCK) {
       if (cacheElevationProvider != null && Objects.equals(cacheIndexReader.get(), reader)) {
         return cacheElevationProvider; // cache hit !
@@ -377,7 +376,8 @@ protected long getConfigVersion(SolrCore core) {
    *
    * @return The loaded {@link ElevationProvider}; not null.
    */
-  private ElevationProvider loadElevationProvider(SolrCore core) throws IOException, SAXException {
+  protected ElevationProvider loadElevationProvider(SolrCore core)
+      throws IOException, SAXException {
     Document xmlDocument;
     try {
       xmlDocument = SafeXMLParsing.parseConfigXML(log, core.getResourceLoader(), configFileName);

From 388398053426eb4c8aa160d45f1dfb3f0d8b8e13 Mon Sep 17 00:00:00 2001
From: patsonluk <patsonluk@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:41:27 -0700
Subject: [PATCH 104/160] SOLR-16890: Fix SSL cert issue for test case in
 TestCoordinatorRole (#1939)

Use HttpSolrClient to get underlying HttpClient.
---
 .../solr/search/TestCoordinatorRole.java      | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

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 581f048785d..f55aca49ae8 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
@@ -21,8 +21,6 @@
 import static org.apache.solr.common.params.CommonParams.TRUE;
 
 import java.lang.invoke.MethodHandles;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.EnumSet;
@@ -37,10 +35,13 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -617,23 +618,27 @@ public void testConfigset() throws Exception {
 
       // Tricky to test configset, since operation such as collection status would direct it to the
       // OS node.
-      // So we use query and check the cache response header which is determined by the
+      // So we use query and check the cache response header, which is determined by the
       // solr-config.xml in the configset
-      // However using solr client would drop cache respons header hence we need to use plain java
-      // HttpURLConnection
-      URL url = new URL(coordinatorJetty.getBaseUrl() + "/c1/select?q=*:*");
-      HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-      urlConnection.connect();
-
-      // conf1 has no cache-control
-      assertNull(urlConnection.getHeaderField("cache-control"));
-
-      url = new URL(coordinatorJetty.getBaseUrl() + "/c2/select?q=*:*");
-      urlConnection = (HttpURLConnection) url.openConnection();
-      urlConnection.connect();
-
-      // conf2 has cache-control defined
-      assertTrue(urlConnection.getHeaderField("cache-control").contains("max-age=30"));
+      // 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()) {
+        HttpResponse response =
+            solrClient
+                .getHttpClient()
+                .execute(new HttpGet(coordinatorJetty.getBaseUrl() + "/c1/select?q=*:*"));
+        // conf1 has no cache-control
+        assertNull(response.getFirstHeader("cache-control"));
+
+        response =
+            solrClient
+                .getHttpClient()
+                .execute(new HttpGet(coordinatorJetty.getBaseUrl() + "/c2/select?q=*:*"));
+        // conf2 has cache-control defined
+        assertTrue(response.getFirstHeader("cache-control").getValue().contains("max-age=30"));
+      }
     } finally {
       cluster.shutdown();
     }

From c2897444b4b6481e82fb0648e63db643f5a62fad Mon Sep 17 00:00:00 2001
From: Andrey Bozhko <andybozhko@gmail.com>
Date: Wed, 20 Sep 2023 14:13:19 -0500
Subject: [PATCH 105/160] fix protected term filter example (#1894)

Co-authored-by: Andrey Bozhko <abozhko@apple.com>
---
 solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
index 0a6214a97e3..b9089f0c8d1 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
@@ -2450,7 +2450,7 @@ For all terms except those in `protectedTerms.txt`, synonyms are added, terms ar
           ignoreCase="true" protected="protectedTerms.txt"
           wrappedFilters="SynonymGraph-fwd,ReverseString,SynonymGraph-rev"
           synonymgraph-FWD.synonyms="fwd-syns.txt"
-          synonymgraph-FWD.synonyms="rev-syns.txt"/>
+          synonymgraph-REV.synonyms="rev-syns.txt"/>
 </analyzer>
 ----
 

From 51c1a785c4611d0103f7b73c8adefa028d608bcd Mon Sep 17 00:00:00 2001
From: wrunderwood <wunder@wunderwood.org>
Date: Wed, 20 Sep 2023 18:42:57 -0400
Subject: [PATCH 106/160] SOLR-15056:  add circuit breaker for CPU, fix load
 circuit breaker (#96)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Høydahl <janhoy@users.noreply.github.com>
---
 solr/CHANGES.txt                              |  4 +
 .../circuitbreaker/CPUCircuitBreaker.java     | 92 +++++++++++++-----
 .../circuitbreaker/CircuitBreakerManager.java |  9 +-
 .../LoadAverageCircuitBreaker.java            | 95 +++++++++++++++++++
 .../solrconfig-pluggable-circuitbreaker.xml   |  4 +
 .../solr/util/BaseTestCircuitBreaker.java     | 84 +++++++---------
 .../pages/circuit-breakers.adoc               | 59 ++++++++++--
 .../pages/major-changes-in-solr-9.adoc        |  3 +
 8 files changed, 265 insertions(+), 85 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/LoadAverageCircuitBreaker.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c2841865fa0..fd6b9a669bd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -72,6 +72,10 @@ New Features
 
 * SOLR-16954: Make Circuit Breakers available for Update Requests (janhoy, Christine Poerschke, Pierre Salagnac)
 
+* SOLR-15056: A new Circuit breaker for percentage of CPU utilization is added. The former "CPU" circuit breaker
+  is now more correctly named LoadAverageCircuitBreaker as it trips on system load average which is not a percentage.
+  Users of legacy CircuitBreakerManager are not affected by this change. (Walter Underwood, janhoy, Christine Poerschke, Atri Sharma)
+
 * SOLR-15771: bin/auth creates reasonable roles and permissions for security: 'search', 'index', 'admin', and 'superadmin' and assigns user superadmin role. (Eric Pugh, janhoy)
 
 * SOLR-15367: Convert "rid" functionality into a default Tracer (Alex Deparvu, David Smiley)
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 90c86499b3c..4c1ac111c58 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -17,56 +17,63 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Metric;
 import java.lang.invoke.MethodHandles;
-import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.metrics.SolrMetricManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Tracks current CPU usage and triggers if the specified threshold is breached.
  *
- * <p>This circuit breaker gets the average CPU load over the last minute and uses that data to take
- * a decision. We depend on OperatingSystemMXBean which does not allow a configurable interval of
- * collection of data. //TODO: Use Codahale Meter to calculate the value locally.
- *
- * <p>The configuration to define which mode to use and the trigger threshold are defined in
- * solrconfig.xml
+ * <p>This circuit breaker gets the recent average CPU usage and uses that data to take a decision.
+ * We depend on OperatingSystemMXBean which does not allow a configurable interval of collection of
+ * data.
  */
 public class CPUCircuitBreaker extends CircuitBreaker {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private static final OperatingSystemMXBean operatingSystemMXBean =
-      ManagementFactory.getOperatingSystemMXBean();
 
+  private boolean enabled = true;
   private double cpuUsageThreshold;
+  private final SolrCore core;
 
   private static final ThreadLocal<Double> seenCPUUsage = ThreadLocal.withInitial(() -> 0.0);
 
   private static final ThreadLocal<Double> allowedCPUUsage = ThreadLocal.withInitial(() -> 0.0);
 
-  public CPUCircuitBreaker() {
+  public CPUCircuitBreaker(SolrCore core) {
     super();
-  }
-
-  public void setThreshold(double threshold) {
-    this.cpuUsageThreshold = threshold;
+    this.core = core;
   }
 
   @Override
-  public boolean isTripped() {
-
-    double localAllowedCPUUsage = getCpuUsageThreshold();
+  public void init(NamedList<?> args) {
+    super.init(args);
     double localSeenCPUUsage = calculateLiveCPUUsage();
 
     if (localSeenCPUUsage < 0) {
-      if (log.isWarnEnabled()) {
-        String msg = "Unable to get CPU usage";
-
-        log.warn(msg);
+      String msg =
+          "Initialization failure for CPU circuit breaker. Unable to get 'systemCpuLoad', not supported by the JVM?";
+      if (log.isErrorEnabled()) {
+        log.error(msg);
       }
+      enabled = false;
+    }
+  }
 
+  @Override
+  public boolean isTripped() {
+    if (!enabled) {
+      if (log.isDebugEnabled()) {
+        log.debug("CPU circuit breaker is disabled due to initialization failure.");
+      }
       return false;
     }
+    double localAllowedCPUUsage = getCpuUsageThreshold();
+    double localSeenCPUUsage = calculateLiveCPUUsage();
 
     allowedCPUUsage.set(localAllowedCPUUsage);
 
@@ -84,11 +91,50 @@ public String getErrorMessage() {
         + allowedCPUUsage.get();
   }
 
+  public void setThreshold(double thresholdValueInPercentage) {
+    if (thresholdValueInPercentage > 100) {
+      throw new IllegalArgumentException("Invalid Invalid threshold value.");
+    }
+
+    if (thresholdValueInPercentage <= 0) {
+      throw new IllegalStateException("Threshold cannot be less than or equal to zero");
+    }
+    cpuUsageThreshold = thresholdValueInPercentage;
+  }
+
   public double getCpuUsageThreshold() {
     return cpuUsageThreshold;
   }
 
+  /**
+   * Calculate the CPU usage for the system in percentage.
+   *
+   * @return Percent CPU usage of -1 if value could not be obtained.
+   */
   protected double calculateLiveCPUUsage() {
-    return operatingSystemMXBean.getSystemLoadAverage();
+    // TODO: Use Codahale Meter to calculate the value
+    Metric metric =
+        this.core
+            .getCoreContainer()
+            .getMetricManager()
+            .registry("solr.jvm")
+            .getMetrics()
+            .get("os.systemCpuLoad");
+
+    if (metric == null) {
+      return -1.0;
+    }
+
+    if (metric instanceof Gauge) {
+      @SuppressWarnings({"rawtypes"})
+      Gauge gauge = (Gauge) metric;
+      // unwrap if needed
+      if (gauge instanceof SolrMetricManager.GaugeWrapper) {
+        gauge = ((SolrMetricManager.GaugeWrapper) gauge).getGauge();
+      }
+      return (Double) gauge.getValue() * 100;
+    }
+
+    return -1.0; // Unable to unpack metric
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index 5b39217b33b..02e3c7af676 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -23,8 +23,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Single CircuitBreaker that registers both a Memory and a CPU CircuitBreaker. This is only for
- * backward compatibility with the 9.x versions prior to 9.4.
+ * Single CircuitBreaker that registers both a Memory and a LoadAverage CircuitBreaker. This is only
+ * for backward compatibility with the 9.x versions prior to 9.4.
  *
  * @deprecated Use individual Circuit Breakers instead
  */
@@ -36,7 +36,7 @@ public class CircuitBreakerManager extends CircuitBreaker {
   private int memThreshold = 100;
   private int cpuThreshold = 100;
   private MemoryCircuitBreaker memCB;
-  private CPUCircuitBreaker cpuCB;
+  private LoadAverageCircuitBreaker cpuCB;
 
   public CircuitBreakerManager() {
     super();
@@ -71,7 +71,8 @@ public void init(NamedList<?> args) {
       memCB.setThreshold(memThreshold);
     }
     if (cpuEnabled) {
-      cpuCB = new CPUCircuitBreaker();
+      // In SOLR-15056 CPUCircuitBreaker was renamed to LoadAverageCircuitBreaker, need back-compat
+      cpuCB = new LoadAverageCircuitBreaker();
       cpuCB.setThreshold(cpuThreshold);
     }
   }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/LoadAverageCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/LoadAverageCircuitBreaker.java
new file mode 100644
index 00000000000..77772b927b3
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/LoadAverageCircuitBreaker.java
@@ -0,0 +1,95 @@
+/*
+ * 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.util.circuitbreaker;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.management.ManagementFactory;
+import java.lang.management.OperatingSystemMXBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Tracks current system load average and triggers if the specified threshold is breached.
+ *
+ * <p>This circuit breaker gets the load average (length of the run queue) over the last minute and
+ * uses that data to take a decision. We depend on OperatingSystemMXBean which does not allow a
+ * configurable interval of collection of data.
+ */
+public class LoadAverageCircuitBreaker extends CircuitBreaker {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private static final OperatingSystemMXBean operatingSystemMXBean =
+      ManagementFactory.getOperatingSystemMXBean();
+
+  private double loadAverageThreshold;
+
+  // Assumption -- the value of these parameters will be set correctly before invoking
+  // getDebugInfo()
+  private static final ThreadLocal<Double> seenLoadAverage = ThreadLocal.withInitial(() -> 0.0);
+
+  private static final ThreadLocal<Double> allowedLoadAverage = ThreadLocal.withInitial(() -> 0.0);
+
+  public LoadAverageCircuitBreaker() {
+    super();
+  }
+
+  @Override
+  public boolean isTripped() {
+    double localAllowedLoadAverage = getLoadAverageThreshold();
+    double localSeenLoadAverage = calculateLiveLoadAverage();
+
+    if (localSeenLoadAverage < 0) {
+      if (log.isWarnEnabled()) {
+        String msg = "Unable to get load average";
+
+        log.warn(msg);
+      }
+
+      return false;
+    }
+
+    allowedLoadAverage.set(localAllowedLoadAverage);
+
+    seenLoadAverage.set(localSeenLoadAverage);
+
+    return (localSeenLoadAverage >= localAllowedLoadAverage);
+  }
+
+  @Override
+  public String getErrorMessage() {
+    return "Load Average Circuit Breaker triggered as seen load average is above allowed threshold."
+        + "Seen load average "
+        + seenLoadAverage.get()
+        + " and allocated threshold "
+        + allowedLoadAverage.get();
+  }
+
+  public void setThreshold(double thresholdValueUnbounded) {
+    if (thresholdValueUnbounded <= 0) {
+      throw new IllegalStateException("Threshold cannot be less than or equal to zero");
+    }
+    loadAverageThreshold = thresholdValueUnbounded;
+  }
+
+  public double getLoadAverageThreshold() {
+    return loadAverageThreshold;
+  }
+
+  protected double calculateLiveLoadAverage() {
+    return operatingSystemMXBean.getSystemLoadAverage();
+  }
+}
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
index 8719a00ea7b..52956f60824 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -98,6 +98,10 @@
     <double  name="threshold">75</double>
   </circuitBreaker>
 
+  <circuitBreaker class="solr.LoadAverageCircuitBreaker">
+    <double  name="threshold">3</double>
+  </circuitBreaker>
+
   <initParams path="/select">
     <lst name="defaults">
       <str name="df">text</str>
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 607bf31c617..71c6fe67f8d 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -30,9 +30,11 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.core.SolrCore;
 import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;
 import org.apache.solr.util.circuitbreaker.CircuitBreaker;
 import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
+import org.apache.solr.util.circuitbreaker.LoadAverageCircuitBreaker;
 import org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker;
 import org.hamcrest.MatcherAssert;
 import org.junit.After;
@@ -120,62 +122,35 @@ public void testBadRequestType() {
   }
 
   public void testBuildingMemoryPressure() {
-    ExecutorService executor =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));
-
-    AtomicInteger failureCount = new AtomicInteger();
-
-    try {
-      removeAllExistingCircuitBreakers();
+    MemoryCircuitBreaker circuitBreaker = new BuildingUpMemoryPressureCircuitBreaker();
+    circuitBreaker.setThreshold(75);
 
-      CircuitBreaker circuitBreaker = new BuildingUpMemoryPressureCircuitBreaker();
-      MemoryCircuitBreaker memoryCircuitBreaker = (MemoryCircuitBreaker) circuitBreaker;
-
-      memoryCircuitBreaker.setThreshold(75);
-
-      h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
+    assertThatHighQueryLoadTrips(circuitBreaker, 1);
+  }
 
-      List<Future<?>> futures = new ArrayList<>();
+  public void testFakeCPUCircuitBreaker() {
+    CPUCircuitBreaker circuitBreaker = new FakeCPUCircuitBreaker(h.getCore());
+    circuitBreaker.setThreshold(75);
 
-      for (int i = 0; i < 5; i++) {
-        Future<?> future =
-            executor.submit(
-                () -> {
-                  try {
-                    h.query(req("name:\"john smith\""));
-                  } catch (SolrException e) {
-                    MatcherAssert.assertThat(
-                        e.getMessage(), containsString("Circuit Breakers tripped"));
-                    failureCount.incrementAndGet();
-                  } catch (Exception e) {
-                    throw new RuntimeException(e.getMessage());
-                  }
-                });
+    assertThatHighQueryLoadTrips(circuitBreaker, 5);
+  }
 
-        futures.add(future);
-      }
+  public void testFakeLoadAverageCircuitBreaker() {
+    LoadAverageCircuitBreaker circuitBreaker = new FakeLoadAverageCircuitBreaker();
+    circuitBreaker.setThreshold(75);
 
-      for (Future<?> future : futures) {
-        try {
-          future.get();
-        } catch (Exception e) {
-          throw new RuntimeException(e.getMessage());
-        }
-      }
-    } finally {
-      ExecutorUtil.shutdownAndAwaitTermination(executor);
-      assertEquals("Number of failed queries is not correct", 1, failureCount.get());
-    }
+    assertThatHighQueryLoadTrips(circuitBreaker, 5);
   }
 
-  public void testFakeCPUCircuitBreaker() {
+  /**
+   * Common assert method to be reused in tests
+   *
+   * @param circuitBreaker the breaker to test
+   * @param numShouldTrip the number of queries that should trip the breaker
+   */
+  private void assertThatHighQueryLoadTrips(CircuitBreaker circuitBreaker, int numShouldTrip) {
     removeAllExistingCircuitBreakers();
 
-    CircuitBreaker circuitBreaker = new FakeCPUCircuitBreaker();
-    CPUCircuitBreaker cpuCircuitBreaker = (CPUCircuitBreaker) circuitBreaker;
-
-    cpuCircuitBreaker.setThreshold(75);
-
     h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
 
     AtomicInteger failureCount = new AtomicInteger();
@@ -212,7 +187,7 @@ public void testFakeCPUCircuitBreaker() {
       }
     } finally {
       ExecutorUtil.shutdownAndAwaitTermination(executor);
-      assertEquals("Number of failed queries is not correct", 5, failureCount.get());
+      assertEquals("Number of failed queries is not correct", numShouldTrip, failureCount.get());
     }
   }
 
@@ -330,9 +305,20 @@ protected long calculateLiveMemoryUsage() {
   }
 
   private static class FakeCPUCircuitBreaker extends CPUCircuitBreaker {
+    public FakeCPUCircuitBreaker(SolrCore core) {
+      super(core);
+    }
+
     @Override
     protected double calculateLiveCPUUsage() {
-      return 92; // Return a value large enough to trigger the circuit breaker
+      return Double.MAX_VALUE;
+    }
+  }
+
+  private static class FakeLoadAverageCircuitBreaker extends LoadAverageCircuitBreaker {
+    @Override
+    protected double calculateLiveLoadAverage() {
+      return Double.MAX_VALUE;
     }
   }
 }
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
index b517a2dd195..f9f535c6005 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc
@@ -24,7 +24,12 @@ resource configuration.
 Circuit breakers should be used when the user wishes to trade request throughput for a higher Solr stability.
 If circuit breakers are enabled, requests may be rejected under the condition of high node duress with HTTP error code 429 'Too Many Requests'.
 
-It is up to the client to handle this error and potentially build a retrial logic as this should ideally be a transient situation.
+It is up to the client to handle this error and potentially build retry logic as this should be a transient situation.
+
+In a sharded collection, when a circuit breaker trips on one shard, the entire query will fail,
+even if the other shard requests succeed. This will multiply the failures seen by the end users.
+Setting the `shards.tolerant=true` parameter on requests can help with graceful degradation when
+circuit breaker thresholds are reached on some nodes. See the <<shards.tolerant Parameter>> for details.
 
 == Circuit Breaker Configurations
 All circuit breaker configurations are listed as independent `<circuitBreaker>` entries in `solrconfig.xml` as shown below.
@@ -32,6 +37,14 @@ A circuit breaker can register itself to trip for query requests and/or update r
 
 == Currently Supported Circuit Breakers
 
+[NOTE]
+====
+The legacy configuration syntax using `CircuitBreakerManager` is deprecated as of Solr 9.4, but will
+continue to work. The "CPU" circuit breaker used by this legacy plugin when configuring a `cpuThreshold`
+is actually the `LoadAverageCircuitBreaker` described below. Also, the `CircuitBreakerManager` will
+return a HTTP 503 code instead of the HTTP 429 code used by the new circuit breakers.
+====
+
 === JVM Heap Usage
 
 This circuit breaker tracks JVM heap memory usage and rejects incoming requests with a 429 error code if the heap usage exceeds a configured percentage of maximum heap allocated to the JVM (-Xmx).
@@ -48,7 +61,9 @@ To enable and configure the JVM heap usage based circuit breaker, add the follow
 
 The `threshold` is defined as a percentage of the max heap allocated to the JVM.
 
-It does not logically make sense to have a threshold below 50% and above 95% of the max heap allocated to the JVM.
+For the circuit breaker configuration, a value of "0" maps to 0% usage and a value of "100" maps to 100% usage.
+
+It does not logically make sense to have a threshold below 50% or above 95% of the max heap allocated to the JVM.
 Hence, the range of valid values for this parameter is [50, 95], both inclusive.
 
 Consider the following example:
@@ -56,11 +71,13 @@ Consider the following example:
 JVM has been allocated a maximum heap of 5GB (-Xmx) and `threshold` is set to `75`.
 In this scenario, the heap usage at which the circuit breaker will trip is 3.75GB.
 
-=== CPU Utilization
+=== System CPU Usage Circuit Breaker
+This circuit breaker tracks system CPU usage and triggers if the recent CPU usage exceeds a configurable threshold.
 
-This circuit breaker tracks CPU utilization and triggers if the average CPU utilization over the last one minute exceeds a configurable threshold.
-Note that the value used in computation is over the last one minute -- so a sudden spike in traffic that goes down might still cause the circuit breaker to trigger for a short while before it resolves and updates the value.
-For more details of the calculation, please see https://en.wikipedia.org/wiki/Load_(computing)
+This is tracked with the JMX metric `OperatingSystemMXBean.getSystemCpuLoad()`. That measures the
+recent CPU usage for the whole system. This metric is provided by the `com.sun.management` package,
+which is not implemented on all JVMs. If the metric is not available, the circuit breaker will be
+disabled and log an error message. An alternative can then be to use the <<system-load-average-circuit-breaker>>.
 
 To enable and configure the CPU utilization based circuit breaker:
 
@@ -71,7 +88,30 @@ To enable and configure the CPU utilization based circuit breaker:
 </circuitBreaker>
 ----
 
-The `threshold` is defined in units of CPU utilization.
+The triggering threshold is defined in percent CPU usage. A value of "0" maps to 0% usage
+and a value of "100" maps to 100% usage. The example above will trip when the CPU usage is
+equal to or greater than 75%.
+
+=== System Load Average Circuit Breaker
+This circuit breaker tracks system load average and triggers if the recent load average exceeds a configurable threshold.
+
+This is tracked with the JMX metric `OperatingSystemMXBean.getSystemLoadAverage()`. That measures the
+recent load average for the whole system. A "load average" is the number of processes using or waiting for a CPU,
+usually averaged over one minute. Some systems include processes waiting on IO in the load average. Check the
+documentation for your system and JVM to understand this metric. For more information, see the
+https://en.wikipedia.org/wiki/Load_(computing)[Wikipedia page for Load],
+
+To enable and configure the CPU utilization based circuit breaker:
+
+[source,xml]
+----
+<circuitBreaker class="org.apache.solr.util.circuitbreaker.LoadAverageCircuitBreaker">
+ <double  name="threshold">8.0</double>
+</circuitBreaker>
+----
+
+The triggering threshold is a floating point number matching load average.
+The example circuit breaker above will trip when the load average is equal to or greater than 8.0.
 
 == Advanced example
 
@@ -99,6 +139,7 @@ This would prevent expensive bulk updates from impacting search. Note also the s
 
 == Performance Considerations
 
-It is worth noting that while JVM or CPU circuit breakers do not add any noticeable overhead per request, having too many circuit breakers checked for a single request can cause a performance overhead.
+While JVM or CPU circuit breakers do not add any noticeable overhead per request, having too many circuit breakers checked for a single request can cause a performance overhead.
 
-In addition, it is a good practice to exponentially back off while retrying requests on a busy node.
+In addition, it is a good practice to exponentially back off while retrying requests on a busy node. 
+See the https://en.wikipedia.org/wiki/Exponential_backoff[Wikipedia page for Exponential Backoff].
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index fd35533abe5..1a64062fb42 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -80,6 +80,9 @@ Therefore, when using the default settings, nodes that were previously excluded
 * The Embedded Zookeeper can now be configured to listen to (or bind to) more hosts than just `localhost`,
 see the  xref:deployment-guide:securing-solr.adoc#network-configuration[Network Configuration documentation] for more information.
 
+=== Circuit Breaker
+* The Circuit Breakers are now pluggable, and you can define multiple circuit breakers including custom ones. The existing `CircuitBreakerManager` is deprecated, and users are encouraged to switch to the new plugins. While the old `CircuitBreakerManager` returned HTTP 503 when a circuit breaker was tripped, the new plugins return HTTP 429.
+
 === Security
 * Since Solr 8.4.1/8.5.0, the `solr.jetty.ssl.verifyClientHostName` sysProp and `SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION` envVar have been used incorrectly.
 It has instead been used to override the `solr.ssl.checkPeerName` sysProp in the `HTTP2SolrClient`.

From 117a6cdf415ae43e3279aa1ea91adc8180a1cf74 Mon Sep 17 00:00:00 2001
From: Chris Hostetter <hossman@apache.org>
Date: Thu, 21 Sep 2023 11:57:46 -0700
Subject: [PATCH 107/160] SOLR-16983: Fixed a bug that could cause some usages
 of SolrStream to fail to close InputStreams from the server.

Also fixed the usage of ObjectReleaseTracker in SolrTestCaseJ4 to catch these kinds of bugs
---
 solr/CHANGES.txt                              |  3 +
 .../metrics/SolrMetricsIntegrationTest.java   | 79 ++++++++++---------
 .../solr/response/TestRawTransformer.java     |  6 +-
 .../solr/servlet/HideStackTraceTest.java      |  7 +-
 .../client/solrj/io/stream/SolrStream.java    |  8 +-
 .../client/solrj/impl/Http2SolrClient.java    | 38 +++++++--
 .../solrj/embedded/SolrExampleJettyTest.java  |  5 +-
 .../solrj/impl/BasicHttpSolrClientTest.java   |  6 +-
 .../solrj/impl/Http2SolrClientTest.java       | 42 ++++++----
 .../java/org/apache/solr/SolrTestCaseJ4.java  | 10 ++-
 10 files changed, 131 insertions(+), 73 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fd6b9a669bd..ba8adb622de 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -198,6 +198,9 @@ Bug Fixes
 
 * SOLR-16931: ReRankScaler explain breaks with debug=true and in distributed mode (Joel Bernstein)
 
+* SOLR-16983: Fixed a bug that could cause some usages of SolrStream to fail to close InputStreams from the server.
+  Also fixed the usage of ObjectReleaseTracker in SolrTestCaseJ4 to catch these kinds of bugs (hossman)
+
 Dependency Upgrades
 ---------------------
 
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 7f77a701d05..06e9a59f54c 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
@@ -31,6 +31,7 @@
 import org.apache.http.client.HttpClient;
 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.impl.HttpSolrClient;
 import org.apache.solr.cloud.MiniSolrCloudCluster;
 import org.apache.solr.common.util.Utils;
@@ -233,47 +234,49 @@ public void testZkMetrics() throws Exception {
     try {
       JettySolrRunner j = cluster.getRandomJetty(random());
       String url = j.getBaseUrl() + "/admin/metrics?key=solr.node:CONTAINER.zkClient&wt=json";
-      HttpClient httpClient = ((HttpSolrClient) j.newClient()).getHttpClient();
-      @SuppressWarnings("unchecked")
-      Map<String, Object> zkMmetrics =
-          (Map<String, Object>)
-              Utils.getObjectByPath(
-                  Utils.executeGET(httpClient, url, Utils.JSONCONSUMER),
-                  false,
-                  List.of("metrics", "solr.node:CONTAINER.zkClient"));
+      try (SolrClient solrClient = j.newClient()) {
+        HttpClient httpClient = ((HttpSolrClient) solrClient).getHttpClient();
+        @SuppressWarnings("unchecked")
+        Map<String, Object> zkMmetrics =
+            (Map<String, Object>)
+                Utils.getObjectByPath(
+                    Utils.executeGET(httpClient, url, Utils.JSONCONSUMER),
+                    false,
+                    List.of("metrics", "solr.node:CONTAINER.zkClient"));
 
-      Set<String> allKeys =
-          Set.of(
-              "watchesFired",
-              "reads",
-              "writes",
-              "bytesRead",
-              "bytesWritten",
-              "multiOps",
-              "cumulativeMultiOps",
-              "childFetches",
-              "cumulativeChildrenFetched",
-              "existsChecks",
-              "deletes");
+        Set<String> allKeys =
+            Set.of(
+                "watchesFired",
+                "reads",
+                "writes",
+                "bytesRead",
+                "bytesWritten",
+                "multiOps",
+                "cumulativeMultiOps",
+                "childFetches",
+                "cumulativeChildrenFetched",
+                "existsChecks",
+                "deletes");
 
-      for (String k : allKeys) {
-        assertNotNull(zkMmetrics.get(k));
-      }
-      Utils.executeGET(
-          httpClient,
-          j.getBaseURLV2() + "/cluster/zookeeper/children/live_nodes",
-          Utils.JSONCONSUMER);
-      @SuppressWarnings("unchecked")
-      Map<String, Object> zkMmetricsNew =
-          (Map<String, Object>)
-              Utils.getObjectByPath(
-                  Utils.executeGET(httpClient, url, Utils.JSONCONSUMER),
-                  false,
-                  List.of("metrics", "solr.node:CONTAINER.zkClient"));
+        for (String k : allKeys) {
+          assertNotNull(zkMmetrics.get(k));
+        }
+        Utils.executeGET(
+            httpClient,
+            j.getBaseURLV2() + "/cluster/zookeeper/children/live_nodes",
+            Utils.JSONCONSUMER);
+        @SuppressWarnings("unchecked")
+        Map<String, Object> zkMmetricsNew =
+            (Map<String, Object>)
+                Utils.getObjectByPath(
+                    Utils.executeGET(httpClient, url, Utils.JSONCONSUMER),
+                    false,
+                    List.of("metrics", "solr.node:CONTAINER.zkClient"));
 
-      assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "childFetches") >= 1);
-      assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "cumulativeChildrenFetched") >= 3);
-      assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "existsChecks") >= 4);
+        assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "childFetches") >= 1);
+        assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "cumulativeChildrenFetched") >= 3);
+        assertTrue(findDelta(zkMmetrics, zkMmetricsNew, "existsChecks") >= 4);
+      }
     } finally {
       cluster.shutdown();
     }
diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
index 393674c2eca..c68ada54af6 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
@@ -118,10 +118,14 @@ private static void initCloud() throws Exception {
 
   @AfterClass
   public static void afterClass() throws Exception {
+    if (CLIENT != null) {
+      org.apache.solr.common.util.IOUtils.closeQuietly(CLIENT);
+      CLIENT = null;
+    }
     if (JSR != null) {
       JSR.stop();
+      JSR = null;
     }
-    // NOTE: CLOUD_CLIENT should be stopped automatically in `SolrCloudTestCase.shutdownCluster()`
   }
 
   @After
diff --git a/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java
index dc6af6f2716..54ac3e28b5a 100644
--- a/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java
@@ -145,13 +145,16 @@ public void testHideStackTrace() throws Exception {
 
     final String url = solrRule.getBaseUrl().toString() + "/collection1/withError?q=*:*&wt=json";
     final HttpGet get = new HttpGet(url);
-    try (var client = HttpClientUtil.createClient(null);
-        CloseableHttpResponse response = client.execute(get)) {
+    var client = HttpClientUtil.createClient(null);
+    try (CloseableHttpResponse response = client.execute(get)) {
+
       assertEquals(500, response.getStatusLine().getStatusCode());
       String responseJson = EntityUtils.toString(response.getEntity());
       assertFalse(responseJson.contains("\"trace\""));
       assertFalse(
           responseJson.contains("org.apache.solr.servlet.HideStackTraceTest$ErrorComponent"));
+    } finally {
+      HttpClientUtil.close(client);
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
index ce4d31babaa..1f06c852fd1 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
@@ -41,6 +41,7 @@
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.params.StreamParams;
+import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.NamedList;
 
 /**
@@ -187,11 +188,10 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
   /** Closes the Stream to a single Solr Instance */
   @Override
   public void close() throws IOException {
-    if (closeableHttpResponse != null) {
-      closeableHttpResponse.close();
-    }
+    IOUtils.closeQuietly(tupleStreamParser);
+    IOUtils.closeQuietly(closeableHttpResponse);
     if (doCloseCache) {
-      clientCache.close();
+      IOUtils.closeQuietly(clientCache);
     }
   }
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 2d6a993be7c..8dbbe3e62df 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -20,6 +20,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
@@ -418,7 +419,7 @@ public OutStream initOutStream(String baseUrl, UpdateRequest updateRequest, Stri
             .method(HttpMethod.POST)
             .body(content);
     decorateRequest(postRequest, updateRequest, false);
-    InputStreamResponseListener responseListener = new InputStreamResponseListener();
+    InputStreamResponseListener responseListener = new InputStreamReleaseTrackingResponseListener();
     postRequest.send(responseListener);
 
     boolean isXml = ClientUtils.TEXT_XML.equals(requestWriter.getUpdateContentType());
@@ -468,14 +469,13 @@ public Cancellable asyncRequest(
     try {
       String url = getRequestPath(solrRequest, collection);
       InputStreamResponseListener listener =
-          new InputStreamResponseListener() {
+          new InputStreamReleaseTrackingResponseListener() {
             @Override
             public void onHeaders(Response response) {
               super.onHeaders(response);
               executor.execute(
                   () -> {
                     InputStream is = getInputStream();
-                    assert ObjectReleaseTracker.track(is);
                     try {
                       NamedList<Object> body =
                           processErrorsAndResponse(solrRequest, response, is, url);
@@ -525,12 +525,11 @@ public NamedList<Object> request(SolrRequest<?> solrRequest, String collection)
     Throwable abortCause = null;
     Request req = null;
     try {
-      InputStreamResponseListener listener = new InputStreamResponseListener();
+      InputStreamResponseListener listener = new InputStreamReleaseTrackingResponseListener();
       req = makeRequestAndSend(solrRequest, url, listener, false);
       Response response = listener.get(idleTimeoutMillis, TimeUnit.MILLISECONDS);
       url = req.getURI().toString();
       InputStream is = listener.getInputStream();
-      assert ObjectReleaseTracker.track(is);
       return processErrorsAndResponse(solrRequest, response, is, url);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
@@ -928,7 +927,6 @@ private NamedList<Object> processErrorsAndResponse(
       if (shouldClose) {
         try {
           is.close();
-          assert ObjectReleaseTracker.release(is);
         } catch (IOException e) {
           // quitely
         }
@@ -1417,4 +1415,32 @@ private static void updateContextMap(Map<String, String> context) {
       }
     }
   }
+
+  /**
+   * Extension of InputStreamResponseListener that handles Object release tracking of the
+   * InputStreams
+   *
+   * @see ObjectReleaseTracker
+   */
+  private static class InputStreamReleaseTrackingResponseListener
+      extends InputStreamResponseListener {
+
+    @Override
+    public InputStream getInputStream() {
+      return new ObjectReleaseTrackedInputStream(super.getInputStream());
+    }
+
+    private static final class ObjectReleaseTrackedInputStream extends FilterInputStream {
+      public ObjectReleaseTrackedInputStream(final InputStream in) {
+        super(in);
+        assert ObjectReleaseTracker.track(in);
+      }
+
+      @Override
+      public void close() throws IOException {
+        assert ObjectReleaseTracker.release(in);
+        super.close();
+      }
+    }
+  }
 }
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 11a593d82c3..ee9bc159c62 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
@@ -66,6 +66,8 @@ public void testBadSetup() {
 
   @Test
   public void testArbitraryJsonIndexing() throws Exception {
+    // For making raw requests...
+    HttpClient httpClient = HttpClientUtil.createClient(null);
     try (SolrClient client = getSolrClient()) {
       client.deleteByQuery("*:*");
       client.commit();
@@ -73,7 +75,6 @@ public void testArbitraryJsonIndexing() throws Exception {
 
       // two docs, one with uniqueKey, another without it
       String json = "{\"id\":\"abc1\", \"name\": \"name1\"} {\"name\" : \"name2\"}";
-      HttpClient httpClient = getHttpClient(getCoreUrl());
       HttpPost post = new HttpPost(getRandomizedUpdateUri(getCoreUrl()));
       post.setHeader("Content-Type", "application/json");
       post.setEntity(
@@ -97,6 +98,8 @@ public void testArbitraryJsonIndexing() throws Exception {
       src = (String) doc.getFieldValue("_src_");
       m = (Map) fromJSONString(src);
       assertEquals("name2", m.get("name"));
+    } finally {
+      HttpClientUtil.close(httpClient);
     }
   }
 
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 8bd9a193eed..0b299f34b4c 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
@@ -649,10 +649,10 @@ public void testCollectionParameters() throws IOException, SolrServerException {
 
   @Test
   public void testGetRawStream() throws SolrServerException, IOException {
-    CloseableHttpClient client = HttpClientUtil.createClient(null);
+    CloseableHttpClient httpClient = HttpClientUtil.createClient(null);
     try (SolrClient solrClient =
         new HttpSolrClient.Builder(getCoreUrl())
-            .withHttpClient(client)
+            .withHttpClient(httpClient)
             .withResponseParser(null)
             .build(); ) {
 
@@ -661,6 +661,8 @@ public void testGetRawStream() throws SolrServerException, IOException {
       InputStream stream = (InputStream) response.get("stream");
       assertNotNull(stream);
       stream.close();
+    } finally {
+      HttpClientUtil.close(httpClient);
     }
   }
 
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index 3657906ec41..21800c6d5a9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -17,7 +17,10 @@
 
 package org.apache.solr.client.solrj.impl;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -56,6 +59,7 @@
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.hamcrest.MatcherAssert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -947,7 +951,10 @@ public void testGetRawStream() throws Exception {
           new GenericSolrRequest(SolrRequest.METHOD.GET, "/select", params("q", "*:*"));
       req.setResponseParser(new InputStreamResponseParser("xml"));
       SimpleSolrResponse rsp = req.process(client);
-      assertNotNull(rsp.getResponse().get("stream"));
+      Object stream = rsp.getResponse().get("stream");
+      assertNotNull(stream);
+      MatcherAssert.assertThat(stream, instanceOf(InputStream.class));
+      org.apache.solr.common.util.IOUtils.closeQuietly((InputStream) stream);
     }
   }
 
@@ -958,31 +965,34 @@ public void testBuilder() {
             .withBasicAuthCredentials("testu", "testp")
             .build()) {
 
-      Http2SolrClient clone1 =
-          new Http2SolrClient.Builder("baseSolrUrl").withHttpClient(seed).build();
-      String expected1 =
-          Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu", "testp");
-      assertEquals(expected1, clone1.basicAuthAuthorizationStr);
+      try (Http2SolrClient clone1 =
+          new Http2SolrClient.Builder("baseSolrUrl").withHttpClient(seed).build()) {
+        String expected1 =
+            Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu", "testp");
+        assertEquals(expected1, clone1.basicAuthAuthorizationStr);
+      }
 
       // test overwrite seed value
-      Http2SolrClient clone2 =
+      try (Http2SolrClient clone2 =
           new Http2SolrClient.Builder("baseSolrUrl")
               .withHttpClient(seed)
               .withBasicAuthCredentials("testu2", "testp2")
-              .build();
-      String expected2 =
-          Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu2", "testp2");
-      assertEquals(expected2, clone2.basicAuthAuthorizationStr);
+              .build()) {
+        String expected2 =
+            Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu2", "testp2");
+        assertEquals(expected2, clone2.basicAuthAuthorizationStr);
+      }
 
       // test overwrite seed value, order of builder method calls reversed
-      Http2SolrClient clone3 =
+      try (Http2SolrClient clone3 =
           new Http2SolrClient.Builder("baseSolrUrl")
               .withBasicAuthCredentials("testu3", "testp3")
               .withHttpClient(seed)
-              .build();
-      String expected3 =
-          Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu3", "testp3");
-      assertEquals(expected3, clone3.basicAuthAuthorizationStr);
+              .build()) {
+        String expected3 =
+            Http2SolrClient.basicAuthCredentialsToAuthorizationString("testu3", "testp3");
+        assertEquals(expected3, clone3.basicAuthAuthorizationStr);
+      }
     }
   }
 
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 32a629824cc..111e2c4580d 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -109,7 +109,6 @@
 import org.apache.solr.common.util.ContentStreamBase;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.IOUtils;
-import org.apache.solr.common.util.ObjectReleaseTracker;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.apache.solr.common.util.Utils;
@@ -335,7 +334,6 @@ public static void teardownTestCases() throws Exception {
       resetFactory();
       coreName = DEFAULT_TEST_CORENAME;
     } finally {
-      ObjectReleaseTracker.clear();
       TestInjection.reset();
       initCoreDataDir = null;
       System.clearProperty("solr.v2RealPath");
@@ -2633,7 +2631,13 @@ private void randomizeCloudSolrClient() {
     }
   }
 
-  /** This method creates a HttpClient from a URL. */
+  /**
+   * This method creates a HttpClient from a URL.
+   *
+   * <p><b>WARNING:</b> if you use this method, the <code>HttpClient</code> returned is tracked by
+   * <code>ObjectReleaseTracker</code>. Your test will fail if you do not pass the <code>HttpClient
+   * </code> to {@link HttpClientUtil#close(HttpClient)} when you are done with it.
+   */
   @Deprecated // We are migrating away from Apache HttpClient.
   public static HttpClient getHttpClient(String url) {
     return new HttpSolrClient.Builder(url).build().getHttpClient();

From 85f5c351858d0540d93f2feaef446eb27f2a3883 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 21 Sep 2023 13:55:10 -0700
Subject: [PATCH 108/160] SOLR-16960 Tests should sometimes run with a Tracer
 (not no-op) (#1943)

---
 solr/CHANGES.txt                              |  2 ++
 .../apache/solr/util/tracing/TraceUtils.java  |  9 ++++++++-
 solr/test-framework/build.gradle              |  1 +
 .../solr/cloud/MiniSolrCloudCluster.java      | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ba8adb622de..24ec5b37e1e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -225,6 +225,8 @@ Other Changes
 
 * SOLR-16978: Be case insensitive when parsing booleans from text (Tomás Fernández Löbbe)
 
+* SOLR-16960: Tests should sometimes run with a Tracer (not no-op) (Alex Deparvu)
+
 ==================  9.3.0 ==================
 
 Upgrade Notes
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index 4d305f373fd..80fc524556b 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -26,6 +26,7 @@
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.request.SolrQueryRequest;
@@ -64,6 +65,12 @@ public class TraceUtils {
 
   public static final String TAG_DB_TYPE_SOLR = "solr";
 
+  /**
+   * this should only be changed in the context of testing, otherwise it would risk not recording
+   * trace data.
+   */
+  public static Predicate<Span> IS_RECORDING = Span::isRecording;
+
   public static Tracer getGlobalTracer() {
     return GlobalOpenTelemetry.getTracer("solr");
   }
@@ -94,7 +101,7 @@ public static void setHttpStatus(Span span, int httpStatus) {
   }
 
   public static void ifNotNoop(Span span, Consumer<Span> consumer) {
-    if (span.isRecording()) {
+    if (IS_RECORDING.test(span)) {
       consumer.accept(span);
     }
   }
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 6c772aac512..cb0ddabf7fa 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -58,6 +58,7 @@ dependencies {
   permitUnusedDeclared 'commons-cli:commons-cli'
   implementation 'org.apache.httpcomponents:httpclient'
   implementation 'org.apache.httpcomponents:httpcore'
+  implementation 'io.opentelemetry:opentelemetry-api'
 
   implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
   implementation 'org.eclipse.jetty:jetty-server'
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 3da6dd7a23e..5d7a9e610ec 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
@@ -83,6 +83,7 @@
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.TimeOut;
 import org.apache.solr.util.tracing.SimplePropagator;
+import org.apache.solr.util.tracing.TraceUtils;
 import org.apache.zookeeper.KeeperException;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -1243,6 +1244,7 @@ public MiniSolrCloudCluster build() throws Exception {
       // eager init to prevent OTEL init races caused by test setup
       if (!disableTraceIdGeneration && TracerConfigurator.TRACE_ID_GEN_ENABLED) {
         SimplePropagator.load();
+        injectRandomRecordingFlag();
       }
 
       JettyConfig jettyConfig = jettyConfigBuilder.build();
@@ -1299,5 +1301,23 @@ public Builder withTraceIdGenerationDisabled() {
       this.disableTraceIdGeneration = true;
       return this;
     }
+
+    /**
+     * Randomizes the tracing Span::isRecording check.
+     *
+     * <p>This will randomize the Span::isRecording check so we have better coverage of all methods
+     * that deal with span creation without having to enable otel module.
+     *
+     * <p>It only makes sense to call this if we are using the alwaysOn tracer, the OTEL tracer
+     * already has this flag turned on and randomizing it would risk not recording trace data.
+     *
+     * <p>Note. Tracing is not a SolrCloud only feature. this method is placed here for convenience
+     * only, any test can make use of this example for more complete coverage of the tracing
+     * mechanics.
+     */
+    private void injectRandomRecordingFlag() {
+      boolean isRecording = LuceneTestCase.rarely();
+      TraceUtils.IS_RECORDING = (ignored) -> isRecording;
+    }
   }
 }

From 1d0d75a079ffd087436504b9474faf5c3075bda7 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Thu, 21 Sep 2023 17:27:12 -0700
Subject: [PATCH 109/160] SOLR-16960 Tests should sometimes run with a Tracer
 (not no-op) (#1948)

- fixed reset of recording flag
---
 .../apache/solr/util/tracing/TraceUtils.java  |  4 +-
 .../solr/cloud/MiniSolrCloudCluster.java      | 39 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index 80fc524556b..7e9daa37bbc 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -65,11 +65,13 @@ public class TraceUtils {
 
   public static final String TAG_DB_TYPE_SOLR = "solr";
 
+  public static final Predicate<Span> DEFAULT_IS_RECORDING = Span::isRecording;
+
   /**
    * this should only be changed in the context of testing, otherwise it would risk not recording
    * trace data.
    */
-  public static Predicate<Span> IS_RECORDING = Span::isRecording;
+  public static Predicate<Span> IS_RECORDING = DEFAULT_IS_RECORDING;
 
   public static Tracer getGlobalTracer() {
     return GlobalOpenTelemetry.getTracer("solr");
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 5d7a9e610ec..eb2eb4ef152 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
@@ -685,6 +685,7 @@ public void shutdown() throws Exception {
       if (!externalZkServer) {
         zkServer.shutdown();
       }
+      resetRecordingFlag();
     }
   }
 
@@ -1301,23 +1302,27 @@ public Builder withTraceIdGenerationDisabled() {
       this.disableTraceIdGeneration = true;
       return this;
     }
+  }
 
-    /**
-     * Randomizes the tracing Span::isRecording check.
-     *
-     * <p>This will randomize the Span::isRecording check so we have better coverage of all methods
-     * that deal with span creation without having to enable otel module.
-     *
-     * <p>It only makes sense to call this if we are using the alwaysOn tracer, the OTEL tracer
-     * already has this flag turned on and randomizing it would risk not recording trace data.
-     *
-     * <p>Note. Tracing is not a SolrCloud only feature. this method is placed here for convenience
-     * only, any test can make use of this example for more complete coverage of the tracing
-     * mechanics.
-     */
-    private void injectRandomRecordingFlag() {
-      boolean isRecording = LuceneTestCase.rarely();
-      TraceUtils.IS_RECORDING = (ignored) -> isRecording;
-    }
+  /**
+   * Randomizes the tracing Span::isRecording check.
+   *
+   * <p>This will randomize the Span::isRecording check so we have better coverage of all methods
+   * that deal with span creation without having to enable otel module.
+   *
+   * <p>It only makes sense to call this if we are using the alwaysOn tracer, the OTEL tracer
+   * already has this flag turned on and randomizing it would risk not recording trace data.
+   *
+   * <p>Note. Tracing is not a SolrCloud only feature. this method is placed here for convenience
+   * only, any test can make use of this example for more complete coverage of the tracing
+   * mechanics.
+   */
+  private static void injectRandomRecordingFlag() {
+    boolean isRecording = LuceneTestCase.rarely();
+    TraceUtils.IS_RECORDING = (ignored) -> isRecording;
+  }
+
+  private static void resetRecordingFlag() {
+    TraceUtils.IS_RECORDING = TraceUtils.DEFAULT_IS_RECORDING;
   }
 }

From d9c65fb1a64f6e85d5b869519ff2dbc1f529cb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Fri, 22 Sep 2023 09:35:57 +0200
Subject: [PATCH 110/160] SOLR-16982: Trip a Circuit Breaker only for external
 requests (#1930)

Co-authored-by: Christine Poerschke <cpoerschke@apache.org>
---
 solr/CHANGES.txt                              |  2 ++
 .../handler/ContentStreamHandlerBase.java     | 11 ++++++++++
 .../solr/handler/RequestHandlerBase.java      | 14 +++++++++++++
 .../solr/handler/component/SearchHandler.java |  6 ++++++
 .../solr/handler/RequestHandlerBaseTest.java  | 21 +++++++++++++++++++
 5 files changed, 54 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 24ec5b37e1e..70a93e99ab6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -113,6 +113,8 @@ Improvements
 
 * SOLR-15474: Make Circuit breakers individually pluggable (Atri Sharma, Christine Poerschke, janhoy)
 
+* SOLR-16982: Trip Circuit Breakers only for external requests (janhoy, Christine Poerschke)
+
 * SOLR-16927: Allow SolrClientCache clients to use Jetty HTTP2 clients (Alex Deparvu, David Smiley)
 
 * SOLR-16896, SOLR-16897: Add support of OAuth 2.0/OIDC 'code with PKCE' flow (Lamine Idjeraoui, janhoy, Kevin Risden, Anshum Gupta)
diff --git a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
index fb40af3c081..f28a7a6a6de 100644
--- a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
@@ -19,6 +19,7 @@
 import static org.apache.solr.common.params.CommonParams.FAILURE;
 import static org.apache.solr.common.params.CommonParams.STATUS;
 
+import java.lang.invoke.MethodHandles;
 import java.util.List;
 import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
 import org.apache.solr.common.SolrException;
@@ -33,6 +34,8 @@
 import org.apache.solr.update.processor.UpdateRequestProcessorChain;
 import org.apache.solr.util.circuitbreaker.CircuitBreaker;
 import org.apache.solr.util.circuitbreaker.CircuitBreakerRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Shares common code between various handlers that manipulate {@link
@@ -40,6 +43,8 @@
  */
 public abstract class ContentStreamHandlerBase extends RequestHandlerBase {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   @Override
   public void init(NamedList<?> args) {
     super.init(args);
@@ -119,6 +124,12 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
    * @return true if circuit breakers are tripped, false otherwise.
    */
   protected boolean checkCircuitBreakers(SolrQueryRequest req, SolrQueryResponse rsp) {
+    if (isInternalShardRequest(req)) {
+      if (log.isTraceEnabled()) {
+        log.trace("Internal request, skipping circuit breaker check");
+      }
+      return false;
+    }
     CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
     if (circuitBreakerRegistry.isEnabled(SolrRequestType.UPDATE)) {
       List<CircuitBreaker> trippedCircuitBreakers =
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 3a3c89f2b8a..2c53eb26625 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -28,6 +28,7 @@
 import org.apache.solr.api.ApiBag;
 import org.apache.solr.api.ApiSupport;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.ShardParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SuppressForbidden;
@@ -44,6 +45,7 @@
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.search.SyntaxError;
 import org.apache.solr.security.PermissionNameProvider;
+import org.apache.solr.update.processor.DistributedUpdateProcessor;
 import org.apache.solr.util.SolrPluginUtils;
 import org.apache.solr.util.TestInjection;
 import org.slf4j.Logger;
@@ -343,4 +345,16 @@ public Collection<Api> getApis() {
     return Collections.singleton(
         new ApiBag.ReqHandlerToApi(this, ApiBag.constructSpec(pluginInfo)));
   }
+
+  /**
+   * Checks whether the given request is an internal request to a shard. We rely on the fact that an
+   * internal search request to a shard contains the param "isShard", and an internal update request
+   * to a shard contains the param "distrib.from".
+   *
+   * @return true if request is internal
+   */
+  public static boolean isInternalShardRequest(SolrQueryRequest req) {
+    return req.getParams().get(DistributedUpdateProcessor.DISTRIB_FROM) != null
+        || "true".equals(req.getParams().get(ShardParams.IS_SHARD));
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 995e6a3c684..744d6093222 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -357,6 +357,12 @@ protected ResponseBuilder newResponseBuilder(
    */
   protected boolean checkCircuitBreakers(
       SolrQueryRequest req, SolrQueryResponse rsp, ResponseBuilder rb) {
+    if (isInternalShardRequest(req)) {
+      if (log.isTraceEnabled()) {
+        log.trace("Internal request, skipping circuit breaker check");
+      }
+      return false;
+    }
     final RTimerTree timer = rb.isDebug() ? req.getRequestTimer() : null;
 
     final CircuitBreakerRegistry circuitBreakerRegistry = req.getCore().getCircuitBreakerRegistry();
diff --git a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java
index 455f1c26df9..c3f2f9bd865 100644
--- a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java
@@ -26,8 +26,10 @@
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
+import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrCore;
@@ -145,6 +147,25 @@ public CoreContainer getCoreContainer() {
     assertEquals(SolrException.ErrorCode.SERVER_ERROR.code, normalizedSolrException.code());
   }
 
+  @Test
+  public void testIsInternalShardRequest() {
+    final SolrQueryRequest solrQueryRequest =
+        new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) {
+          @Override
+          public CoreContainer getCoreContainer() {
+            return coreContainer;
+          }
+        };
+
+    assertFalse(RequestHandlerBase.isInternalShardRequest(solrQueryRequest));
+
+    solrQueryRequest.setParams(new MapSolrParams(Map.of("isShard", "true")));
+    assertTrue(RequestHandlerBase.isInternalShardRequest(solrQueryRequest));
+
+    solrQueryRequest.setParams(new MapSolrParams(Map.of("distrib.from", "http://foo:1234/solr")));
+    assertTrue(RequestHandlerBase.isInternalShardRequest(solrQueryRequest));
+  }
+
   // Ideally we wouldn't need to use mocks here, but HandlerMetrics requires a SolrMetricsContext,
   // which
   //  requires a MetricsManager, which requires ...

From 8ca4a5d657f04d5467d42334d5ed7c9efac2b9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Fri, 22 Sep 2023 10:05:15 +0200
Subject: [PATCH 111/160] SOLR-16968: The MemoryCircuitBreaker now uses average
 heap usage (#1905)

---
 solr/CHANGES.txt                              |  2 +
 .../java/org/apache/solr/core/SolrCore.java   | 17 +++-
 .../AveragingMetricProvider.java              | 80 +++++++++++++++++++
 .../util/circuitbreaker/CircuitBreaker.java   |  9 ++-
 .../circuitbreaker/CircuitBreakerManager.java | 14 ++++
 .../CircuitBreakerRegistry.java               | 75 ++++++++++++++---
 .../circuitbreaker/MemoryCircuitBreaker.java  | 70 +++++++++++-----
 .../solr/util/BaseTestCircuitBreaker.java     | 31 ++++---
 8 files changed, 253 insertions(+), 45 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/AveragingMetricProvider.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 70a93e99ab6..18114626a2b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -129,6 +129,8 @@ Improvements
 
 * SOLR-16970: SOLR_OPTS is now able to override options set by the Solr control scripts, "bin/solr" and "bin/solr.cmd". (Houston Putman)
 
+* SOLR-16968: The MemoryCircuitBreaker now uses average heap usage over the last 30 seconds (janhoy, Christine Poerschke)
+
 * SOLR-14886: Suppress stack traces in query response (Isabelle Giguere via Alex Deparvu)
 
 * SOLR-16461: `/solr/coreName/replication?command=backup` now has a v2 equivalent, available at
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 944d4684016..f5e28b34aa0 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1088,9 +1088,6 @@ private SolrCore(
       solrMetricsContext = coreMetricManager.getSolrMetricsContext();
       this.coreMetricManager.loadReporters();
 
-      // init pluggable circuit breakers
-      initPlugins(null, CircuitBreaker.class);
-
       if (updateHandler == null) {
         directoryFactory = initDirectoryFactory();
         recoveryStrategyBuilder = initRecoveryStrategyBuilder();
@@ -1115,6 +1112,9 @@ private SolrCore(
       // initialize core metrics
       initializeMetrics(solrMetricsContext, null);
 
+      // init pluggable circuit breakers, after metrics because some circuit breakers use metrics
+      initPlugins(null, CircuitBreaker.class);
+
       SolrFieldCacheBean solrFieldCacheBean = new SolrFieldCacheBean();
       // this is registered at the CONTAINER level because it's not core-specific - for now we
       // also register it here for back-compat
@@ -1764,6 +1764,17 @@ private void doClose() {
 
     ExecutorUtil.shutdownAndAwaitTermination(coreAsyncTaskExecutor);
 
+    // Close circuit breakers that may have background threads, before metrics because some circuit
+    // breakers use metrics
+    try {
+      getCircuitBreakerRegistry().close();
+    } catch (Throwable e) {
+      log.error("Exception closing circuit breakers", e);
+      if (e instanceof Error) {
+        throw (Error) e;
+      }
+    }
+
     // stop reporting metrics
     try {
       coreMetricManager.close();
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/AveragingMetricProvider.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/AveragingMetricProvider.java
new file mode 100644
index 00000000000..60161e98181
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/AveragingMetricProvider.java
@@ -0,0 +1,80 @@
+/*
+ * 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.util.circuitbreaker;
+
+import com.google.common.util.concurrent.AtomicDouble;
+import java.io.Closeable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.logging.CircularList;
+
+/** Averages the metric value over a period of time */
+public class AveragingMetricProvider implements Closeable {
+  private final CircularList<Double> samplesRingBuffer;
+  private ScheduledExecutorService executor;
+  private final AtomicDouble currentAverageValue = new AtomicDouble(-1);
+
+  /**
+   * Creates an instance with an executor that runs every sampleInterval seconds and averages over
+   * numSamples samples.
+   *
+   * @param metricProvider metric provider that will provide a value
+   * @param numSamples number of samples to calculate average for
+   * @param sampleInterval interval between each sample
+   */
+  public AveragingMetricProvider(
+      MetricProvider metricProvider, int numSamples, long sampleInterval) {
+    this.samplesRingBuffer = new CircularList<>(numSamples);
+    executor =
+        Executors.newSingleThreadScheduledExecutor(
+            new SolrNamedThreadFactory(
+                "AveragingMetricProvider-" + metricProvider.getClass().getSimpleName()));
+    executor.scheduleWithFixedDelay(
+        () -> {
+          samplesRingBuffer.add(metricProvider.getMetricValue());
+          currentAverageValue.set(
+              samplesRingBuffer.toList().stream()
+                  .mapToDouble(Double::doubleValue)
+                  .average()
+                  .orElse(-1));
+        },
+        0,
+        sampleInterval,
+        TimeUnit.SECONDS);
+  }
+
+  /**
+   * Return current average. This is a cached value, so calling this method will not incur any
+   * calculations
+   */
+  public double getMetricValue() {
+    return currentAverageValue.get();
+  }
+
+  @Override
+  public void close() {
+    ExecutorUtil.shutdownAndAwaitTermination(executor);
+  }
+
+  /** Interface to provide the metric value. */
+  public interface MetricProvider {
+    double getMetricValue();
+  }
+}
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
index 4b9d24bb694..78841cceaf7 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
@@ -17,6 +17,8 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -41,7 +43,7 @@
  *
  * @lucene.experimental
  */
-public abstract class CircuitBreaker implements NamedListInitializedPlugin {
+public abstract class CircuitBreaker implements NamedListInitializedPlugin, Closeable {
   // Only query requests are checked by default
   private Set<SolrRequestType> requestTypes = Set.of(SolrRequestType.QUERY);
   private final List<SolrRequestType> SUPPORTED_TYPES =
@@ -60,6 +62,11 @@ public CircuitBreaker() {}
   /** Get error message when the circuit breaker triggers */
   public abstract String getErrorMessage();
 
+  @Override
+  public void close() throws IOException {
+    // Nothing to do by default
+  }
+
   /**
    * Set the request types for which this circuit breaker should be checked. If not called, the
    * circuit breaker will be checked for the {@link SolrRequestType#QUERY} request type only.
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index 02e3c7af676..3ca0c760a86 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -17,6 +17,7 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import org.apache.solr.common.util.NamedList;
 import org.slf4j.Logger;
@@ -77,6 +78,19 @@ public void init(NamedList<?> args) {
     }
   }
 
+  @Override
+  public void close() throws IOException {
+    try {
+      if (memEnabled) {
+        memCB.close();
+      }
+    } finally {
+      if (cpuEnabled) {
+        cpuCB.close();
+      }
+    }
+  }
+
   // The methods below will be called by super class during init
   public void setMemEnabled(String enabled) {
     this.memEnabled = Boolean.getBoolean(enabled);
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
index 84c2f61fb9b..a7081df96f6 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
@@ -18,12 +18,19 @@
 package org.apache.solr.util.circuitbreaker;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Keeps track of all registered circuit breaker instances for various request types. Responsible
@@ -32,26 +39,35 @@
  * @lucene.experimental
  * @since 9.4
  */
-public class CircuitBreakerRegistry {
+public class CircuitBreakerRegistry implements Closeable {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final Map<SolrRequestType, List<CircuitBreaker>> circuitBreakerMap = new HashMap<>();
 
   public CircuitBreakerRegistry() {}
 
   public void register(CircuitBreaker circuitBreaker) {
-    circuitBreaker
-        .getRequestTypes()
-        .forEach(
-            r -> {
-              List<CircuitBreaker> list =
-                  circuitBreakerMap.computeIfAbsent(r, k -> new ArrayList<>());
-              list.add(circuitBreaker);
-            });
+    synchronized (circuitBreakerMap) {
+      circuitBreaker
+          .getRequestTypes()
+          .forEach(
+              r -> {
+                List<CircuitBreaker> list =
+                    circuitBreakerMap.computeIfAbsent(r, k -> new ArrayList<>());
+                list.add(circuitBreaker);
+                if (log.isInfoEnabled()) {
+                  log.info(
+                      "Registered circuit breaker {} for request type(s) {}",
+                      circuitBreaker.getClass().getSimpleName(),
+                      r);
+                }
+              });
+    }
   }
 
   @VisibleForTesting
-  public void deregisterAll() {
-    circuitBreakerMap.clear();
+  public void deregisterAll() throws IOException {
+    this.close();
   }
 
   /**
@@ -97,4 +113,41 @@ public static String toErrorMessage(List<CircuitBreaker> circuitBreakerList) {
   public boolean isEnabled(SolrRequestType requestType) {
     return circuitBreakerMap.containsKey(requestType);
   }
+
+  @Override
+  public void close() throws IOException {
+    synchronized (circuitBreakerMap) {
+      final AtomicInteger closeFailedCounter = new AtomicInteger(0);
+      circuitBreakerMap
+          .values()
+          .forEach(
+              list ->
+                  list.forEach(
+                      it -> {
+                        try {
+                          if (log.isDebugEnabled()) {
+                            log.debug(
+                                "Closed circuit breaker {} for request type(s) {}",
+                                it.getClass().getSimpleName(),
+                                it.getRequestTypes());
+                          }
+                          it.close();
+                        } catch (IOException e) {
+                          if (log.isErrorEnabled()) {
+                            log.error(
+                                String.format(
+                                    Locale.ROOT,
+                                    "Failed to close circuit breaker %s",
+                                    it.getClass().getSimpleName()),
+                                e);
+                          }
+                          closeFailedCounter.incrementAndGet();
+                        }
+                      }));
+      circuitBreakerMap.clear();
+      if (closeFailedCounter.get() > 0) {
+        throw new IOException("Failed to close " + closeFailedCounter.get() + " circuit breakers");
+      }
+    }
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
index 3004d732e4d..4a3eb3f5b9f 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
@@ -17,32 +17,64 @@
 
 package org.apache.solr.util.circuitbreaker;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
+import org.apache.solr.util.RefCounted;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Tracks the current JVM heap usage and triggers if it exceeds the defined percentage of the
- * maximum heap size allocated to the JVM. This circuit breaker is a part of the default
- * CircuitBreakerRegistry so is checked for every request -- hence it is realtime. Once the memory
- * usage goes below the threshold, it will start allowing queries again.
+ * Tracks the current JVM heap usage and triggers if a moving heap usage average over 30 seconds
+ * exceeds the defined percentage of the maximum heap size allocated to the JVM. Once the average
+ * memory usage goes below the threshold, it will start allowing queries again.
  *
  * <p>The memory threshold is defined as a percentage of the maximum memory allocated -- see
- * memThreshold in solrconfig.xml.
+ * memThreshold in <code>solrconfig.xml</code>.
  */
 public class MemoryCircuitBreaker extends CircuitBreaker {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final MemoryMXBean MEMORY_MX_BEAN = ManagementFactory.getMemoryMXBean();
+  // One shared provider / executor for all instances of this class
+  private static RefCounted<AveragingMetricProvider> averagingMetricProvider;
 
   private long heapMemoryThreshold;
 
   private static final ThreadLocal<Long> seenMemory = ThreadLocal.withInitial(() -> 0L);
   private static final ThreadLocal<Long> allowedMemory = ThreadLocal.withInitial(() -> 0L);
 
+  /** Creates an instance which averages over 6 samples during last 30 seconds. */
   public MemoryCircuitBreaker() {
+    this(6, 5);
+  }
+
+  /**
+   * Constructor that allows override of sample interval for which the memory usage is fetched. This
+   * is provided for testing, not intended for general use because the average metric provider
+   * implementation is the same for all instances of the class.
+   *
+   * @param numSamples number of samples to calculate average for
+   * @param sampleInterval interval between each sample
+   */
+  protected MemoryCircuitBreaker(int numSamples, int sampleInterval) {
     super();
+    synchronized (MemoryCircuitBreaker.class) {
+      if (averagingMetricProvider == null || averagingMetricProvider.getRefcount() == 0) {
+        averagingMetricProvider =
+            new RefCounted<>(
+                new AveragingMetricProvider(
+                    () -> MEMORY_MX_BEAN.getHeapMemoryUsage().getUsed(),
+                    numSamples,
+                    sampleInterval)) {
+              @Override
+              protected void close() {
+                get().close();
+              }
+            };
+      }
+      averagingMetricProvider.incref();
+    }
   }
 
   public void setThreshold(double thresholdValueInPercentage) {
@@ -60,14 +92,11 @@ public void setThreshold(double thresholdValueInPercentage) {
     }
   }
 
-  // TODO: An optimization can be to trip the circuit breaker for a duration of time
-  // after the circuit breaker condition is matched. This will optimize for per call
-  // overhead of calculating the condition parameters but can result in false positives.
   @Override
   public boolean isTripped() {
 
     long localAllowedMemory = getCurrentMemoryThreshold();
-    long localSeenMemory = calculateLiveMemoryUsage();
+    long localSeenMemory = getAvgMemoryUsage();
 
     allowedMemory.set(localAllowedMemory);
 
@@ -76,6 +105,10 @@ public boolean isTripped() {
     return (localSeenMemory >= localAllowedMemory);
   }
 
+  protected long getAvgMemoryUsage() {
+    return (long) averagingMetricProvider.get().getMetricValue();
+  }
+
   @Override
   public String getErrorMessage() {
     return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold. "
@@ -89,17 +122,12 @@ private long getCurrentMemoryThreshold() {
     return heapMemoryThreshold;
   }
 
-  /**
-   * Calculate the live memory usage for the system. This method has package visibility to allow
-   * using for testing.
-   *
-   * @return Memory usage in bytes.
-   */
-  protected long calculateLiveMemoryUsage() {
-    // NOTE: MemoryUsageGaugeSet provides memory usage statistics but we do not use them
-    // here since it will require extra allocations and incur cost, hence it is cheaper to use
-    // MemoryMXBean directly. Ideally, this call should not add noticeable
-    // latency to a query -- but if it does, please signify on SOLR-14588
-    return MEMORY_MX_BEAN.getHeapMemoryUsage().getUsed();
+  @Override
+  public void close() throws IOException {
+    synchronized (MemoryCircuitBreaker.class) {
+      if (averagingMetricProvider != null && averagingMetricProvider.getRefcount() > 0) {
+        averagingMetricProvider.decref();
+      }
+    }
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
index 71c6fe67f8d..14c83df771a 100644
--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -19,6 +19,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +44,8 @@
 
 public abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private static final CircuitBreaker dummyMemBreaker = new MemoryCircuitBreaker();
+  private static final CircuitBreaker dummyCBManager = new CircuitBreakerManager();
 
   protected static void indexDocs() {
     removeAllExistingCircuitBreakers();
@@ -62,11 +65,13 @@ protected static void indexDocs() {
   @Override
   public void tearDown() throws Exception {
     super.tearDown();
+    dummyMemBreaker.close();
+    dummyCBManager.close();
   }
 
   @After
   public void after() {
-    h.getCore().getCircuitBreakerRegistry().deregisterAll();
+    removeAllExistingCircuitBreakers();
   }
 
   public void testCBAlwaysTrips() {
@@ -116,9 +121,10 @@ public void testCBFakeMemoryPressure() throws Exception {
   }
 
   public void testBadRequestType() {
+
     expectThrows(
         IllegalArgumentException.class,
-        () -> new MemoryCircuitBreaker().setRequestTypes(List.of("badRequestType")));
+        () -> dummyMemBreaker.setRequestTypes(List.of("badRequestType")));
   }
 
   public void testBuildingMemoryPressure() {
@@ -236,17 +242,21 @@ public void testResponseWithCBTiming() {
         "//lst[@name='process']/double[@name='time']");
   }
 
-  public void testErrorCode() {
+  public void testErrorCode() throws Exception {
     assertEquals(
         SolrException.ErrorCode.SERVICE_UNAVAILABLE,
-        CircuitBreaker.getErrorCode(List.of(new CircuitBreakerManager())));
+        CircuitBreaker.getErrorCode(List.of(dummyCBManager)));
     assertEquals(
         SolrException.ErrorCode.TOO_MANY_REQUESTS,
-        CircuitBreaker.getErrorCode(List.of(new MemoryCircuitBreaker())));
+        CircuitBreaker.getErrorCode(List.of(dummyMemBreaker)));
   }
 
   private static void removeAllExistingCircuitBreakers() {
-    h.getCore().getCircuitBreakerRegistry().deregisterAll();
+    try {
+      h.getCore().getCircuitBreakerRegistry().deregisterAll();
+    } catch (IOException e) {
+      fail("Failed to unload circuit breakers");
+    }
   }
 
   private static class MockCircuitBreaker extends MemoryCircuitBreaker {
@@ -264,10 +274,12 @@ public boolean isTripped() {
   }
 
   private static class FakeMemoryPressureCircuitBreaker extends MemoryCircuitBreaker {
+    public FakeMemoryPressureCircuitBreaker() {
+      super(1, 1);
+    }
 
     @Override
-    protected long calculateLiveMemoryUsage() {
-      // Return a number large enough to trigger a pushback from the circuit breaker
+    protected long getAvgMemoryUsage() {
       return Long.MAX_VALUE;
     }
   }
@@ -276,11 +288,12 @@ private static class BuildingUpMemoryPressureCircuitBreaker extends MemoryCircui
     private AtomicInteger count;
 
     public BuildingUpMemoryPressureCircuitBreaker() {
+      super(1, 1);
       this.count = new AtomicInteger(0);
     }
 
     @Override
-    protected long calculateLiveMemoryUsage() {
+    protected long getAvgMemoryUsage() {
       int localCount = count.getAndIncrement();
 
       if (localCount >= 4) {

From 1a8457d9ca394d93af9098c4a49c1593f97774db Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 22 Sep 2023 11:21:23 -0400
Subject: [PATCH 112/160] SOLR-16925: Fix indentation for JacksonJsonWriter
 (#1942)

---
 solr/CHANGES.txt                                             | 2 ++
 .../src/java/org/apache/solr/response/JacksonJsonWriter.java | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 18114626a2b..6393ea2cd29 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -205,6 +205,8 @@ Bug Fixes
 * SOLR-16983: Fixed a bug that could cause some usages of SolrStream to fail to close InputStreams from the server.
   Also fixed the usage of ObjectReleaseTracker in SolrTestCaseJ4 to catch these kinds of bugs (hossman)
 
+* SOLR-16925: Fix indentation for JacksonJsonWriter (Houston Putman)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
index 7a1ff5276a8..4de5039ba1e 100644
--- a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.PrettyPrinter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -32,7 +31,7 @@
 public class JacksonJsonWriter extends BinaryResponseWriter {
 
   protected final JsonFactory jsonfactory;
-  protected static final PrettyPrinter pretty =
+  protected static final DefaultPrettyPrinter pretty =
       new DefaultPrettyPrinter()
           .withoutSpacesInObjectEntries()
           .withArrayIndenter(DefaultPrettyPrinter.NopIndenter.instance);
@@ -71,7 +70,7 @@ public WriterImpl(
       try {
         gen = j.createGenerator(out, JsonEncoding.UTF8);
         if (doIndent) {
-          gen.setPrettyPrinter(pretty);
+          gen.setPrettyPrinter(pretty.createInstance());
         }
       } catch (IOException e) {
         throw new RuntimeException(e);

From f22a51cc64f83f7b1268d9f3a4c50e36249bdd87 Mon Sep 17 00:00:00 2001
From: patsonluk <patsonluk@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:21:46 -0700
Subject: [PATCH 113/160] SOLR-16701: Race condition on PRS enabled collection
 deletion (#1460)

---
 solr/CHANGES.txt                              |   2 +
 .../cloud/overseer/ZkStateReaderTest.java     | 120 ++++++++++++++++++
 .../common/cloud/PerReplicaStatesOps.java     |  14 ++
 .../solr/common/cloud/ZkStateReader.java      |  15 +++
 .../solr/common/util/CommonTestInjection.java |  96 ++++++++++++++
 5 files changed, 247 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6393ea2cd29..bd51cf030e0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -207,6 +207,8 @@ Bug Fixes
 
 * SOLR-16925: Fix indentation for JacksonJsonWriter (Houston Putman)
 
+* SOLR-16701: Fix race condition on PRS enabled collection deletion (Patson Luk)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
index 6e1f4221943..3e1ca33963c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
@@ -43,16 +43,19 @@
 import org.apache.solr.common.cloud.PerReplicaStates;
 import org.apache.solr.common.cloud.PerReplicaStatesOps;
 import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.util.CommonTestInjection;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.TimeSource;
+import org.apache.solr.common.util.Utils;
 import org.apache.solr.common.util.ZLibCompressor;
 import org.apache.solr.handler.admin.ConfigSetsHandler;
 import org.apache.solr.util.LogLevel;
 import org.apache.solr.util.TimeOut;
+import org.apache.zookeeper.KeeperException;
 import org.junit.After;
 import org.junit.Before;
 import org.slf4j.Logger;
@@ -664,4 +667,121 @@ public void testWatchRaceCondition() throws Exception {
       ExecutorUtil.awaitTermination(executorService);
     }
   }
+
+  /**
+   * Ensure that collection state fetching (getCollectionLive etc.) would not throw exception when
+   * the state.json is deleted in between the state.json read and PRS entries read
+   */
+  public void testDeletePrsCollection() throws Exception {
+    ZkStateWriter writer = fixture.writer;
+    ZkStateReader reader = fixture.reader;
+
+    String collectionName = "c1";
+    fixture.zkClient.makePath(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collectionName, true);
+
+    ClusterState clusterState = reader.getClusterState();
+
+    String nodeName = "node1:10000_solr";
+    String sliceName = "shard1";
+    Slice slice = new Slice(sliceName, Map.of(), Map.of(), collectionName);
+
+    // create new collection
+    DocCollection state =
+        DocCollection.create(
+            collectionName,
+            Map.of(sliceName, slice),
+            Collections.singletonMap(DocCollection.CollectionStateProps.PER_REPLICA_STATE, true),
+            DocRouter.DEFAULT,
+            0,
+            PerReplicaStatesOps.getZkClientPrsSupplier(
+                fixture.zkClient, DocCollection.getCollectionPath(collectionName)));
+    ZkWriteCommand wc = new ZkWriteCommand(collectionName, state);
+    writer.enqueueUpdate(clusterState, Collections.singletonList(wc), null);
+    clusterState = writer.writePendingUpdates();
+
+    TimeOut timeOut = new TimeOut(5000, TimeUnit.MILLISECONDS, TimeSource.NANO_TIME);
+    timeOut.waitFor(
+        "Timeout on waiting for c1 to show up in cluster state",
+        () -> reader.getClusterState().getCollectionOrNull(collectionName) != null);
+
+    String collectionPath = ZkStateReader.getCollectionPath(collectionName);
+
+    // now create the replica, take note that this has to be done after DocCollection creation with
+    // empty slice, otherwise the DocCollection ctor would fetch the PRS entries and throw
+    // exceptions
+    String replicaBaseUrl = Utils.getBaseUrlForNodeName(nodeName, "http");
+
+    String replicaName = "replica1";
+    Replica replica =
+        new Replica(
+            replicaName,
+            Map.of(
+                ZkStateReader.CORE_NAME_PROP,
+                "core1",
+                ZkStateReader.STATE_PROP,
+                Replica.State.ACTIVE.toString(),
+                ZkStateReader.NODE_NAME_PROP,
+                nodeName,
+                ZkStateReader.BASE_URL_PROP,
+                replicaBaseUrl,
+                ZkStateReader.REPLICA_TYPE,
+                Replica.Type.NRT.name()),
+            collectionName,
+            sliceName);
+
+    wc =
+        new ZkWriteCommand(
+            collectionName, SliceMutator.updateReplica(state, slice, replica.getName(), replica));
+    writer.enqueueUpdate(clusterState, Collections.singletonList(wc), null);
+    clusterState = writer.writePendingUpdates();
+
+    timeOut.waitFor(
+        "Timeout on waiting for replica to show up in cluster state",
+        () ->
+            reader.getCollectionLive(collectionName).getSlice(sliceName).getReplica(replicaName)
+                != null);
+
+    try (CommonTestInjection.BreakpointSetter breakpointSetter =
+        new CommonTestInjection.BreakpointSetter()) {
+      // set breakpoint such that after state.json fetch and before PRS entry fetch, we can delete
+      // the state.json and PRS entries to trigger the race condition
+      breakpointSetter.setImplementation(
+          PerReplicaStatesOps.class.getName() + "/beforePrsFetch",
+          (args) -> {
+            try {
+              // this is invoked after ZkStateReader.fetchCollectionState has fetched the state.json
+              // but before PRS entries.
+              // call delete state.json on ZK directly, very tricky to control execution order with
+              // writer.enqueueUpdate
+              reader.getZkClient().clean(collectionPath);
+            } catch (InterruptedException e) {
+              throw new RuntimeException(e);
+            } catch (KeeperException e) {
+              throw new RuntimeException(e);
+            }
+          });
+
+      // set breakpoint to verify the expected PrsZkNodeNotFoundException is indeed thrown within
+      // the execution flow, such exception is caught within the logic and not thrown to the
+      // caller
+      AtomicBoolean prsZkNodeNotFoundExceptionThrown = new AtomicBoolean(false);
+      breakpointSetter.setImplementation(
+          ZkStateReader.class.getName() + "/exercised",
+          (args) -> {
+            if (args[0] instanceof PerReplicaStatesOps.PrsZkNodeNotFoundException) {
+              prsZkNodeNotFoundExceptionThrown.set(true);
+            }
+          });
+
+      timeOut.waitFor(
+          "Timeout waiting for collection state to become null",
+          () -> {
+            // this should not throw exception even if the PRS entry read is delayed artificially
+            // (by previous command) and deleted after the following getCollectionLive call
+            return reader.getCollectionLive(collectionName) == null;
+          });
+
+      assertTrue(prsZkNodeNotFoundExceptionThrown.get());
+    }
+  }
 }
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
index 475b852e75c..dd0b14fd3e1 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.function.Function;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.CommonTestInjection;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Op;
@@ -56,6 +57,8 @@ public class PerReplicaStatesOps {
   public static PerReplicaStates fetch(
       String path, SolrZkClient zkClient, PerReplicaStates current) {
     try {
+      assert CommonTestInjection.injectBreakpoint(
+          PerReplicaStatesOps.class.getName() + "/beforePrsFetch");
       if (current != null) {
         Stat stat = zkClient.exists(current.path, null, true);
         if (stat == null) return new PerReplicaStates(path, 0, Collections.emptyList());
@@ -64,6 +67,11 @@ public static PerReplicaStates fetch(
       Stat stat = new Stat();
       List<String> children = zkClient.getChildren(path, null, stat, true);
       return new PerReplicaStates(path, stat.getCversion(), Collections.unmodifiableList(children));
+    } catch (KeeperException.NoNodeException e) {
+      throw new PrsZkNodeNotFoundException(
+          SolrException.ErrorCode.SERVER_ERROR,
+          "Error fetching per-replica states. The node [" + path + "] is not found",
+          e);
     } catch (KeeperException e) {
       throw new SolrException(
           SolrException.ErrorCode.SERVER_ERROR, "Error fetching per-replica states", e);
@@ -76,6 +84,12 @@ public static PerReplicaStates fetch(
     }
   }
 
+  public static class PrsZkNodeNotFoundException extends SolrException {
+    private PrsZkNodeNotFoundException(ErrorCode code, String msg, Throwable cause) {
+      super(code, msg, cause);
+    }
+  }
+
   public static DocCollection.PrsSupplier getZkClientPrsSupplier(
       SolrZkClient zkClient, String collectionPath) {
     return () -> fetch(collectionPath, zkClient, null);
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index d8115fdf1b8..17f7bdbc5d5 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1627,6 +1627,21 @@ private DocCollection fetchCollectionState(String coll, Watcher watcher)
           }
         }
         return null;
+      } catch (PerReplicaStatesOps.PrsZkNodeNotFoundException e) {
+        assert CommonTestInjection.injectBreakpoint(
+            ZkStateReader.class.getName() + "/exercised", e);
+        // could be a race condition that state.json and PRS entries are deleted between the
+        // state.json fetch and PRS entry fetch
+        Stat exists = zkClient.exists(collectionPath, watcher, true);
+        if (exists == null) {
+          log.info(
+              "PRS entry for collection {} not found in ZK. It was probably deleted between state.json read and PRS entry read.",
+              coll);
+
+          return null;
+        } else {
+          throw e; // unexpected, PRS node not found but the collection state.json still exists
+        }
       }
     }
   }
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommonTestInjection.java b/solr/solrj/src/java/org/apache/solr/common/util/CommonTestInjection.java
index e1d7caa8dd9..bcacd715a71 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/CommonTestInjection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommonTestInjection.java
@@ -17,8 +17,14 @@
 
 package org.apache.solr.common.util;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +38,7 @@ public class CommonTestInjection {
 
   private static volatile Map<String, String> additionalSystemProps = null;
   private static volatile Integer delay = null;
+  private static final ConcurrentMap<String, Breakpoint> breakpoints = new ConcurrentHashMap<>();
 
   public static void reset() {
     additionalSystemProps = null;
@@ -73,4 +80,93 @@ public static boolean injectDelay() {
     }
     return true;
   }
+
+  /**
+   * Injects a breakpoint that pauses the existing code execution, executes the code defined in the
+   * breakpoint implementation and then resumes afterward. The breakpoint implementation is looked
+   * up by the corresponding key used in {@link BreakpointSetter#setImplementation(String,
+   * Breakpoint)}
+   *
+   * <p>An example usages :
+   *
+   * <ol>
+   *   <li>Inject a precise wait until a race condition is fulfilled before proceeding with original
+   *       code execution
+   *   <li>Inject a flag to catch exception statement which handles the exception without
+   *       re-throwing. This could verify caught exception does get triggered
+   * </ol>
+   *
+   * <p>This should always be a part of an assert statement (ie assert injectBreakpoint(key)) such
+   * that it will be skipped for normal code execution
+   *
+   * @see BreakpointSetter#setImplementation(String, Breakpoint)
+   * @param key could simply be the fully qualified class name or more granular like class name +
+   *     other id (such as method name). This should only be set by corresponding unit test cases
+   *     with CommonTestInjection#setBreakpoint
+   * @param args optional arguments list to be passed to the Breakpoint
+   */
+  public static boolean injectBreakpoint(String key, Object... args) {
+    Breakpoint breakpoint = breakpoints.get(key);
+    if (breakpoint != null) {
+      log.info("Breakpoint with key {} is triggered", key);
+      breakpoint.executeAndResume(args);
+      log.info("Breakpoint with key {} was executed and normal code execution resumes", key);
+    } else {
+      log.debug(
+          "Breakpoint with key {} is triggered but there's no implementation set. Skipping...",
+          key);
+    }
+    return true;
+  }
+
+  public interface Breakpoint {
+    /**
+     * Code execution should break at where the breakpoint was injected, then it would execute this
+     * method and resumes the execution afterward.
+     */
+    void executeAndResume(Object... args);
+  }
+
+  /**
+   * Breakpoints should be set via this {@link BreakpointSetter} within the test case and close
+   * should be invoked as cleanup. Since this is closeable, it should usually be used in the
+   * try-with-resource syntax, such as:
+   *
+   * <pre>{@code
+   * try (BreakpointSetter breakpointSetter = new BreakpointSetter() {
+   *     //... test code here that calls breakpointSetter.setImplementation(...)
+   * }
+   * }</pre>
+   */
+  public static class BreakpointSetter implements Closeable {
+    private Set<String> keys = new HashSet<>();
+    /**
+     * This is usually set by the test cases.
+     *
+     * <p>If a breakpoint implementation is set by this method, then code execution would break at
+     * the code execution point marked by CommonTestInjection#injectBreakpoint with matching key,
+     * executes the provided implementation in the {@link Breakpoint}, then resumes the normal code
+     * execution.
+     *
+     * @see CommonTestInjection#injectBreakpoint(String, Object...)
+     * @param key could simply be the fully qualified class name or more granular like class name +
+     *     other id (such as method name). This should batch the key used in injectBreakpoint
+     * @param implementation The Breakpoint implementation
+     */
+    public void setImplementation(String key, Breakpoint implementation) {
+      if (breakpoints.containsKey(key)) {
+        throw new IllegalArgumentException(
+            "Cannot redefine Breakpoint implementation with key " + key);
+      }
+      breakpoints.put(key, implementation);
+      keys.add(key);
+    }
+
+    @Override
+    public void close() throws IOException {
+      for (String key : keys) {
+        breakpoints.remove(key);
+      }
+    }
+  }
 }

From 4980fbd1dd89a44086e52b9950cf181585001343 Mon Sep 17 00:00:00 2001
From: Lamine <104593675+laminelam@users.noreply.github.com>
Date: Sat, 23 Sep 2023 12:29:49 -0500
Subject: [PATCH 114/160] SOLR-16991: Fix bug: Concurrent requests failing JWT
 Auth intermittently (#1949)

---
 solr/CHANGES.txt                                | 2 ++
 solr/webapp/web/js/angular/app.js               | 4 ++++
 solr/webapp/web/js/angular/controllers/login.js | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bd51cf030e0..aab89a0a118 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -209,6 +209,8 @@ Bug Fixes
 
 * SOLR-16701: Fix race condition on PRS enabled collection deletion (Patson Luk)
 
+* SOLR-16991: Concurrent requests failing JWT authentication in Admin UI intermittently (Lamine Idjeraoui, janhoy)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index 206f246e866..0cb3bf529b9 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -592,6 +592,10 @@ solrAdminApp.controller('MainController', function($scope, $route, $rootScope, $
     $scope.http401 = sessionStorage.getItem("http401");
   };
 
+  $scope.showHideMenu = function() {
+    $scope.http401 = sessionStorage.getItem("http401");
+  };
+
   $scope.isMultiDestAlias = function(selectedColl) {
     return selectedColl && selectedColl.type === 'alias' && selectedColl.collections.includes(',');
   };
diff --git a/solr/webapp/web/js/angular/controllers/login.js b/solr/webapp/web/js/angular/controllers/login.js
index 0e22100c306..6f1a63a8ef1 100644
--- a/solr/webapp/web/js/angular/controllers/login.js
+++ b/solr/webapp/web/js/angular/controllers/login.js
@@ -18,7 +18,7 @@
 solrAdminApp.controller('LoginController',
     ['$scope', '$routeParams', '$rootScope', '$location', '$window', 'AuthenticationService', 'Constants',
       function ($scope, $routeParams, $rootScope, $location, $window, AuthenticationService, Constants) {
-        $scope.resetMenu("login", Constants.IS_ROOT_PAGE);
+        $scope.showHideMenu();
         $scope.subPath = $routeParams.route;
         $rootScope.exceptions = {};
 

From de61e1a6dd56590d5b90b2a498c32b0f4dadc29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Sat, 23 Sep 2023 21:18:18 +0200
Subject: [PATCH 115/160] Clean up some deprecations and warnings in jwt-auth
 module (#1952)

---
 solr/modules/jwt-auth/build.gradle              |  1 +
 .../apache/solr/security/jwt/JWTAuthPlugin.java | 10 +++++-----
 .../jwt/JWTVerificationkeyResolver.java         |  9 +++------
 .../jwt/JWTAuthPluginIntegrationTest.java       | 10 ++++++----
 .../solr/security/jwt/JWTAuthPluginTest.java    | 17 ++++++-----------
 .../solr/security/jwt/JWTIssuerConfigTest.java  |  3 ++-
 .../jwt/JWTVerificationkeyResolverTest.java     |  2 ++
 7 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradle
index 3bed1606e4a..1b420899e33 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -39,6 +39,7 @@ dependencies {
   implementation 'org.apache.httpcomponents:httpclient'
   implementation 'org.apache.httpcomponents:httpcore'
   implementation 'org.eclipse.jetty:jetty-client'
+  implementation 'org.eclipse.jetty:jetty-http'
   implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
   implementation 'com.google.guava:guava'
   implementation 'org.slf4j:slf4j-api'
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
index 3e3f7578fc9..bb64f458f4e 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
@@ -257,9 +257,9 @@ public void init(Map<String, Object> pluginConfig) {
     issuerConfigs.addAll(parseIssuers(pluginConfig));
     verificationKeyResolver = new JWTVerificationkeyResolver(issuerConfigs, requireIssuer);
 
-    if (issuerConfigs.size() > 0 && getPrimaryIssuer().getAuthorizationEndpoint() != null) {
+    if (!issuerConfigs.isEmpty() && getPrimaryIssuer().getAuthorizationEndpoint() != null) {
       adminUiScope = (String) pluginConfig.get(PARAM_ADMINUI_SCOPE);
-      if (adminUiScope == null && requiredScopes.size() > 0) {
+      if (adminUiScope == null && !requiredScopes.isEmpty()) {
         adminUiScope = requiredScopes.get(0);
         log.warn(
             "No adminUiScope given, using first scope in 'scope' list as required scope for accessing Admin UI");
@@ -384,7 +384,7 @@ private Optional<JWTIssuerConfig> parseIssuerFromTopLevelConfig(Map<String, Obje
    * @return JWTIssuerConfig object for the primary issuer
    */
   JWTIssuerConfig getPrimaryIssuer() {
-    if (issuerConfigs.size() == 0) {
+    if (issuerConfigs.isEmpty()) {
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "No issuers configured");
     }
     return issuerConfigs.get(0);
@@ -690,7 +690,7 @@ protected JWTAuthenticationResponse authenticate(String authorizationHeader) {
                 }
               }
             }
-            if (finalRoles.size() > 0) {
+            if (!finalRoles.isEmpty()) {
               return new JWTAuthenticationResponse(
                   AuthCode.AUTHENTICATED,
                   new JWTPrincipalWithUserRoles(
@@ -972,7 +972,7 @@ protected boolean interceptInternodeRequest(Request request) {
     Object userToken = request.getAttributes().get(Http2SolrClient.REQ_PRINCIPAL_KEY);
     if (userToken instanceof JWTPrincipal) {
       JWTPrincipal jwtPrincipal = (JWTPrincipal) userToken;
-      request.header(HttpHeaders.AUTHORIZATION, "Bearer " + jwtPrincipal.getToken());
+      request.headers(h -> h.put(HttpHeaders.AUTHORIZATION, "Bearer " + jwtPrincipal.getToken()));
       return true;
     }
     return false;
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
index a9254c7d5d7..2fe75a1baf5 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
@@ -59,9 +59,9 @@
 public class JWTVerificationkeyResolver implements VerificationKeyResolver {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  private VerificationJwkSelector verificationJwkSelector = new VerificationJwkSelector();
+  private final VerificationJwkSelector verificationJwkSelector = new VerificationJwkSelector();
 
-  private Map<String, JWTIssuerConfig> issuerConfigs = new HashMap<>();
+  private final Map<String, JWTIssuerConfig> issuerConfigs = new HashMap<>();
   private final boolean requireIssuer;
 
   /**
@@ -73,10 +73,7 @@ public class JWTVerificationkeyResolver implements VerificationKeyResolver {
   public JWTVerificationkeyResolver(
       Collection<JWTIssuerConfig> issuerConfigs, boolean requireIssuer) {
     this.requireIssuer = requireIssuer;
-    issuerConfigs.forEach(
-        ic -> {
-          this.issuerConfigs.put(ic.getIss(), ic);
-        });
+    issuerConfigs.forEach(ic -> this.issuerConfigs.put(ic.getIss(), ic));
   }
 
   @Override
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
index 23cefdbca51..c2613d8550c 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java
@@ -86,7 +86,6 @@
  */
 @SolrTestCaseJ4.SuppressSSL
 public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
-  private final String COLLECTION = "jwtColl";
 
   private static String mockOAuthToken;
   private static Path pemFilePath;
@@ -143,7 +142,7 @@ public void mockOAuth2Server() throws Exception {
   }
 
   @Test
-  public void mockOAuth2ServerWrongPEMInTruststore() throws Exception {
+  public void mockOAuth2ServerWrongPEMInTruststore() {
     // JWTAuthPlugin throws SSLHandshakeException when fetching JWK, so this trips cluster init
     assertThrows(Exception.class, () -> configureClusterMockOauth(2, wrongPemFilePath, 2000));
   }
@@ -209,6 +208,7 @@ public void testMetrics() throws Exception {
     String baseUrl = cluster.getRandomJetty(random()).getBaseUrl().toString();
     CloseableHttpClient cl = HttpClientUtil.createClient(null);
 
+    String COLLECTION = "jwtColl";
     createCollection(cluster, COLLECTION);
 
     // Missing token
@@ -524,8 +524,10 @@ private static MockOAuth2Server createMockOAuthServer(Path p12CertPath, String s
           TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
       trustManagerFactory.init(keystore);
 
-      MockWebServerWrapper mockWebServerWrapper = new MockWebServerWrapper();
-      MockWebServer mockWebServer = mockWebServerWrapper.getMockWebServer();
+      MockWebServer mockWebServer;
+      try (MockWebServerWrapper mockWebServerWrapper = new MockWebServerWrapper()) {
+        mockWebServer = mockWebServerWrapper.getMockWebServer();
+      }
       SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
       sslContext.init(
           keyManagerFactory.getKeyManagers(), /*trustManagerFactory.getTrustManagers()*/
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
index 9e04865c6c3..211b75c1b5f 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java
@@ -636,11 +636,7 @@ public void initWithIdpCertWrongDoubleConfig() {
     authConf.put("trustedCerts", trustedPemCert);
     authConf.put("trustedCertsFile", "/path/to/cert.pem");
     plugin = new JWTAuthPlugin();
-    expectThrows(
-        SolrException.class,
-        () -> {
-          plugin.init(authConf);
-        });
+    expectThrows(SolrException.class, () -> plugin.init(authConf));
   }
 
   @Test
@@ -656,12 +652,11 @@ public void parseInvalidPemToX509() {
     expectThrows(
         SolrException.class,
         CertificateException.class,
-        () -> {
-          CryptoKeys.parseX509Certs(
-              new ByteArrayInputStream(
-                  ("-----BEGIN CERTIFICATE-----\n" + "foo\n" + "-----END CERTIFICATE-----\n")
-                      .getBytes(StandardCharsets.UTF_8)));
-        });
+        () ->
+            CryptoKeys.parseX509Certs(
+                new ByteArrayInputStream(
+                    ("-----BEGIN CERTIFICATE-----\n" + "foo\n" + "-----END CERTIFICATE-----\n")
+                        .getBytes(StandardCharsets.UTF_8))));
   }
 
   @Test
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
index 57c0261b897..6416b60c61c 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTIssuerConfigTest.java
@@ -37,6 +37,7 @@
 import org.junit.Test;
 import org.noggit.JSONUtil;
 
+@SuppressWarnings("HttpUrlsUsage")
 public class JWTIssuerConfigTest extends SolrTestCase {
   private JWTIssuerConfig testIssuer;
   private Map<String, Object> testIssuerConfigMap;
@@ -153,7 +154,7 @@ public void jwksUrlwithHttpBehaviors() {
 
     JWTIssuerConfig issuerConfig = new JWTIssuerConfig(issuerConfigMap);
 
-    SolrException e = expectThrows(SolrException.class, () -> issuerConfig.getHttpsJwks());
+    SolrException e = expectThrows(SolrException.class, issuerConfig::getHttpsJwks);
     assertEquals(400, e.code());
     assertEquals(
         "jwksUrl is using http protocol. HTTPS required for IDP communication. Please use SSL or start your nodes with -Dsolr.auth.jwt.allowOutboundHttp=true to allow HTTP for test purposes.",
diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTVerificationkeyResolverTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTVerificationkeyResolverTest.java
index 216154efbb6..3406e439dbb 100644
--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTVerificationkeyResolverTest.java
+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTVerificationkeyResolverTest.java
@@ -43,6 +43,7 @@
 import org.mockito.junit.MockitoRule;
 
 /** Tests the multi jwks resolver that can fetch keys from multiple JWKs */
+@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
 public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {
   private JWTVerificationkeyResolver resolver;
 
@@ -117,6 +118,7 @@ public void notFoundKey() throws JoseException {
     resolver.resolveKey(k5.getJws(), null);
   }
 
+  @SuppressWarnings("NewClassNamingConvention")
   public static class KeyHolder {
     private final RsaJsonWebKey key;
     private final String kid;

From adc03933add19659449f5aac0567ea7bb7c0e195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Tue, 26 Sep 2023 14:30:34 +0200
Subject: [PATCH 116/160] SOLR-16997: OTEL configurator NPE when SOLR_HOST not
 set (#1959)

---
 solr/CHANGES.txt                                              | 2 ++
 .../org/apache/solr/opentelemetry/OtelTracerConfigurator.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index aab89a0a118..5849c78767a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -211,6 +211,8 @@ Bug Fixes
 
 * SOLR-16991: Concurrent requests failing JWT authentication in Admin UI intermittently (Lamine Idjeraoui, janhoy)
 
+* SOLR-16997: OTEL configurator NPE when SOLR_HOST not set (janhoy)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
index 221cb571b7b..cdddd55c46d 100644
--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
@@ -65,7 +65,9 @@ void prepareConfiguration(NamedList<?> args) {
     setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
     setDefaultIfNotConfigured("OTEL_TRACES_SAMPLER", "parentbased_always_on");
     setDefaultIfNotConfigured("OTEL_PROPAGATORS", "tracecontext,baggage");
-    addOtelResourceAttributes(Map.of("host.name", System.getProperty("host")));
+    if (System.getProperty("host") != null) {
+      addOtelResourceAttributes(Map.of("host.name", System.getProperty("host")));
+    }
 
     final String currentConfig = getCurrentOtelConfigAsString();
     log.info("OpenTelemetry tracer enabled with configuration: {}", currentConfig);

From 61d41e5734fd8e965b3d7ba9ef5ed86e01d50325 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Tue, 26 Sep 2023 06:13:19 -0700
Subject: [PATCH 117/160] SOLR-16980 Connect to SOLR standalone with basic
 authentication (#1957)

---
 solr/CHANGES.txt                              |   2 +
 solr/prometheus-exporter/build.gradle         |   2 +-
 .../exporter/SolrClientFactory.java           |  41 +++---
 .../prometheus/exporter/SolrExporter.java     |  25 +++-
 .../exporter/SolrScrapeConfiguration.java     |  16 +++
 .../scraper/SolrCloudScraperTest.java         |  25 +---
 .../SolrStandaloneScraperBasicAuthTest.java   | 127 ++++++++++++++++++
 .../scraper/SolrStandaloneScraperTest.java    |  69 +++++-----
 ...onitoring-with-prometheus-and-grafana.adoc |  12 +-
 .../apache/solr/util/SolrClientTestRule.java  |  20 +++
 10 files changed, 271 insertions(+), 68 deletions(-)
 create mode 100644 solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperBasicAuthTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5849c78767a..ae656b4ad8f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -213,6 +213,8 @@ Bug Fixes
 
 * SOLR-16997: OTEL configurator NPE when SOLR_HOST not set (janhoy)
 
+* SOLR-16980: Connect to SOLR standalone with basic authentication (Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradle
index a64fa08147d..66beb70aed7 100644
--- a/solr/prometheus-exporter/build.gradle
+++ b/solr/prometheus-exporter/build.gradle
@@ -56,8 +56,8 @@ dependencies {
   testImplementation project(':solr:test-framework')
   testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
   testImplementation 'junit:junit'
+  testImplementation 'org.apache.lucene:lucene-test-framework'
 
-  testImplementation 'commons-io:commons-io'
   testImplementation 'org.apache.httpcomponents:httpclient'
   testImplementation 'org.apache.httpcomponents:httpcore'
 }
diff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
index f34aad926e3..c1c4a891593 100644
--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
@@ -17,6 +17,7 @@
 
 package org.apache.solr.prometheus.exporter;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -28,37 +29,43 @@
 
 public class SolrClientFactory {
 
-  private PrometheusExporterSettings settings;
+  private final PrometheusExporterSettings settings;
+  private final SolrScrapeConfiguration configuration;
 
-  public SolrClientFactory(PrometheusExporterSettings settings) {
+  public SolrClientFactory(
+      PrometheusExporterSettings settings, SolrScrapeConfiguration configuration) {
     this.settings = settings;
+    this.configuration = configuration;
   }
 
-  public Http2SolrClient createStandaloneSolrClient(String solrHost) {
-    Http2SolrClient http2SolrClient =
+  private static Http2SolrClient.Builder newHttp2SolrClientBuilder(
+      String solrHost, PrometheusExporterSettings settings, SolrScrapeConfiguration configuration) {
+    var builder =
         new Http2SolrClient.Builder(solrHost)
             .withIdleTimeout(settings.getHttpReadTimeout(), TimeUnit.MILLISECONDS)
             .withConnectionTimeout(settings.getHttpConnectionTimeout(), TimeUnit.MILLISECONDS)
-            .withResponseParser(new NoOpResponseParser("json"))
-            .build();
+            .withResponseParser(new NoOpResponseParser("json"));
+    if (configuration.getBasicAuthUser() != null) {
+      builder.withBasicAuthCredentials(
+          configuration.getBasicAuthUser(), configuration.getBasicAuthPwd());
+    }
+    return builder;
+  }
 
-    return http2SolrClient;
+  public Http2SolrClient createStandaloneSolrClient(String solrHost) {
+    return newHttp2SolrClientBuilder(solrHost, settings, configuration).build();
   }
 
   public CloudSolrClient createCloudSolrClient(String zookeeperConnectionString) {
     ConnectStringParser parser = new ConnectStringParser(zookeeperConnectionString);
 
+    List<String> zkHosts =
+        parser.getServerAddresses().stream()
+            .map(address -> address.getHostString() + ":" + address.getPort())
+            .collect(Collectors.toList());
     CloudSolrClient client =
-        new CloudHttp2SolrClient.Builder(
-                parser.getServerAddresses().stream()
-                    .map(address -> address.getHostString() + ":" + address.getPort())
-                    .collect(Collectors.toList()),
-                Optional.ofNullable(parser.getChrootPath()))
-            .withInternalClientBuilder(
-                new Http2SolrClient.Builder()
-                    .withIdleTimeout(settings.getHttpReadTimeout(), TimeUnit.MILLISECONDS)
-                    .withConnectionTimeout(
-                        settings.getHttpConnectionTimeout(), TimeUnit.MILLISECONDS))
+        new CloudHttp2SolrClient.Builder(zkHosts, Optional.ofNullable(parser.getChrootPath()))
+            .withInternalClientBuilder(newHttp2SolrClientBuilder(null, settings, configuration))
             .withResponseParser(new NoOpResponseParser("json"))
             .build();
 
diff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
index 2cad046fa44..946df18cd78 100644
--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
@@ -96,6 +96,13 @@ public class SolrExporter {
           + ARG_NUM_THREADS_DEFAULT
           + ".";
 
+  private static final String[] ARG_CREDENTIALS_FLAGS = {"-u", "--credentials"};
+  private static final String ARG_CREDENTIALS_METAVAR = "CREDENTIALS";
+  private static final String ARG_CREDENTIALS_DEST = "credentials";
+  private static final String ARG_CREDENTIALS_DEFAULT = "";
+  private static final String ARG_CREDENTIALS_HELP =
+      "Specify the credentials in the format username:password. Example: --credentials solr:SolrRocks";
+
   public static final CollectorRegistry defaultRegistry = new CollectorRegistry();
 
   private final int port;
@@ -161,7 +168,7 @@ private SolrScraper createScraper(
       SolrScrapeConfiguration configuration,
       PrometheusExporterSettings settings,
       String clusterId) {
-    SolrClientFactory factory = new SolrClientFactory(settings);
+    SolrClientFactory factory = new SolrClientFactory(settings, configuration);
 
     switch (configuration.getType()) {
       case STANDALONE:
@@ -242,6 +249,14 @@ public static void main(String[] args) {
         .setDefault(ARG_CLUSTER_ID_DEFAULT)
         .help(ARG_CLUSTER_ID_HELP);
 
+    parser
+        .addArgument(ARG_CREDENTIALS_FLAGS)
+        .metavar(ARG_CREDENTIALS_METAVAR)
+        .dest(ARG_CREDENTIALS_DEST)
+        .type(String.class)
+        .setDefault(ARG_CREDENTIALS_DEFAULT)
+        .help(ARG_CREDENTIALS_HELP);
+
     try {
       Namespace res = parser.parseArgs(args);
 
@@ -266,6 +281,14 @@ public static void main(String[] args) {
         clusterId = defaultClusterId;
       }
 
+      if (!res.getString(ARG_CREDENTIALS_DEST).isEmpty()) {
+        String credentials = res.getString(ARG_CREDENTIALS_DEST);
+        if (credentials.indexOf(':') > 0) {
+          String[] credentialsArray = credentials.split(":", 2);
+          scrapeConfiguration.withBasicAuthCredentials(credentialsArray[0], credentialsArray[1]);
+        }
+      }
+
       SolrExporter solrExporter =
           new SolrExporter(
               port,
diff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java
index a1e1fbdf27b..f61447b810d 100644
--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java
+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java
@@ -29,6 +29,8 @@ public enum ConnectionType {
   private final ConnectionType type;
   private final String zookeeperConnectionString;
   private final String solrHost;
+  private String basicAuthUser;
+  private String basicAuthPwd;
 
   private SolrScrapeConfiguration(
       ConnectionType type, String zookeeperConnectionString, String solrHost) {
@@ -57,6 +59,20 @@ public static SolrScrapeConfiguration standalone(String solrHost) {
     return new SolrScrapeConfiguration(ConnectionType.STANDALONE, null, solrHost);
   }
 
+  public SolrScrapeConfiguration withBasicAuthCredentials(String user, String password) {
+    this.basicAuthUser = user;
+    this.basicAuthPwd = password;
+    return this;
+  }
+
+  public String getBasicAuthUser() {
+    return basicAuthUser;
+  }
+
+  public String getBasicAuthPwd() {
+    return basicAuthPwd;
+  }
+
   @Override
   public String toString() {
     if (type == ConnectionType.CLOUD) {
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java
index f3839a1d8cd..2ebc3752cae 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java
@@ -21,15 +21,11 @@
 import io.prometheus.client.Collector;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.common.cloud.ClusterState;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
@@ -42,6 +38,7 @@
 import org.apache.solr.prometheus.exporter.MetricsConfiguration;
 import org.apache.solr.prometheus.exporter.PrometheusExporterSettings;
 import org.apache.solr.prometheus.exporter.SolrClientFactory;
+import org.apache.solr.prometheus.exporter.SolrScrapeConfiguration;
 import org.apache.solr.prometheus.utils.Helpers;
 import org.junit.After;
 import org.junit.Before;
@@ -55,16 +52,11 @@ public class SolrCloudScraperTest extends PrometheusExporterTestBase {
   private ExecutorService executor;
 
   private SolrCloudScraper createSolrCloudScraper() {
-    var solrClient =
-        new CloudSolrClient.Builder(
-                Collections.singletonList(cluster.getZkServer().getZkAddress()), Optional.empty())
-            .withResponseParser(new NoOpResponseParser("json"))
-            .build();
-
-    solrClient.connect();
-
-    SolrClientFactory factory = new SolrClientFactory(PrometheusExporterSettings.builder().build());
-
+    PrometheusExporterSettings settings = PrometheusExporterSettings.builder().build();
+    SolrScrapeConfiguration scrapeConfiguration =
+        SolrScrapeConfiguration.standalone(cluster.getZkServer().getZkAddress());
+    SolrClientFactory factory = new SolrClientFactory(settings, scrapeConfiguration);
+    var solrClient = factory.createCloudSolrClient(cluster.getZkServer().getZkAddress());
     return new SolrCloudScraper(solrClient, executor, factory, "test");
   }
 
@@ -93,10 +85,7 @@ public void setUp() throws Exception {
   public void tearDown() throws Exception {
     super.tearDown();
     IOUtils.closeQuietly(solrCloudScraper);
-    if (null != executor) {
-      executor.shutdownNow();
-      executor = null;
-    }
+    ExecutorUtil.shutdownNowAndAwaitTermination(executor);
   }
 
   @Test
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperBasicAuthTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperBasicAuthTest.java
new file mode 100644
index 00000000000..b08e771e7d3
--- /dev/null
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperBasicAuthTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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.prometheus.scraper;
+
+import io.prometheus.client.Collector;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.IOUtils;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.prometheus.PrometheusExporterTestBase;
+import org.apache.solr.prometheus.exporter.MetricsConfiguration;
+import org.apache.solr.prometheus.exporter.PrometheusExporterSettings;
+import org.apache.solr.prometheus.exporter.SolrClientFactory;
+import org.apache.solr.prometheus.exporter.SolrScrapeConfiguration;
+import org.apache.solr.prometheus.utils.Helpers;
+import org.apache.solr.util.SolrJettyTestRule;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+public class SolrStandaloneScraperBasicAuthTest extends SolrTestCaseJ4 {
+
+  @ClassRule public static final SolrJettyTestRule solrRule = new SolrJettyTestRule();
+
+  private static Http2SolrClient solrClient;
+  private static MetricsConfiguration configuration;
+  private static SolrStandaloneScraper solrScraper;
+  private static ExecutorService executor;
+
+  private static String user = "solr";
+  private static String pass = "SolrRocks";
+  private static String securityJson =
+      "{\n"
+          + "\"authentication\":{ \n"
+          + "   \"blockUnknown\": true, \n"
+          + "   \"class\":\"solr.BasicAuthPlugin\",\n"
+          + "   \"credentials\":{\"solr\":\"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c=\"}, \n"
+          + "   \"realm\":\"My Solr users\", \n"
+          + "   \"forwardCredentials\": false \n"
+          + "},\n"
+          + "\"authorization\":{\n"
+          + "   \"class\":\"solr.RuleBasedAuthorizationPlugin\",\n"
+          + "   \"permissions\":[{\"name\":\"security-edit\",\n"
+          + "      \"role\":\"admin\"}],\n"
+          + "   \"user-role\":{\"solr\":\"admin\"}\n"
+          + "}}";
+
+  @BeforeClass
+  public static void setupSolrHome() throws Exception {
+    Path solrHome = LuceneTestCase.createTempDir();
+    Files.write(solrHome.resolve("security.json"), securityJson.getBytes(StandardCharsets.UTF_8));
+    solrRule.startSolr(solrHome);
+
+    Path configSet = LuceneTestCase.createTempDir();
+    SolrStandaloneScraperTest.createConf(configSet);
+    solrRule
+        .newCollection()
+        .withConfigSet(configSet.toString())
+        .withBasicAuthCredentials(user, pass)
+        .create();
+
+    configuration =
+        Helpers.loadConfiguration("conf/prometheus-solr-exporter-scraper-test-config.xml");
+
+    PrometheusExporterSettings settings = PrometheusExporterSettings.builder().build();
+    SolrScrapeConfiguration scrapeConfiguration =
+        SolrScrapeConfiguration.standalone(solrRule.getBaseUrl())
+            .withBasicAuthCredentials(user, pass);
+    solrClient =
+        new SolrClientFactory(settings, scrapeConfiguration)
+            .createStandaloneSolrClient(solrRule.getBaseUrl());
+    executor =
+        ExecutorUtil.newMDCAwareFixedThreadPool(
+            25, new SolrNamedThreadFactory("solr-cloud-scraper-tests"));
+    solrScraper = new SolrStandaloneScraper(solrClient, executor, "test");
+
+    Helpers.indexAllDocs(solrClient);
+  }
+
+  @AfterClass
+  public static void cleanup() throws Exception {
+    // scraper also closes the client
+    IOUtils.closeQuietly(solrScraper);
+    ExecutorUtil.shutdownNowAndAwaitTermination(executor);
+  }
+
+  @Test
+  public void search() throws Exception {
+    List<Collector.MetricFamilySamples> samples =
+        solrScraper.search(configuration.getSearchConfiguration().get(0)).asList();
+
+    assertEquals(1, samples.size());
+
+    Collector.MetricFamilySamples sampleFamily = samples.get(0);
+    assertEquals("solr_facets_category", sampleFamily.name);
+    assertEquals(PrometheusExporterTestBase.FACET_VALUES.size(), sampleFamily.samples.size());
+
+    for (Collector.MetricFamilySamples.Sample sample : sampleFamily.samples) {
+      assertEquals(
+          PrometheusExporterTestBase.FACET_VALUES.get(sample.labelValues.get(0)),
+          sample.value,
+          0.001);
+    }
+  }
+}
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
index 1db0142c2ea..7f756c0fb3e 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
@@ -18,27 +18,34 @@
 package org.apache.solr.prometheus.scraper;
 
 import io.prometheus.client.Collector;
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
-import org.apache.commons.io.FileUtils;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.prometheus.PrometheusExporterTestBase;
 import org.apache.solr.prometheus.collector.MetricSamples;
 import org.apache.solr.prometheus.exporter.MetricsConfiguration;
+import org.apache.solr.prometheus.exporter.PrometheusExporterSettings;
+import org.apache.solr.prometheus.exporter.SolrClientFactory;
+import org.apache.solr.prometheus.exporter.SolrScrapeConfiguration;
 import org.apache.solr.prometheus.utils.Helpers;
-import org.apache.solr.util.RestTestBase;
+import org.apache.solr.util.SolrJettyTestRule;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 
-public class SolrStandaloneScraperTest extends RestTestBase {
+public class SolrStandaloneScraperTest extends SolrTestCaseJ4 {
+
+  @ClassRule public static final SolrJettyTestRule solrRule = new SolrJettyTestRule();
 
   private static MetricsConfiguration configuration;
   private static SolrStandaloneScraper solrScraper;
@@ -47,42 +54,45 @@ public class SolrStandaloneScraperTest extends RestTestBase {
 
   @BeforeClass
   public static void setupBeforeClass() throws Exception {
-    File tmpSolrHome = createTempDir().toFile();
-    tmpSolrHome.deleteOnExit();
-
-    FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
-
-    initCore("solrconfig.xml", "managed-schema");
+    solrRule.startSolr(LuceneTestCase.createTempDir());
 
-    createJettyAndHarness(
-        tmpSolrHome.getAbsolutePath(), "solrconfig.xml", "managed-schema", "/solr", true, null);
+    Path configSet = LuceneTestCase.createTempDir();
+    createConf(configSet);
+    solrRule.newCollection().withConfigSet(configSet.toString()).create();
 
+    PrometheusExporterSettings settings = PrometheusExporterSettings.builder().build();
+    SolrScrapeConfiguration scrapeConfiguration =
+        SolrScrapeConfiguration.standalone(solrRule.getBaseUrl());
+    solrClient =
+        new SolrClientFactory(settings, scrapeConfiguration)
+            .createStandaloneSolrClient(solrRule.getBaseUrl());
     executor =
         ExecutorUtil.newMDCAwareFixedThreadPool(
             25, new SolrNamedThreadFactory("solr-cloud-scraper-tests"));
     configuration =
         Helpers.loadConfiguration("conf/prometheus-solr-exporter-scraper-test-config.xml");
-
-    solrClient =
-        new Http2SolrClient.Builder(restTestHarness.getAdminURL())
-            .withResponseParser(new NoOpResponseParser("json"))
-            .build();
     solrScraper = new SolrStandaloneScraper(solrClient, executor, "test");
 
     Helpers.indexAllDocs(solrClient);
   }
 
+  public static void createConf(Path configSet) throws IOException {
+    Path subHome = configSet.resolve("conf");
+    Files.createDirectories(subHome);
+
+    Path top = SolrTestCaseJ4.TEST_PATH().resolve("collection1").resolve("conf");
+    Files.copy(top.resolve("managed-schema.xml"), subHome.resolve("schema.xml"));
+    Files.copy(top.resolve("solrconfig.xml"), subHome.resolve("solrconfig.xml"));
+
+    Files.copy(top.resolve("stopwords.txt"), subHome.resolve("stopwords.txt"));
+    Files.copy(top.resolve("synonyms.txt"), subHome.resolve("synonyms.txt"));
+  }
+
   @AfterClass
-  public static void cleanUp() throws Exception {
+  public static void cleanup() throws Exception {
+    // scraper also closes the client
     IOUtils.closeQuietly(solrScraper);
-    IOUtils.closeQuietly(solrClient);
-    cleanUpHarness();
-    if (null != executor) {
-      executor.shutdownNow();
-      executor = null;
-    }
-    solrScraper = null;
-    solrClient = null;
+    ExecutorUtil.shutdownNowAndAwaitTermination(executor);
   }
 
   @Test
@@ -107,8 +117,7 @@ public void pingCores() throws Exception {
     assertEquals(1, samples.samples.size());
     assertEquals(1.0, samples.samples.get(0).value, 0.001);
     assertEquals(List.of("base_url", "cluster_id"), samples.samples.get(0).labelNames);
-    assertEquals(
-        List.of(restTestHarness.getAdminURL(), "test"), samples.samples.get(0).labelValues);
+    assertEquals(List.of(solrRule.getBaseUrl(), "test"), samples.samples.get(0).labelValues);
   }
 
   @Test
@@ -127,7 +136,7 @@ public void metricsForHost() throws Exception {
     assertEquals(1, metricsByHost.size());
 
     List<Collector.MetricFamilySamples> replicaSamples =
-        metricsByHost.get(restTestHarness.getAdminURL()).asList();
+        metricsByHost.get(solrRule.getBaseUrl()).asList();
 
     assertEquals(1, replicaSamples.size());
 
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adoc
index b05631f89a6..3e484647c5d 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adoc
@@ -40,6 +40,8 @@ See the section below <<Prometheus Configuration>>
 == Starting the Exporter
 You can start `solr-exporter` by running `./bin/solr-exporter` (Linux) or `.\bin\solr-exporter.cmd` (Windows) from the `prometheus-exporter/` directory.
 
+The metrics exposed by `solr-exporter` can be seen at the metrics endpoint: `\http://localhost:8983/solr/admin/metrics`.
+
 See the commands below depending on your operating system and Solr operating mode:
 
 [.dynamic-tabs]
@@ -171,7 +173,15 @@ The freshness of the metrics can be improved by reducing the scrape interval but
 +
 A unique ID for the cluster to monitor. This ID will be added to all metrics as a label `cluster_id` and can be used as a filter in the Grafana dashboard if you operate multiple Solr clusters reporting to the same Prometheus instance. If this option is omitted, a hash of the `baseUrl` or `zkHost` will be used as ID by default.
 
-The metrics exposed by `solr-exporter` can be seen at the metrics endpoint: `\http://localhost:8983/solr/admin/metrics`.
+`-u`, `--credentials`, `$CREDENTIALS`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: none
+|===
++
+Specify the credentials in the format `username:password`. Example: `--credentials solr:SolrRocks`.
+
 
 === Environment Variable Options
 
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
index a0407093bb4..cb2d74ff204 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java
@@ -61,6 +61,8 @@ public class NewCollectionBuilder {
     private String configSet;
     private String configFile;
     private String schemaFile;
+    private String basicAuthUser;
+    private String basicAuthPwd;
 
     public NewCollectionBuilder(String name) {
       this.name = name;
@@ -93,6 +95,12 @@ public NewCollectionBuilder withSchemaFile(String schemaFile) {
       return this;
     }
 
+    public NewCollectionBuilder withBasicAuthCredentials(String user, String password) {
+      this.basicAuthUser = user;
+      this.basicAuthPwd = password;
+      return this;
+    }
+
     public String getName() {
       return name;
     }
@@ -112,6 +120,14 @@ public String getSchemaFile() {
     public void create() throws SolrServerException, IOException {
       SolrClientTestRule.this.create(this);
     }
+
+    public String getBasicAuthUser() {
+      return basicAuthUser;
+    }
+
+    public String getBasicAuthPwd() {
+      return basicAuthPwd;
+    }
   }
 
   protected void create(NewCollectionBuilder b) throws SolrServerException, IOException {
@@ -132,6 +148,10 @@ protected void create(NewCollectionBuilder b) throws SolrServerException, IOExce
       req.setSchemaName(b.getSchemaFile());
     }
 
+    if (b.getBasicAuthUser() != null) {
+      req.setBasicAuthCredentials(b.getBasicAuthUser(), b.getBasicAuthPwd());
+    }
+
     req.process(getAdminClient());
   }
 

From dafbe800c2f74086b53269f5b5a62988abadb717 Mon Sep 17 00:00:00 2001
From: Michael Gibney <michael@michaelgibney.net>
Date: Tue, 26 Sep 2023 10:34:44 -0400
Subject: [PATCH 118/160] SOLR-16989: Optimize and consolidate reuse of
 DocValues iterators for value retrieval (#1938)

---
 solr/CHANGES.txt                              |   1 +
 .../component/RealTimeGetComponent.java       |  14 +-
 .../solr/handler/export/BoolFieldWriter.java  |   8 +-
 .../solr/handler/export/DateFieldWriter.java  |  53 +--
 .../handler/export/DoubleFieldWriter.java     |  41 +--
 .../solr/handler/export/ExportWriter.java     |  44 ++-
 .../solr/handler/export/FloatFieldWriter.java |  42 +--
 .../solr/handler/export/IntFieldWriter.java   |  31 +-
 .../solr/handler/export/LongFieldWriter.java  |  37 +-
 .../solr/handler/export/MultiFieldWriter.java |  64 ++--
 .../handler/export/StringFieldWriter.java     |  34 +-
 .../solr/search/DocValuesIteratorCache.java   | 319 ++++++++++++++++++
 .../solr/search/SolrDocumentFetcher.java      |  74 ++--
 .../search/TestDocValuesIteratorCache.java    | 154 +++++++++
 14 files changed, 660 insertions(+), 256 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/TestDocValuesIteratorCache.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ae656b4ad8f..e8382b835ff 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -149,6 +149,7 @@ Optimizations
 
 * SOLR-16265: reduce memory usage of ContentWriter based requests in Http2SolrClient (Alex Deparvu, Kevin Risden, David Smiley)
 
+* SOLR-16989: Optimize and consolidate reuse of DocValues iterators for value retrieval (Michael Gibney)
 
 Bug Fixes
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 7944f4840ce..a34cd99d8be 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -81,6 +81,7 @@
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.schema.SchemaField;
 import org.apache.solr.search.DocList;
+import org.apache.solr.search.DocValuesIteratorCache;
 import org.apache.solr.search.QueryUtils;
 import org.apache.solr.search.ReturnFields;
 import org.apache.solr.search.SolrDocumentFetcher;
@@ -238,6 +239,7 @@ public void process(ResponseBuilder rb) throws IOException {
 
       boolean opennedRealtimeSearcher = false;
       BytesRefBuilder idBytes = new BytesRefBuilder();
+      DocValuesIteratorCache reuseDvIters = null;
       for (String idStr : reqIds.allIds) {
         fieldType.readableToIndexed(idStr, idBytes);
         // if _route_ is passed, id is a child doc.  TODO remove in SOLR-15064
@@ -348,7 +350,11 @@ public void process(ResponseBuilder rb) throws IOException {
             searcherInfo.getSearcher().doc(docid, rsp.getReturnFields().getLuceneFieldNames());
         SolrDocument doc = toSolrDoc(luceneDocument, core.getLatestSchema());
         SolrDocumentFetcher docFetcher = searcherInfo.getSearcher().getDocFetcher();
-        docFetcher.decorateDocValueFields(doc, docid, docFetcher.getNonStoredDVs(true));
+        if (reuseDvIters == null) {
+          reuseDvIters = new DocValuesIteratorCache(searcherInfo.getSearcher());
+        }
+        docFetcher.decorateDocValueFields(
+            doc, docid, docFetcher.getNonStoredDVs(true), reuseDvIters);
         if (null != transformer) {
           if (null == resultContext) {
             // either first pass, or we've re-opened searcher - either way now we setContext
@@ -575,7 +581,11 @@ private static SolrDocument mergePartialDocWithFullDocFromIndex(
       if (!doc.containsKey(VERSION_FIELD)) {
         searcher
             .getDocFetcher()
-            .decorateDocValueFields(doc, docid, Collections.singleton(VERSION_FIELD));
+            .decorateDocValueFields(
+                doc,
+                docid,
+                Collections.singleton(VERSION_FIELD),
+                new DocValuesIteratorCache(searcher, false));
       }
 
       long docVersion = (long) doc.getFirstValue(VERSION_FIELD);
diff --git a/solr/core/src/java/org/apache/solr/handler/export/BoolFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/BoolFieldWriter.java
index fbeccdc4c0d..cf32497b5d7 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/BoolFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/BoolFieldWriter.java
@@ -21,10 +21,14 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.schema.FieldType;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class BoolFieldWriter extends StringFieldWriter {
-  public BoolFieldWriter(String field, FieldType fieldType) {
-    super(field, fieldType);
+  public BoolFieldWriter(
+      String field,
+      FieldType fieldType,
+      DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
+    super(field, fieldType, docValuesCache);
   }
 
   @Override
diff --git a/solr/core/src/java/org/apache/solr/handler/export/DateFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/DateFieldWriter.java
index c86f0eacac1..7e32e98d5b8 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/DateFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/DateFieldWriter.java
@@ -17,58 +17,19 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
 import java.util.Date;
-import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.NumericDocValues;
 import org.apache.solr.common.MapWriter;
+import org.apache.solr.search.DocValuesIteratorCache;
 
-class DateFieldWriter extends FieldWriter {
-  private String field;
-  private IntObjectHashMap<NumericDocValues> docValuesCache = new IntObjectHashMap<>();
-
-  public DateFieldWriter(String field) {
-    this.field = field;
+class DateFieldWriter extends LongFieldWriter {
+  public DateFieldWriter(
+      String field, DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
+    super(field, docValuesCache);
   }
 
   @Override
-  public boolean write(
-      SortDoc sortDoc, LeafReaderContext readerContext, MapWriter.EntryWriter ew, int fieldIndex)
-      throws IOException {
-    Long val;
-    SortValue sortValue = sortDoc.getSortValue(this.field);
-    if (sortValue != null) {
-      if (sortValue.isPresent()) {
-        val = (long) sortValue.getCurrentValue();
-      } else { // empty-value
-        return false;
-      }
-    } else {
-      // field is not part of 'sort' param, but part of 'fl' param
-      int readerOrd = readerContext.ord;
-      NumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        NumericDocValues numericDocValues = docValuesCache.get(readerOrd);
-        if (numericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = numericDocValues;
-        }
-      }
-
-      if (vals == null) {
-        vals = DocValues.getNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-
-      if (vals.advance(sortDoc.docId) == sortDoc.docId) {
-        val = vals.longValue();
-      } else {
-        return false;
-      }
-    }
-    ew.put(this.field, new Date(val));
-    return true;
+  protected void doWrite(MapWriter.EntryWriter ew, long val) throws IOException {
+    ew.put(field, new Date(val));
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/export/DoubleFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/DoubleFieldWriter.java
index 50cbdddb385..e439560894b 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/DoubleFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/DoubleFieldWriter.java
@@ -17,57 +17,46 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.solr.common.MapWriter;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class DoubleFieldWriter extends FieldWriter {
-  private String field;
-  private IntObjectHashMap<NumericDocValues> docValuesCache = new IntObjectHashMap<>();
+  private final String field;
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
-  public DoubleFieldWriter(String field) {
+  public DoubleFieldWriter(
+      String field, DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
   public boolean write(
       SortDoc sortDoc, LeafReaderContext readerContext, MapWriter.EntryWriter ew, int fieldIndex)
       throws IOException {
+    double val;
     SortValue sortValue = sortDoc.getSortValue(this.field);
     if (sortValue != null) {
       if (sortValue.isPresent()) {
-        double val = (double) sortValue.getCurrentValue();
-        ew.put(this.field, val);
-        return true;
+        val = (double) sortValue.getCurrentValue();
       } else { // empty-value
         return false;
       }
     } else {
       // field is not part of 'sort' param, but part of 'fl' param
-      int readerOrd = readerContext.ord;
-      NumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        NumericDocValues numericDocValues = docValuesCache.get(readerOrd);
-        if (numericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = numericDocValues;
-        }
-      }
-
-      if (vals == null) {
-        vals = DocValues.getNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-      if (vals.advance(sortDoc.docId) == sortDoc.docId) {
-        long val = vals.longValue();
-        ew.put(this.field, Double.longBitsToDouble(val));
-        return true;
+      NumericDocValues vals =
+          docValuesCache.getNumericDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
+      if (vals != null) {
+        val = Double.longBitsToDouble(vals.longValue());
       } else {
         return false;
       }
     }
+    ew.put(this.field, val);
+    return true;
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 8f38c94942e..51ba5551b69 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -74,6 +74,7 @@
 import org.apache.solr.schema.SchemaField;
 import org.apache.solr.schema.SortableTextField;
 import org.apache.solr.schema.StrField;
+import org.apache.solr.search.DocValuesIteratorCache;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.search.SortSpec;
 import org.apache.solr.search.SyntaxError;
@@ -99,6 +100,14 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
 
   public static final int DEFAULT_BATCH_SIZE = 30000;
   public static final int DEFAULT_QUEUE_SIZE = 150000;
+  private static final FieldWriter EMPTY_FIELD_WRITER =
+      new FieldWriter() {
+        @Override
+        public boolean write(
+            SortDoc sortDoc, LeafReaderContext readerContext, EntryWriter out, int fieldIndex) {
+          return false;
+        }
+      };
 
   private OutputStreamWriter respWriter;
   final SolrQueryRequest req;
@@ -480,6 +489,7 @@ public FieldWriter[] getFieldWriters(String[] fields, SolrIndexSearcher searcher
       throws IOException {
     IndexSchema schema = searcher.getSchema();
     FieldWriter[] writers = new FieldWriter[fields.length];
+    DocValuesIteratorCache dvIterCache = new DocValuesIteratorCache(searcher, false);
     for (int i = 0; i < fields.length; i++) {
       String field = fields[i];
       SchemaField schemaField = null;
@@ -501,47 +511,51 @@ public FieldWriter[] getFieldWriters(String[] fields, SolrIndexSearcher searcher
             schemaField + " Must have useDocValuesAsStored='true' to be used with export writer");
       }
 
-      if (fieldType instanceof IntValueFieldType) {
+      DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache = dvIterCache.getSupplier(field);
+
+      if (docValuesCache == null) {
+        writers[i] = EMPTY_FIELD_WRITER;
+      } else if (fieldType instanceof IntValueFieldType) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true, docValuesCache);
         } else {
-          writers[i] = new IntFieldWriter(field);
+          writers[i] = new IntFieldWriter(field, docValuesCache);
         }
       } else if (fieldType instanceof LongValueFieldType) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true, docValuesCache);
         } else {
-          writers[i] = new LongFieldWriter(field);
+          writers[i] = new LongFieldWriter(field, docValuesCache);
         }
       } else if (fieldType instanceof FloatValueFieldType) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true, docValuesCache);
         } else {
-          writers[i] = new FloatFieldWriter(field);
+          writers[i] = new FloatFieldWriter(field, docValuesCache);
         }
       } else if (fieldType instanceof DoubleValueFieldType) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true, docValuesCache);
         } else {
-          writers[i] = new DoubleFieldWriter(field);
+          writers[i] = new DoubleFieldWriter(field, docValuesCache);
         }
       } else if (fieldType instanceof StrField || fieldType instanceof SortableTextField) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, false);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, false, docValuesCache);
         } else {
-          writers[i] = new StringFieldWriter(field, fieldType);
+          writers[i] = new StringFieldWriter(field, fieldType, docValuesCache);
         }
       } else if (fieldType instanceof DateValueFieldType) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, false);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, false, docValuesCache);
         } else {
-          writers[i] = new DateFieldWriter(field);
+          writers[i] = new DateFieldWriter(field, docValuesCache);
         }
       } else if (fieldType instanceof BoolField) {
         if (multiValued) {
-          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true);
+          writers[i] = new MultiFieldWriter(field, fieldType, schemaField, true, docValuesCache);
         } else {
-          writers[i] = new BoolFieldWriter(field, fieldType);
+          writers[i] = new BoolFieldWriter(field, fieldType, docValuesCache);
         }
       } else {
         throw new IOException(
diff --git a/solr/core/src/java/org/apache/solr/handler/export/FloatFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/FloatFieldWriter.java
index 48bd9d632ed..a60c14e6b0a 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/FloatFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/FloatFieldWriter.java
@@ -17,58 +17,46 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.solr.common.MapWriter;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class FloatFieldWriter extends FieldWriter {
-  private String field;
-  private IntObjectHashMap<NumericDocValues> docValuesCache = new IntObjectHashMap<>();
+  private final String field;
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
-  public FloatFieldWriter(String field) {
+  public FloatFieldWriter(
+      String field, DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
   public boolean write(
       SortDoc sortDoc, LeafReaderContext readerContext, MapWriter.EntryWriter ew, int fieldIndex)
       throws IOException {
+    float val;
     SortValue sortValue = sortDoc.getSortValue(this.field);
     if (sortValue != null) {
       if (sortValue.isPresent()) {
-        float val = (float) sortValue.getCurrentValue();
-        ew.put(this.field, val);
-        return true;
+        val = (float) sortValue.getCurrentValue();
       } else { // empty-value
         return false;
       }
     } else {
       // field is not part of 'sort' param, but part of 'fl' param
-      int readerOrd = readerContext.ord;
-      NumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        NumericDocValues numericDocValues = docValuesCache.get(readerOrd);
-        if (numericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = numericDocValues;
-        }
-      }
-
-      if (vals == null) {
-        vals = DocValues.getNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-
-      if (vals.advance(sortDoc.docId) == sortDoc.docId) {
-        int val = (int) vals.longValue();
-        ew.put(this.field, Float.intBitsToFloat(val));
-        return true;
+      NumericDocValues vals =
+          docValuesCache.getNumericDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
+      if (vals != null) {
+        val = Float.intBitsToFloat((int) vals.longValue());
       } else {
         return false;
       }
     }
+    ew.put(this.field, val);
+    return true;
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/export/IntFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/IntFieldWriter.java
index 1ecef85f21b..bf0396d4ab8 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/IntFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/IntFieldWriter.java
@@ -17,19 +17,20 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.solr.common.MapWriter;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class IntFieldWriter extends FieldWriter {
-  private String field;
-  private IntObjectHashMap<NumericDocValues> docValuesCache = new IntObjectHashMap<>();
+  private final String field;
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
-  public IntFieldWriter(String field) {
+  public IntFieldWriter(
+      String field, DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
@@ -46,22 +47,10 @@ public boolean write(
       }
     } else {
       // field is not part of 'sort' param, but part of 'fl' param
-      int readerOrd = readerContext.ord;
-      NumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        NumericDocValues numericDocValues = docValuesCache.get(readerOrd);
-        if (numericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = numericDocValues;
-        }
-      }
-
-      if (vals == null) {
-        vals = DocValues.getNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-
-      if (vals.advance(sortDoc.docId) == sortDoc.docId) {
+      NumericDocValues vals =
+          docValuesCache.getNumericDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
+      if (vals != null) {
         val = (int) vals.longValue();
       } else {
         return false;
diff --git a/solr/core/src/java/org/apache/solr/handler/export/LongFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/LongFieldWriter.java
index 9c18a72bd6d..7961549477c 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/LongFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/LongFieldWriter.java
@@ -17,20 +17,21 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.solr.common.MapWriter;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class LongFieldWriter extends FieldWriter {
-  private String field;
+  protected final String field;
 
-  private IntObjectHashMap<NumericDocValues> docValuesCache = new IntObjectHashMap<>();
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
-  public LongFieldWriter(String field) {
+  public LongFieldWriter(
+      String field, DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
@@ -47,28 +48,20 @@ public boolean write(
       }
     } else {
       // field is not part of 'sort' param, but part of 'fl' param
-      int readerOrd = readerContext.ord;
-      NumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        NumericDocValues numericDocValues = docValuesCache.get(readerOrd);
-        if (numericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = numericDocValues;
-        }
-      }
-
-      if (vals == null) {
-        vals = DocValues.getNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-
-      if (vals.advance(sortDoc.docId) == sortDoc.docId) {
+      NumericDocValues vals =
+          docValuesCache.getNumericDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
+      if (vals != null) {
         val = vals.longValue();
       } else {
         return false;
       }
     }
-    ew.put(field, val);
+    doWrite(ew, val);
     return true;
   }
+
+  protected void doWrite(MapWriter.EntryWriter ew, long val) throws IOException {
+    ew.put(field, val);
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java
index 86dd8ba82e3..7f5bdee4899 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java
@@ -17,11 +17,9 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
 import java.util.Date;
 import java.util.function.LongFunction;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;
@@ -33,18 +31,23 @@
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.schema.FieldType;
 import org.apache.solr.schema.SchemaField;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class MultiFieldWriter extends FieldWriter {
-  private String field;
-  private FieldType fieldType;
-  private SchemaField schemaField;
-  private boolean numeric;
-  private CharsRefBuilder cref = new CharsRefBuilder();
+  private final String field;
+  private final FieldType fieldType;
+  private final SchemaField schemaField;
+  private final boolean numeric;
+  private final CharsRefBuilder cref = new CharsRefBuilder();
   private final LongFunction<Object> bitsToValue;
-  private IntObjectHashMap<Object> docValuesCache = new IntObjectHashMap<>();
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
   public MultiFieldWriter(
-      String field, FieldType fieldType, SchemaField schemaField, boolean numeric) {
+      String field,
+      FieldType fieldType,
+      SchemaField schemaField,
+      boolean numeric,
+      DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
     this.fieldType = fieldType;
     this.schemaField = schemaField;
@@ -54,6 +57,7 @@ public MultiFieldWriter(
     } else {
       bitsToValue = null;
     }
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
@@ -61,24 +65,13 @@ public boolean write(
       SortDoc sortDoc, LeafReaderContext readerContext, MapWriter.EntryWriter out, int fieldIndex)
       throws IOException {
     if (this.fieldType.isPointField()) {
-      int readerOrd = readerContext.ord;
-      SortedNumericDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        SortedNumericDocValues sortedNumericDocValues =
-            (SortedNumericDocValues) docValuesCache.get(readerOrd);
-        if (sortedNumericDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = sortedNumericDocValues;
-        }
-      }
-
+      SortedNumericDocValues vals =
+          docValuesCache.getSortedNumericDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
       if (vals == null) {
-        vals = DocValues.getSortedNumeric(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
+        return false;
       }
 
-      if (!vals.advanceExact(sortDoc.docId)) return false;
-
       final SortedNumericDocValues docVals = vals;
 
       out.put(
@@ -91,32 +84,21 @@ public boolean write(
               });
       return true;
     } else {
-      int readerOrd = readerContext.ord;
-      SortedSetDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        SortedSetDocValues sortedSetDocValues = (SortedSetDocValues) docValuesCache.get(readerOrd);
-        if (sortedSetDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = sortedSetDocValues;
-        }
-      }
-
+      SortedSetDocValues vals =
+          docValuesCache.getSortedSetDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
       if (vals == null) {
-        vals = DocValues.getSortedSet(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
+        return false;
       }
 
-      if (vals.advance(sortDoc.docId) != sortDoc.docId) return false;
-
       final SortedSetDocValues docVals = vals;
 
       out.put(
           this.field,
           (IteratorWriter)
               w -> {
-                long o;
-                while ((o = docVals.nextOrd()) != SortedSetDocValues.NO_MORE_ORDS) {
-                  BytesRef ref = docVals.lookupOrd(o);
+                for (int i = 0, count = docVals.docValueCount(); i < count; i++) {
+                  BytesRef ref = docVals.lookupOrd(docVals.nextOrd());
                   fieldType.indexedToReadable(ref, cref);
                   IndexableField f = fieldType.createField(schemaField, cref.toString());
                   if (f == null) w.add(cref.toString());
diff --git a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
index 7e15704f32d..2f8d0963e3a 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
@@ -17,9 +17,7 @@
 
 package org.apache.solr.handler.export;
 
-import com.carrotsearch.hppc.IntObjectHashMap;
 import java.io.IOException;
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.util.BytesRef;
@@ -28,13 +26,14 @@
 import org.apache.solr.common.util.ByteArrayUtf8CharSequence;
 import org.apache.solr.common.util.JavaBinCodec;
 import org.apache.solr.schema.FieldType;
+import org.apache.solr.search.DocValuesIteratorCache;
 
 class StringFieldWriter extends FieldWriter {
-  protected String field;
-  private FieldType fieldType;
+  protected final String field;
+  private final FieldType fieldType;
   private BytesRef lastRef;
   private int lastOrd = -1;
-  private IntObjectHashMap<SortedDocValues> docValuesCache = new IntObjectHashMap<>();
+  private final DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache;
 
   protected CharsRefBuilder cref = new CharsRefBuilder();
   final ByteArrayUtf8CharSequence utf8 =
@@ -50,9 +49,13 @@ public String toString() {
         }
       };
 
-  public StringFieldWriter(String field, FieldType fieldType) {
+  public StringFieldWriter(
+      String field,
+      FieldType fieldType,
+      DocValuesIteratorCache.FieldDocValuesSupplier docValuesCache) {
     this.field = field;
     this.fieldType = fieldType;
+    this.docValuesCache = docValuesCache;
   }
 
   @Override
@@ -82,23 +85,10 @@ public boolean write(
     }
 
     if (ref == null) {
-      // Reuse the last DocValues object if possible
-      int readerOrd = readerContext.ord;
-      SortedDocValues vals = null;
-      if (docValuesCache.containsKey(readerOrd)) {
-        SortedDocValues sortedDocValues = docValuesCache.get(readerOrd);
-        if (sortedDocValues.docID() < sortDoc.docId) {
-          // We have not advanced beyond the current docId so we can use this docValues.
-          vals = sortedDocValues;
-        }
-      }
-
+      SortedDocValues vals =
+          docValuesCache.getSortedDocValues(
+              sortDoc.docId, readerContext.reader(), readerContext.ord);
       if (vals == null) {
-        vals = DocValues.getSorted(readerContext.reader(), this.field);
-        docValuesCache.put(readerOrd, vals);
-      }
-
-      if (vals.advance(sortDoc.docId) != sortDoc.docId) {
         return false;
       }
 
diff --git a/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java b/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java
new file mode 100644
index 00000000000..eba8a731881
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java
@@ -0,0 +1,319 @@
+/*
+ * 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.util.Arrays;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.function.Function;
+import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.DocValuesType;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.NumericDocValues;
+import org.apache.lucene.index.SortedDocValues;
+import org.apache.lucene.index.SortedNumericDocValues;
+import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.solr.schema.SchemaField;
+
+/**
+ * A helper class for random-order value access over docValues (such as in the case of
+ * useDocValuesAsStored). This class optimizes access by reusing DocValues iterators where possible,
+ * and by narrowing the scope of DocValues per-field/per-segment (shortcircuiting attempts to
+ * `advance()` to docs that are known to have no value for a given field).
+ */
+public class DocValuesIteratorCache {
+
+  private static final EnumMap<DocValuesType, IOBiFunction<LeafReader, String, DocIdSetIterator>>
+      funcMap = new EnumMap<>(DocValuesType.class);
+
+  static {
+    funcMap.put(DocValuesType.NUMERIC, LeafReader::getNumericDocValues);
+    funcMap.put(DocValuesType.BINARY, LeafReader::getBinaryDocValues);
+    funcMap.put(
+        DocValuesType.SORTED,
+        (r, f) -> {
+          SortedDocValues dvs = r.getSortedDocValues(f);
+          return dvs == null || dvs.getValueCount() < 1 ? null : dvs;
+        });
+    funcMap.put(DocValuesType.SORTED_NUMERIC, LeafReader::getSortedNumericDocValues);
+    funcMap.put(
+        DocValuesType.SORTED_SET,
+        (r, f) -> {
+          SortedSetDocValues dvs = r.getSortedSetDocValues(f);
+          return dvs == null || dvs.getValueCount() < 1 ? null : dvs;
+        });
+  }
+
+  private static final FieldDocValuesSupplier NONE = new FieldDocValuesSupplier(null, null, 0);
+
+  private final SolrIndexSearcher searcher;
+  private final int nLeaves;
+  private final Function<String, FieldDocValuesSupplier> getSupplier;
+
+  /**
+   * Construct an instance used to optimize random-order DocValues iterator access for the specified
+   * searcher.
+   */
+  public DocValuesIteratorCache(SolrIndexSearcher searcher) {
+    this(searcher, true);
+  }
+
+  /**
+   * Construct an instance used to optimize random-order DocValues iterator access for the specified
+   * searcher.
+   *
+   * @param searcher the associated searcher
+   * @param cache if false, caching is disabled (useful mainly for single-field, single-doc access).
+   */
+  public DocValuesIteratorCache(SolrIndexSearcher searcher, boolean cache) {
+    this.searcher = searcher;
+    this.nLeaves = searcher.getTopReaderContext().leaves().size();
+    if (cache) {
+      HashMap<String, FieldDocValuesSupplier> map = new HashMap<>();
+      getSupplier = (f) -> map.computeIfAbsent(f, this::newEntry);
+    } else {
+      getSupplier = this::newEntry;
+    }
+  }
+
+  public FieldDocValuesSupplier getSupplier(String fieldName) {
+    FieldDocValuesSupplier ret = getSupplier.apply(fieldName);
+    return ret == NONE ? null : ret;
+  }
+
+  private FieldDocValuesSupplier newEntry(String fieldName) {
+    final SchemaField schemaField = searcher.getSchema().getFieldOrNull(fieldName);
+    FieldInfo fi = searcher.getFieldInfos().fieldInfo(fieldName);
+    if (schemaField == null || !schemaField.hasDocValues() || fi == null) {
+      return NONE; // Searcher doesn't have info about this field, hence ignore it.
+    }
+    final DocValuesType dvType = fi.getDocValuesType();
+    switch (dvType) {
+      case NUMERIC:
+      case BINARY:
+      case SORTED:
+      case SORTED_NUMERIC:
+      case SORTED_SET:
+        return new FieldDocValuesSupplier(schemaField, dvType, nLeaves);
+      default:
+        return NONE;
+    }
+  }
+
+  private interface IOBiFunction<T, U, R> {
+    R apply(T t, U u) throws IOException;
+  }
+
+  /**
+   * Supplies (and coordinates arbitrary-order value retrieval over) docValues iterators for a
+   * particular field, encapsulating the logic of iterator creation, reuse/caching, and advancing.
+   * Returned iterators are already positioned, and should <i>not</i> be advanced (though
+   * multi-valued iterators may consume/iterate over values/ords).
+   *
+   * <p>Instances of this class are specifically designed to support arbitrary-order value
+   * retrieval, (e.g., useDocValuesAsStored, ExportWriter) and should generally not be used for
+   * ordered retrieval (although ordered retrieval would work perfectly fine, and would add only
+   * minimal overhead).
+   */
+  public static class FieldDocValuesSupplier {
+    public final SchemaField schemaField;
+    public final DocValuesType type;
+    private final int[] minLocalIds;
+    private final int[] ceilingIds;
+    private final int[] noMatchSince;
+    private final DocIdSetIterator[] perLeaf;
+
+    private FieldDocValuesSupplier(SchemaField schemaField, DocValuesType type, int nLeaves) {
+      this.schemaField = schemaField;
+      this.type = type;
+      this.minLocalIds = new int[nLeaves];
+      Arrays.fill(minLocalIds, -1);
+      this.ceilingIds = new int[nLeaves];
+      Arrays.fill(ceilingIds, DocIdSetIterator.NO_MORE_DOCS);
+      this.noMatchSince = new int[nLeaves];
+      this.perLeaf = new DocIdSetIterator[nLeaves];
+    }
+
+    /**
+     * This method does the actual work caching iterators, determining eligibility for re-use,
+     * pulling new iterators if necessary, and determining if we have a hit for a particular doc id.
+     */
+    private DocIdSetIterator getDocValues(
+        int localId,
+        LeafReader leafReader,
+        int leafOrd,
+        boolean singleValued,
+        IOBiFunction<LeafReader, String, DocIdSetIterator> dvFunction)
+        throws IOException {
+      int min = minLocalIds[leafOrd];
+      DocIdSetIterator dv;
+      if (min == -1) {
+        // we are not yet initialized for this field/leaf.
+        dv = dvFunction.apply(leafReader, schemaField.getName());
+        if (dv == null) {
+          minLocalIds[leafOrd] = DocIdSetIterator.NO_MORE_DOCS; // cache absence of this field
+          return null;
+        }
+        // on field/leaf init, determine the min doc, so that we don't expend effort pulling
+        // new iterators for docs that fall below this floor.
+        min = dv.nextDoc();
+        minLocalIds[leafOrd] = min;
+        perLeaf[leafOrd] = dv;
+        if (localId < min) {
+          noMatchSince[leafOrd] = 0; // implicit in initial `nextDoc()` call
+          return null;
+        } else if (localId == min) {
+          noMatchSince[leafOrd] = DocIdSetIterator.NO_MORE_DOCS;
+          return dv;
+        }
+      } else if (localId < min || localId >= ceilingIds[leafOrd]) {
+        // out of range: either too low or too high
+        return null;
+      } else {
+        dv = perLeaf[leafOrd];
+        int currentDoc = dv.docID();
+        if (localId == currentDoc) {
+          if (singleValued) {
+            return dv;
+          } else if (noMatchSince[leafOrd] != DocIdSetIterator.NO_MORE_DOCS) {
+            // `noMatchSince[leafOrd] != DocIdSetIterator.NO_MORE_DOCS` means that `dv` has not
+            // been returned at its current position, and has therefore not been consumed and
+            // is thus eligible to be returned directly. (singleValued dv iterators are always
+            // eligible to be returned directly, as they have no concept of being "consumed")
+
+            // NOTE: we must reset `noMatchSince[leafOrd]` here in order to prevent returning
+            // consumed docValues; even though this actually loses us possible skipping information,
+            // it's an edge case, and allows us to use `noMatchSince[leafOrd]` as a signal of
+            // whether we have consumed multivalued docValues.
+            noMatchSince[leafOrd] = DocIdSetIterator.NO_MORE_DOCS;
+            return dv;
+          }
+        }
+        if (localId <= currentDoc) {
+          if (localId >= noMatchSince[leafOrd]) {
+            // if the requested doc falls between the last requested doc and the current
+            // position, then we know there's no match.
+            return null;
+          }
+          // we must re-init the iterator
+          dv = dvFunction.apply(leafReader, schemaField.getName());
+          perLeaf[leafOrd] = dv;
+        }
+      }
+      // NOTE: use `advance()`, not `advanceExact()`. There's no cost (in terms of re-use) to
+      // doing so, because we track `noMatchSince` in the event of a miss.
+      int found = dv.advance(localId);
+      if (found == localId) {
+        noMatchSince[leafOrd] = DocIdSetIterator.NO_MORE_DOCS;
+        return dv;
+      } else {
+        if (found == DocIdSetIterator.NO_MORE_DOCS) {
+          ceilingIds[leafOrd] = Math.min(localId, ceilingIds[leafOrd]);
+        }
+        noMatchSince[leafOrd] = localId;
+        return null;
+      }
+    }
+
+    /**
+     * Returns docValues for the specified doc id in the specified reader, if the specified doc
+     * holds docValues for this {@link FieldDocValuesSupplier} instance, otherwise returns null.
+     *
+     * <p>If a non-null value is returned, it will already positioned at the specified docId.
+     *
+     * @param localId leaf-scoped docId
+     * @param leafReader reader containing docId
+     * @param leafOrd top-level ord of the specified reader
+     */
+    public NumericDocValues getNumericDocValues(int localId, LeafReader leafReader, int leafOrd)
+        throws IOException {
+      return (NumericDocValues)
+          getDocValues(localId, leafReader, leafOrd, true, funcMap.get(DocValuesType.NUMERIC));
+    }
+
+    /**
+     * Returns docValues for the specified doc id in the specified reader, if the specified doc
+     * holds docValues for this {@link FieldDocValuesSupplier} instance, otherwise returns null.
+     *
+     * <p>If a non-null value is returned, it will already positioned at the specified docId.
+     *
+     * @param localId leaf-scoped docId
+     * @param leafReader reader containing docId
+     * @param leafOrd top-level ord of the specified reader
+     */
+    public BinaryDocValues getBinaryDocValues(int localId, LeafReader leafReader, int leafOrd)
+        throws IOException {
+      return (BinaryDocValues)
+          getDocValues(localId, leafReader, leafOrd, true, funcMap.get(DocValuesType.BINARY));
+    }
+
+    /**
+     * Returns docValues for the specified doc id in the specified reader, if the specified doc
+     * holds docValues for this {@link FieldDocValuesSupplier} instance, otherwise returns null.
+     *
+     * <p>If a non-null value is returned, it will already positioned at the specified docId.
+     *
+     * @param localId leaf-scoped docId
+     * @param leafReader reader containing docId
+     * @param leafOrd top-level ord of the specified reader
+     */
+    public SortedDocValues getSortedDocValues(int localId, LeafReader leafReader, int leafOrd)
+        throws IOException {
+      return (SortedDocValues)
+          getDocValues(localId, leafReader, leafOrd, true, funcMap.get(DocValuesType.SORTED));
+    }
+
+    /**
+     * Returns docValues for the specified doc id in the specified reader, if the specified doc
+     * holds docValues for this {@link FieldDocValuesSupplier} instance, otherwise returns null.
+     *
+     * <p>If a non-null value is returned, it will already positioned at the specified docId, and
+     * with values ({@link SortedNumericDocValues#nextValue()}) not yet consumed.
+     *
+     * @param localId leaf-scoped docId
+     * @param leafReader reader containing docId
+     * @param leafOrd top-level ord of the specified reader
+     */
+    public SortedNumericDocValues getSortedNumericDocValues(
+        int localId, LeafReader leafReader, int leafOrd) throws IOException {
+      return (SortedNumericDocValues)
+          getDocValues(
+              localId, leafReader, leafOrd, false, funcMap.get(DocValuesType.SORTED_NUMERIC));
+    }
+
+    /**
+     * Returns docValues for the specified doc id in the specified reader, if the specified doc
+     * holds docValues for this {@link FieldDocValuesSupplier} instance, otherwise returns null.
+     *
+     * <p>If a non-null value is returned, it will already positioned at the specified docId, and
+     * with ords ({@link SortedSetDocValues#nextOrd()}) not yet consumed.
+     *
+     * @param localId leaf-scoped docId
+     * @param leafReader reader containing docId
+     * @param leafOrd top-level ord of the specified reader
+     */
+    public SortedSetDocValues getSortedSetDocValues(int localId, LeafReader leafReader, int leafOrd)
+        throws IOException {
+      return (SortedSetDocValues)
+          getDocValues(localId, leafReader, leafOrd, false, funcMap.get(DocValuesType.SORTED_SET));
+    }
+  }
+}
diff --git a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
index a975337f869..e6ccb9edd18 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
@@ -84,6 +84,8 @@ public class SolrDocumentFetcher {
 
   private final SolrIndexSearcher searcher;
 
+  private final int nLeaves;
+
   private final boolean enableLazyFieldLoading;
 
   private final SolrCache<Integer, Document> documentCache;
@@ -119,6 +121,7 @@ public class SolrDocumentFetcher {
   @SuppressWarnings({"unchecked"})
   SolrDocumentFetcher(SolrIndexSearcher searcher, SolrConfig solrConfig, boolean cachingEnabled) {
     this.searcher = searcher;
+    this.nLeaves = searcher.getTopReaderContext().leaves().size();
     this.enableLazyFieldLoading = solrConfig.enableLazyFieldLoading;
     if (cachingEnabled) {
       documentCache =
@@ -561,16 +564,23 @@ public InvertableType invertableType() {
    * @param fields The fields with docValues to populate the document with. DocValues fields which
    *     do not exist or not decodable will be ignored.
    */
-  public void decorateDocValueFields(SolrDocumentBase<?, ?> doc, int docid, Set<String> fields)
+  public void decorateDocValueFields(
+      SolrDocumentBase<?, ?> doc,
+      int docid,
+      Set<String> fields,
+      DocValuesIteratorCache reuseDvIters)
       throws IOException {
     final List<LeafReaderContext> leafContexts = searcher.getLeafContexts();
     final int subIndex = ReaderUtil.subIndex(docid, leafContexts);
     final int localId = docid - leafContexts.get(subIndex).docBase;
     final LeafReader leafReader = leafContexts.get(subIndex).reader();
     for (String fieldName : fields) {
-      Object fieldValue = decodeDVField(localId, leafReader, fieldName);
-      if (fieldValue != null) {
-        doc.setField(fieldName, fieldValue);
+      DocValuesIteratorCache.FieldDocValuesSupplier e = reuseDvIters.getSupplier(fieldName);
+      if (e != null) {
+        Object fieldValue = decodeDVField(localId, leafReader, subIndex, e);
+        if (fieldValue != null) {
+          doc.setField(fieldName, fieldValue);
+        }
       }
     }
   }
@@ -580,59 +590,56 @@ public void decorateDocValueFields(SolrDocumentBase<?, ?> doc, int docid, Set<St
    *
    * @return null if DV field is not exist or can not decodable
    */
-  private Object decodeDVField(int localId, LeafReader leafReader, String fieldName)
+  private Object decodeDVField(
+      int localId,
+      LeafReader leafReader,
+      int readerOrd,
+      DocValuesIteratorCache.FieldDocValuesSupplier e)
       throws IOException {
-    final SchemaField schemaField = searcher.getSchema().getFieldOrNull(fieldName);
-    FieldInfo fi = searcher.getFieldInfos().fieldInfo(fieldName);
-    if (schemaField == null || !schemaField.hasDocValues() || fi == null) {
-      return null; // Searcher doesn't have info about this field, hence ignore it.
-    }
 
-    final DocValuesType dvType = fi.getDocValuesType();
+    final DocValuesType dvType = e.type;
     switch (dvType) {
       case NUMERIC:
-        final NumericDocValues ndv = leafReader.getNumericDocValues(fieldName);
+        final NumericDocValues ndv = e.getNumericDocValues(localId, leafReader, readerOrd);
         if (ndv == null) {
           return null;
         }
-        if (!ndv.advanceExact(localId)) {
-          return null;
-        }
-        Long val = ndv.longValue();
-        return decodeNumberFromDV(schemaField, val, false);
+        long val = ndv.longValue();
+        return decodeNumberFromDV(e.schemaField, val, false);
       case BINARY:
-        BinaryDocValues bdv = leafReader.getBinaryDocValues(fieldName);
-        if (bdv != null && bdv.advanceExact(localId)) {
+        BinaryDocValues bdv = e.getBinaryDocValues(localId, leafReader, readerOrd);
+        if (bdv != null) {
           return BytesRef.deepCopyOf(bdv.binaryValue());
         }
         return null;
       case SORTED:
-        SortedDocValues sdv = leafReader.getSortedDocValues(fieldName);
-        if (sdv != null && sdv.advanceExact(localId)) {
+        SortedDocValues sdv = e.getSortedDocValues(localId, leafReader, readerOrd);
+        if (sdv != null) {
           final BytesRef bRef = sdv.lookupOrd(sdv.ordValue());
           // Special handling for Boolean fields since they're stored as 'T' and 'F'.
-          if (schemaField.getType() instanceof BoolField) {
-            return schemaField.getType().toObject(schemaField, bRef);
+          if (e.schemaField.getType() instanceof BoolField) {
+            return e.schemaField.getType().toObject(e.schemaField, bRef);
           } else {
             return bRef.utf8ToString();
           }
         }
         return null;
       case SORTED_NUMERIC:
-        final SortedNumericDocValues numericDv = leafReader.getSortedNumericDocValues(fieldName);
-        if (numericDv != null && numericDv.advance(localId) == localId) {
+        final SortedNumericDocValues numericDv =
+            e.getSortedNumericDocValues(localId, leafReader, readerOrd);
+        if (numericDv != null) {
           final int docValueCount = numericDv.docValueCount();
           final List<Object> outValues = new ArrayList<>(docValueCount);
           for (int i = 0; i < docValueCount; i++) {
             long number = numericDv.nextValue();
-            Object value = decodeNumberFromDV(schemaField, number, true);
+            Object value = decodeNumberFromDV(e.schemaField, number, true);
             // return immediately if the number is not decodable, hence won't return an empty list.
             if (value == null) {
               return null;
             }
             // normally never true but LatLonPointSpatialField uses SORTED_NUMERIC even when single
             // valued
-            else if (schemaField.multiValued() == false) {
+            else if (e.schemaField.multiValued() == false) {
               return value;
             } else {
               outValues.add(value);
@@ -643,21 +650,21 @@ else if (schemaField.multiValued() == false) {
         }
         return null;
       case SORTED_SET:
-        final SortedSetDocValues values = leafReader.getSortedSetDocValues(fieldName);
-        if (values != null && values.getValueCount() > 0 && values.advance(localId) == localId) {
+        final SortedSetDocValues values = e.getSortedSetDocValues(localId, leafReader, readerOrd);
+        if (values != null) {
           final List<Object> outValues = new ArrayList<>();
           for (long ord = values.nextOrd();
               ord != SortedSetDocValues.NO_MORE_ORDS;
               ord = values.nextOrd()) {
             BytesRef value = values.lookupOrd(ord);
-            outValues.add(schemaField.getType().toObject(schemaField, value));
+            outValues.add(e.schemaField.getType().toObject(e.schemaField, value));
           }
           assert outValues.size() > 0;
           return outValues;
         }
         return null;
       default:
-        return null;
+        throw new IllegalStateException();
     }
   }
 
@@ -751,6 +758,8 @@ class RetrieveFieldsOptimizer {
 
     private final SolrReturnFields solrReturnFields;
 
+    private final DocValuesIteratorCache reuseDvIters;
+
     RetrieveFieldsOptimizer(SolrReturnFields solrReturnFields) {
       this.storedFields = calcStoredFieldsForReturn(solrReturnFields);
       this.dvFields = calcDocValueFieldsForReturn(solrReturnFields);
@@ -760,6 +769,7 @@ class RetrieveFieldsOptimizer {
         dvFields.addAll(storedFields);
         storedFields.clear();
       }
+      reuseDvIters = dvFields.isEmpty() ? null : new DocValuesIteratorCache(searcher);
     }
 
     /**
@@ -881,7 +891,7 @@ private SolrDocument getSolrDoc(int luceneDocId) {
 
         // decorate the document with non-stored docValues fields
         if (returnDVFields()) {
-          decorateDocValueFields(sdoc, luceneDocId, getDvFields());
+          decorateDocValueFields(sdoc, luceneDocId, getDvFields(), reuseDvIters);
         }
       } catch (IOException e) {
         throw new SolrException(
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocValuesIteratorCache.java b/solr/core/src/test/org/apache/solr/search/TestDocValuesIteratorCache.java
new file mode 100644
index 00000000000..338be897c70
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/TestDocValuesIteratorCache.java
@@ -0,0 +1,154 @@
+/*
+ * 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.Closeable;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Random;
+import java.util.Set;
+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.SolrServerException;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.index.NoMergePolicyFactory;
+import org.apache.solr.util.EmbeddedSolrServerTestRule;
+import org.apache.solr.util.RefCounted;
+import org.apache.solr.util.SolrClientTestRule;
+import org.junit.ClassRule;
+
+public class TestDocValuesIteratorCache extends SolrTestCaseJ4 {
+
+  private static final int DOC_COUNT = 1000;
+
+  @ClassRule
+  public static final SolrClientTestRule solrClientTestRule =
+      new EmbeddedSolrServerTestRule() {
+        @Override
+        protected void before() throws Throwable {
+          // must set NoMergePolicyFactory, because OrdinalMap building depends on the predictable
+          // existence of multiple segments; if the merge policy happens to combine into a single
+          // segment, no OrdinalMap will be built, throwing off our tests
+          systemSetPropertySolrTestsMergePolicyFactory(NoMergePolicyFactory.class.getName());
+          startSolr(LuceneTestCase.createTempDir());
+        }
+
+        @Override
+        protected void after() {
+          systemClearPropertySolrTestsMergePolicyFactory();
+          super.after();
+        }
+      };
+
+  private static String fieldConfig(String fieldName, boolean multivalued) {
+    return "<field name=\""
+        + fieldName
+        + "\" type=\"string\" indexed=\"false\" stored=\"false\" docValues=\"true\" useDocValuesAsStored=\"true\" multiValued=\""
+        + multivalued
+        + "\"/>\n";
+  }
+
+  private static final String SINGLE = "single";
+  private static final String MULTI = "multi";
+
+  @SuppressWarnings("try")
+  public void test() throws Exception {
+    Path configSet = LuceneTestCase.createTempDir();
+    SolrTestCaseJ4.copyMinConf(configSet.toFile());
+    Path schemaXml = configSet.resolve("conf/schema.xml");
+    Files.writeString(
+        schemaXml,
+        Files.readString(schemaXml)
+            .replace(
+                "</schema>", fieldConfig(SINGLE, false) + fieldConfig(MULTI, true) + "</schema>"));
+
+    solrClientTestRule.newCollection().withConfigSet(configSet.toString()).create();
+
+    SolrClient client = solrClientTestRule.getSolrClient();
+
+    Random r = random();
+    String[][] expectVals = indexDocs(client, r);
+
+    try (SolrCore core =
+        ((EmbeddedSolrServer) client).getCoreContainer().getCore(DEFAULT_TEST_CORENAME)) {
+      RefCounted<SolrIndexSearcher> sref = core.getSearcher();
+      try (Closeable c = sref::decref) {
+        SolrIndexSearcher s = sref.get();
+        assertEquals(DOC_COUNT, s.maxDoc());
+        SolrDocumentFetcher docFetcher = s.getDocFetcher();
+        DocValuesIteratorCache dvIterCache = new DocValuesIteratorCache(s);
+        final Set<String> getFields = Set.of(SINGLE, MULTI);
+        final SolrDocument doc = new SolrDocument();
+        for (int i = DOC_COUNT * 10; i >= 0; i--) {
+          int checkId = r.nextInt(DOC_COUNT);
+          doc.clear();
+          docFetcher.decorateDocValueFields(doc, checkId, getFields, dvIterCache);
+          String[] expected = expectVals[checkId];
+          if (expected == null) {
+            assertTrue(doc.isEmpty());
+          } else {
+            assertEquals(2, doc.size());
+            Object singleValue = doc.getFieldValue(SINGLE);
+            Collection<Object> actualVals = doc.getFieldValues(MULTI);
+            assertEquals(expected.length, actualVals.size() + 1); // +1 for single-valued field
+            assertEquals(expected[0], singleValue);
+            int j = 1;
+            for (Object o : actualVals) {
+              assertEquals(expected[j++], o);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private String[][] indexDocs(SolrClient client, Random r)
+      throws SolrServerException, IOException {
+    String[][] ret = new String[DOC_COUNT][];
+    int pct = r.nextInt(100);
+    for (int i = 0; i < DOC_COUNT; i++) {
+      if (r.nextInt(100) > pct) {
+        client.add(sdoc("id", Integer.toString(i)));
+      } else {
+        String str = TestUtil.randomSimpleString(r);
+        String str1 = TestUtil.randomSimpleString(r);
+        String str2 = TestUtil.randomSimpleString(r);
+        client.add(sdoc("id", Integer.toString(i), SINGLE, str, MULTI, str1, MULTI, str2));
+        int cmp = str1.compareTo(str2);
+        if (cmp == 0) {
+          ret[i] = new String[] {str, str1};
+        } else if (cmp < 0) {
+          ret[i] = new String[] {str, str1, str2};
+        } else {
+          ret[i] = new String[] {str, str2, str1};
+        }
+      }
+      if (r.nextInt(DOC_COUNT / 5) == 0) {
+        // aim for 5 segments
+        client.commit();
+      }
+    }
+    client.commit();
+    return ret;
+  }
+}

From 708ab9b9be31d8166a863eaa9e5f4a62d5da18f3 Mon Sep 17 00:00:00 2001
From: Vincent P <vincent.primault@gmail.com>
Date: Wed, 27 Sep 2023 03:32:10 +0200
Subject: [PATCH 119/160] SOLR-16959: Make CoresLocator class configurable
 (#1891)

Co-authored-by: Vincent Primault <vprimault@salesforce.com>
---
 solr/CHANGES.txt                              |  2 +
 .../org/apache/solr/core/CoreContainer.java   | 16 +++----
 .../solr/core/CorePropertiesLocator.java      | 11 +++++
 .../org/apache/solr/core/CoresLocator.java    | 38 +++++++++++++---
 .../java/org/apache/solr/core/NodeConfig.java | 18 +++++++-
 .../org/apache/solr/core/SolrXmlConfig.java   |  3 ++
 .../apache/solr/core/TestCoreContainer.java   | 44 +++++++++++++++++++
 .../org/apache/solr/core/TestLazyCores.java   |  2 +-
 .../pages/configuring-solr-xml.adoc           | 14 +++++-
 .../solr/util/ReadOnlyCoresLocator.java       |  6 +++
 .../org/apache/solr/util/TestHarness.java     |  2 +-
 11 files changed, 138 insertions(+), 18 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e8382b835ff..6c084388b4e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -142,6 +142,8 @@ Improvements
 
 * SOLR-15440: The Learning To Rank FieldValueFeature now uses DocValues when docValues=true and stored=true are combined. (Christine Poerschke, Tom Gilke)
 
+* SOLR-16959: Make the internal CoresLocator implementation configurable in solr.xml (Vincent Primault via David Smiley)
+
 Optimizations
 ---------------------
 
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 b35cbbef058..cdf90bdc7a4 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -26,7 +26,6 @@
 import static org.apache.solr.common.params.CommonParams.METRICS_PATH;
 import static org.apache.solr.common.params.CommonParams.ZK_PATH;
 import static org.apache.solr.common.params.CommonParams.ZK_STATUS_PATH;
-import static org.apache.solr.core.CorePropertiesLocator.PROPERTIES_FILENAME;
 import static org.apache.solr.security.AuthenticationPlugin.AUTHENTICATION_PLUGIN_PROP;
 
 import com.github.benmanes.caffeine.cache.Interner;
@@ -377,21 +376,24 @@ public CoreContainer(Path solrHome, Properties properties) {
    * @see #load()
    */
   public CoreContainer(NodeConfig config) {
-    this(config, new CorePropertiesLocator(config.getCoreRootDirectory()));
+    this(config, CoresLocator.instantiate(config));
   }
 
   public CoreContainer(NodeConfig config, boolean asyncSolrCoreLoad) {
-    this(config, new CorePropertiesLocator(config.getCoreRootDirectory()), asyncSolrCoreLoad);
+    this(config, CoresLocator.instantiate(config), asyncSolrCoreLoad);
   }
 
   /**
-   * Create a new CoreContainer using the given configuration and locator. The container's cores are
-   * not loaded.
+   * Create a new CoreContainer using the given configuration and locator.
+   *
+   * <p>The container's cores are not loaded. This constructor should be used only in tests, as it
+   * overrides {@link CoresLocator}'s instantiation process.
    *
    * @param config a ConfigSolr representation of this container's configuration
    * @param locator a CoresLocator
    * @see #load()
    */
+  @VisibleForTesting
   public CoreContainer(NodeConfig config, CoresLocator locator) {
     this(config, locator, false);
   }
@@ -1945,9 +1947,7 @@ private CoreDescriptor reloadCoreDescriptor(CoreDescriptor oldDesc) {
       return null;
     }
 
-    CorePropertiesLocator cpl = new CorePropertiesLocator(null);
-    CoreDescriptor ret =
-        cpl.buildCoreDescriptor(oldDesc.getInstanceDir().resolve(PROPERTIES_FILENAME), this);
+    CoreDescriptor ret = getCoresLocator().reload(oldDesc, this);
 
     // Ok, this little jewel is all because we still create core descriptors on the fly from lists
     // of properties in tests particularly. Theoretically, there should be _no_ way to create a
diff --git a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
index be3da5c3447..c060fc5d3cd 100644
--- a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
+++ b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.core;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -51,6 +52,11 @@ public class CorePropertiesLocator implements CoresLocator {
 
   private final Path rootDirectory;
 
+  public CorePropertiesLocator(NodeConfig nodeConfig) {
+    this(nodeConfig.getCoreRootDirectory());
+  }
+
+  @VisibleForTesting
   public CorePropertiesLocator(Path coreDiscoveryRoot) {
     this.rootDirectory = coreDiscoveryRoot;
     log.debug("Config-defined core root directory: {}", this.rootDirectory);
@@ -193,6 +199,11 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce
     return cds;
   }
 
+  @Override
+  public CoreDescriptor reload(CoreDescriptor cd, CoreContainer cc) {
+    return buildCoreDescriptor(cd.getInstanceDir().resolve(PROPERTIES_FILENAME), cc);
+  }
+
   protected CoreDescriptor buildCoreDescriptor(Path propertiesFile, CoreContainer cc) {
     if (Files.notExists(propertiesFile)) {
       // This can happen in tests, see CoreContainer#reloadCoreDescriptor
diff --git a/solr/core/src/java/org/apache/solr/core/CoresLocator.java b/solr/core/src/java/org/apache/solr/core/CoresLocator.java
index 10eac005230..3321e057860 100644
--- a/solr/core/src/java/org/apache/solr/core/CoresLocator.java
+++ b/solr/core/src/java/org/apache/solr/core/CoresLocator.java
@@ -27,7 +27,7 @@ public interface CoresLocator {
    * @param cc the CoreContainer
    * @param coreDescriptors CoreDescriptors to persist
    */
-  public void create(CoreContainer cc, CoreDescriptor... coreDescriptors);
+  void create(CoreContainer cc, CoreDescriptor... coreDescriptors);
 
   /**
    * Ensure that the core definitions from the passed in CoreDescriptors will persist across
@@ -36,7 +36,7 @@ public interface CoresLocator {
    * @param cc the CoreContainer
    * @param coreDescriptors CoreDescriptors to persist
    */
-  public void persist(CoreContainer cc, CoreDescriptor... coreDescriptors);
+  void persist(CoreContainer cc, CoreDescriptor... coreDescriptors);
 
   /**
    * Ensure that the core definitions from the passed in CoreDescriptors are not available for
@@ -45,7 +45,7 @@ public interface CoresLocator {
    * @param cc the CoreContainer
    * @param coreDescriptors CoreDescriptors of the cores to remove
    */
-  public void delete(CoreContainer cc, CoreDescriptor... coreDescriptors);
+  void delete(CoreContainer cc, CoreDescriptor... coreDescriptors);
 
   /**
    * Persist the new name of a renamed core
@@ -54,7 +54,7 @@ public interface CoresLocator {
    * @param oldCD the CoreDescriptor of the core before renaming
    * @param newCD the CoreDescriptor of the core after renaming
    */
-  public void rename(CoreContainer cc, CoreDescriptor oldCD, CoreDescriptor newCD);
+  void rename(CoreContainer cc, CoreDescriptor oldCD, CoreDescriptor newCD);
 
   /**
    * Swap two core definitions
@@ -63,7 +63,7 @@ public interface CoresLocator {
    * @param cd1 the core descriptor of the first core, after swapping
    * @param cd2 the core descriptor of the second core, after swapping
    */
-  public void swap(CoreContainer cc, CoreDescriptor cd1, CoreDescriptor cd2);
+  void swap(CoreContainer cc, CoreDescriptor cd1, CoreDescriptor cd2);
 
   /**
    * Load all the CoreDescriptors from persistence store
@@ -71,5 +71,31 @@ public interface CoresLocator {
    * @param cc the CoreContainer
    * @return a list of all CoreDescriptors found
    */
-  public List<CoreDescriptor> discover(CoreContainer cc);
+  List<CoreDescriptor> discover(CoreContainer cc);
+
+  /**
+   * Reload a core descriptor.
+   *
+   * @param cd the old core descriptor
+   * @param cc the CoreContainer
+   * @return a new core descriptor
+   */
+  CoreDescriptor reload(CoreDescriptor cd, CoreContainer cc);
+
+  /**
+   * Returns a new instance of {@link CoresLocator}, depending on provided config.
+   *
+   * @param nodeConfig Solr configuration.
+   */
+  static CoresLocator instantiate(NodeConfig nodeConfig) {
+    final String coresLocatorClass = nodeConfig.getCoresLocatorClass();
+    return nodeConfig
+        .getSolrResourceLoader()
+        .newInstance(
+            coresLocatorClass,
+            CoresLocator.class,
+            null,
+            new Class<?>[] {NodeConfig.class},
+            new Object[] {nodeConfig});
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
index 9177889f447..387fe3beafb 100644
--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
@@ -56,6 +56,7 @@ public class NodeConfig {
   private final String nodeName;
 
   private final Path coreRootDirectory;
+  private final String coresLocatorClass;
 
   private final Path solrDataHome;
 
@@ -125,6 +126,7 @@ public class NodeConfig {
   private NodeConfig(
       String nodeName,
       Path coreRootDirectory,
+      String coresLocatorClass,
       Path solrDataHome,
       Integer booleanQueryMaxClauseCount,
       Path configSetBaseDirectory,
@@ -162,6 +164,7 @@ private NodeConfig(
     // all Path params here are absolute and normalized.
     this.nodeName = nodeName;
     this.coreRootDirectory = coreRootDirectory;
+    this.coresLocatorClass = coresLocatorClass;
     this.solrDataHome = solrDataHome;
     this.booleanQueryMaxClauseCount = booleanQueryMaxClauseCount;
     this.configSetBaseDirectory = configSetBaseDirectory;
@@ -271,6 +274,10 @@ public Path getCoreRootDirectory() {
     return coreRootDirectory;
   }
 
+  public String getCoresLocatorClass() {
+    return this.coresLocatorClass;
+  }
+
   /** Absolute. */
   public Path getSolrDataHome() {
     return solrDataHome;
@@ -592,6 +599,7 @@ public static class NodeConfigBuilder {
     // all Path fields here are absolute and normalized.
     private SolrResourceLoader loader;
     private Path coreRootDirectory;
+    private String coresLocatorClass = DEFAULT_CORESLOCATORCLASS;
     private Path solrDataHome;
     private Integer booleanQueryMaxClauseCount;
     private Path configSetBaseDirectory;
@@ -632,6 +640,8 @@ public static class NodeConfigBuilder {
     // No:of core load threads in cloud mode is set to a default of 8
     public static final int DEFAULT_CORE_LOAD_THREADS_IN_CLOUD = 8;
 
+    private static final String DEFAULT_CORESLOCATORCLASS =
+        "org.apache.solr.core.CorePropertiesLocator";
     private static final String DEFAULT_ADMINHANDLERCLASS =
         "org.apache.solr.handler.admin.CoreAdminHandler";
     private static final String DEFAULT_INFOHANDLERCLASS =
@@ -671,6 +681,11 @@ public NodeConfigBuilder setCoreRootDirectory(String coreRootDirectory) {
       return this;
     }
 
+    public NodeConfigBuilder setCoresLocatorClass(String coresLocatorClass) {
+      this.coresLocatorClass = coresLocatorClass;
+      return this;
+    }
+
     public NodeConfigBuilder setSolrDataHome(String solrDataHomeString) {
       // keep it null unless explicitly set to non-empty value
       if (solrDataHomeString != null && !solrDataHomeString.isEmpty()) {
@@ -755,8 +770,8 @@ public NodeConfigBuilder setReplayUpdatesThreads(int replayUpdatesThreads) {
       this.replayUpdatesThreads = replayUpdatesThreads;
       return this;
     }
-
     // Remove in Solr 10.0
+
     @Deprecated
     public NodeConfigBuilder setTransientCacheSize(int transientCacheSize) {
       this.transientCacheSize = transientCacheSize;
@@ -886,6 +901,7 @@ public NodeConfig build() {
       return new NodeConfig(
           nodeName,
           coreRootDirectory,
+          coresLocatorClass,
           solrDataHome,
           booleanQueryMaxClauseCount,
           configSetBaseDirectory,
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index df0645c8f69..cba8a277504 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -348,6 +348,9 @@ private static NodeConfig fillSolrSection(NodeConfig.NodeConfigBuilder builder,
               case "configSetService":
                 builder.setConfigSetServiceClass(it.txt());
                 break;
+              case "coresLocator":
+                builder.setCoresLocatorClass(it.txt());
+                break;
               case "coreRootDirectory":
                 builder.setCoreRootDirectory(it.txt());
                 break;
diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
index e6b194858c9..5e828bc9be7 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
@@ -770,6 +770,45 @@ public void testCustomConfigSetService() throws Exception {
     }
   }
 
+  @Test
+  public void testDefaultCoresLocator() throws Exception {
+    String solrXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><solr></solr>";
+    CoreContainer cc = init(solrXml);
+    try {
+      assertTrue(cc.getCoresLocator() instanceof CorePropertiesLocator);
+    } finally {
+      cc.shutdown();
+    }
+  }
+
+  @Test
+  public void testCustomCoresLocator() throws Exception {
+    String solrXml =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+            + "<solr>\n"
+            + "<str name=\"coresLocator\">org.apache.solr.core.TestCoreContainer$CustomCoresLocator</str>\n"
+            + "</solr>";
+    CoreContainer cc = init(solrXml);
+    try {
+      assertTrue(cc.getCoresLocator() instanceof CustomCoresLocator);
+      assertSame(cc.getNodeConfig(), ((CustomCoresLocator) cc.getCoresLocator()).getNodeConfig());
+    } finally {
+      cc.shutdown();
+    }
+  }
+
+  public static class CustomCoresLocator extends MockCoresLocator {
+    private final NodeConfig nodeConfig;
+
+    public CustomCoresLocator(NodeConfig nodeConfig) {
+      this.nodeConfig = nodeConfig;
+    }
+
+    public NodeConfig getNodeConfig() {
+      return nodeConfig;
+    }
+  }
+
   private static class MockCoresLocator implements CoresLocator {
 
     List<CoreDescriptor> cores = new ArrayList<>();
@@ -799,6 +838,11 @@ public void swap(CoreContainer cc, CoreDescriptor cd1, CoreDescriptor cd2) {}
     public List<CoreDescriptor> discover(CoreContainer cc) {
       return cores;
     }
+
+    @Override
+    public CoreDescriptor reload(CoreDescriptor cd, CoreContainer cc) {
+      return cd;
+    }
   }
 
   @Test
diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
index fbb2f5ecf57..30b038609cb 100644
--- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
+++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
@@ -743,7 +743,7 @@ private CoreContainer initGoodAndBad(
     NodeConfig config = SolrXmlConfig.fromString(solrHomeDirectory.toPath(), "<solr/>");
 
     // OK this should succeed, but at the end we should have recorded a series of errors.
-    return createCoreContainer(config, new CorePropertiesLocator(config.getCoreRootDirectory()));
+    return createCoreContainer(config, new CorePropertiesLocator(config));
   }
 
   // We want to see that the core "heals itself" if an un-corrupted file is written to the
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
index 09dc697ed49..65751c24c06 100644
--- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
@@ -95,7 +95,7 @@ The tables below list the child nodes of each XML element in `solr.xml`.
 +
 This attribute does not need to be set.
 +
-If used, this attribute should be set to the FQN (Fully qualified name) of a class that inherits from `ConfigSetService`, and you must provide a constructor with one parameter which the type is `org.apache.solr.core.CoreContainer`.
+If used, this attribute should be set to the FQN (Fully qualified name) of a class that inherits from `ConfigSetService`, and you must provide a constructor with one parameter of type `org.apache.solr.core.CoreContainer`.
 For example, `<str name="configSetService">com.myorg.CustomConfigSetService</str>`.
 +
 If this attribute isn't set, Solr uses the default `configSetService`, with zookeeper aware of `org.apache.solr.cloud.ZkConfigSetService`, without zookeeper aware of `org.apache.solr.core.FileSystemConfigSetService`.
@@ -189,6 +189,18 @@ The default value is equal to the number of processors.
 +
 The root of the core discovery tree, defaults to `$SOLR_HOME`.
 
+`coresLocator`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `org.apache.solr.core.CorePropertiesLocator`
+|===
++
+This attribute does not need to be set.
++
+If used, this attribute should be set to the FQN (Fully qualified name) of a class that implements `CoresLocator`, and you must provide a constructor with one parameter of type `org.apache.solr.core.NodeConfig`.
+For example, `<str name="coresLocator">com.myorg.CustomCoresLocator</str>`.
+
 `managementPath`::
 +
 [%autowidth,frame=none]
diff --git a/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java b/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java
index 29c9c41b0eb..fc04418048e 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java
@@ -46,4 +46,10 @@ public void rename(CoreContainer cc, CoreDescriptor oldCD, CoreDescriptor newCD)
   public void swap(CoreContainer cc, CoreDescriptor cd1, CoreDescriptor cd2) {
     // no-op
   }
+
+  @Override
+  public CoreDescriptor reload(CoreDescriptor cd, CoreContainer cc) {
+    // no-op
+    return cd;
+  }
 }
diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
index 2f8dc0121a7..37ac8cf0e38 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
@@ -175,7 +175,7 @@ public TestHarness(Path solrHome, String solrXml) {
   }
 
   public TestHarness(NodeConfig nodeConfig) {
-    this(nodeConfig, new CorePropertiesLocator(nodeConfig.getCoreRootDirectory()));
+    this(nodeConfig, new CorePropertiesLocator(nodeConfig));
   }
 
   /**

From 4c80cc2ef9e50915fb7aaa6e9cfe042a27d2c44d Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Tue, 26 Sep 2023 22:19:57 -0400
Subject: [PATCH 120/160] SOLR-16967: ConfigSet: shouldn't require
 solrconfig.xml (#1900)

ConfigSetService.checkConfigExists() should not require solrconfig.xml to exist; the parent directory's existence is fine.  Users may choose for their config to be a different name, after all.
---
 solr/CHANGES.txt                                             | 3 +++
 .../src/java/org/apache/solr/cloud/ZkConfigSetService.java   | 5 +----
 .../org/apache/solr/core/FileSystemConfigSetService.java     | 3 +--
 .../org/apache/solr/common/cloud/TestZkConfigSetService.java | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6c084388b4e..c485b9cb033 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -144,6 +144,9 @@ Improvements
 
 * SOLR-16959: Make the internal CoresLocator implementation configurable in solr.xml (Vincent Primault via David Smiley)
 
+* SOLR-16967: Some ConfigSet operations formerly required that solrconfig.xml exist but should not have because
+  the name of the file is configurable when creating cores / collections.  (David Smiley)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java b/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
index 5f83f88c8eb..1718edbf56a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
@@ -139,10 +139,7 @@ public String configSetName(CoreDescriptor cd) {
   @Override
   public boolean checkConfigExists(String configName) throws IOException {
     try {
-      Boolean existsSolrConfigXml =
-          zkClient.exists(CONFIGS_ZKNODE + "/" + configName + "/solrconfig.xml", true);
-      if (existsSolrConfigXml == null) return false;
-      return existsSolrConfigXml;
+      return zkClient.exists(CONFIGS_ZKNODE + "/" + configName, true);
     } catch (KeeperException | InterruptedException e) {
       throw new IOException(
           "Error checking whether config exists", SolrZkClient.checkInterrupted(e));
diff --git a/solr/core/src/java/org/apache/solr/core/FileSystemConfigSetService.java b/solr/core/src/java/org/apache/solr/core/FileSystemConfigSetService.java
index 5ada2f99cfb..7631edc9809 100644
--- a/solr/core/src/java/org/apache/solr/core/FileSystemConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/core/FileSystemConfigSetService.java
@@ -80,8 +80,7 @@ public String configSetName(CoreDescriptor cd) {
 
   @Override
   public boolean checkConfigExists(String configName) throws IOException {
-    Path solrConfigXmlFile = getConfigDir(configName).resolve("solrconfig.xml");
-    return Files.exists(solrConfigXmlFile);
+    return Files.exists(getConfigDir(configName));
   }
 
   @Override
diff --git a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
index 16454d5dc3e..5375f62cdeb 100644
--- a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
+++ b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/TestZkConfigSetService.java
@@ -100,6 +100,7 @@ public void testUploadConfig() throws IOException {
       List<String> configs = configSetService.listConfigs();
       assertEquals(1, configs.size());
       assertEquals("testconfig", configs.get(0));
+      assertTrue(configSetService.checkConfigExists("testconfig"));
 
       // check downloading
       Path downloadPath = createTempDir("download");

From f0fcd300c896b858ae83235ecdb0a109eaea5cea Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 27 Sep 2023 13:44:14 -0700
Subject: [PATCH 121/160] SOLR-16992 Non-reproducible StreamingTest failures
 (#1955)

-- suggests CloudSolrStream concurency race condition
---
 solr/CHANGES.txt                              |  2 +
 .../solr/client/solrj/io/SolrClientCache.java | 23 +++--
 .../solrj/io/stream/CloudSolrStream.java      | 30 ++----
 .../solrj/io/stream/DeepRandomStream.java     | 37 ++-----
 .../io/stream/FeaturesSelectionStream.java    | 29 ++----
 .../solrj/io/stream/ParallelListStream.java   | 35 ++-----
 .../io/stream/SignificantTermsStream.java     | 29 ++----
 .../solrj/io/stream/StreamExecutorHelper.java | 53 ++++++++++
 .../solrj/io/stream/TextLogitStream.java      | 29 ++----
 .../client/solrj/io/stream/TopicStream.java   | 40 +++-----
 .../client/solrj/io/stream/TupleStream.java   | 98 ++++++++++---------
 .../io/stream/StreamExecutorHelperTest.java   | 68 +++++++++++++
 .../apache/solr/common/util/ExecutorUtil.java | 49 ++++++++++
 .../solr/common/util/ExecutorUtilTest.java    | 58 +++++++++++
 14 files changed, 357 insertions(+), 223 deletions(-)
 create mode 100644 solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamExecutorHelper.java
 create mode 100644 solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExecutorHelperTest.java

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c485b9cb033..cb46073b65e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -221,6 +221,8 @@ Bug Fixes
 
 * SOLR-16980: Connect to SOLR standalone with basic authentication (Alex Deparvu)
 
+* SOLR-16992: Non-reproducible StreamingTest failures -- suggests CloudSolrStream concurency race condition (Alex Deparvu, hossman)
+
 Dependency Upgrades
 ---------------------
 
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 02621784d00..e56d1a55c13 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
@@ -17,7 +17,6 @@
 package org.apache.solr.client.solrj.io;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.http.client.HttpClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
@@ -34,6 +34,8 @@
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.SolrClientBuilder;
+import org.apache.solr.common.AlreadyClosedException;
+import org.apache.solr.common.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,6 +56,7 @@ public class SolrClientCache implements Closeable {
   private final Map<String, SolrClient> solrClients = new HashMap<>();
   private final HttpClient apacheHttpClient;
   private final Http2SolrClient http2SolrClient;
+  private final AtomicBoolean isClosed = new AtomicBoolean(false);
 
   public SolrClientCache() {
     this.apacheHttpClient = null;
@@ -72,6 +75,7 @@ public SolrClientCache(Http2SolrClient http2SolrClient) {
   }
 
   public synchronized CloudSolrClient getCloudSolrClient(String zkHost) {
+    ensureOpen();
     Objects.requireNonNull(zkHost, "ZooKeeper host cannot be null!");
     if (solrClients.containsKey(zkHost)) {
       return (CloudSolrClient) solrClients.get(zkHost);
@@ -108,6 +112,7 @@ private static CloudHttp2SolrClient newCloudHttp2SolrClient(
   }
 
   public synchronized SolrClient getHttpSolrClient(String baseUrl) {
+    ensureOpen();
     Objects.requireNonNull(baseUrl, "Url cannot be null!");
     if (solrClients.containsKey(baseUrl)) {
       return solrClients.get(baseUrl);
@@ -159,13 +164,17 @@ private static Http2SolrClient.Builder newHttp2SolrClientBuilder(
 
   @Override
   public synchronized void close() {
-    for (Map.Entry<String, SolrClient> entry : solrClients.entrySet()) {
-      try {
-        entry.getValue().close();
-      } catch (IOException e) {
-        log.error("Error closing SolrClient for {}", entry.getKey(), e);
+    if (isClosed.compareAndSet(false, true)) {
+      for (Map.Entry<String, SolrClient> entry : solrClients.entrySet()) {
+        IOUtils.closeQuietly(entry.getValue());
       }
+      solrClients.clear();
+    }
+  }
+
+  private void ensureOpen() {
+    if (isClosed.get()) {
+      throw new AlreadyClosedException();
     }
-    solrClients.clear();
   }
 }
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
index 8b2bd54aef7..f75dec91c38 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 import static org.apache.solr.common.params.CommonParams.SORT;
 
@@ -32,8 +33,6 @@
 import java.util.Objects;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -54,8 +53,6 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * Connects to Zookeeper to pick replicas from a specific collection to send the query to. Under the
@@ -412,24 +409,15 @@ protected void constructStreams() throws IOException {
   }
 
   private void openStreams() throws IOException {
-    ExecutorService service =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("CloudSolrStream"));
-    List<Future<TupleWrapper>> futures =
+    List<StreamOpener> tasks =
         solrStreams.stream()
-            .map(ss -> service.submit(new StreamOpener((SolrStream) ss, comp)))
-            .collect(Collectors.toList());
-    try {
-      for (Future<TupleWrapper> f : futures) {
-        TupleWrapper w = f.get();
-        if (w != null) {
-          tuples.add(w);
-        }
-      }
-    } catch (Exception e) {
-      throw new IOException(e);
-    } finally {
-      service.shutdown();
-    }
+            .map(s -> new StreamOpener((SolrStream) s, comp))
+            .collect(Collectors.toUnmodifiableList());
+    var results =
+        submitAllAndAwaitAggregatingExceptions(tasks, "CloudSolrStream").stream()
+            .filter(Objects::nonNull)
+            .collect(Collectors.toUnmodifiableList());
+    tuples.addAll(results);
   }
 
   /** Closes the CloudSolrStream */
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
index 2e32dc26f09..8598cdb1604 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 import static org.apache.solr.common.params.CommonParams.ROWS;
 import static org.apache.solr.common.params.CommonParams.SORT;
@@ -34,8 +35,6 @@
 import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
@@ -49,8 +48,6 @@
 import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * Connects to Zookeeper to pick replicas from a specific collection to send the query to. Under the
@@ -322,29 +319,15 @@ protected void constructStreams() throws IOException {
   }
 
   private void openStreams() throws IOException {
-    ExecutorService service =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("DeepRandomStream"));
-    try {
-      List<Future<TupleWrapper>> futures = new ArrayList<>();
-      for (TupleStream solrStream : solrStreams) {
-        StreamOpener so = new StreamOpener((SolrStream) solrStream, comp);
-        Future<TupleWrapper> future = service.submit(so);
-        futures.add(future);
-      }
-
-      try {
-        for (Future<TupleWrapper> f : futures) {
-          TupleWrapper w = f.get();
-          if (w != null) {
-            tuples.add(w);
-          }
-        }
-      } catch (Exception e) {
-        throw new IOException(e);
-      }
-    } finally {
-      service.shutdown();
-    }
+    List<Callable<TupleWrapper>> tasks =
+        solrStreams.stream()
+            .map(s -> new StreamOpener((SolrStream) s, comp))
+            .collect(Collectors.toUnmodifiableList());
+    var results =
+        submitAllAndAwaitAggregatingExceptions(tasks, "DeepRandomStream").stream()
+            .filter(Objects::nonNull)
+            .collect(Collectors.toUnmodifiableList());
+    tuples.addAll(results);
   }
 
   @Override
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
index 3a761ceaee4..9c7478a4623 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
@@ -17,6 +17,7 @@
 
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 import static org.apache.solr.common.params.CommonParams.ID;
 
@@ -33,8 +34,6 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.stream.Stream;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
@@ -54,9 +53,7 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * @since 6.2.0
@@ -77,7 +74,6 @@ public class FeaturesSelectionStream extends TupleStream implements Expressible
 
   protected transient SolrClientCache clientCache;
   private transient boolean doCloseCache;
-  protected transient ExecutorService executorService;
 
   public FeaturesSelectionStream(
       String zkHost,
@@ -262,10 +258,6 @@ public void open() throws IOException {
     } else {
       doCloseCache = false;
     }
-
-    this.executorService =
-        ExecutorUtil.newMDCAwareCachedThreadPool(
-            new SolrNamedThreadFactory("FeaturesSelectionStream"));
   }
 
   @Override
@@ -304,9 +296,8 @@ private List<String> getShardUrls() throws IOException {
     }
   }
 
-  private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOException {
-
-    List<Future<NamedList<?>>> futures = new ArrayList<>();
+  private Collection<NamedList<?>> callShards(List<String> baseUrls) throws IOException {
+    List<FeaturesSelectionCall> tasks = new ArrayList<>();
     for (String baseUrl : baseUrls) {
       FeaturesSelectionCall lc =
           new FeaturesSelectionCall(
@@ -317,12 +308,9 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
               this.positiveLabel,
               this.numTerms,
               this.clientCache);
-
-      Future<NamedList<?>> future = executorService.submit(lc);
-      futures.add(future);
+      tasks.add(lc);
     }
-
-    return futures;
+    return submitAllAndAwaitAggregatingExceptions(tasks, "FeaturesSelectionStream");
   }
 
   @Override
@@ -330,10 +318,6 @@ public void close() throws IOException {
     if (doCloseCache) {
       clientCache.close();
     }
-
-    if (executorService != null) {
-      executorService.shutdown();
-    }
   }
 
   /** Return the stream sort - ie, the order in which records are returned */
@@ -359,8 +343,7 @@ public Tuple read() throws IOException {
         Map<String, Long> docFreqs = new HashMap<>();
 
         long numDocs = 0;
-        for (Future<NamedList<?>> getTopTermsCall : callShards(getShardUrls())) {
-          NamedList<?> resp = getTopTermsCall.get();
+        for (NamedList<?> resp : callShards(getShardUrls())) {
 
           @SuppressWarnings({"unchecked"})
           NamedList<Double> shardTopTerms = (NamedList<Double>) resp.get("featuredTerms");
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
index a8a205c06ce..8c86384dbbf 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
@@ -17,12 +17,12 @@
 
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
 import org.apache.solr.client.solrj.io.stream.expr.Explanation;
@@ -31,8 +31,6 @@
 import org.apache.solr.client.solrj.io.stream.expr.StreamExplanation;
 import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
 import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 public class ParallelListStream extends TupleStream implements Expressible {
 
@@ -140,27 +138,14 @@ public void open() throws IOException {
   }
 
   private void openStreams() throws IOException {
-    ExecutorService service =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("ParallelListStream"));
-    try {
-      List<Future<StreamIndex>> futures = new ArrayList<>();
-      int i = 0;
-      for (TupleStream tupleStream : streams) {
-        StreamOpener so = new StreamOpener(new StreamIndex(tupleStream, i++));
-        Future<StreamIndex> future = service.submit(so);
-        futures.add(future);
-      }
-
-      try {
-        for (Future<StreamIndex> f : futures) {
-          StreamIndex streamIndex = f.get();
-          this.streams[streamIndex.getIndex()] = streamIndex.getTupleStream();
-        }
-      } catch (Exception e) {
-        throw new IOException(e);
-      }
-    } finally {
-      service.shutdown();
+    List<Callable<StreamIndex>> tasks = new ArrayList<>();
+    int i = 0;
+    for (TupleStream tupleStream : streams) {
+      tasks.add(new StreamOpener(new StreamIndex(tupleStream, i++)));
+    }
+    var results = submitAllAndAwaitAggregatingExceptions(tasks, "ParallelListStream");
+    for (var r : results) {
+      this.streams[r.getIndex()] = r.getTupleStream();
     }
   }
 
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 22d7c8bc73c..3b79a3c1fa4 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -17,10 +17,12 @@
 
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,8 +30,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.io.SolrClientCache;
@@ -47,9 +47,7 @@
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * @since 6.5.0
@@ -71,7 +69,6 @@ public class SignificantTermsStream extends TupleStream implements Expressible {
   private transient SolrClientCache clientCache;
   private transient boolean doCloseCache;
   private transient StreamContext streamContext;
-  private transient ExecutorService executorService;
 
   public SignificantTermsStream(
       String zkHost,
@@ -251,10 +248,6 @@ public void open() throws IOException {
     } else {
       doCloseCache = false;
     }
-
-    this.executorService =
-        ExecutorUtil.newMDCAwareCachedThreadPool(
-            new SolrNamedThreadFactory("SignificantTermsStream"));
   }
 
   @Override
@@ -262,9 +255,8 @@ public List<TupleStream> children() {
     return null;
   }
 
-  private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOException {
-
-    List<Future<NamedList<?>>> futures = new ArrayList<>();
+  private Collection<NamedList<?>> callShards(List<String> baseUrls) throws IOException {
+    List<SignificantTermsCall> tasks = new ArrayList<>();
     for (String baseUrl : baseUrls) {
       SignificantTermsCall lc =
           new SignificantTermsCall(
@@ -277,12 +269,9 @@ private List<Future<NamedList<?>>> callShards(List<String> baseUrls) throws IOEx
               this.numTerms,
               streamContext.isLocal(),
               clientCache);
-
-      Future<NamedList<?>> future = executorService.submit(lc);
-      futures.add(future);
+      tasks.add(lc);
     }
-
-    return futures;
+    return submitAllAndAwaitAggregatingExceptions(tasks, "SignificantTermsStream");
   }
 
   @Override
@@ -290,8 +279,6 @@ public void close() throws IOException {
     if (doCloseCache) {
       clientCache.close();
     }
-
-    executorService.shutdown();
   }
 
   /** Return the stream sort - ie, the order in which records are returned */
@@ -316,9 +303,7 @@ public Tuple read() throws IOException {
         Map<String, int[]> mergeFreqs = new HashMap<>();
         long numDocs = 0;
         long resultCount = 0;
-        for (Future<NamedList<?>> getTopTermsCall :
-            callShards(getShards(zkHost, collection, streamContext))) {
-          NamedList<?> fullResp = getTopTermsCall.get();
+        for (NamedList<?> fullResp : callShards(getShards(zkHost, collection, streamContext))) {
           Map<?, ?> stResp = (Map<?, ?>) fullResp.get("significantTerms");
 
           @SuppressWarnings({"unchecked"})
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamExecutorHelper.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamExecutorHelper.java
new file mode 100644
index 00000000000..0df2add101f
--- /dev/null
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamExecutorHelper.java
@@ -0,0 +1,53 @@
+/*
+ * 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.io.stream;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
+
+public class StreamExecutorHelper {
+
+  /**
+   * Takes a list of Callables and executes them returning the results as a list. The method waits
+   * for the return of every task even if one of them throws an exception. If any exception happens
+   * it will be thrown, wrapped into an IOException, and other following exceptions will be added as
+   * `addSuppressed` to the original exception
+   *
+   * @param <T> the response type
+   * @param tasks the list of callables to be executed
+   * @param threadsName name to be used by the SolrNamedThreadFactory
+   * @return results collection
+   * @throws IOException in case any exceptions happened
+   */
+  public static <T> Collection<T> submitAllAndAwaitAggregatingExceptions(
+      List<? extends Callable<T>> tasks, String threadsName) throws IOException {
+    ExecutorService service =
+        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory(threadsName));
+    try {
+      return ExecutorUtil.submitAllAndAwaitAggregatingExceptions(service, tasks).stream()
+          .collect(Collectors.toList());
+    } finally {
+      ExecutorUtil.shutdownNowAndAwaitTermination(service);
+    }
+  }
+}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
index e3ff627232a..1461a3af70d 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
@@ -17,6 +17,7 @@
 
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 import static org.apache.solr.common.params.CommonParams.ID;
 
@@ -33,8 +34,6 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.io.ClassificationEvaluation;
@@ -55,9 +54,7 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * @since 6.2.0
@@ -85,7 +82,6 @@ public class TextLogitStream extends TupleStream implements Expressible {
   private transient boolean doCloseCache;
 
   protected transient StreamContext streamContext;
-  protected transient ExecutorService executorService;
   protected TupleStream termsStream;
   private List<String> terms;
 
@@ -367,9 +363,6 @@ public void open() throws IOException {
     } else {
       doCloseCache = false;
     }
-
-    this.executorService =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TextLogitSolrStream"));
   }
 
   @Override
@@ -410,9 +403,8 @@ protected List<String> getShardUrls() throws IOException {
     }
   }
 
-  private List<Future<Tuple>> callShards(List<String> baseUrls) throws IOException {
-
-    List<Future<Tuple>> futures = new ArrayList<>();
+  private Collection<Tuple> callShards(List<String> baseUrls) throws IOException {
+    List<LogitCall> tasks = new ArrayList<>();
     for (String baseUrl : baseUrls) {
       LogitCall lc =
           new LogitCall(
@@ -428,12 +420,9 @@ private List<Future<Tuple>> callShards(List<String> baseUrls) throws IOException
               this.threshold,
               this.idfs,
               this.clientCache);
-
-      Future<Tuple> future = executorService.submit(lc);
-      futures.add(future);
+      tasks.add(lc);
     }
-
-    return futures;
+    return submitAllAndAwaitAggregatingExceptions(tasks, "TextLogitSolrStream");
   }
 
   @Override
@@ -441,10 +430,6 @@ public void close() throws IOException {
     if (doCloseCache) {
       clientCache.close();
     }
-
-    if (executorService != null) {
-      executorService.shutdown();
-    }
     termsStream.close();
   }
 
@@ -511,9 +496,7 @@ public Tuple read() throws IOException {
         this.evaluation = new ClassificationEvaluation();
 
         this.error = 0;
-        for (Future<Tuple> logitCall : callShards(getShardUrls())) {
-
-          Tuple tuple = logitCall.get();
+        for (Tuple tuple : callShards(getShardUrls())) {
           @SuppressWarnings({"unchecked"})
           List<Double> shardWeights = (List<Double>) tuple.get("weights");
           allWeights.add(shardWeights);
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
index e343d56e35c..8e3844c152a 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
@@ -17,6 +17,7 @@
 
 package org.apache.solr.client.solrj.io.stream;
 
+import static org.apache.solr.client.solrj.io.stream.StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions;
 import static org.apache.solr.common.params.CommonParams.DISTRIB;
 import static org.apache.solr.common.params.CommonParams.ID;
 import static org.apache.solr.common.params.CommonParams.SORT;
@@ -32,11 +33,11 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
@@ -59,8 +60,6 @@
 import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
 
 /**
  * @since 6.0.0
@@ -338,30 +337,15 @@ public void open() throws IOException {
   }
 
   private void openStreams() throws IOException {
-
-    ExecutorService service =
-        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TopicStream"));
-    try {
-      List<Future<TupleWrapper>> futures = new ArrayList<>();
-      for (TupleStream solrStream : solrStreams) {
-        StreamOpener so = new StreamOpener((SolrStream) solrStream, comp);
-        Future<TupleWrapper> future = service.submit(so);
-        futures.add(future);
-      }
-
-      try {
-        for (Future<TupleWrapper> f : futures) {
-          TupleWrapper w = f.get();
-          if (w != null) {
-            tuples.add(w);
-          }
-        }
-      } catch (Exception e) {
-        throw new IOException(e);
-      }
-    } finally {
-      service.shutdown();
-    }
+    List<Callable<TupleWrapper>> tasks =
+        solrStreams.stream()
+            .map(s -> new StreamOpener((SolrStream) s, comp))
+            .collect(Collectors.toUnmodifiableList());
+    var results =
+        submitAllAndAwaitAggregatingExceptions(tasks, "TopicStream").stream()
+            .filter(Objects::nonNull)
+            .collect(Collectors.toUnmodifiableList());
+    tuples.addAll(results);
   }
 
   @Override
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
index 13faf73acde..435d5984083 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
@@ -42,6 +42,7 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.IOUtils;
 
 /**
  * @since 5.1.0
@@ -125,6 +126,14 @@ public static List<String> getShards(
   static List<Replica> getReplicas(
       String zkHost, String collection, StreamContext streamContext, SolrParams requestParams)
       throws IOException {
+    if (zkHost == null) {
+      throw new IOException(
+          String.format(
+              Locale.ROOT,
+              "invalid expression - zkHost not found for collection '%s'",
+              collection));
+    }
+
     List<Replica> replicas = new ArrayList<>();
 
     // SolrCloud Sharding
@@ -139,54 +148,49 @@ static List<Replica> getReplicas(
       localSolrClientCache = null;
     }
 
-    if (zkHost == null) {
-      throw new IOException(
-          String.format(
-              Locale.ROOT,
-              "invalid expression - zkHost not found for collection '%s'",
-              collection));
-    }
-
-    CloudSolrClient cloudSolrClient = solrClientCache.getCloudSolrClient(zkHost);
-    ClusterState clusterState = cloudSolrClient.getClusterStateProvider().getClusterState();
-    Slice[] slices = CloudSolrStream.getSlices(collection, cloudSolrClient, true);
-    Set<String> liveNodes = clusterState.getLiveNodes();
-
-    RequestReplicaListTransformerGenerator requestReplicaListTransformerGenerator;
-    final ModifiableSolrParams solrParams;
-    if (streamContext != null) {
-      solrParams = new ModifiableSolrParams(streamContext.getRequestParams());
-      requestReplicaListTransformerGenerator =
-          streamContext.getRequestReplicaListTransformerGenerator();
-    } else {
-      solrParams = new ModifiableSolrParams();
-      requestReplicaListTransformerGenerator = null;
-    }
-    if (requestReplicaListTransformerGenerator == null) {
-      requestReplicaListTransformerGenerator = new RequestReplicaListTransformerGenerator();
-    }
-    solrParams.add(requestParams);
-
-    ReplicaListTransformer replicaListTransformer =
-        requestReplicaListTransformerGenerator.getReplicaListTransformer(solrParams);
-
-    final String coreFilter =
-        streamContext != null && streamContext.isLocal()
-            ? (String) streamContext.get("core")
-            : null;
-    List<Replica> sortedReplicas = new ArrayList<>();
-    for (Slice slice : slices) {
-      slice.getReplicas().stream().filter(r -> r.isActive(liveNodes)).forEach(sortedReplicas::add);
-      replicaListTransformer.transform(sortedReplicas);
-      sortedReplicas.stream()
-          .filter(r -> coreFilter == null || coreFilter.equals(r.core))
-          .findFirst()
-          .ifPresent(replicas::add);
-      sortedReplicas.clear();
-    }
+    try {
+      CloudSolrClient cloudSolrClient = solrClientCache.getCloudSolrClient(zkHost);
+      ClusterState clusterState = cloudSolrClient.getClusterStateProvider().getClusterState();
+      Slice[] slices = CloudSolrStream.getSlices(collection, cloudSolrClient, true);
+      Set<String> liveNodes = clusterState.getLiveNodes();
+
+      RequestReplicaListTransformerGenerator requestReplicaListTransformerGenerator;
+      final ModifiableSolrParams solrParams;
+      if (streamContext != null) {
+        solrParams = new ModifiableSolrParams(streamContext.getRequestParams());
+        requestReplicaListTransformerGenerator =
+            streamContext.getRequestReplicaListTransformerGenerator();
+      } else {
+        solrParams = new ModifiableSolrParams();
+        requestReplicaListTransformerGenerator = null;
+      }
+      if (requestReplicaListTransformerGenerator == null) {
+        requestReplicaListTransformerGenerator = new RequestReplicaListTransformerGenerator();
+      }
+      solrParams.add(requestParams);
+
+      ReplicaListTransformer replicaListTransformer =
+          requestReplicaListTransformerGenerator.getReplicaListTransformer(solrParams);
+
+      final String coreFilter =
+          streamContext != null && streamContext.isLocal()
+              ? (String) streamContext.get("core")
+              : null;
+      List<Replica> sortedReplicas = new ArrayList<>();
+      for (Slice slice : slices) {
+        slice.getReplicas().stream()
+            .filter(r -> r.isActive(liveNodes))
+            .forEach(sortedReplicas::add);
+        replicaListTransformer.transform(sortedReplicas);
+        sortedReplicas.stream()
+            .filter(r -> coreFilter == null || coreFilter.equals(r.core))
+            .findFirst()
+            .ifPresent(replicas::add);
+        sortedReplicas.clear();
+      }
 
-    if (localSolrClientCache != null) {
-      localSolrClientCache.close();
+    } finally {
+      IOUtils.closeQuietly(localSolrClientCache);
     }
 
     return replicas;
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExecutorHelperTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExecutorHelperTest.java
new file mode 100644
index 00000000000..ae80cea1060
--- /dev/null
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExecutorHelperTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.io.stream;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.solr.SolrTestCase;
+import org.junit.Test;
+
+public class StreamExecutorHelperTest extends SolrTestCase {
+
+  @Test
+  public void submitAllTest() throws IOException {
+    AtomicLong idx = new AtomicLong();
+    Callable<Long> c = () -> idx.getAndIncrement();
+
+    List<Callable<Long>> tasks = List.of(c, c, c, c, c);
+    List<Long> results = new ArrayList<>();
+    results.addAll(StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions(tasks, "test"));
+    Collections.sort(results);
+    List<Long> expected = List.of(0l, 1l, 2l, 3l, 4l);
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void submitAllWithExceptionsTest() {
+    AtomicLong idx = new AtomicLong();
+    Callable<Long> c =
+        () -> {
+          long id = idx.getAndIncrement();
+          if (id % 2 == 0) {
+            throw new Exception("TestException" + id);
+          }
+          return id;
+        };
+    List<Callable<Long>> tasks = List.of(c, c, c, c, c);
+    IOException ex =
+        expectThrows(
+            IOException.class,
+            () -> StreamExecutorHelper.submitAllAndAwaitAggregatingExceptions(tasks, "test"));
+    List<String> results = new ArrayList<>();
+    results.add(ex.getCause().getMessage());
+    for (var s : ex.getSuppressed()) {
+      results.add(s.getMessage());
+    }
+    Collections.sort(results);
+    List<String> expected = List.of("TestException0", "TestException2", "TestException4");
+    assertEquals(expected, results);
+  }
+}
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java
index 1c8f5647e75..cfa7b176d50 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java
@@ -16,13 +16,17 @@
  */
 package org.apache.solr.common.util;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.SynchronousQueue;
@@ -30,6 +34,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -329,4 +334,48 @@ public static void setServerThreadFlag(Boolean flag) {
     if (flag == null) isServerPool.remove();
     else isServerPool.set(flag);
   }
+
+  /**
+   * Takes an executor and a list of Callables and executes them returning the results as a list.
+   * The method waits for the return of every task even if one of them throws an exception. If any
+   * exception happens it will be thrown, wrapped into an IOException, and other following
+   * exceptions will be added as `addSuppressed` to the original exception
+   *
+   * @param <T> the response type
+   * @param service executor
+   * @param tasks the list of callables to be executed
+   * @return results list
+   * @throws IOException in case any exceptions happened
+   */
+  public static <T> Collection<T> submitAllAndAwaitAggregatingExceptions(
+      ExecutorService service, List<? extends Callable<T>> tasks) throws IOException {
+    List<T> results = new ArrayList<>(tasks.size());
+    IOException parentException = null;
+
+    // Could alternatively use service.invokeAll, but this way we can start looping over futures
+    // before all are done
+    List<Future<T>> futures =
+        tasks.stream().map(service::submit).collect(Collectors.toUnmodifiableList());
+    for (Future<T> f : futures) {
+      try {
+        results.add(f.get());
+      } catch (ExecutionException e) {
+        if (parentException == null) {
+          parentException = new IOException(e.getCause());
+        } else {
+          parentException.addSuppressed(e.getCause());
+        }
+      } catch (Exception e) {
+        if (parentException == null) {
+          parentException = new IOException(e);
+        } else {
+          parentException.addSuppressed(e);
+        }
+      }
+    }
+    if (parentException != null) {
+      throw parentException;
+    }
+    return results;
+  }
 }
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java b/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
index d7cfbe9c321..c3fc2137018 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
@@ -17,10 +17,16 @@
 package org.apache.solr.common.util;
 
 import com.carrotsearch.randomizedtesting.annotations.Timeout;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import org.apache.solr.SolrTestCase;
 import org.apache.solr.util.TimeOut;
 import org.junit.Test;
@@ -95,4 +101,56 @@ private boolean getTestThread(
     }
     return true; // ran full time
   }
+
+  @Test
+  public void submitAllTest() throws IOException {
+    AtomicLong idx = new AtomicLong();
+    Callable<Long> c = () -> idx.getAndIncrement();
+
+    List<Long> results = new ArrayList<>();
+    ExecutorService service =
+        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("test"));
+    try {
+      List<Callable<Long>> tasks = List.of(c, c, c, c, c);
+      results.addAll(ExecutorUtil.submitAllAndAwaitAggregatingExceptions(service, tasks));
+    } finally {
+      ExecutorUtil.shutdownNowAndAwaitTermination(service);
+    }
+    Collections.sort(results);
+    List<Long> expected = List.of(0l, 1l, 2l, 3l, 4l);
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void submitAllWithExceptionsTest() {
+    AtomicLong idx = new AtomicLong();
+    Callable<Long> c =
+        () -> {
+          long id = idx.getAndIncrement();
+          if (id % 2 == 0) {
+            throw new Exception("TestException" + id);
+          }
+          return id;
+        };
+
+    ExecutorService service =
+        ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("test"));
+    try {
+      List<Callable<Long>> tasks = List.of(c, c, c, c, c);
+      IOException ex =
+          expectThrows(
+              IOException.class,
+              () -> ExecutorUtil.submitAllAndAwaitAggregatingExceptions(service, tasks));
+      List<String> results = new ArrayList<>();
+      results.add(ex.getCause().getMessage());
+      for (var s : ex.getSuppressed()) {
+        results.add(s.getMessage());
+      }
+      Collections.sort(results);
+      List<String> expected = List.of("TestException0", "TestException2", "TestException4");
+      assertEquals(expected, results);
+    } finally {
+      ExecutorUtil.shutdownNowAndAwaitTermination(service);
+    }
+  }
 }

From 0f7e067f916f49f4094f74c63512cd0accf9e2ca Mon Sep 17 00:00:00 2001
From: Raghavan Muthuregunathan <raghavan.mit@gmail.com>
Date: Tue, 15 Aug 2023 01:42:51 -0700
Subject: [PATCH 122/160] SOLR-16644 Fixing the entropy warning threshold based
 on OS ubuntu and the kernel version

---
 solr/bin/solr | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index cc72f621094..9f2c858ac79 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1915,12 +1915,28 @@ function start_solr() {
         -jar start.jar "${SOLR_JETTY_CONFIG[@]}" $SOLR_JETTY_ADDL_CONFIG \
 	1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
 
-    # check if /proc/sys/kernel/random/entropy_avail exists then check output of cat /proc/sys/kernel/random/entropy_avail to see if less than 300
-    if [[ -f /proc/sys/kernel/random/entropy_avail ]] && (( $(cat /proc/sys/kernel/random/entropy_avail) < 300)); then
-	echo "Warning: Available entropy is low. As a result, use of the UUIDField, SSL, or any other features that require"
-	echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
-	echo ""
+  entropy_threshold=300
+  # Determine if the operating system is Ubuntu
+  os_name=$(lsb_release -is)
+  if [[ "$os_name" == "Ubuntu" ]]; then
+    # Get the kernel version
+    kernel_version=$(uname -r | awk -F. '{print $1"."$2}')
+    # Set entropy threshold based on kernel version
+    if [[ $(echo "$kernel_version >= 5.15" | bc) -eq 1 ]]; then
+      # For kernels 5.15 and newer
+      entropy_threshold=64  # Adjusted for 256 pool size (approx 25% of 256)
+    else
+      # For older kernels
+      entropy_threshold=300  # Original threshold for 4096 pool size
     fi
+  fi
+
+        # Check entropy and display warning if below threshold
+    if [[ -f /proc/sys/kernel/random/entropy_avail ]] && (( $(cat /proc/sys/kernel/random/entropy_avail) < $entropy_threshold)); then
+      echo "Warning: Available entropy is low. As a result, use of the UUIDField, SSL, or any other features that require"
+      echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
+    fi
+
     # no lsof on cygwin though
     if lsof -v 2>&1 | grep -q revision; then
       echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT"

From df3ff50085b18af3007e0c6e858bd244fd2ee480 Mon Sep 17 00:00:00 2001
From: Raghavan Muthuregunathan <raghavan.mit@gmail.com>
Date: Wed, 27 Sep 2023 00:15:04 -0700
Subject: [PATCH 123/160] SOLR-16644: Updating the check based on ratio

---
 solr/bin/solr | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index 9f2c858ac79..d0d54eae3bf 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1915,27 +1915,30 @@ function start_solr() {
         -jar start.jar "${SOLR_JETTY_CONFIG[@]}" $SOLR_JETTY_ADDL_CONFIG \
 	1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
 
-  entropy_threshold=300
-  # Determine if the operating system is Ubuntu
-  os_name=$(lsb_release -is)
-  if [[ "$os_name" == "Ubuntu" ]]; then
-    # Get the kernel version
-    kernel_version=$(uname -r | awk -F. '{print $1"."$2}')
-    # Set entropy threshold based on kernel version
-    if [[ $(echo "$kernel_version >= 5.15" | bc) -eq 1 ]]; then
-      # For kernels 5.15 and newer
-      entropy_threshold=64  # Adjusted for 256 pool size (approx 25% of 256)
-    else
-      # For older kernels
-      entropy_threshold=300  # Original threshold for 4096 pool size
-    fi
-  fi
+  #!/bin/bash
+
+# Get the current entropy available
+entropy_avail=$(cat /proc/sys/kernel/random/entropy_avail)
+
+# Get the pool size
+pool_size=$(cat /proc/sys/kernel/random/poolsize)
 
-        # Check entropy and display warning if below threshold
-    if [[ -f /proc/sys/kernel/random/entropy_avail ]] && (( $(cat /proc/sys/kernel/random/entropy_avail) < $entropy_threshold)); then
+# Check if entropy is available and pool size is non-zero
+if [[ $entropy_avail -gt 0 && $pool_size -ne 0 ]]; then
+    # Compute the ratio of entropy available to pool size
+    ratio=$(awk -v ea="$entropy_avail" -v ps="$pool_size" 'BEGIN {print (ea/ps)*100}')
+    
+    # Check if the ratio is less than 25%
+    if (( $(echo "$ratio < 25" | bc -l) )); then
       echo "Warning: Available entropy is low. As a result, use of the UUIDField, SSL, or any other features that require"
       echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
     fi
+else
+    echo "Error: Either no entropy is available or the pool size is zero."
+fi
+
+
+ 
 
     # no lsof on cygwin though
     if lsof -v 2>&1 | grep -q revision; then

From 943395e8c1b8787ce19e1270891634bde5a7e62f Mon Sep 17 00:00:00 2001
From: Ishan Chattopadhyaya <ishan@apache.org>
Date: Fri, 29 Sep 2023 22:54:43 +0530
Subject: [PATCH 124/160] SOLR-16644: Fixing the entropy warning threshold
 using scaling based on poolsize (closes #1842)

---
 solr/CHANGES.txt |  2 ++
 solr/bin/solr    | 41 ++++++++++++++++++-----------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cb46073b65e..cc7d9a46059 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -223,6 +223,8 @@ Bug Fixes
 
 * SOLR-16992: Non-reproducible StreamingTest failures -- suggests CloudSolrStream concurency race condition (Alex Deparvu, hossman)
 
+* SOLR-16644: Fixing the entropy warning threshold using scaling based on poolsize (Raghavan Muthuregunathan)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/bin/solr b/solr/bin/solr
index d0d54eae3bf..101fde35a51 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1915,30 +1915,25 @@ function start_solr() {
         -jar start.jar "${SOLR_JETTY_CONFIG[@]}" $SOLR_JETTY_ADDL_CONFIG \
 	1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
 
-  #!/bin/bash
-
-# Get the current entropy available
-entropy_avail=$(cat /proc/sys/kernel/random/entropy_avail)
-
-# Get the pool size
-pool_size=$(cat /proc/sys/kernel/random/poolsize)
-
-# Check if entropy is available and pool size is non-zero
-if [[ $entropy_avail -gt 0 && $pool_size -ne 0 ]]; then
-    # Compute the ratio of entropy available to pool size
-    ratio=$(awk -v ea="$entropy_avail" -v ps="$pool_size" 'BEGIN {print (ea/ps)*100}')
-    
-    # Check if the ratio is less than 25%
-    if (( $(echo "$ratio < 25" | bc -l) )); then
-      echo "Warning: Available entropy is low. As a result, use of the UUIDField, SSL, or any other features that require"
-      echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
+    # Get the current entropy available
+    entropy_avail=$(cat /proc/sys/kernel/random/entropy_avail)
+
+    # Get the pool size
+    pool_size=$(cat /proc/sys/kernel/random/poolsize)
+
+    # Check if entropy is available and pool size is non-zero
+    if [[ $entropy_avail -gt 0 && $pool_size -ne 0 ]]; then
+        # Compute the ratio of entropy available to pool size
+        ratio=$(awk -v ea="$entropy_avail" -v ps="$pool_size" 'BEGIN {print (ea/ps)*100}')
+        
+        # Check if the ratio is less than 25%
+        if (( $(echo "$ratio < 25" | bc -l) )); then
+          echo "Warning: Available entropy is low. As a result, use of the UUIDField, SSL, or any other features that require"
+          echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
+        fi
+    else
+        echo "Error: Either no entropy is available or the pool size is zero."
     fi
-else
-    echo "Error: Either no entropy is available or the pool size is zero."
-fi
-
-
- 
 
     # no lsof on cygwin though
     if lsof -v 2>&1 | grep -q revision; then

From 240ae14962a62192fedaea48d07590dd15ff1891 Mon Sep 17 00:00:00 2001
From: Kevin Risden <risdenk@users.noreply.github.com>
Date: Fri, 29 Sep 2023 14:02:04 -0400
Subject: [PATCH 125/160] SOLR-17004: ZkStateReader waitForState should check
 clusterState before using watchers (#1945)

---
 solr/CHANGES.txt                              |  3 +-
 .../cloud/LeaderElectionIntegrationTest.java  | 10 +++++-
 .../solr/common/cloud/ZkStateReader.java      | 33 +++++++++++++++----
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cc7d9a46059..df10be97fc9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -21,7 +21,8 @@ Improvements
 
 Optimizations
 ---------------------
-(No changes)
+
+* SOLR-17004: ZkStateReader waitForState should check clusterState before using watchers (Kevin Risden)
 
 Bug Fixes
 ---------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
index 4491476f030..5da2f862ea2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
@@ -79,15 +79,22 @@ public void testSimpleSliceLeaderElection() throws Exception {
               .getCoreDescriptor()
               .getCloudDescriptor()
               .getShardId());
+      String jettyNodeName = jetty.getNodeName(); // must get before shutdown
       jetty.stop();
       stoppedRunners.add(jetty);
+      waitForState(
+          "Leader should not be " + jettyNodeName,
+          collection,
+          (n, c) ->
+              c.getLeader("shard1") != null
+                  && !jettyNodeName.equals(c.getLeader("shard1").getNodeName()));
     }
 
     for (JettySolrRunner runner : stoppedRunners) {
       runner.start();
     }
     waitForState(
-        "Expected to see nodes come back " + collection, collection, (n, c) -> n.size() == 6);
+        "Expected to see nodes come back for " + collection, collection, (n, c) -> n.size() == 6);
     CollectionAdminRequest.deleteCollection(collection).process(cluster.getSolrClient());
 
     // testLeaderElectionAfterClientTimeout
@@ -99,6 +106,7 @@ public void testSimpleSliceLeaderElection() throws Exception {
     // timeout the leader
     String leader = getLeader(collection);
     JettySolrRunner jetty = getRunner(leader);
+    assertNotNull(jetty);
     cluster.expireZkSession(jetty);
 
     for (int i = 0; i < 60; i++) { // wait till leader is changed
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 17f7bdbc5d5..4879733e7fe 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -936,7 +936,6 @@ public Replica getLeaderRetry(String collection, String shard) throws Interrupte
   /** Get shard leader properties, with retry if none exist. */
   public Replica getLeaderRetry(String collection, String shard, int timeout)
       throws InterruptedException {
-    AtomicReference<DocCollection> coll = new AtomicReference<>();
     AtomicReference<Replica> leader = new AtomicReference<>();
     try {
       waitForState(
@@ -945,7 +944,6 @@ public Replica getLeaderRetry(String collection, String shard, int timeout)
           TimeUnit.MILLISECONDS,
           (n, c) -> {
             if (c == null) return false;
-            coll.set(c);
             Replica l = getLeader(n, c, shard);
             if (l != null) {
               log.debug("leader found for {}/{} to be {}", collection, shard, l);
@@ -1802,6 +1800,18 @@ public void waitForState(
       throw new AlreadyClosedException();
     }
 
+    // Check predicate against known clusterState before trying to add watchers
+    if (clusterState != null) {
+      Set<String> liveNodes = clusterState.getLiveNodes();
+      DocCollection docCollection = clusterState.getCollectionOrNull(collection);
+      if (liveNodes != null && docCollection != null) {
+        if (predicate.matches(liveNodes, docCollection)) {
+          log.debug("Found {} directly in clusterState", predicate);
+          return;
+        }
+      }
+    }
+
     final CountDownLatch latch = new CountDownLatch(1);
     waitLatches.add(latch);
     AtomicReference<DocCollection> docCollection = new AtomicReference<>();
@@ -1855,12 +1865,23 @@ public DocCollection waitForState(
       throw new AlreadyClosedException();
     }
 
+    // Check predicate against known clusterState before trying to add watchers
+    if (clusterState != null) {
+      DocCollection docCollection = clusterState.getCollectionOrNull(collection);
+      if (docCollection != null) {
+        if (predicate.test(docCollection)) {
+          log.debug("Found {} directly in clusterState", predicate);
+          return docCollection;
+        }
+      }
+    }
+
     final CountDownLatch latch = new CountDownLatch(1);
     waitLatches.add(latch);
-    AtomicReference<DocCollection> docCollection = new AtomicReference<>();
+    AtomicReference<DocCollection> docCollectionReference = new AtomicReference<>();
     DocCollectionWatcher watcher =
         (c) -> {
-          docCollection.set(c);
+          docCollectionReference.set(c);
           boolean matches = predicate.test(c);
           if (matches) latch.countDown();
 
@@ -1875,8 +1896,8 @@ public DocCollection waitForState(
             "Timeout waiting to see state for collection="
                 + collection
                 + " :"
-                + docCollection.get());
-      return docCollection.get();
+                + docCollectionReference.get());
+      return docCollectionReference.get();
     } finally {
       removeDocCollectionWatcher(collection, watcher);
       waitLatches.remove(latch);

From d5881569474864ae5105f5a534d8277fc4a8aa58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Sat, 30 Sep 2023 01:20:48 +0200
Subject: [PATCH 126/160] Fix the admin UI green core-size graph on nodes
 screen (#1963)

---
 solr/CHANGES.txt                                |  2 ++
 solr/webapp/web/js/angular/controllers/cloud.js | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index df10be97fc9..b58374160ce 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -220,6 +220,8 @@ Bug Fixes
 
 * SOLR-16997: OTEL configurator NPE when SOLR_HOST not set (janhoy)
 
+* PR#1963: Fix the admin UI green core-size graph on nodes screen (janhoy)
+
 * SOLR-16980: Connect to SOLR standalone with basic authentication (Alex Deparvu)
 
 * SOLR-16992: Non-reproducible StreamingTest failures -- suggests CloudSolrStream concurency race condition (Alex Deparvu, hossman)
diff --git a/solr/webapp/web/js/angular/controllers/cloud.js b/solr/webapp/web/js/angular/controllers/cloud.js
index ece27cb657a..70b89611614 100644
--- a/solr/webapp/web/js/angular/controllers/cloud.js
+++ b/solr/webapp/web/js/angular/controllers/cloud.js
@@ -423,9 +423,10 @@ var nodesSubController = function($scope, Collections, System, Metrics) {
               // These are the cores we _expect_ to find on this node according to the CLUSTERSTATUS
               var cores = nodes[node]['cores'];
               var indexSizeTotal = 0;
+              var indexSizeMax = 0;
               var docsTotal = 0;
               var graphData = [];
-              for (coreId in cores) {
+              for (let coreId in cores) {
                 var core = cores[coreId];
                 if (core['shard_state'] !== 'active' || core['state'] !== 'active') {
                   // If core state is not active, display the real state, or if shard is inactive, display that
@@ -440,7 +441,8 @@ var nodesSubController = function($scope, Collections, System, Metrics) {
                   size = (typeof size !== 'undefined') ? size : 0;
                   core['sizeInBytes'] = size;
                   core['size'] = bytesToSize(size);
-                  indexSizeTotal += size;
+                  indexSizeTotal = indexSizeTotal + size;
+                  indexSizeMax = size > indexSizeMax ? size : indexSizeMax;
                   var numDocs = coreMetric['SEARCHER.searcher.numDocs'];
                   numDocs = (typeof numDocs !== 'undefined') ? numDocs : 0;
                   core['numDocs'] = numDocs;
@@ -455,12 +457,14 @@ var nodesSubController = function($scope, Collections, System, Metrics) {
                   core['warmupTime'] = warmupTime;
                   docsTotal += core['numDocs'];
                 }
-
+              }
+              for (let coreId in cores) {
+                var core = cores[coreId];
                 var graphObj = {};
                 graphObj['label'] = core['label'];
                 graphObj['size'] = core['sizeInBytes'];
                 graphObj['sizeHuman'] = core['size'];
-                graphObj['pct'] = (core['sizeInBytes'] / indexSizeTotal) * 100;
+                graphObj['pct'] = (core['sizeInBytes'] / indexSizeMax) * 100;
                 graphData.push(graphObj);
               }
               if (cores) {

From 83f768bf1b4be99b10aa9b90928976bfa4c4340e Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Fri, 29 Sep 2023 19:38:07 -0700
Subject: [PATCH 127/160] SOLR-16985 Upgrade Lucene to 9.8.0 (#1958)

Co-authored-by: Christine Poerschke <cpoerschke@apache.org>
---
 solr/CHANGES.txt                              |  2 +
 .../apache/solr/core/SchemaCodecFactory.java  | 38 +++++++++++++-
 .../index/SlowCompositeReaderWrapper.java     | 10 ++--
 .../apache/solr/schema/DenseVectorField.java  | 11 ++--
 .../solr/search/CollapsingQParserPlugin.java  | 20 +++----
 .../solr/search/DelegatingCollector.java      | 18 ++++++-
 .../java/org/apache/solr/search/Grouping.java |  4 +-
 .../solr/search/IGainTermsQParserPlugin.java  |  4 +-
 .../search/SignificantTermsQParserPlugin.java |  6 +--
 .../apache/solr/search/SolrIndexSearcher.java |  6 +--
 .../TextLogisticRegressionQParserPlugin.java  |  4 +-
 .../solr/schema/DenseVectorFieldTest.java     |  2 +-
 .../search/AnalyticsTestQParserPlugin.java    |  4 +-
 .../SignificantTermsQParserPluginTest.java    |  4 +-
 .../org/apache/solr/search/TestDocSet.java    | 14 ++---
 .../solr/search/neural/KnnQParserTest.java    |  2 +-
 .../lucene-analysis-common-9.7.0.jar.sha1     |  1 -
 .../lucene-analysis-common-9.8.0.jar.sha1     |  1 +
 .../lucene-analysis-icu-9.7.0.jar.sha1        |  1 -
 .../lucene-analysis-icu-9.8.0.jar.sha1        |  1 +
 .../lucene-analysis-kuromoji-9.7.0.jar.sha1   |  1 -
 .../lucene-analysis-kuromoji-9.8.0.jar.sha1   |  1 +
 .../lucene-analysis-morfologik-9.7.0.jar.sha1 |  1 -
 .../lucene-analysis-morfologik-9.8.0.jar.sha1 |  1 +
 .../lucene-analysis-nori-9.7.0.jar.sha1       |  1 -
 .../lucene-analysis-nori-9.8.0.jar.sha1       |  1 +
 .../lucene-analysis-opennlp-9.7.0.jar.sha1    |  1 -
 .../lucene-analysis-opennlp-9.8.0.jar.sha1    |  1 +
 .../lucene-analysis-phonetic-9.7.0.jar.sha1   |  1 -
 .../lucene-analysis-phonetic-9.8.0.jar.sha1   |  1 +
 .../lucene-analysis-smartcn-9.7.0.jar.sha1    |  1 -
 .../lucene-analysis-smartcn-9.8.0.jar.sha1    |  1 +
 .../lucene-analysis-stempel-9.7.0.jar.sha1    |  1 -
 .../lucene-analysis-stempel-9.8.0.jar.sha1    |  1 +
 .../lucene-backward-codecs-9.7.0.jar.sha1     |  1 -
 .../lucene-backward-codecs-9.8.0.jar.sha1     |  1 +
 .../lucene-classification-9.7.0.jar.sha1      |  1 -
 .../lucene-classification-9.8.0.jar.sha1      |  1 +
 solr/licenses/lucene-codecs-9.7.0.jar.sha1    |  1 -
 solr/licenses/lucene-codecs-9.8.0.jar.sha1    |  1 +
 solr/licenses/lucene-core-9.7.0.jar.sha1      |  1 -
 solr/licenses/lucene-core-9.8.0.jar.sha1      |  1 +
 .../lucene-expressions-9.7.0.jar.sha1         |  1 -
 .../lucene-expressions-9.8.0.jar.sha1         |  1 +
 solr/licenses/lucene-grouping-9.7.0.jar.sha1  |  1 -
 solr/licenses/lucene-grouping-9.8.0.jar.sha1  |  1 +
 .../lucene-highlighter-9.7.0.jar.sha1         |  1 -
 .../lucene-highlighter-9.8.0.jar.sha1         |  1 +
 solr/licenses/lucene-join-9.7.0.jar.sha1      |  1 -
 solr/licenses/lucene-join-9.8.0.jar.sha1      |  1 +
 solr/licenses/lucene-memory-9.7.0.jar.sha1    |  1 -
 solr/licenses/lucene-memory-9.8.0.jar.sha1    |  1 +
 solr/licenses/lucene-misc-9.7.0.jar.sha1      |  1 -
 solr/licenses/lucene-misc-9.8.0.jar.sha1      |  1 +
 solr/licenses/lucene-queries-9.7.0.jar.sha1   |  1 -
 solr/licenses/lucene-queries-9.8.0.jar.sha1   |  1 +
 .../lucene-queryparser-9.7.0.jar.sha1         |  1 -
 .../lucene-queryparser-9.8.0.jar.sha1         |  1 +
 solr/licenses/lucene-sandbox-9.7.0.jar.sha1   |  1 -
 solr/licenses/lucene-sandbox-9.8.0.jar.sha1   |  1 +
 .../lucene-spatial-extras-9.7.0.jar.sha1      |  1 -
 .../lucene-spatial-extras-9.8.0.jar.sha1      |  1 +
 solr/licenses/lucene-spatial3d-9.7.0.jar.sha1 |  1 -
 solr/licenses/lucene-spatial3d-9.8.0.jar.sha1 |  1 +
 solr/licenses/lucene-suggest-9.7.0.jar.sha1   |  1 -
 solr/licenses/lucene-suggest-9.8.0.jar.sha1   |  1 +
 .../lucene-test-framework-9.7.0.jar.sha1      |  1 -
 .../lucene-test-framework-9.8.0.jar.sha1      |  1 +
 .../configsets/_default/conf/solrconfig.xml   |  2 +-
 .../conf/solrconfig.xml                       |  2 +-
 .../pages/major-changes-in-solr-9.adoc        |  3 ++
 versions.lock                                 | 52 +++++++++----------
 versions.props                                |  2 +-
 73 files changed, 156 insertions(+), 106 deletions(-)
 delete mode 100644 solr/licenses/lucene-analysis-common-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-common-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-icu-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-kuromoji-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-morfologik-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-nori-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-opennlp-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-phonetic-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-smartcn-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-stempel-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-backward-codecs-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-classification-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-classification-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-codecs-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-codecs-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-core-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-core-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-expressions-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-expressions-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-grouping-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-grouping-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-highlighter-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-highlighter-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-join-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-join-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-memory-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-memory-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-misc-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-misc-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-queries-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-queries-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-queryparser-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-queryparser-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-sandbox-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-sandbox-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial-extras-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial3d-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial3d-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-suggest-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-suggest-9.8.0.jar.sha1
 delete mode 100644 solr/licenses/lucene-test-framework-9.7.0.jar.sha1
 create mode 100644 solr/licenses/lucene-test-framework-9.8.0.jar.sha1

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b58374160ce..17feb62fba3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -233,6 +233,8 @@ Dependency Upgrades
 
 * PR#1846: Update io.opentelemetry to 1.29.0 (Alex Deparvu)
 
+* SOLR-16985: Upgrade Lucene to 9.8.0 (Alex Deparvu, Christine Poerschke)
+
 Other Changes
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
index 8615e0a32ef..2b2933b0f86 100644
--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
@@ -16,16 +16,21 @@
  */
 package org.apache.solr.core;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.Locale;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.DocValuesFormat;
 import org.apache.lucene.codecs.KnnVectorsFormat;
+import org.apache.lucene.codecs.KnnVectorsReader;
+import org.apache.lucene.codecs.KnnVectorsWriter;
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.codecs.lucene95.Lucene95Codec;
 import org.apache.lucene.codecs.lucene95.Lucene95Codec.Mode;
 import org.apache.lucene.codecs.lucene95.Lucene95HnswVectorsFormat;
+import org.apache.lucene.index.SegmentReadState;
+import org.apache.lucene.index.SegmentWriteState;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.util.NamedList;
@@ -127,7 +132,8 @@ public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
               if (DenseVectorField.HNSW_ALGORITHM.equals(knnAlgorithm)) {
                 int maxConn = vectorType.getHnswMaxConn();
                 int beamWidth = vectorType.getHnswBeamWidth();
-                return new Lucene95HnswVectorsFormat(maxConn, beamWidth);
+                var delegate = new Lucene95HnswVectorsFormat(maxConn, beamWidth);
+                return new SolrDelegatingKnnVectorsFormat(delegate, vectorType.getDimension());
               } else {
                 throw new SolrException(
                     ErrorCode.SERVER_ERROR, knnAlgorithm + " KNN algorithm is not supported");
@@ -145,4 +151,34 @@ public Codec getCodec() {
     assert core != null : "inform must be called first";
     return codec;
   }
+
+  /**
+   * This class exists because Lucene95HnswVectorsFormat's getMaxDimensions method is final and we
+   * need to workaround that constraint to allow more than the default number of dimensions
+   */
+  private static final class SolrDelegatingKnnVectorsFormat extends KnnVectorsFormat {
+    private final KnnVectorsFormat delegate;
+    private final int maxDimensions;
+
+    public SolrDelegatingKnnVectorsFormat(KnnVectorsFormat delegate, int maxDimensions) {
+      super(delegate.getName());
+      this.delegate = delegate;
+      this.maxDimensions = maxDimensions;
+    }
+
+    @Override
+    public KnnVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
+      return delegate.fieldsWriter(state);
+    }
+
+    @Override
+    public KnnVectorsReader fieldsReader(SegmentReadState state) throws IOException {
+      return delegate.fieldsReader(state);
+    }
+
+    @Override
+    public int getMaxDimensions(String fieldName) {
+      return maxDimensions;
+    }
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
index b066ba373fd..85084f5887b 100644
--- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
+++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
@@ -50,7 +50,7 @@
 import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.TermVectors;
 import org.apache.lucene.index.Terms;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.KnnCollector;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.Version;
 import org.apache.lucene.util.packed.PackedInts;
@@ -368,14 +368,14 @@ public ByteVectorValues getByteVectorValues(String field) {
   }
 
   @Override
-  public TopDocs searchNearestVectors(
-      String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException {
+  public void searchNearestVectors(
+      String field, float[] target, KnnCollector knnCollector, Bits acceptDocs) throws IOException {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public TopDocs searchNearestVectors(
-      String field, byte[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException {
+  public void searchNearestVectors(
+      String field, byte[] target, KnnCollector knnCollector, Bits acceptDocs) throws IOException {
     throw new UnsupportedOperationException();
   }
 
diff --git a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
index 5d2013cf204..feda6169ea1 100644
--- a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
@@ -25,12 +25,11 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import org.apache.lucene.codecs.KnnVectorsFormat;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.KnnByteVectorField;
 import org.apache.lucene.document.KnnFloatVectorField;
 import org.apache.lucene.document.StoredField;
-import org.apache.lucene.index.ByteVectorValues;
-import org.apache.lucene.index.FloatVectorValues;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.VectorEncoding;
 import org.apache.lucene.index.VectorSimilarityFunction;
@@ -194,24 +193,24 @@ public void checkSchemaField(final SchemaField field) throws SolrException {
 
     switch (vectorEncoding) {
       case FLOAT32:
-        if (dimension > FloatVectorValues.MAX_DIMENSIONS) {
+        if (dimension > KnnVectorsFormat.DEFAULT_MAX_DIMENSIONS) {
           if (log.isWarnEnabled()) {
             log.warn(
                 "The vector dimension {} specified for field {} exceeds the current Lucene default max dimension of {}. It's un-tested territory, extra caution and benchmarks are recommended for production systems.",
                 dimension,
                 field.getName(),
-                FloatVectorValues.MAX_DIMENSIONS);
+                KnnVectorsFormat.DEFAULT_MAX_DIMENSIONS);
           }
         }
         break;
       case BYTE:
-        if (dimension > ByteVectorValues.MAX_DIMENSIONS) {
+        if (dimension > KnnVectorsFormat.DEFAULT_MAX_DIMENSIONS) {
           if (log.isWarnEnabled()) {
             log.warn(
                 "The vector dimension {} specified for field {} exceeds the current Lucene default max dimension of {}. It's un-tested territory, extra caution and benchmarks are recommended for production systems.",
                 dimension,
                 field.getName(),
-                ByteVectorValues.MAX_DIMENSIONS);
+                KnnVectorsFormat.DEFAULT_MAX_DIMENSIONS);
           }
         }
         break;
diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
index 82316adf85f..d19b59470ee 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -712,7 +712,7 @@ public void collect(int contextDoc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       if (contexts.length == 0) {
         return;
       }
@@ -803,7 +803,7 @@ public void finish() throws IOException {
       }
 
       if (delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) delegate).finish();
+        ((DelegatingCollector) delegate).complete();
       }
     }
   }
@@ -919,7 +919,7 @@ public void collect(int contextDoc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       if (contexts.length == 0) {
         return;
       }
@@ -993,7 +993,7 @@ public void finish() throws IOException {
       }
 
       if (delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) delegate).finish();
+        ((DelegatingCollector) delegate).complete();
       }
     }
   }
@@ -1196,7 +1196,7 @@ public void collect(int contextDoc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       if (contexts.length == 0) {
         return;
       }
@@ -1278,7 +1278,7 @@ public void finish() throws IOException {
       }
 
       if (delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) delegate).finish();
+        ((DelegatingCollector) delegate).complete();
       }
     }
   }
@@ -1443,7 +1443,7 @@ public void collect(int contextDoc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       if (contexts.length == 0) {
         return;
       }
@@ -1507,7 +1507,7 @@ public void finish() throws IOException {
       }
 
       if (delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) delegate).finish();
+        ((DelegatingCollector) delegate).complete();
       }
     }
   }
@@ -1587,11 +1587,11 @@ protected boolean isBoostedAdvanceExact(final int contextDoc) {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       // Deal with last group (if any)...
       maybeDelegateCollect();
 
-      super.finish();
+      super.complete();
     }
 
     /**
diff --git a/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java b/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java
index 685a5512b3c..af9b669f01f 100644
--- a/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java
@@ -80,9 +80,23 @@ protected void doSetNextReader(LeafReaderContext context) throws IOException {
     leafDelegate = delegate.getLeafCollector(context);
   }
 
-  public void finish() throws IOException {
+  /**
+   * From Solr 9.4 using Lucene 9.8 onwards <code>DelegatingCollector.finish</code> clashes with the
+   * super class's <code>LeafCollector.finish</code> method. Please relocate any finishing logic
+   * into the <code>DelegatingCollector.complete</code> replacement completion method.
+   */
+  @Override
+  public final void finish() throws IOException {
+    if (leafDelegate != null) {
+      leafDelegate.finish();
+    }
+    super.finish();
+  }
+
+  /** since 9.4 */
+  public void complete() throws IOException {
     if (delegate instanceof DelegatingCollector) {
-      ((DelegatingCollector) delegate).finish();
+      ((DelegatingCollector) delegate).complete();
     }
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.java
index dcc88463696..f838361d407 100644
--- a/solr/core/src/java/org/apache/solr/search/Grouping.java
+++ b/solr/core/src/java/org/apache/solr/search/Grouping.java
@@ -368,7 +368,7 @@ public void execute() throws IOException {
       searchWithTimeLimiter(filterQuery, allCollectors);
 
       if (allCollectors instanceof DelegatingCollector) {
-        ((DelegatingCollector) allCollectors).finish();
+        ((DelegatingCollector) allCollectors).complete();
       }
     }
 
@@ -409,7 +409,7 @@ public void execute() throws IOException {
           searchWithTimeLimiter(filterQuery, secondPhaseCollectors);
         }
         if (secondPhaseCollectors instanceof DelegatingCollector) {
-          ((DelegatingCollector) secondPhaseCollectors).finish();
+          ((DelegatingCollector) secondPhaseCollectors).complete();
         }
       }
     }
diff --git a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java
index 74b31fe04cd..011e22c0f6c 100644
--- a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java
@@ -146,7 +146,7 @@ public void collect(int doc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       NamedList<Double> analytics = new NamedList<>();
       NamedList<Integer> topFreq = new NamedList<>();
       NamedList<Integer> allFreq = new NamedList<>();
@@ -204,7 +204,7 @@ public void finish() throws IOException {
       }
 
       if (this.delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) this.delegate).finish();
+        ((DelegatingCollector) this.delegate).complete();
       }
     }
 
diff --git a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
index 2488df85e5b..4e6c09f38f6 100644
--- a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
@@ -109,7 +109,7 @@ private NoOpTermsCollector(ResponseBuilder rb) {
     public void collect(int doc) throws IOException {}
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       List<String> outTerms = new ArrayList<>();
       List<Integer> outFreq = new ArrayList<>();
       List<Integer> outQueryFreq = new ArrayList<>();
@@ -174,7 +174,7 @@ public void collect(int doc) throws IOException {
     }
 
     @Override
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       List<String> outTerms = new ArrayList<>();
       List<Integer> outFreq = new ArrayList<>();
       List<Integer> outQueryFreq = new ArrayList<>();
@@ -270,7 +270,7 @@ public void finish() throws IOException {
       }
 
       if (this.delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) this.delegate).finish();
+        ((DelegatingCollector) this.delegate).complete();
       }
     }
   }
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 79bc89eec9f..65e668490c7 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -280,7 +280,7 @@ private Collector buildAndRunCollectorChain(
       qr.setPartialResults(true);
     } catch (EarlyTerminatingCollectorException etce) {
       if (collector instanceof DelegatingCollector) {
-        ((DelegatingCollector) collector).finish();
+        ((DelegatingCollector) collector).complete();
       }
       throw etce;
     } finally {
@@ -293,7 +293,7 @@ private Collector buildAndRunCollectorChain(
       }
     }
     if (collector instanceof DelegatingCollector) {
-      ((DelegatingCollector) collector).finish();
+      ((DelegatingCollector) collector).complete();
     }
 
     return collector;
@@ -1133,7 +1133,7 @@ public DocSet getDocSet(List<Query> queries) throws IOException {
     search(query, collector);
 
     if (collector instanceof DelegatingCollector) {
-      ((DelegatingCollector) collector).finish();
+      ((DelegatingCollector) collector).complete();
     }
 
     return DocSetUtil.getDocSet(setCollector, this);
diff --git a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
index b72fade0065..0f8142da399 100644
--- a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
@@ -168,7 +168,7 @@ public void collect(int doc) throws IOException {
 
     @Override
     @SuppressWarnings({"unchecked"})
-    public void finish() throws IOException {
+    public void complete() throws IOException {
 
       Map<Integer, double[]> docVectors = new HashMap<>();
       Terms terms =
@@ -230,7 +230,7 @@ public void finish() throws IOException {
       analytics.add("feature", trainingParams.feature);
       analytics.add("positiveLabel", trainingParams.positiveLabel);
       if (this.delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) this.delegate).finish();
+        ((DelegatingCollector) this.delegate).complete();
       }
     }
 
diff --git a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
index 8a89a6b6422..03b3fa0d750 100644
--- a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
@@ -461,7 +461,7 @@ public void indexing_correctDocument_shouldBeIndexed() throws Exception {
   @Test
   public void indexing_highDimensionalityVectorDocument_shouldBeIndexed() throws Exception {
     try {
-      initCore("solrconfig-basic.xml", "schema-densevector-high-dimensionality.xml");
+      initCore("solrconfig_codec.xml", "schema-densevector-high-dimensionality.xml");
 
       List<Float> highDimensionalityVector = new ArrayList<>();
       for (float i = 0; i < 2048f; i++) {
diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
index 489809f549e..7c062695097 100644
--- a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
@@ -90,13 +90,13 @@ public void collect(int doc) throws IOException {
 
     @Override
     @SuppressWarnings({"unchecked"})
-    public void finish() throws IOException {
+    public void complete() throws IOException {
       @SuppressWarnings({"rawtypes"})
       NamedList analytics = new NamedList();
       rb.rsp.add("analytics", analytics);
       analytics.add("mycount", count + base);
       if (this.delegate instanceof DelegatingCollector) {
-        ((DelegatingCollector) this.delegate).finish();
+        ((DelegatingCollector) this.delegate).complete();
       }
     }
   }
diff --git a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
index cc64c320e50..12c8ec9dfa0 100644
--- a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
@@ -81,7 +81,7 @@ public void testEmptyCollectionDoesNotThrow() throws Exception {
           query.getAnalyticsCollector(
               new ResponseBuilder(null, resp, Collections.emptyList()), searcher.get());
       assertNotNull(analyticsCollector);
-      analyticsCollector.finish();
+      analyticsCollector.complete();
       LinkedHashMap<String, Object> expectedValues = new LinkedHashMap<>();
       expectedValues.put("numDocs", 0);
       expectedValues.put("sterms", new ArrayList<String>());
@@ -116,7 +116,7 @@ public void testCollectionWithDocuments() throws Exception {
       DelegatingCollector analyticsCollector =
           query.getAnalyticsCollector(responseBuilder, searcher.get());
       assertNotNull(analyticsCollector);
-      analyticsCollector.finish();
+      analyticsCollector.complete();
 
       LinkedHashMap<String, Object> expectedValues = new LinkedHashMap<>();
       expectedValues.put("numDocs", 1);
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
index 0c41d642f27..60a3d8c91e3 100644
--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
@@ -44,7 +44,7 @@
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.KnnCollector;
 import org.apache.lucene.search.TotalHits;
 import org.apache.lucene.util.BitSetIterator;
 import org.apache.lucene.util.Bits;
@@ -383,16 +383,12 @@ public StoredFields storedFields() {
       }
 
       @Override
-      public TopDocs searchNearestVectors(
-          String field, float[] target, int k, Bits acceptDoc, int visitedLimits) {
-        return null;
-      }
+      public void searchNearestVectors(
+          String field, float[] target, KnnCollector knnCollector, Bits acceptDocs) {}
 
       @Override
-      public TopDocs searchNearestVectors(
-          String field, byte[] target, int k, Bits acceptDoc, int visitedLimits) {
-        return null;
-      }
+      public void searchNearestVectors(
+          String field, byte[] target, KnnCollector knnCollector, Bits acceptDocs) {}
 
       @Override
       protected void doClose() {}
diff --git a/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java b/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java
index 92a05ce5593..5cf2fd41f97 100644
--- a/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java
@@ -39,7 +39,7 @@ public class KnnQParserTest extends SolrTestCaseJ4 {
   @Before
   public void prepareIndex() throws Exception {
     /* vectorDimension="4" similarityFunction="cosine" */
-    initCore("solrconfig-basic.xml", "schema-densevector.xml");
+    initCore("solrconfig_codec.xml", "schema-densevector.xml");
 
     List<SolrInputDocument> docsToIndex = this.prepareDocs();
     for (SolrInputDocument doc : docsToIndex) {
diff --git a/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1
deleted file mode 100644
index 48853a554ef..00000000000
--- a/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27ba6caaa4587a982cd451f7217b5a982bcfc44a
diff --git a/solr/licenses/lucene-analysis-common-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.8.0.jar.sha1
new file mode 100644
index 00000000000..6b9555a1364
--- /dev/null
+++ b/solr/licenses/lucene-analysis-common-9.8.0.jar.sha1
@@ -0,0 +1 @@
+36f0363325ca7bf62c180160d1ed5165c7c37795
diff --git a/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1
deleted file mode 100644
index e17e815b879..00000000000
--- a/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94293b169fb8572f440a5a4a523320ecf9778ffe
diff --git a/solr/licenses/lucene-analysis-icu-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.8.0.jar.sha1
new file mode 100644
index 00000000000..512bf46865e
--- /dev/null
+++ b/solr/licenses/lucene-analysis-icu-9.8.0.jar.sha1
@@ -0,0 +1 @@
+7133d34e92770f59eb28686f4d511b9f3f32e970
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
deleted file mode 100644
index 1cb53b61d8e..00000000000
--- a/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2df800a38b64867b8dcd61fc2cd986114e4a80cb
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.8.0.jar.sha1
new file mode 100644
index 00000000000..4d7de125029
--- /dev/null
+++ b/solr/licenses/lucene-analysis-kuromoji-9.8.0.jar.sha1
@@ -0,0 +1 @@
+be44282e1f6b91a0650fcceb558053d6bdd4863d
diff --git a/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
deleted file mode 100644
index 08b3abe8f12..00000000000
--- a/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfb4313f3c68d337310522840d7144c1605d084a
diff --git a/solr/licenses/lucene-analysis-morfologik-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.8.0.jar.sha1
new file mode 100644
index 00000000000..db1649319c3
--- /dev/null
+++ b/solr/licenses/lucene-analysis-morfologik-9.8.0.jar.sha1
@@ -0,0 +1 @@
+b054f2c7b11fc7c5601b4c3cdf18aa7508612898
diff --git a/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1
deleted file mode 100644
index 47ae76abb25..00000000000
--- a/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a01e8153f34d72e8c8c0180c1dea5b10f677dd3a
diff --git a/solr/licenses/lucene-analysis-nori-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.8.0.jar.sha1
new file mode 100644
index 00000000000..cb1a7f78e51
--- /dev/null
+++ b/solr/licenses/lucene-analysis-nori-9.8.0.jar.sha1
@@ -0,0 +1 @@
+bd1f80d33346f7e588685484ef29a304db5190e4
diff --git a/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1
deleted file mode 100644
index 3419a3d6303..00000000000
--- a/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af475c4941f250d6a94d26130e884798ca57b982
diff --git a/solr/licenses/lucene-analysis-opennlp-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.8.0.jar.sha1
new file mode 100644
index 00000000000..92c8bd6d8a0
--- /dev/null
+++ b/solr/licenses/lucene-analysis-opennlp-9.8.0.jar.sha1
@@ -0,0 +1 @@
+f878344c9742c33a42dd06b51a0a2e73cb49f16c
diff --git a/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
deleted file mode 100644
index 3ea0a099d5a..00000000000
--- a/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7d47d54683b0b1e09b271c32d1b7d3eb1990f49
diff --git a/solr/licenses/lucene-analysis-phonetic-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.8.0.jar.sha1
new file mode 100644
index 00000000000..8aa6dd91877
--- /dev/null
+++ b/solr/licenses/lucene-analysis-phonetic-9.8.0.jar.sha1
@@ -0,0 +1 @@
+b9ffdc7a52d2087ecb03318ec06305b480cdfe82
diff --git a/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
deleted file mode 100644
index 29630dabbb0..00000000000
--- a/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e68b9816e6cff8ee15f5b350cf2ffa54f9828b7
diff --git a/solr/licenses/lucene-analysis-smartcn-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.8.0.jar.sha1
new file mode 100644
index 00000000000..40c216271ed
--- /dev/null
+++ b/solr/licenses/lucene-analysis-smartcn-9.8.0.jar.sha1
@@ -0,0 +1 @@
+f73e2007b133fb699e517ef13b4952844f0150d8
diff --git a/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
deleted file mode 100644
index 409b414b486..00000000000
--- a/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d23b1f05b471e05d0d6068b3ece7c8c65672eae7
diff --git a/solr/licenses/lucene-analysis-stempel-9.8.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.8.0.jar.sha1
new file mode 100644
index 00000000000..08c368f78ac
--- /dev/null
+++ b/solr/licenses/lucene-analysis-stempel-9.8.0.jar.sha1
@@ -0,0 +1 @@
+2c09cbc021a8f81a01600a1d2a999361e70f7aed
diff --git a/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1
deleted file mode 100644
index f186a6837fc..00000000000
--- a/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6389463bfbfcf902c8d31d12e9513a6818ac9d5e
diff --git a/solr/licenses/lucene-backward-codecs-9.8.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.8.0.jar.sha1
new file mode 100644
index 00000000000..bd8949e70af
--- /dev/null
+++ b/solr/licenses/lucene-backward-codecs-9.8.0.jar.sha1
@@ -0,0 +1 @@
+e98fb408028f40170e6d87c16422bfdc0bb2e392
diff --git a/solr/licenses/lucene-classification-9.7.0.jar.sha1 b/solr/licenses/lucene-classification-9.7.0.jar.sha1
deleted file mode 100644
index 7ed14dfe1a7..00000000000
--- a/solr/licenses/lucene-classification-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e5eadd2126228e0c64ad5b6e5858ab9727a4356
diff --git a/solr/licenses/lucene-classification-9.8.0.jar.sha1 b/solr/licenses/lucene-classification-9.8.0.jar.sha1
new file mode 100644
index 00000000000..60037652b8f
--- /dev/null
+++ b/solr/licenses/lucene-classification-9.8.0.jar.sha1
@@ -0,0 +1 @@
+a9ba5a08bb0e34aba034b9411c33a5a977e5a571
diff --git a/solr/licenses/lucene-codecs-9.7.0.jar.sha1 b/solr/licenses/lucene-codecs-9.7.0.jar.sha1
deleted file mode 100644
index 12fdb9869ca..00000000000
--- a/solr/licenses/lucene-codecs-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ce18930d286e29c9f78f594c26cd5653ef3fe83e
diff --git a/solr/licenses/lucene-codecs-9.8.0.jar.sha1 b/solr/licenses/lucene-codecs-9.8.0.jar.sha1
new file mode 100644
index 00000000000..c01ff967edd
--- /dev/null
+++ b/solr/licenses/lucene-codecs-9.8.0.jar.sha1
@@ -0,0 +1 @@
+5661a90424b164551302a14d946e5cf35d90be72
diff --git a/solr/licenses/lucene-core-9.7.0.jar.sha1 b/solr/licenses/lucene-core-9.7.0.jar.sha1
deleted file mode 100644
index e524210f516..00000000000
--- a/solr/licenses/lucene-core-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad391210ffd806931334be9670a35af00c56f959
diff --git a/solr/licenses/lucene-core-9.8.0.jar.sha1 b/solr/licenses/lucene-core-9.8.0.jar.sha1
new file mode 100644
index 00000000000..1c357709b86
--- /dev/null
+++ b/solr/licenses/lucene-core-9.8.0.jar.sha1
@@ -0,0 +1 @@
+5e8421c5f8573bcf22e9265fc7e19469545a775a
diff --git a/solr/licenses/lucene-expressions-9.7.0.jar.sha1 b/solr/licenses/lucene-expressions-9.7.0.jar.sha1
deleted file mode 100644
index df99d15fd55..00000000000
--- a/solr/licenses/lucene-expressions-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-297e1cfade4ef71466cc9d4f361d81807c8dc4c8
diff --git a/solr/licenses/lucene-expressions-9.8.0.jar.sha1 b/solr/licenses/lucene-expressions-9.8.0.jar.sha1
new file mode 100644
index 00000000000..2b13fab40dc
--- /dev/null
+++ b/solr/licenses/lucene-expressions-9.8.0.jar.sha1
@@ -0,0 +1 @@
+7725476acfcb9bdfeff1b813ce15c39c6b857dc2
diff --git a/solr/licenses/lucene-grouping-9.7.0.jar.sha1 b/solr/licenses/lucene-grouping-9.7.0.jar.sha1
deleted file mode 100644
index 81519bec541..00000000000
--- a/solr/licenses/lucene-grouping-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e6f0c229f4861be641047c33b05067176e4279c
diff --git a/solr/licenses/lucene-grouping-9.8.0.jar.sha1 b/solr/licenses/lucene-grouping-9.8.0.jar.sha1
new file mode 100644
index 00000000000..c67fb0ff341
--- /dev/null
+++ b/solr/licenses/lucene-grouping-9.8.0.jar.sha1
@@ -0,0 +1 @@
+d39184518351178c404ed9669fc6cb6111f2288d
diff --git a/solr/licenses/lucene-highlighter-9.7.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.7.0.jar.sha1
deleted file mode 100644
index 31744c10d96..00000000000
--- a/solr/licenses/lucene-highlighter-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-facb7c7ee0f75ed457a2d98f10d6430e25a53691
diff --git a/solr/licenses/lucene-highlighter-9.8.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.8.0.jar.sha1
new file mode 100644
index 00000000000..c1a7f60dc79
--- /dev/null
+++ b/solr/licenses/lucene-highlighter-9.8.0.jar.sha1
@@ -0,0 +1 @@
+1ac38c8278dbd63dfab30744a41dd955a415a31c
diff --git a/solr/licenses/lucene-join-9.7.0.jar.sha1 b/solr/licenses/lucene-join-9.7.0.jar.sha1
deleted file mode 100644
index e9134ce0f3e..00000000000
--- a/solr/licenses/lucene-join-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d041bdc0947a14223cf68357407ee18b21027587
diff --git a/solr/licenses/lucene-join-9.8.0.jar.sha1 b/solr/licenses/lucene-join-9.8.0.jar.sha1
new file mode 100644
index 00000000000..842065e6321
--- /dev/null
+++ b/solr/licenses/lucene-join-9.8.0.jar.sha1
@@ -0,0 +1 @@
+3d64fc57bb6e718d906413a9f73c713e6d4d8bb0
diff --git a/solr/licenses/lucene-memory-9.7.0.jar.sha1 b/solr/licenses/lucene-memory-9.7.0.jar.sha1
deleted file mode 100644
index 9ac3c50a4c9..00000000000
--- a/solr/licenses/lucene-memory-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0fade51ee353e15ddbbc45262aafe6f99ed020f1
diff --git a/solr/licenses/lucene-memory-9.8.0.jar.sha1 b/solr/licenses/lucene-memory-9.8.0.jar.sha1
new file mode 100644
index 00000000000..375f8028682
--- /dev/null
+++ b/solr/licenses/lucene-memory-9.8.0.jar.sha1
@@ -0,0 +1 @@
+5283ac71d6ccecb5e00c7b52df2faec012f2625a
diff --git a/solr/licenses/lucene-misc-9.7.0.jar.sha1 b/solr/licenses/lucene-misc-9.7.0.jar.sha1
deleted file mode 100644
index 9df2fb89f24..00000000000
--- a/solr/licenses/lucene-misc-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7fcf451e2376526c3a027958812866cc5b0ff13f
diff --git a/solr/licenses/lucene-misc-9.8.0.jar.sha1 b/solr/licenses/lucene-misc-9.8.0.jar.sha1
new file mode 100644
index 00000000000..3e2022b60e4
--- /dev/null
+++ b/solr/licenses/lucene-misc-9.8.0.jar.sha1
@@ -0,0 +1 @@
+9a57b049cf51a5e9c9c1909c420f645f1b6f9a54
diff --git a/solr/licenses/lucene-queries-9.7.0.jar.sha1 b/solr/licenses/lucene-queries-9.7.0.jar.sha1
deleted file mode 100644
index 80c638e986c..00000000000
--- a/solr/licenses/lucene-queries-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-126989d4622419aa06fcbf3a342e859cab8c8799
diff --git a/solr/licenses/lucene-queries-9.8.0.jar.sha1 b/solr/licenses/lucene-queries-9.8.0.jar.sha1
new file mode 100644
index 00000000000..75cdfee9f96
--- /dev/null
+++ b/solr/licenses/lucene-queries-9.8.0.jar.sha1
@@ -0,0 +1 @@
+628db4ef46f1c6a05145bdac1d1bc4ace6341b13
diff --git a/solr/licenses/lucene-queryparser-9.7.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.7.0.jar.sha1
deleted file mode 100644
index 277242ad56c..00000000000
--- a/solr/licenses/lucene-queryparser-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6e77bde908ff698354e4a2149e6dd4658b56d7b0
diff --git a/solr/licenses/lucene-queryparser-9.8.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.8.0.jar.sha1
new file mode 100644
index 00000000000..865bd1783cd
--- /dev/null
+++ b/solr/licenses/lucene-queryparser-9.8.0.jar.sha1
@@ -0,0 +1 @@
+982faf2bfa55542bf57fbadef54c19ac00f57cae
diff --git a/solr/licenses/lucene-sandbox-9.7.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.7.0.jar.sha1
deleted file mode 100644
index 60ad0045f4d..00000000000
--- a/solr/licenses/lucene-sandbox-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f3e8e1947f2f1c5784132444af51a060ff0b4bf
diff --git a/solr/licenses/lucene-sandbox-9.8.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.8.0.jar.sha1
new file mode 100644
index 00000000000..5e95a9d52e1
--- /dev/null
+++ b/solr/licenses/lucene-sandbox-9.8.0.jar.sha1
@@ -0,0 +1 @@
+06493dbd14d02537716822254866a94458f4d842
diff --git a/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1
deleted file mode 100644
index 5a4ee73e3ee..00000000000
--- a/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-01b0bc7a407d8c35a70a1adf7966bb3e7caae928
diff --git a/solr/licenses/lucene-spatial-extras-9.8.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.8.0.jar.sha1
new file mode 100644
index 00000000000..54f649ad950
--- /dev/null
+++ b/solr/licenses/lucene-spatial-extras-9.8.0.jar.sha1
@@ -0,0 +1 @@
+9d9a731822ad6eefa1ba288a0c158d478522f165
diff --git a/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1
deleted file mode 100644
index dfa1e68bbf4..00000000000
--- a/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c6b1b6e0a70c9cd177371e648648c2f896742a2
diff --git a/solr/licenses/lucene-spatial3d-9.8.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.8.0.jar.sha1
new file mode 100644
index 00000000000..f29a79e5e9f
--- /dev/null
+++ b/solr/licenses/lucene-spatial3d-9.8.0.jar.sha1
@@ -0,0 +1 @@
+ce752a52b2d4eac90633c7df7982e29504f99e76
diff --git a/solr/licenses/lucene-suggest-9.7.0.jar.sha1 b/solr/licenses/lucene-suggest-9.7.0.jar.sha1
deleted file mode 100644
index a1661406108..00000000000
--- a/solr/licenses/lucene-suggest-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c37fd9a5d71dc87fe1cd4c18ff295ec8cfac170
diff --git a/solr/licenses/lucene-suggest-9.8.0.jar.sha1 b/solr/licenses/lucene-suggest-9.8.0.jar.sha1
new file mode 100644
index 00000000000..25ba9a373ad
--- /dev/null
+++ b/solr/licenses/lucene-suggest-9.8.0.jar.sha1
@@ -0,0 +1 @@
+f977f96f2093b7fddea6b67caa2e1c5b10edebf6
diff --git a/solr/licenses/lucene-test-framework-9.7.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.7.0.jar.sha1
deleted file mode 100644
index e4c93a23107..00000000000
--- a/solr/licenses/lucene-test-framework-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9339d7fdb424940ab437134f06b9f64937d45e2
diff --git a/solr/licenses/lucene-test-framework-9.8.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.8.0.jar.sha1
new file mode 100644
index 00000000000..29315f64529
--- /dev/null
+++ b/solr/licenses/lucene-test-framework-9.8.0.jar.sha1
@@ -0,0 +1 @@
+44903631a74e9cf5551452f905ab8a5b0652f1a5
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index ecd3693f642..d68a091f163 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>9.7</luceneMatchVersion>
+  <luceneMatchVersion>9.8</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 2fd3d0ae857..9c0aa25d52c 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>9.7</luceneMatchVersion>
+  <luceneMatchVersion>9.8</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 1a64062fb42..ee5bc9ed840 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -101,6 +101,9 @@ To disable the always-on trace generation set the system property `solr.alwaysOn
 === Learning To Rank
 * The FieldValueFeature class now always uses DocValues when docValues=true is set. A LegacyFieldValueFeature class provides the prior behaviour of not using DocValues when the docValues=true and stored=true field attributes are both set.
 
+=== Other
+* From Solr 9.4 using Lucene 9.8 onwards `DelegatingCollector.finish` clashes with the super class's `LeafCollector.finish` method. Any custom component extending the `DelegatingCollector` needs to rename the `finish` method to `complete` to follow Solr's implementation.
+
 == Solr 9.3
 === Binary Releases
 * Solr now comes with two xref:deployment-guide:installing-solr.adoc#available-solr-packages[binary releases] and xref:deployment-guide:solr-in-docker.adoc#available-images[docker images], **full** and **slim**.
diff --git a/versions.lock b/versions.lock
index 7dbb1578b25..316f9555dd6 100644
--- a/versions.lock
+++ b/versions.lock
@@ -207,32 +207,32 @@ org.apache.logging.log4j:log4j-jul:2.20.0 (1 constraints: 3605333b)
 org.apache.logging.log4j:log4j-layout-template-json:2.20.0 (1 constraints: 3605333b)
 org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0 (1 constraints: 3605333b)
 org.apache.logging.log4j:log4j-web:2.20.0 (1 constraints: 3605333b)
-org.apache.lucene:lucene-analysis-common:9.7.0 (10 constraints: f29eac6b)
-org.apache.lucene:lucene-analysis-icu:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-kuromoji:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-morfologik:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-nori:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-opennlp:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-phonetic:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-smartcn:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-analysis-stempel:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-backward-codecs:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-classification:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-codecs:9.7.0 (3 constraints: a8253445)
-org.apache.lucene:lucene-core:9.7.0 (26 constraints: 49905bd5)
-org.apache.lucene:lucene-expressions:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-grouping:9.7.0 (2 constraints: ea1590e4)
-org.apache.lucene:lucene-highlighter:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-join:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-memory:9.7.0 (1 constraints: 9c0fb483)
-org.apache.lucene:lucene-misc:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-queries:9.7.0 (6 constraints: c651867e)
-org.apache.lucene:lucene-queryparser:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-sandbox:9.7.0 (1 constraints: d00f2d87)
-org.apache.lucene:lucene-spatial-extras:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-spatial3d:9.7.0 (1 constraints: bf10bcb9)
-org.apache.lucene:lucene-suggest:9.7.0 (1 constraints: 12052d36)
-org.apache.lucene:lucene-test-framework:9.7.0 (1 constraints: 12052d36)
+org.apache.lucene:lucene-analysis-common:9.8.0 (10 constraints: fc9e4474)
+org.apache.lucene:lucene-analysis-icu:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-kuromoji:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-morfologik:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-nori:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-opennlp:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-phonetic:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-smartcn:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-analysis-stempel:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-backward-codecs:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-classification:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-codecs:9.8.0 (3 constraints: ab25ca45)
+org.apache.lucene:lucene-core:9.8.0 (26 constraints: 6390b70d)
+org.apache.lucene:lucene-expressions:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-grouping:9.8.0 (2 constraints: ec15c6e4)
+org.apache.lucene:lucene-highlighter:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-join:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-memory:9.8.0 (1 constraints: 9d0fb783)
+org.apache.lucene:lucene-misc:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-queries:9.8.0 (6 constraints: cc512481)
+org.apache.lucene:lucene-queryparser:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-sandbox:9.8.0 (1 constraints: d10f3087)
+org.apache.lucene:lucene-spatial-extras:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-spatial3d:9.8.0 (1 constraints: c010bfb9)
+org.apache.lucene:lucene-suggest:9.8.0 (1 constraints: 13053036)
+org.apache.lucene:lucene-test-framework:9.8.0 (1 constraints: 13053036)
 org.apache.opennlp:opennlp-tools:1.9.4 (2 constraints: f91d5c6d)
 org.apache.pdfbox:fontbox:2.0.26 (1 constraints: 180b72d8)
 org.apache.pdfbox:jbig2-imageio:3.0.4 (1 constraints: 5e0cef01)
diff --git a/versions.props b/versions.props
index a3853c76705..82178390e69 100644
--- a/versions.props
+++ b/versions.props
@@ -47,7 +47,7 @@ org.apache.httpcomponents:httpcore=4.4.16
 org.apache.httpcomponents:httpmime=4.5.14
 org.apache.kerby:*=1.0.1
 org.apache.logging.log4j:*=2.20.0
-org.apache.lucene:*=9.7.0
+org.apache.lucene:*=9.8.0
 org.apache.tika:*=1.28.5
 org.apache.tomcat:annotations-api=6.0.53
 org.apache.zookeeper:*=3.9.0

From 11a34bf273fa71e902ce9d01e78d08e222f0a0e5 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Sat, 30 Sep 2023 19:19:03 +0200
Subject: [PATCH 128/160] Update dependency org.xerial.snappy:snappy-java to
 v1.1.10.4 (#1806)

---
 solr/licenses/snappy-java-1.1.10.1.jar.sha1 | 1 -
 solr/licenses/snappy-java-1.1.10.4.jar.sha1 | 1 +
 versions.lock                               | 2 +-
 versions.props                              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/snappy-java-1.1.10.1.jar.sha1
 create mode 100644 solr/licenses/snappy-java-1.1.10.4.jar.sha1

diff --git a/solr/licenses/snappy-java-1.1.10.1.jar.sha1 b/solr/licenses/snappy-java-1.1.10.1.jar.sha1
deleted file mode 100644
index 6958970d2ab..00000000000
--- a/solr/licenses/snappy-java-1.1.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4a1e1a22cba39145dfa20f2fef4e1ca38c8e02a1
diff --git a/solr/licenses/snappy-java-1.1.10.4.jar.sha1 b/solr/licenses/snappy-java-1.1.10.4.jar.sha1
new file mode 100644
index 00000000000..3022bc5d1fd
--- /dev/null
+++ b/solr/licenses/snappy-java-1.1.10.4.jar.sha1
@@ -0,0 +1 @@
+50d0390056017158bdc75c063efd5c2a898d5f0c
diff --git a/versions.lock b/versions.lock
index 316f9555dd6..d88587843e5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -353,7 +353,7 @@ org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
 org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
 org.threeten:threetenbp:1.6.8 (4 constraints: 2433e267)
 org.tukaani:xz:1.9 (1 constraints: 030c5be9)
-org.xerial.snappy:snappy-java:1.1.10.1 (4 constraints: b1385afd)
+org.xerial.snappy:snappy-java:1.1.10.4 (4 constraints: b4381fff)
 software.amazon.awssdk:annotations:2.20.128 (20 constraints: 812e7fc3)
 software.amazon.awssdk:apache-client:2.20.128 (4 constraints: bd2a0169)
 software.amazon.awssdk:arns:2.20.128 (2 constraints: 791848ec)
diff --git a/versions.props b/versions.props
index 82178390e69..cee8f7f97e8 100644
--- a/versions.props
+++ b/versions.props
@@ -68,5 +68,5 @@ org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=5.1.0
 org.slf4j:*=2.0.9
-org.xerial.snappy:snappy-java=1.1.10.1
+org.xerial.snappy:snappy-java=1.1.10.4
 software.amazon.awssdk:*=2.20.128

From 39f6f1a150aa36591dd79369882405d5007c0aaf Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Sun, 1 Oct 2023 16:55:06 +0200
Subject: [PATCH 129/160] Update forbiddenapis to 3.6 (#1971)

---
 build.gradle     | 2 +-
 solr/CHANGES.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b612fe2bf58..f10d8a1c23e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
   id "com.palantir.consistent-versions" version "2.11.0"
   id "org.owasp.dependencycheck" version "8.0.1"
   id 'ca.cutterslade.analyze' version "1.9.0"
-  id 'de.thetaphi.forbiddenapis' version '3.5' apply false
+  id 'de.thetaphi.forbiddenapis' version '3.6' apply false
   id "de.undercouch.download" version "5.2.0" apply false
   id "net.ltgt.errorprone" version "3.0.1" apply false
   id 'com.diffplug.spotless' version "6.5.2" apply false
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 17feb62fba3..203b6ccace9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -235,6 +235,8 @@ Dependency Upgrades
 
 * SOLR-16985: Upgrade Lucene to 9.8.0 (Alex Deparvu, Christine Poerschke)
 
+* PR#1971: Update forbiddenapis to 3.6 to support Java 21/22 and commons-io up to 2.14.0 (Uwe Schindler)
+
 Other Changes
 ---------------------
 

From 690aaace14d7f02b66ed8b39ff3db0319d796306 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:51:10 +0200
Subject: [PATCH 130/160] Update dependency commons-io:commons-io to v2.14.0
 (#1653)

---
 solr/licenses/commons-io-2.11.0.jar.sha1 | 1 -
 solr/licenses/commons-io-2.14.0.jar.sha1 | 1 +
 versions.lock                            | 2 +-
 versions.props                           | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/commons-io-2.11.0.jar.sha1
 create mode 100644 solr/licenses/commons-io-2.14.0.jar.sha1

diff --git a/solr/licenses/commons-io-2.11.0.jar.sha1 b/solr/licenses/commons-io-2.11.0.jar.sha1
deleted file mode 100644
index da98d09a124..00000000000
--- a/solr/licenses/commons-io-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2503f302b11ebde7ebc3df41daebe0e4eea3689
diff --git a/solr/licenses/commons-io-2.14.0.jar.sha1 b/solr/licenses/commons-io-2.14.0.jar.sha1
new file mode 100644
index 00000000000..bf1e8ae3d24
--- /dev/null
+++ b/solr/licenses/commons-io-2.14.0.jar.sha1
@@ -0,0 +1 @@
+a4c6e1f6c196339473cd2e1b037f0eb97c62755b
diff --git a/versions.lock b/versions.lock
index d88587843e5..7955a5281af 100644
--- a/versions.lock
+++ b/versions.lock
@@ -80,7 +80,7 @@ com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
 commons-cli:commons-cli:1.5.0 (1 constraints: 0805ff35)
 commons-codec:commons-codec:1.16.0 (11 constraints: a297a2db)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
-commons-io:commons-io:2.11.0 (9 constraints: 9d65151d)
+commons-io:commons-io:2.14.0 (9 constraints: a0658a20)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
 edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
 edu.ucar:grib:4.5.5 (1 constraints: 650c0402)
diff --git a/versions.props b/versions.props
index cee8f7f97e8..e55df283260 100644
--- a/versions.props
+++ b/versions.props
@@ -19,7 +19,7 @@ com.tdunning:t-digest=3.1
 commons-cli:commons-cli=1.5.0
 commons-codec:commons-codec=1.16.0
 commons-collections:commons-collections=3.2.2
-commons-io:commons-io=2.11.0
+commons-io:commons-io=2.14.0
 io.dropwizard.metrics:*=4.2.19
 io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.97.Final

From 03f656f0a63c08b95acc020860c0710a5c29bb65 Mon Sep 17 00:00:00 2001
From: Noble Paul <noblepaul@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:46:43 +1100
Subject: [PATCH 131/160] Coordinator node does not have correct collection
 tagged for TracingSpan (#1962)

---
 .../solr/servlet/CoordinatorHttpSolrCall.java      | 14 ++++++++++++++
 .../java/org/apache/solr/servlet/HttpSolrCall.java | 13 +++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
index 82664b23623..aa4a0e2fd75 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
@@ -47,6 +47,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * A coordinator node can serve requests as if it hosts all collections in the cluster. it does so
+ * by hosting a synthetic replica for each configset used in the cluster.
+ *
+ * <p>This class is responsible for forwarding the requests to the right core when the node is
+ * acting as a Coordinator The responsibilities also involve creating a synthetic collection or
+ * replica if they do not exist. It also sets the right threadlocal variables which reflects the
+ * current collection being served.
+ */
 public class CoordinatorHttpSolrCall extends HttpSolrCall {
   public static final String SYNTHETIC_COLL_PREFIX =
       Assign.SYSTEM_COLL_PREFIX + "COORDINATOR-COLL-";
@@ -277,6 +286,11 @@ protected void init() throws Exception {
     }
   }
 
+  @Override
+  protected String getCoreOrColName() {
+    return collectionName;
+  }
+
   public static SolrQueryRequest wrappedReq(
       SolrQueryRequest delegate, String collectionName, HttpSolrCall httpSolrCall) {
     Properties p = new Properties();
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 9137f3ded4e..ce9b1f8e6be 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -637,10 +637,7 @@ public Span getSpan() {
   // called after init().
   protected void populateTracingSpan(Span span) {
     // Set db.instance
-    String coreOrColName = HttpSolrCall.this.origCorename;
-    if (coreOrColName == null && getCore() != null) {
-      coreOrColName = getCore().getName();
-    }
+    String coreOrColName = getCoreOrColName();
     TraceUtils.setDbInstance(span, coreOrColName);
 
     // Set operation name.
@@ -658,6 +655,14 @@ protected void populateTracingSpan(Span span) {
     span.updateName(verb + ":" + path);
   }
 
+  protected String getCoreOrColName() {
+    String coreOrColName = HttpSolrCall.this.origCorename;
+    if (coreOrColName == null && getCore() != null) {
+      coreOrColName = getCore().getName();
+    }
+    return coreOrColName;
+  }
+
   public boolean shouldAudit() {
     return shouldAudit(cores);
   }

From e413210646bfdf1d5bc342d5b52ae5a4f0239c70 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Mon, 2 Oct 2023 11:48:23 +0100
Subject: [PATCH 132/160] SOLR-16994: facilitate date-related FieldValueFeature
 extensions (docValues=True only) (#1950)

---
 .../solr/ltr/feature/FieldValueFeature.java   |  13 +++
 .../ltr/feature/TestFieldValueFeature.java    | 109 ++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
index bab34fa8d3e..583e080954c 100644
--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java
@@ -129,6 +129,17 @@ public FieldValueFeatureWeight(
       }
     }
 
+    /**
+     * Override this method in sub classes that wish to use not an absolute time but an interval
+     * such as document age or remaining shelf life relative to a specific date or relative to now.
+     *
+     * @param val value of the field
+     * @return value after transformation
+     */
+    protected long readNumericDocValuesDate(long val) {
+      return val;
+    }
+
     /**
      * Return a FeatureScorer that uses docValues or storedFields if no docValues are present
      *
@@ -261,6 +272,8 @@ private float readNumericDocValues() throws IOException {
         } else if (NumberType.DOUBLE.equals(numberType)) {
           // handle double value conversion
           return (float) Double.longBitsToDouble(docValues.longValue());
+        } else if (NumberType.DATE.equals(numberType)) {
+          return readNumericDocValuesDate(docValues.longValue());
         }
         // just take the long value
         return docValues.longValue();
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index 8bed4efe7ed..b10d9d7f952 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -17,8 +17,10 @@
 package org.apache.solr.ltr.feature;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -692,6 +694,113 @@ public void testThatDateValuesAreCorrectlyParsed() throws Exception {
     }
   }
 
+  public static class RelativeDateFieldValueFeature extends FieldValueFeature {
+
+    private boolean since = false;
+    private boolean until = false;
+
+    public boolean getSince() {
+      return this.since;
+    }
+
+    public void setSince(boolean since) {
+      this.since = since;
+    }
+
+    public boolean getUntil() {
+      return this.until;
+    }
+
+    public void setUntil(boolean until) {
+      this.until = until;
+    }
+
+    public RelativeDateFieldValueFeature(String name, Map<String, Object> params) {
+      super(name, params);
+    }
+
+    @Override
+    protected void validate() throws FeatureException {
+      if (since != until) {
+        return;
+      }
+      throw new FeatureException(
+          getClass().getSimpleName() + ": exactly one of 'since' and 'until' must be provided");
+    }
+
+    @Override
+    public FeatureWeight createWeight(
+        IndexSearcher searcher,
+        boolean needsScores,
+        SolrQueryRequest request,
+        Query originalQuery,
+        Map<String, String[]> efi)
+        throws IOException {
+      return new FieldValueFeatureWeight(searcher, request, originalQuery, efi) {
+        private final long timeZero = Instant.parse("2000-01-01T00:00:00.000Z").toEpochMilli();
+
+        @Override
+        public long readNumericDocValuesDate(long val) {
+          if (since) return TimeUnit.MILLISECONDS.toMinutes(val - this.timeZero);
+          if (until) return TimeUnit.MILLISECONDS.toMinutes(this.timeZero - val);
+          return 0;
+        }
+      };
+    }
+  }
+
+  @Test
+  public void testRelativeDateFieldValueFeature() throws Exception {
+    final String field = "dvDateField";
+    for (boolean since : new boolean[] {false, true}) {
+      final String[][] inputsAndTests = {
+        new String[] {
+          "2000-01-01T00:00:00.000Z",
+          "/response/docs/[0]/=={'[fv]':'"
+              + FeatureLoggerTestUtils.toFeatureVector(field, "0.0")
+              + "'}"
+        },
+        new String[] {
+          "2000-01-01T00:01:02.003Z",
+          "/response/docs/[0]/=={'[fv]':'"
+              + FeatureLoggerTestUtils.toFeatureVector(field, (since ? "1.0" : "-1.0"))
+              + "'}"
+        },
+        new String[] {
+          "2000-01-01T01:02:03.004Z",
+          "/response/docs/[0]/=={'[fv]':'"
+              + FeatureLoggerTestUtils.toFeatureVector(field, (since ? "62.0" : "-62.0"))
+              + "'}"
+        }
+      };
+
+      final String fstore = "testRelativeDateFieldValueFeature" + field + "_" + since;
+      final String model = fstore + "-model";
+      loadFeature(
+          field,
+          RelativeDateFieldValueFeature.class.getName(),
+          fstore,
+          "{\"field\":\"" + field + "\", \"" + (since ? "since" : "until") + "\": true}");
+      loadModel(
+          model,
+          LinearModel.class.getName(),
+          new String[] {field},
+          fstore,
+          "{\"weights\":{\"" + field + "\":1.0}}");
+
+      for (String[] inputAndTest : inputsAndTests) {
+        assertU(adoc("id", "21", field, inputAndTest[0]));
+        assertU(commit());
+
+        final SolrQuery query = new SolrQuery("id:21");
+        query.add("rq", "{!ltr model=" + model + " reRankDocs=4}");
+        query.add("fl", "[fv]");
+
+        assertJQ("/query" + query.toQueryString(), inputAndTest[1]);
+      }
+    }
+  }
+
   /**
    * This class is used to track which specific FieldValueFeature is used so that we can test,
    * whether the fallback mechanism works correctly.

From 3e7d11f638c77b5a48d4397cb84407969bb2ced6 Mon Sep 17 00:00:00 2001
From: Kevin Risden <krisden@apache.org>
Date: Mon, 2 Oct 2023 09:46:25 -0400
Subject: [PATCH 133/160] SOLR-17004: Move CHANGES to 9.4

---
 solr/CHANGES.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 203b6ccace9..d9e18452386 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -21,8 +21,7 @@ Improvements
 
 Optimizations
 ---------------------
-
-* SOLR-17004: ZkStateReader waitForState should check clusterState before using watchers (Kevin Risden)
+(No changes)
 
 Bug Fixes
 ---------------------
@@ -157,6 +156,8 @@ Optimizations
 
 * SOLR-16989: Optimize and consolidate reuse of DocValues iterators for value retrieval (Michael Gibney)
 
+* SOLR-17004: ZkStateReader waitForState should check clusterState before using watchers (Kevin Risden)
+
 Bug Fixes
 ---------------------
 

From 0bdf356bef296646e9de28759bff99f15627a9d6 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:54:47 +0200
Subject: [PATCH 134/160] Update dependency
 com.google.errorprone:error_prone_annotations to v2.22.0 (#1701)

* Update dependency com.google.errorprone:error_prone_annotations to v2.22.0

Co-authored-by: Kevin Risden <krisden@apache.org>
---
 gradle/validation/error-prone.gradle          | 24 ++++++++-
 .../org/apache/solr/cli/SimplePostTool.java   |  1 -
 .../java/org/apache/solr/core/SolrCore.java   |  8 +--
 .../solr/handler/ReplicationHandler.java      |  9 ++--
 .../solr/handler/admin/PrepRecoveryOp.java    |  7 +--
 .../handler/component/FieldFacetStats.java    |  1 -
 .../solr/metrics/SolrMetricManager.java       |  5 +-
 .../apache/solr/request/json/ObjectUtil.java  |  1 -
 .../org/apache/solr/schema/PointType.java     |  2 +-
 .../solr/search/CollapsingQParserPlugin.java  |  4 +-
 .../solr/search/facet/FacetFieldMerger.java   |  4 +-
 .../facet/FacetFieldProcessorByArrayDV.java   |  2 +-
 .../facet/FacetRequestSortedMerger.java       |  2 +-
 .../security/SolrLogAuditLoggerPlugin.java    | 54 +++++++++----------
 .../servlet/cache/HttpCacheHeaderUtil.java    |  2 -
 .../java/org/apache/solr/update/PeerSync.java |  2 +-
 .../solr/core/TestConfigSetImmutable.java     |  2 +-
 ...utedFacetSimpleRefinementLongTailTest.java | 27 +++++-----
 .../FieldMutatingUpdateProcessorTest.java     |  1 +
 .../error_prone_annotations-2.18.0.jar.sha1   |  1 -
 .../error_prone_annotations-2.22.0.jar.sha1   |  1 +
 .../extraction/ExtractingDocumentLoader.java  | 19 ++++---
 .../test/org/apache/hadoop/fs/FileUtil.java   |  4 +-
 .../hdfs/store/blockcache/BlockCacheTest.java | 12 ++---
 .../java/org/apache/solr/ltr/LTRRescorer.java |  2 +-
 .../client/solrj/impl/Http2SolrClient.java    |  6 ++-
 .../client/solrj/impl/HttpClientUtil.java     | 14 ++---
 .../solr/client/solrj/impl/LBSolrClient.java  |  2 +-
 .../client/solrj/impl/XMLResponseParser.java  |  2 +-
 .../org/apache/solr/common/cloud/Slice.java   |  2 +-
 .../apache/solr/common/util/JavaBinCodec.java |  2 +-
 .../solrj/impl/Http2SolrClientTest.java       |  2 +-
 .../solr/cloud/MiniSolrCloudCluster.java      |  2 +-
 versions.lock                                 |  2 +-
 versions.props                                |  2 +-
 35 files changed, 123 insertions(+), 110 deletions(-)
 delete mode 100644 solr/licenses/error_prone_annotations-2.18.0.jar.sha1
 create mode 100644 solr/licenses/error_prone_annotations-2.22.0.jar.sha1

diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index 9c80fea0c47..d2800242425 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -85,6 +85,7 @@ allprojects { prj ->
             // '-Xep:AutoValueConstructorOrderChecker:OFF', // we don't use autovalue
             '-Xep:BadAnnotationImplementation:ERROR',
             '-Xep:BadShiftAmount:ERROR',
+            '-Xep:BanClassLoader:ERROR',
             '-Xep:BanJNDI:ERROR', // todo - implement with forbidden APIs instead?
             '-Xep:BoxedPrimitiveEquality:ERROR',
             // '-Xep:BundleDeserializationCast:OFF', // we don't use android
@@ -104,6 +105,7 @@ allprojects { prj ->
             '-Xep:DangerousLiteralNull:ERROR',
             '-Xep:DeadException:ERROR',
             '-Xep:DeadThread:ERROR',
+            '-Xep:DereferenceWithNullBranch:ERROR',
             '-Xep:DiscardedPostfixExpression:ERROR',
             // '-Xep:DoNotCall:OFF', // we don't use this annotation
             '-Xep:DoNotMock:ERROR',
@@ -262,6 +264,7 @@ allprojects { prj ->
             '-Xep:AssertThrowsMultipleStatements:WARN',
             '-Xep:AssertionFailureIgnored:WARN',
             '-Xep:AssistedInjectAndInjectOnSameConstructor:WARN',
+            '-Xep:AttemptedNegativeZero:WARN',
             // '-Xep:AutoValueFinalMethods:OFF', // we don't use autovalue
             // '-Xep:AutoValueImmutableFields:OFF', // we don't use autovalue
             // '-Xep:AutoValueSubclassLeaked:OFF', // we don't use autovalue
@@ -284,6 +287,7 @@ allprojects { prj ->
             '-Xep:ClassCanBeStatic:WARN',
             '-Xep:ClassNewInstance:WARN',
             // '-Xep:CloseableProvides:OFF', // we don't use this annotation
+            '-Xep:ClosingStandardOutputStreams:WARN',
             '-Xep:CollectionUndefinedEquality:WARN',
             '-Xep:CollectorShouldNotUseState:WARN',
             '-Xep:ComparableAndComparator:WARN',
@@ -299,6 +303,7 @@ allprojects { prj ->
             // '-Xep:DoNotCallSuggester:OFF', // we don't use this annotation
             // '-Xep:DoNotClaimAnnotations:OFF', // we don't use this annotation
             // '-Xep:DoNotMockAutoValue:OFF', // we don't use autovalue
+            // '-Xep:DoNotUseRuleChain:OFF', // todo could be fixed but not easy
             // '-Xep:DoubleCheckedLocking:OFF', // todo check if useful or comment why not
             '-Xep:EmptyBlockTag:WARN',
             // '-Xep:EmptyCatch:OFF', // todo check if useful or comment why not - might be handled by ECJ?
@@ -325,6 +330,7 @@ allprojects { prj ->
             // '-Xep:FutureReturnValueIgnored:OFF', // todo there are problems that should be fixed
             '-Xep:GetClassOnEnum:WARN',
             '-Xep:HidingField:WARN',
+            '-Xep:ICCProfileGetInstance:WARN',
             '-Xep:IdentityHashMapUsage:WARN',
             // '-Xep:ImmutableAnnotationChecker:OFF', // we don't use this annotation
             '-Xep:ImmutableEnumChecker:WARN',
@@ -343,6 +349,7 @@ allprojects { prj ->
             // '-Xep:InlineMeInliner:OFF', // we don't use this annotation
             // '-Xep:InlineMeSuggester:OFF', // We don't use this annotation
             // '-Xep:InputStreamSlowMultibyteRead:OFF', // todo check if useful or comment why not
+            '-Xep:InlineTrivialConstant:WARN',
             '-Xep:InstanceOfAndCastMatchWrongType:WARN',
             '-Xep:IntLongMath:WARN',
             // '-Xep:InvalidBlockTag:OFF', // this is needed for tags like lucene.internal
@@ -379,6 +386,7 @@ allprojects { prj ->
             '-Xep:LiteEnumValueOf:WARN',
             '-Xep:LiteProtoToString:WARN',
             '-Xep:LockNotBeforeTry:WARN',
+            '-Xep:LockOnNonEnclosingClassLiteral:WARN',
             '-Xep:LogicalAssignment:WARN',
             '-Xep:LongDoubleConversion:WARN',
             '-Xep:LongFloatConversion:WARN',
@@ -390,25 +398,32 @@ allprojects { prj ->
             '-Xep:MissingFail:WARN',
             '-Xep:MissingImplementsComparable:WARN',
             '-Xep:MissingOverride:WARN',
+            // '-Xep:MissingRefasterAnnotation:OFF', // don't use Refaster
             // '-Xep:MissingSummary:OFF', // style preference that we don't want to enforce
             // '-Xep:MixedMutabilityReturnType:OFF', // todo check if useful or comment why not
             '-Xep:MockNotUsedInProduction:WARN',
             '-Xep:ModifiedButNotUsed:WARN',
             '-Xep:ModifyCollectionInEnhancedForLoop:WARN',
             '-Xep:ModifySourceCollectionInStream:WARN',
+            '-Xep:MultimapKeys:WARN',
             '-Xep:MultipleParallelOrSequentialCalls:WARN',
             '-Xep:MultipleUnaryOperatorsInMethodCall:WARN',
+            // '-Xep:MutableGuiceModule:OFF', // we don't use guice
             '-Xep:MutablePublicArray:WARN',
+            '-Xep:NamedLikeContextualKeyword:WARN',
             '-Xep:NarrowCalculation:WARN',
             '-Xep:NarrowingCompoundAssignment:WARN',
             // '-Xep:NegativeCharLiteral:OFF', // todo check if useful or comment why not
             '-Xep:NestedInstanceOfConditions:WARN',
             '-Xep:NewFileSystem:WARN',
+            //'-Xep:NonApiType:OFF', // todo could be fixed but lots of changes
             // '-Xep:NonAtomicVolatileUpdate:OFF', // todo check if useful or comment why not
             '-Xep:NonCanonicalType:WARN',
             '-Xep:NonOverridingEquals:WARN',
+            '-Xep:NotJavadoc:WARN',
             '-Xep:NullOptional:WARN',
             // '-Xep:NullableConstructor:OFF', // we don't use this annotation
+            '-Xep:NullableOptional:WARN',
             // '-Xep:NullablePrimitive:OFF', // we don't use this annotation
             // '-Xep:NullablePrimitiveArray:OFF', // we don't use this annotation
             // '-Xep:NullableVoid:OFF', // we don't use this annotation
@@ -420,9 +435,10 @@ allprojects { prj ->
             '-Xep:OptionalNotPresent:WARN',
             '-Xep:OrphanedFormatString:WARN',
             // '-Xep:OutlineNone:OFF', // we don't use gwt
+            '-Xep:OverridingMethodInconsistentArgumentNamesChecker:WARN',
             '-Xep:OverrideThrowableToString:WARN',
             '-Xep:Overrides:WARN',
-            '-Xep:OverridesGuiceInjectableMethod:WARN',
+            // '-Xep:OverridesGuiceInjectableMethod:OFF', // we don't use guice
             '-Xep:ParameterName:WARN',
             '-Xep:PreconditionsCheckNotNullRepeated:WARN',
             '-Xep:PrimitiveAtomicReference:WARN',
@@ -434,6 +450,7 @@ allprojects { prj ->
             '-Xep:ReachabilityFenceUsage:WARN',
             '-Xep:ReferenceEquality:WARN',
             '-Xep:RethrowReflectiveOperationExceptionAsLinkageError:WARN',
+            '-Xep:ReturnAtTheEndOfVoidFunction:WARN',
             '-Xep:ReturnFromVoid:WARN',
             '-Xep:RobolectricShadowDirectlyOn:WARN',
             '-Xep:RxReturnValueIgnored:WARN',
@@ -446,6 +463,7 @@ allprojects { prj ->
             '-Xep:StaticMockMember:WARN',
             // '-Xep:StreamResourceLeak:OFF', // todo check if useful or comment why not
             '-Xep:StreamToIterable:WARN',
+            // '-Xep:StringCaseLocaleUsage:OFF', // we have forbiddenapis for that
             // '-Xep:StringSplitter:OFF', // todo check if useful or comment why not - might be able to use forbidden-apis for this?
             // '-Xep:SwigMemoryLeak:OFF', // we don't use swig
             // '-Xep:SynchronizeOnNonFinalField:OFF', // todo check if useful or comment why not
@@ -457,6 +475,7 @@ allprojects { prj ->
             '-Xep:ToStringReturnsNull:WARN',
             // '-Xep:TruthAssertExpected:OFF', // we don't use truth
             // '-Xep:TruthConstantAsserts:OFF', // we don't use truth
+            // '-Xep:TruthContainsExactlyElementsInUsage:OFF', // we don't use truth
             // '-Xep:TruthGetOrDefault:OFF', // we don't use truth
             // '-Xep:TruthIncompatibleType:OFF', // we don't use truth
             '-Xep:TypeEquals:WARN',
@@ -468,11 +487,14 @@ allprojects { prj ->
             '-Xep:UnescapedEntity:WARN',
             // '-Xep:UnicodeEscape:OFF', // can't enable since Lucene/Solr tests use unicode a bunch
             // '-Xep:UnnecessaryAssignment:OFF', // we don't use these annotations
+            '-Xep:UnnecessaryAsync:WARN',
             '-Xep:UnnecessaryLambda:WARN',
             '-Xep:UnnecessaryLongToIntConversion:WARN',
             '-Xep:UnnecessaryMethodInvocationMatcher:WARN',
             '-Xep:UnnecessaryMethodReference:WARN',
             // '-Xep:UnnecessaryParentheses:OFF', // style preference that we don't want to enforce
+            '-Xep:UnnecessaryStringBuilder:WARN',
+            // '-Xep:UnnecessaryTestMethodPrefix:OFF', // style preference that we don't want to enforce
             // '-Xep:UnqualifiedYield:OFF', // javac takes care
             '-Xep:UnrecognisedJavadocTag:WARN',
             '-Xep:UnsafeFinalization:WARN',
diff --git a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
index 6def73ad789..1c4ceaba9e8 100644
--- a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
@@ -409,7 +409,6 @@ private void doWebMode() {
     } catch (MalformedURLException e) {
       fatal("Wrong URL trying to append /extract to " + solrUrl);
     }
-    return;
   }
 
   private void doStdinMode() {
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index f5e28b34aa0..cb741cc97b6 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -3052,10 +3052,10 @@ public PluginBag<QueryResponseWriter> getResponseWriters() {
     try {
       m.put(
           "xlsx",
-          (QueryResponseWriter)
-              Class.forName("org.apache.solr.handler.extraction.XLSXResponseWriter")
-                  .getConstructor()
-                  .newInstance());
+          Class.forName("org.apache.solr.handler.extraction.XLSXResponseWriter")
+              .asSubclass(QueryResponseWriter.class)
+              .getDeclaredConstructor()
+              .newInstance());
     } catch (Exception e) {
       // don't worry; extraction module not in class path
     }
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index ab40ff02543..096f81ee492 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -1804,11 +1804,10 @@ private static Long readIntervalNs(String interval) {
 
   public static final String LEADER_URL = "leaderUrl";
 
-  @Deprecated
   /**
-   * @deprecated: Only used for backwards compatibility. Use {@link #LEADER_URL}
+   * @deprecated Only used for backwards compatibility. Use {@link #LEADER_URL}
    */
-  public static final String LEGACY_LEADER_URL = "masterUrl";
+  @Deprecated public static final String LEGACY_LEADER_URL = "masterUrl";
 
   public static final String FETCH_FROM_LEADER = "fetchFromLeader";
 
@@ -1817,11 +1816,11 @@ private static Long readIntervalNs(String interval) {
   // loss
   public static final String SKIP_COMMIT_ON_LEADER_VERSION_ZERO = "skipCommitOnLeaderVersionZero";
 
-  @Deprecated
   /**
-   * @deprecated: Only used for backwards compatibility. Use {@link
+   * @deprecated Only used for backwards compatibility. Use {@link
    *     #SKIP_COMMIT_ON_LEADER_VERSION_ZERO}
    */
+  @Deprecated
   public static final String LEGACY_SKIP_COMMIT_ON_LEADER_VERSION_ZERO =
       "skipCommitOnMasterVersionZero";
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
index df9453d3da6..d56dbb6506f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
@@ -20,7 +20,6 @@
 import java.lang.invoke.MethodHandles;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicReference;
 import org.apache.solr.cloud.CloudDescriptor;
 import org.apache.solr.cloud.ZkController.NotInClusterStateException;
 import org.apache.solr.cloud.ZkShardTerms;
@@ -75,7 +74,6 @@ public void execute(CallInfo it) throws Exception {
       collectionName = core.getCoreDescriptor().getCloudDescriptor().getCollectionName();
       cloudDescriptor = core.getCoreDescriptor().getCloudDescriptor();
     }
-    AtomicReference<String> errorMessage = new AtomicReference<>();
     try {
       coreContainer
           .getZkController()
@@ -201,9 +199,8 @@ public void execute(CallInfo it) throws Exception {
                 return false;
               });
     } catch (TimeoutException | InterruptedException e) {
-      String error = errorMessage.get();
-      if (error == null) error = "Timeout waiting for collection state.";
-      throw new NotInClusterStateException(ErrorCode.SERVER_ERROR, error);
+      throw new NotInClusterStateException(
+          ErrorCode.SERVER_ERROR, "Timeout waiting for collection state.");
     }
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java b/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
index 8c0201be2d0..2b0926ba2ee 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
@@ -190,6 +190,5 @@ public void accumulateMissing() throws IOException {
         }
       }
     }
-    return;
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
index bd63e9e8a22..fa1034797c8 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
@@ -897,7 +897,7 @@ public static String enforcePrefix(String name) {
     if (name.startsWith(REGISTRY_NAME_PREFIX)) {
       return name;
     } else {
-      return new StringBuilder(REGISTRY_NAME_PREFIX).append(name).toString();
+      return REGISTRY_NAME_PREFIX + name;
     }
   }
 
@@ -912,8 +912,7 @@ public static String enforcePrefix(String name) {
    */
   public static String getRegistryName(SolrInfoBean.Group group, String... names) {
     String fullName;
-    String prefix =
-        new StringBuilder(REGISTRY_NAME_PREFIX).append(group.name()).append('.').toString();
+    String prefix = REGISTRY_NAME_PREFIX + group.name() + '.';
     // check for existing prefix and group
     if (names != null && names.length > 0 && names[0] != null && names[0].startsWith(prefix)) {
       // assume the first segment already was expanded
diff --git a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java
index 337ce85974b..9711081f950 100644
--- a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java
+++ b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java
@@ -60,7 +60,6 @@ public void handleConflict(
 
       // if we aren't handling as a list, and we aren't handling as a map, then just overwrite (i.e.
       // nothing else to do)
-      return;
     }
 
     // merges srcMap onto targetMap (i.e. changes targetMap but not srcMap)
diff --git a/solr/core/src/java/org/apache/solr/schema/PointType.java b/solr/core/src/java/org/apache/solr/schema/PointType.java
index 6a6b29b698b..3d68af9449c 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointType.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointType.java
@@ -123,8 +123,8 @@ public Type getUninversionType(SchemaField sf) {
     return null;
   }
 
-  @Override
   /** Care should be taken in calling this with higher order dimensions for performance reasons. */
+  @Override
   protected Query getSpecializedRangeQuery(
       QParser parser,
       SchemaField field,
diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
index d19b59470ee..d5dde182b84 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -3387,9 +3387,7 @@ public boolean collectInNullGroupIfBoosted(int globalDoc) {
         public void purgeGroupsThatHaveBoostedDocs(
             final FixedBitSet collapsedSet,
             final IntProcedure removeGroupKey,
-            final Runnable resetNullGroupHead) {
-          return;
-        }
+            final Runnable resetNullGroupHead) {}
       };
     }
 
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
index fbf5b18858e..7799db960c2 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
@@ -104,7 +104,7 @@ public Object getMergedResult() {
 
     List<SimpleOrderedMap<?>> resultBuckets = new ArrayList<>(Math.max(0, (int) (last - first)));
 
-    /**
+    /*
      * this only works if there are no filters (like mincount) for (int i=first; i<last; i++) {
      * FacetBucket bucket = sortedBuckets.get(i); resultBuckets.add( bucket.getMergedBucket() ); } *
      */
@@ -166,7 +166,7 @@ Map<String, Object> getRefinementSpecial(
         refinement =
             getRefinementSpecial(mcontext, refinement, tagsWithPartial, missingBucket, "missing");
       }
-      /**
+      /*
        * allBuckets does not execute sub-facets because we don't change the domain. We may need
        * refinement info in the future though for stats. if (freq.allBuckets) { refinement =
        * getRefinementSpecial(mcontext, refinement, tagsWithPartial, allBuckets, "allBuckets"); }
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByArrayDV.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByArrayDV.java
index 366922e008a..cb7d5492a91 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByArrayDV.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByArrayDV.java
@@ -215,7 +215,7 @@ private void collectPerSeg(SortedDocValues singleDv, SweepDISI disi, LongValues
     int segMax = singleDv.getValueCount();
     final SegCountPerSeg segCounter = getSegCountPerSeg(disi, segMax);
 
-    /**
+    /*
      * alternate trial implementations // ord // FieldUtil.visitOrds(singleDv, disi,
      * (doc,ord)->{counts[ord+1]++;} );
      *
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
index 63a28aa0829..e5176c6e2af 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
@@ -108,7 +108,7 @@ public void sortBuckets(final FacetRequest.FacetSort sort) {
     } else {
       final String key = sort.sortVariable;
 
-      /**
+      /*
        * final FacetSortableMerger[] arr = new FacetSortableMerger[buckets.size()]; final int[]
        * index = new int[arr.length]; int start = 0; int nullStart = index.length; int i=0; for
        * (FacetBucket bucket : buckets.values()) { FacetMerger merger =
diff --git a/solr/core/src/java/org/apache/solr/security/SolrLogAuditLoggerPlugin.java b/solr/core/src/java/org/apache/solr/security/SolrLogAuditLoggerPlugin.java
index ed609668d87..f5a4ec5a099 100644
--- a/solr/core/src/java/org/apache/solr/security/SolrLogAuditLoggerPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/SolrLogAuditLoggerPlugin.java
@@ -42,34 +42,32 @@ public void init(Map<String, Object> pluginConfig) {
     super.init(pluginConfig);
     setFormatter(
         event ->
-            new StringBuilder()
-                .append("type=\"")
-                .append(event.getEventType().name())
-                .append("\"")
-                .append(" message=\"")
-                .append(event.getMessage())
-                .append("\"")
-                .append(" method=\"")
-                .append(event.getHttpMethod())
-                .append("\"")
-                .append(" status=\"")
-                .append(event.getStatus())
-                .append("\"")
-                .append(" requestType=\"")
-                .append(event.getRequestType())
-                .append("\"")
-                .append(" username=\"")
-                .append(event.getUsername())
-                .append("\"")
-                .append(" resource=\"")
-                .append(event.getResource())
-                .append("\"")
-                .append(" queryString=\"")
-                .append(event.getHttpQueryString())
-                .append("\"")
-                .append(" collections=")
-                .append(event.getCollections())
-                .toString());
+            "type=\""
+                + event.getEventType().name()
+                + "\""
+                + " message=\""
+                + event.getMessage()
+                + "\""
+                + " method=\""
+                + event.getHttpMethod()
+                + "\""
+                + " status=\""
+                + event.getStatus()
+                + "\""
+                + " requestType=\""
+                + event.getRequestType()
+                + "\""
+                + " username=\""
+                + event.getUsername()
+                + "\""
+                + " resource=\""
+                + event.getResource()
+                + "\""
+                + " queryString=\""
+                + event.getHttpQueryString()
+                + "\""
+                + " collections="
+                + event.getCollections());
     if (pluginConfig.size() > 0) {
       throw new SolrException(
           SolrException.ErrorCode.INVALID_STATE,
diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
index 078f57e8908..f661a7d156e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
+++ b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
@@ -180,8 +180,6 @@ public static void setCacheControlHeader(
     if (null != maxAge) {
       resp.setDateHeader("Expires", timeNowForHeader() + (maxAge * 1000L));
     }
-
-    return;
   }
 
   /**
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java
index 8f5700d7c86..7636bf54452 100644
--- a/solr/core/src/java/org/apache/solr/update/PeerSync.java
+++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java
@@ -767,8 +767,8 @@ MissedUpdatesRequest handleVersionsWithRanges(List<Long> otherVersions, boolean
       return handleVersionsWithRanges(otherVersions, completeList, ourUpdates, ourLowThreshold);
     }
 
-    @VisibleForTesting
     /** Implementation assumes the passed in lists are sorted and contain no duplicates. */
+    @VisibleForTesting
     static MissedUpdatesRequest handleVersionsWithRanges(
         List<Long> otherVersions,
         boolean completeList,
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
index a3282439ac3..1ede297abdc 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
@@ -50,7 +50,7 @@ public void before() throws Exception {
     // make the ConfigSet immutable
     Files.writeString(
         tmpConfDir.resolve("configsetprops.json"),
-        new StringBuilder("{\"immutable\":\"true\"}"),
+        "{\"immutable\":\"true\"}",
         StandardCharsets.UTF_8);
 
     System.setProperty("managed.schema.mutable", "true");
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 40cfb8a5019..0be315afc21 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
@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.common.params.SolrParams;
@@ -87,7 +86,7 @@ public static void buildIndexes(final List<SolrClient> clients, final String sta
 
     assertEquals("This indexing code assumes exactly 3 shards/clients", 3, clients.size());
 
-    final AtomicInteger docNum = new AtomicInteger();
+    int docNum = 0;
     final SolrClient shard0 = clients.get(0);
     final SolrClient shard1 = clients.get(1);
     final SolrClient shard2 = clients.get(2);
@@ -95,9 +94,9 @@ public static void buildIndexes(final List<SolrClient> clients, final String sta
     // the 5 top foo_s terms have 100 docs each on every shard
     for (int i = 0; i < 100; i++) {
       for (int j = 0; j < 5; j++) {
-        shard0.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "aaa" + j, statField, j * 13 - i));
-        shard1.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "aaa" + j, statField, j * 3 + i));
-        shard2.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "aaa" + j, statField, i * 7 + j));
+        shard0.add(sdoc("id", docNum++, "foo_s", "aaa" + j, statField, j * 13 - i));
+        shard1.add(sdoc("id", docNum++, "foo_s", "aaa" + j, statField, j * 3 + i));
+        shard2.add(sdoc("id", docNum++, "foo_s", "aaa" + j, statField, i * 7 + j));
       }
     }
 
@@ -105,14 +104,14 @@ public static void buildIndexes(final List<SolrClient> clients, final String sta
     // on both shard0 & shard1 ("bbb_")
     for (int i = 0; i < 50; i++) {
       for (int j = 0; j < 20; j++) {
-        shard0.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "bbb" + j, statField, 0));
-        shard1.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "bbb" + j, statField, 1));
+        shard0.add(sdoc("id", docNum++, "foo_s", "bbb" + j, statField, 0));
+        shard1.add(sdoc("id", docNum++, "foo_s", "bbb" + j, statField, 1));
       }
       // distracting term appears on only on shard2 50 times
-      shard2.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "junkA"));
+      shard2.add(sdoc("id", docNum++, "foo_s", "junkA"));
     }
     // put "bbb0" on shard2 exactly once to sanity check refinement
-    shard2.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "bbb0", statField, -2));
+    shard2.add(sdoc("id", docNum++, "foo_s", "bbb0", statField, -2));
 
     // long 'tail' foo_s term appears in 45 docs on every shard
     // foo_s:tail is the only term with bar_s sub-pivot terms
@@ -122,23 +121,21 @@ public static void buildIndexes(final List<SolrClient> clients, final String sta
       // but the top 5 terms are ccc(0-4) -- 7 on each shard
       // (4 docs each have junk terms)
       String sub_term = (i < 35) ? "ccc" + (i % 5) : ((i < 41) ? "tailB" : "junkA");
-      shard0.add(
-          sdoc("id", docNum.incrementAndGet(), "foo_s", "tail", "bar_s", sub_term, statField, i));
-      shard1.add(
-          sdoc("id", docNum.incrementAndGet(), "foo_s", "tail", "bar_s", sub_term, statField, i));
+      shard0.add(sdoc("id", docNum++, "foo_s", "tail", "bar_s", sub_term, statField, i));
+      shard1.add(sdoc("id", docNum++, "foo_s", "tail", "bar_s", sub_term, statField, i));
 
       // shard2's top 5 sub-pivot terms are junk only it has with 8 docs each
       // and 5 docs that use "tailB"
       // NOTE: none of these get statField ! !
       sub_term = (i < 40) ? "junkB" + (i % 5) : "tailB";
-      shard2.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "tail", "bar_s", sub_term));
+      shard2.add(sdoc("id", docNum++, "foo_s", "tail", "bar_s", sub_term));
     }
 
     // really long tail uncommon foo_s terms on shard2
     for (int i = 0; i < 30; i++) {
       // NOTE: using "Z" here so these sort before bbb0 when they tie for '1' instance each on
       // shard2
-      shard2.add(sdoc("id", docNum.incrementAndGet(), "foo_s", "ZZZ" + i));
+      shard2.add(sdoc("id", docNum++, "foo_s", "ZZZ" + i));
     }
   }
 
diff --git a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
index 25f66221f73..bca3918786f 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
@@ -65,6 +65,7 @@ public void testComprehensive() throws Exception {
         "//long[@name='min_foo_l'][.='-34']");
   }
 
+  @SuppressWarnings("UnnecessaryStringBuilder")
   public void testTrimAll() throws Exception {
     SolrInputDocument d = null;
 
diff --git a/solr/licenses/error_prone_annotations-2.18.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.18.0.jar.sha1
deleted file mode 100644
index df2166e6403..00000000000
--- a/solr/licenses/error_prone_annotations-2.18.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89b684257096f548fa39a7df9fdaa409d4d4df91
diff --git a/solr/licenses/error_prone_annotations-2.22.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.22.0.jar.sha1
new file mode 100644
index 00000000000..a0a78a421a9
--- /dev/null
+++ b/solr/licenses/error_prone_annotations-2.22.0.jar.sha1
@@ -0,0 +1 @@
+bfb9e4281a4cea34f0ec85b3acd47621cfab35b4
diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index 69e44360f2b..c10b42c0cfe 100644
--- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -215,14 +215,17 @@ public void load(
           }
           parser.parse(inputStream, parsingHandler, metadata, context);
         } catch (TikaException e) {
-          if (ignoreTikaException)
-            log.warn(
-                new StringBuilder("skip extracting text due to ")
-                    .append(e.getLocalizedMessage())
-                    .append(". metadata=")
-                    .append(metadata.toString())
-                    .toString()); // nowarn
-          else throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+          if (ignoreTikaException) {
+            if (log.isWarnEnabled()) {
+              log.warn(
+                  "skip extracting text due to {}. metadata={}",
+                  e.getLocalizedMessage(),
+                  metadata,
+                  e);
+            }
+          } else {
+            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+          }
         }
         if (extractOnly == false) {
           addDoc(handler);
diff --git a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
index f8d800dfaf7..f9a8717c1c7 100644
--- a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
+++ b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
@@ -1899,8 +1899,6 @@ public static FileContext write(final FileContext fileContext,
     return write(fileContext, path, charseq, StandardCharsets.UTF_8);
   }
 
-  @InterfaceAudience.LimitedPrivate({"ViewDistributedFileSystem"})
-  @InterfaceStability.Unstable
   /**
    * Used in ViewDistributedFileSystem rename API to get access to the protected
    * API of FileSystem interface. Even though Rename with options API
@@ -1909,6 +1907,8 @@ public static FileContext write(final FileContext fileContext,
    * out casting to the specific filesystem. This util method is proposed to get
    * the access to FileSystem#rename with options.
    */
+  @InterfaceAudience.LimitedPrivate({"ViewDistributedFileSystem"})
+  @InterfaceStability.Unstable
   @SuppressWarnings("deprecation")
   public static void rename(FileSystem srcFs, Path src, Path dst,
       final Options.Rename... options) throws IOException {
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
index b14b012280c..6cd2cf35d63 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
@@ -43,8 +43,8 @@ public void testBlockCache() {
     byte[] buffer = new byte[1024];
     Random random = random();
     byte[] newData = new byte[blockSize];
-    AtomicLong hitsInCache = new AtomicLong();
-    AtomicLong missesInCache = new AtomicLong();
+    long hitsInCache = 0L;
+    long missesInCache = 0L;
     long storeTime = 0;
     long fetchTime = 0;
     int passes = 10000;
@@ -59,9 +59,9 @@ public void testBlockCache() {
       blockCacheKey.setPath("/");
 
       if (blockCache.fetch(blockCacheKey, buffer)) {
-        hitsInCache.incrementAndGet();
+        hitsInCache += 1;
       } else {
-        missesInCache.incrementAndGet();
+        missesInCache += 1;
       }
 
       byte[] testData = testData(random, blockSize, newData);
@@ -77,8 +77,8 @@ public void testBlockCache() {
         assertArrayEquals("buffer content differs", testData, buffer);
       }
     }
-    System.out.println("Cache Hits    = " + hitsInCache.get());
-    System.out.println("Cache Misses  = " + missesInCache.get());
+    System.out.println("Cache Hits    = " + hitsInCache);
+    System.out.println("Cache Misses  = " + missesInCache);
     System.out.println("Store         = " + (storeTime / (double) passes) / 1000000.0);
     System.out.println("Fetch         = " + (fetchTime / (double) passes) / 1000000.0);
     System.out.println("# of Elements = " + blockCache.getSize());
diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
index 64070349bfa..19ac717bdda 100644
--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
@@ -218,7 +218,7 @@ protected static boolean scoreSingleHit(
       LTRScoringQuery.ModelWeight.ModelScorer scorer,
       ScoreDoc[] reranked)
       throws IOException {
-    /**
+    /*
      * Scorer for a LTRScoringQuery.ModelWeight should never be null since we always have to call
      * score even if no feature scorers match, since a model might use that info to return a
      * non-zero score. Same applies for the case of advancing a
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 8dbbe3e62df..0cf7abbf0d1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -1090,8 +1090,10 @@ private void httpClientBuilderSetup(Http2SolrClient client) {
         HttpClientBuilderFactory factory;
         try {
           factory =
-              (HttpClientBuilderFactory)
-                  Class.forName(factoryClassName).getConstructor().newInstance();
+              Class.forName(factoryClassName)
+                  .asSubclass(HttpClientBuilderFactory.class)
+                  .getDeclaredConstructor()
+                  .newInstance();
         } catch (InstantiationException
             | IllegalAccessException
             | ClassNotFoundException
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index 90fc938901a..b0d86fa2c6d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -162,10 +162,10 @@ public class HttpClientUtil {
       log.debug("Using {}", socketFactoryRegistryProviderClassName);
       try {
         socketFactoryRegistryProvider =
-            (SocketFactoryRegistryProvider)
-                Class.forName(socketFactoryRegistryProviderClassName)
-                    .getConstructor()
-                    .newInstance();
+            Class.forName(socketFactoryRegistryProviderClassName)
+                .asSubclass(SocketFactoryRegistryProvider.class)
+                .getDeclaredConstructor()
+                .newInstance();
       } catch (InstantiationException
           | IllegalAccessException
           | ClassNotFoundException
@@ -181,8 +181,10 @@ public class HttpClientUtil {
       log.debug("Using {}", factoryClassName);
       try {
         HttpClientBuilderFactory factory =
-            (HttpClientBuilderFactory)
-                Class.forName(factoryClassName).getConstructor().newInstance();
+            Class.forName(factoryClassName)
+                .asSubclass(HttpClientBuilderFactory.class)
+                .getDeclaredConstructor()
+                .newInstance();
         httpClientBuilder = factory.getHttpClientBuilder(SolrHttpClientBuilder.create());
       } catch (InstantiationException
           | IllegalAccessException
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 d3b5b31412f..50841ba2e7e 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
@@ -87,7 +87,7 @@ public abstract class LBSolrClient extends SolrClient {
 
   static {
     solrQuery.setRows(0);
-    /**
+    /*
      * Default sort (if we don't supply a sort) is by score and since we request 0 rows any sorting
      * and scoring is not necessary. SolrQuery.DOCID schema-independently specifies a non-scoring
      * sort. <code>_docid_ asc</code> sort is efficient, <code>_docid_ desc</code> sort is not, so
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
index 3ad6d3af0a9..b33f6771c16 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
@@ -284,7 +284,7 @@ protected NamedList<Object> readNamedList(XMLStreamReader parser) throws XMLStre
             }
           }
 
-          /**
+          /*
            * The name in a NamedList can actually be null if( name == null ) { throw new
            * XMLStreamException( "requires 'name' attribute: "+parser.getLocalName(),
            * parser.getLocation() ); }
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
index 7ca05b279e3..6648dd17e5c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
@@ -180,7 +180,7 @@ public Slice(
     }
     range = tmpRange;
 
-    /**
+    /*
      * debugging. this isn't an error condition for custom sharding. if (range == null) {
      * System.out.println("###### NO RANGE for " + name + " props=" + props); }
      */
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
index 341edfb864f..f70c0bd583a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
@@ -95,7 +95,7 @@ public class JavaBinCodec implements PushWriter {
       SOLRDOCLST = 12,
       BYTEARR = 13,
       ITERATOR = 14,
-      /** this is a special tag signals an end. No value is associated with it */
+      /* this is a special tag signals an end. No value is associated with it */
       END = 15,
       SOLRINPUTDOC = 16,
       MAP_ENTRY_ITER = 17,
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index 21800c6d5a9..dd9bf0ea927 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -996,5 +996,5 @@ public void testBuilder() {
     }
   }
 
-  /** Missed tests : - set cookies via interceptor - invariant params - compression */
+  /* Missed tests : - set cookies via interceptor - invariant params - compression */
 }
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 eb2eb4ef152..75113bc5b66 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
@@ -1146,7 +1146,6 @@ public Builder useOtherCollectionConfigSetExecution() {
       return this;
     }
 
-    @SuppressWarnings("InvalidParam")
     /**
      * Force the cluster Collection and config state API execution as well as the cluster state
      * update strategy to be either Overseer based or distributed. <b>This method can be useful when
@@ -1181,6 +1180,7 @@ public Builder useOtherCollectionConfigSetExecution() {
      *     <p>If {@code distributedCollectionConfigSetApi} is {@code true} then this parameter must
      *     be {@code true}.
      */
+    @SuppressWarnings("InvalidParam")
     public Builder withDistributedClusterStateUpdates(
         boolean distributedCollectionConfigSetApi, boolean distributedClusterStateUpdates) {
       useDistributedCollectionConfigSetExecution = distributedCollectionConfigSetApi;
diff --git a/versions.lock b/versions.lock
index 7955a5281af..0b6f62a0dff 100644
--- a/versions.lock
+++ b/versions.lock
@@ -42,7 +42,7 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
 com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: bb893df4)
+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: bb893df4)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
 com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
diff --git a/versions.props b/versions.props
index e55df283260..9f7185e206a 100644
--- a/versions.props
+++ b/versions.props
@@ -10,7 +10,7 @@ com.github.ben-manes.caffeine:caffeine=3.1.6
 com.github.spotbugs:*=4.7.3
 com.github.stephenc.jcip:jcip-annotations=1.0-1
 com.google.cloud:google-cloud-bom=0.197.0
-com.google.errorprone:*=2.18.0
+com.google.errorprone:*=2.22.0
 com.google.guava:guava=32.1.2-jre
 com.google.re2j:re2j=1.7
 com.jayway.jsonpath:json-path=2.8.0

From bd09cb5ac59b76a3318fd543d1dcfbaa8fb3977c Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Mon, 2 Oct 2023 11:02:49 -0700
Subject: [PATCH 135/160] SOLR-16960 Tests should sometimes run with a Tracer
 (not no-op) (#1972)

---
 .../org/apache/solr/servlet/ServletUtils.java     |  2 +-
 .../org/apache/solr/util/tracing/TraceUtils.java  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
index 5297fe44401..2de3b3f2582 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
@@ -236,7 +236,7 @@ private static void traceHttpRequestExecution2(
     try (var scope = context.with(span).makeCurrent()) {
       assert scope != null; // prevent javac warning about scope being unused
       TraceUtils.setSpan(request, span);
-      TraceUtils.ifNotNoop(
+      TraceUtils.ifValidTraceId(
           span, s -> MDCLoggingContext.setTracerId(s.getSpanContext().getTraceId()));
       tracedExecution.run();
     } catch (ExceptionWhileTracing e) {
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index 7e9daa37bbc..7edfe8fc55f 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -21,6 +21,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
@@ -108,6 +109,20 @@ public static void ifNotNoop(Span span, Consumer<Span> consumer) {
     }
   }
 
+  /**
+   * Sometimes the tests will use a recoding noop span to verify the complete code path so we need
+   * to distinguish this case and only perform a specific operation (like updating the MDC context)
+   * only in case the generated trace id is valid
+   *
+   * @param span current span
+   * @param consumer consumer to be called
+   */
+  public static void ifValidTraceId(Span span, Consumer<Span> consumer) {
+    if (TraceId.isValid(span.getSpanContext().getTraceId())) {
+      consumer.accept(span);
+    }
+  }
+
   public static void setSpan(HttpServletRequest req, Span span) {
     req.setAttribute(REQ_ATTR_TRACING_SPAN, span);
   }

From 62c90c92624ad3e19a22485f580507677cd7c33a Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:08:12 +0200
Subject: [PATCH 136/160] Update dependency org.apache.commons:commons-compress
 to v1.24.0 (#1910)

---
 solr/licenses/commons-compress-1.23.0.jar.sha1 | 1 -
 solr/licenses/commons-compress-1.24.0.jar.sha1 | 1 +
 versions.lock                                  | 2 +-
 versions.props                                 | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/commons-compress-1.23.0.jar.sha1
 create mode 100644 solr/licenses/commons-compress-1.24.0.jar.sha1

diff --git a/solr/licenses/commons-compress-1.23.0.jar.sha1 b/solr/licenses/commons-compress-1.23.0.jar.sha1
deleted file mode 100644
index a5708f08bbb..00000000000
--- a/solr/licenses/commons-compress-1.23.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4af2060ea9b0c8b74f1854c6cafe4d43cfc161fc
diff --git a/solr/licenses/commons-compress-1.24.0.jar.sha1 b/solr/licenses/commons-compress-1.24.0.jar.sha1
new file mode 100644
index 00000000000..f770e229028
--- /dev/null
+++ b/solr/licenses/commons-compress-1.24.0.jar.sha1
@@ -0,0 +1 @@
+b4b1b5a3d9573b2970fddab236102c0a4d27d35e
diff --git a/versions.lock b/versions.lock
index 0b6f62a0dff..2209f50f97b 100644
--- a/versions.lock
+++ b/versions.lock
@@ -169,7 +169,7 @@ org.apache.calcite:calcite-linq4j:1.34.0 (2 constraints: c912b74b)
 org.apache.calcite.avatica:avatica-core:1.23.0 (3 constraints: fb20cdcb)
 org.apache.calcite.avatica:avatica-metrics:1.23.0 (1 constraints: 991049c4)
 org.apache.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
-org.apache.commons:commons-compress:1.23.0 (3 constraints: fd1bd8d1)
+org.apache.commons:commons-compress:1.24.0 (3 constraints: fe1b1fd2)
 org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
diff --git a/versions.props b/versions.props
index 9f7185e206a..c9283262a2f 100644
--- a/versions.props
+++ b/versions.props
@@ -34,7 +34,7 @@ no.nav.security:mock-oauth2-server=0.4.3
 org.apache.calcite.avatica:avatica-core=1.23.0
 org.apache.calcite:*=1.34.0
 org.apache.commons:commons-collections4=4.4
-org.apache.commons:commons-compress=1.23.0
+org.apache.commons:commons-compress=1.24.0
 org.apache.commons:commons-configuration2=2.9.0
 org.apache.commons:commons-exec=1.3
 org.apache.commons:commons-lang3=3.13.0

From 15813586241c6bce15056a8ac715b1cb3ce76678 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:09:34 +0200
Subject: [PATCH 137/160] Update dependency no.nav.security:mock-oauth2-server
 to v0.5.10 (#1608)

---
 solr/licenses/accessors-smart-2.4.7.jar.sha1  |  1 -
 solr/licenses/accessors-smart-2.4.9.jar.sha1  |  1 +
 solr/licenses/freemarker-2.3.31.jar.sha1      |  1 -
 solr/licenses/freemarker-2.3.32.jar.sha1      |  1 +
 solr/licenses/json-smart-2.4.10.jar.sha1      |  1 +
 solr/licenses/json-smart-2.4.7.jar.sha1       |  1 -
 .../kotlin-logging-jvm-2.1.21.jar.sha1        |  1 -
 .../kotlin-logging-jvm-3.0.5.jar.sha1         |  1 +
 solr/licenses/kotlin-reflect-1.6.10.jar.sha1  |  1 -
 solr/licenses/kotlin-reflect-1.8.22.jar.sha1  |  1 +
 solr/licenses/kotlin-stdlib-1.6.20.jar.sha1   |  1 -
 solr/licenses/kotlin-stdlib-1.8.22.jar.sha1   |  1 +
 .../kotlin-stdlib-common-1.6.20.jar.sha1      |  1 -
 .../kotlin-stdlib-common-1.8.22.jar.sha1      |  1 +
 .../kotlin-stdlib-jdk7-1.6.20.jar.sha1        |  1 -
 .../kotlin-stdlib-jdk7-1.8.0.jar.sha1         |  1 +
 .../kotlin-stdlib-jdk8-1.6.20.jar.sha1        |  1 -
 .../kotlin-stdlib-jdk8-1.8.0.jar.sha1         |  1 +
 solr/licenses/lang-tag-1.5.jar.sha1           |  1 -
 solr/licenses/lang-tag-1.7.jar.sha1           |  1 +
 .../mock-oauth2-server-0.4.3.jar.sha1         |  1 -
 .../mock-oauth2-server-0.5.10.jar.sha1        |  1 +
 solr/licenses/mockwebserver-4.11.0.jar.sha1   |  1 +
 solr/licenses/mockwebserver-4.9.3.jar.sha1    |  1 -
 solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 |  1 -
 solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1 |  1 +
 .../licenses/oauth2-oidc-sdk-10.10.1.jar.sha1 |  1 +
 solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 |  1 -
 versions.lock                                 | 40 +++++++++----------
 versions.props                                |  2 +-
 30 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 solr/licenses/accessors-smart-2.4.7.jar.sha1
 create mode 100644 solr/licenses/accessors-smart-2.4.9.jar.sha1
 delete mode 100644 solr/licenses/freemarker-2.3.31.jar.sha1
 create mode 100644 solr/licenses/freemarker-2.3.32.jar.sha1
 create mode 100644 solr/licenses/json-smart-2.4.10.jar.sha1
 delete mode 100644 solr/licenses/json-smart-2.4.7.jar.sha1
 delete mode 100644 solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1
 create mode 100644 solr/licenses/kotlin-logging-jvm-3.0.5.jar.sha1
 delete mode 100644 solr/licenses/kotlin-reflect-1.6.10.jar.sha1
 create mode 100644 solr/licenses/kotlin-reflect-1.8.22.jar.sha1
 delete mode 100644 solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-1.8.22.jar.sha1
 delete mode 100644 solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-common-1.8.22.jar.sha1
 delete mode 100644 solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-jdk7-1.8.0.jar.sha1
 delete mode 100644 solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
 create mode 100644 solr/licenses/kotlin-stdlib-jdk8-1.8.0.jar.sha1
 delete mode 100644 solr/licenses/lang-tag-1.5.jar.sha1
 create mode 100644 solr/licenses/lang-tag-1.7.jar.sha1
 delete mode 100644 solr/licenses/mock-oauth2-server-0.4.3.jar.sha1
 create mode 100644 solr/licenses/mock-oauth2-server-0.5.10.jar.sha1
 create mode 100644 solr/licenses/mockwebserver-4.11.0.jar.sha1
 delete mode 100644 solr/licenses/mockwebserver-4.9.3.jar.sha1
 delete mode 100644 solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1
 create mode 100644 solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1
 create mode 100644 solr/licenses/oauth2-oidc-sdk-10.10.1.jar.sha1
 delete mode 100644 solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1

diff --git a/solr/licenses/accessors-smart-2.4.7.jar.sha1 b/solr/licenses/accessors-smart-2.4.7.jar.sha1
deleted file mode 100644
index 6d865c8b50c..00000000000
--- a/solr/licenses/accessors-smart-2.4.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3970cfc505e6657ca60f3aa57c849f6043000d7a
diff --git a/solr/licenses/accessors-smart-2.4.9.jar.sha1 b/solr/licenses/accessors-smart-2.4.9.jar.sha1
new file mode 100644
index 00000000000..4f92fc9a8fc
--- /dev/null
+++ b/solr/licenses/accessors-smart-2.4.9.jar.sha1
@@ -0,0 +1 @@
+32e540749224c22c9b17de8137e916aae9057e22
diff --git a/solr/licenses/freemarker-2.3.31.jar.sha1 b/solr/licenses/freemarker-2.3.31.jar.sha1
deleted file mode 100644
index d870a1a4a2c..00000000000
--- a/solr/licenses/freemarker-2.3.31.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd4fc0942b4a8bdb19f3b669aa42136fb54feb55
diff --git a/solr/licenses/freemarker-2.3.32.jar.sha1 b/solr/licenses/freemarker-2.3.32.jar.sha1
new file mode 100644
index 00000000000..60149ea2b7f
--- /dev/null
+++ b/solr/licenses/freemarker-2.3.32.jar.sha1
@@ -0,0 +1 @@
+8607259125d4fbe982754227ea4f75dd513c6d19
diff --git a/solr/licenses/json-smart-2.4.10.jar.sha1 b/solr/licenses/json-smart-2.4.10.jar.sha1
new file mode 100644
index 00000000000..5b6f2472c45
--- /dev/null
+++ b/solr/licenses/json-smart-2.4.10.jar.sha1
@@ -0,0 +1 @@
+91cb329e9424bf32131eeb1ce2d17bf31b9899bc
diff --git a/solr/licenses/json-smart-2.4.7.jar.sha1 b/solr/licenses/json-smart-2.4.7.jar.sha1
deleted file mode 100644
index 92aebfdd778..00000000000
--- a/solr/licenses/json-smart-2.4.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d7f4c1530c07c54930935f3da85f48b83b3c109
diff --git a/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1 b/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1
deleted file mode 100644
index 590ef71bee7..00000000000
--- a/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a65a2789a27c67c281a4fe9e78689cf5e2b36d8
diff --git a/solr/licenses/kotlin-logging-jvm-3.0.5.jar.sha1 b/solr/licenses/kotlin-logging-jvm-3.0.5.jar.sha1
new file mode 100644
index 00000000000..7ccd1527962
--- /dev/null
+++ b/solr/licenses/kotlin-logging-jvm-3.0.5.jar.sha1
@@ -0,0 +1 @@
+82f2256aeedccfd9c27ea585274a50bf06517383
diff --git a/solr/licenses/kotlin-reflect-1.6.10.jar.sha1 b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
deleted file mode 100644
index c8ade6487d9..00000000000
--- a/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1cbe9c92c12a94eea200d23c2bbaedaf3daf5132
diff --git a/solr/licenses/kotlin-reflect-1.8.22.jar.sha1 b/solr/licenses/kotlin-reflect-1.8.22.jar.sha1
new file mode 100644
index 00000000000..02571f1cce1
--- /dev/null
+++ b/solr/licenses/kotlin-reflect-1.8.22.jar.sha1
@@ -0,0 +1 @@
+b52be44bc57cb6fd2169a29aefa4507c4e49c858
diff --git a/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
deleted file mode 100644
index 35a1db0e8cd..00000000000
--- a/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6cedc143badbb4f1c6b7f5a340b04edff1743208
diff --git a/solr/licenses/kotlin-stdlib-1.8.22.jar.sha1 b/solr/licenses/kotlin-stdlib-1.8.22.jar.sha1
new file mode 100644
index 00000000000..cb50d0ab7ab
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-1.8.22.jar.sha1
@@ -0,0 +1 @@
+636bf8b320e7627482771bbac9ed7246773c02bd
diff --git a/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
deleted file mode 100644
index 7359fecd8a2..00000000000
--- a/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27b4562b6713d70f458c6d7ea39aadacb8e6a92b
diff --git a/solr/licenses/kotlin-stdlib-common-1.8.22.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.8.22.jar.sha1
new file mode 100644
index 00000000000..7c3d697f6fa
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-common-1.8.22.jar.sha1
@@ -0,0 +1 @@
+1a8e3601703ae14bb58757ea6b2d8e8e5935a586
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
deleted file mode 100644
index e649f57208c..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk7-1.6.20.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f8629f336bad4001c89e9cffa5ef3d4b5d0f5e22
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.8.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.8.0.jar.sha1
new file mode 100644
index 00000000000..4309dede1fa
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk7-1.8.0.jar.sha1
@@ -0,0 +1 @@
+3c91271347f678c239607abb676d4032a7898427
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
deleted file mode 100644
index dcea4bda07a..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk8-1.6.20.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dab8089bca6ac0e394c37281ea8cff2f99acd421
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.8.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.8.0.jar.sha1
new file mode 100644
index 00000000000..37663cb32db
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk8-1.8.0.jar.sha1
@@ -0,0 +1 @@
+ed04f49e186a116753ad70d34f0ac2925d1d8020
diff --git a/solr/licenses/lang-tag-1.5.jar.sha1 b/solr/licenses/lang-tag-1.5.jar.sha1
deleted file mode 100644
index 3a38e4930d3..00000000000
--- a/solr/licenses/lang-tag-1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e82e3c4c593f85addf4bd209abde4f8ff933a07
diff --git a/solr/licenses/lang-tag-1.7.jar.sha1 b/solr/licenses/lang-tag-1.7.jar.sha1
new file mode 100644
index 00000000000..7da7f31c5ce
--- /dev/null
+++ b/solr/licenses/lang-tag-1.7.jar.sha1
@@ -0,0 +1 @@
+97c73ecd70bc7e8eefb26c5eea84f251a63f1031
diff --git a/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1 b/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1
deleted file mode 100644
index 3347ef06d63..00000000000
--- a/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-28586c0d946551b69198535c46ae55389ad39cae
diff --git a/solr/licenses/mock-oauth2-server-0.5.10.jar.sha1 b/solr/licenses/mock-oauth2-server-0.5.10.jar.sha1
new file mode 100644
index 00000000000..da3d7cc1a78
--- /dev/null
+++ b/solr/licenses/mock-oauth2-server-0.5.10.jar.sha1
@@ -0,0 +1 @@
+1d1b2d193db1c5646d530e87b1dd5510b8192ece
diff --git a/solr/licenses/mockwebserver-4.11.0.jar.sha1 b/solr/licenses/mockwebserver-4.11.0.jar.sha1
new file mode 100644
index 00000000000..443999ff488
--- /dev/null
+++ b/solr/licenses/mockwebserver-4.11.0.jar.sha1
@@ -0,0 +1 @@
+1dc21cc47456f1e564a698102e6505eff931780f
diff --git a/solr/licenses/mockwebserver-4.9.3.jar.sha1 b/solr/licenses/mockwebserver-4.9.3.jar.sha1
deleted file mode 100644
index c9505428447..00000000000
--- a/solr/licenses/mockwebserver-4.9.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-436df81ae01a2326b72d013783a782b595f173a5
diff --git a/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 b/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1
deleted file mode 100644
index c6839fccdd9..00000000000
--- a/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bd47fe347968ea624355dda6144e98596b62d12
diff --git a/solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1 b/solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1
new file mode 100644
index 00000000000..98b8f46f617
--- /dev/null
+++ b/solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1
@@ -0,0 +1 @@
+3a291d6af4007fd88df384249378130102912385
diff --git a/solr/licenses/oauth2-oidc-sdk-10.10.1.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-10.10.1.jar.sha1
new file mode 100644
index 00000000000..94aec1b8cf7
--- /dev/null
+++ b/solr/licenses/oauth2-oidc-sdk-10.10.1.jar.sha1
@@ -0,0 +1 @@
+a9a0d131feff0f8a059c306bd5fca886bf8195cc
diff --git a/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1
deleted file mode 100644
index 21e85703982..00000000000
--- a/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2339e9e610683544bd69d7c3c839df2f0e97f7aa
diff --git a/versions.lock b/versions.lock
index 2209f50f97b..ad5240b1019 100644
--- a/versions.lock
+++ b/versions.lock
@@ -9,7 +9,7 @@ com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
 com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55)
 com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6617)
 com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42025e28)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 89633f8a)
+com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63008e)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)
@@ -70,7 +70,7 @@ com.mchange:mchange-commons-java:0.2.19 (1 constraints: 84075b75)
 com.pff:java-libpst:0.9.3 (1 constraints: 630cfa01)
 com.rometools:rome:1.18.0 (1 constraints: 910c870e)
 com.rometools:rome-utils:1.18.0 (1 constraints: 10095d96)
-com.squareup.okhttp3:okhttp:4.11.0 (2 constraints: 8126a451)
+com.squareup.okhttp3:okhttp:4.11.0 (2 constraints: a7264c6a)
 com.squareup.okio:okio:3.2.0 (1 constraints: 4f0c2cfd)
 com.squareup.okio:okio-jvm:3.2.0 (1 constraints: 4c0ac7b9)
 com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)
@@ -323,10 +323,10 @@ org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)
 org.jctools:jctools-core:4.0.1 (1 constraints: 07050036)
 org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
 org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
-org.jetbrains.kotlin:kotlin-stdlib:1.6.20 (5 constraints: d04c515f)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 (3 constraints: 342c6071)
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20 (1 constraints: e010f5d2)
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 (4 constraints: d9389ae4)
+org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (5 constraints: 7a4c42d2)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 (3 constraints: 3a2cc871)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 (1 constraints: b01019c2)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (4 constraints: dd389ae5)
 org.junit:junit-bom:5.9.1 (1 constraints: c8116ede)
 org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
 org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
@@ -337,7 +337,7 @@ org.openjdk.jmh:jmh-core:1.37 (1 constraints: df04fc30)
 org.osgi:org.osgi.resource:1.0.0 (1 constraints: e60f2999)
 org.osgi:org.osgi.service.serviceloader:1.0.0 (1 constraints: e60f2999)
 org.osgi:osgi.annotation:8.1.0 (1 constraints: 0b051636)
-org.ow2.asm:asm:9.3 (5 constraints: e139bef1)
+org.ow2.asm:asm:9.3 (5 constraints: e339cef2)
 org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)
 org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
 org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
@@ -346,7 +346,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
 org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
 org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
 org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
-org.slf4j:slf4j-api:2.0.9 (59 constraints: 131131a0)
+org.slf4j:slf4j-api:2.0.9 (59 constraints: db106466)
 org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
 org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
 org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
@@ -390,25 +390,25 @@ com.amazonaws:jmespath-java:1.12.488 (2 constraints: cc1a98b5)
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2 (2 constraints: aa195413)
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2 (3 constraints: fc2e56b4)
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 (4 constraints: 6d485635)
-com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2 (2 constraints: a61d3360)
+com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2 (2 constraints: a91d3a60)
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.2 (2 constraints: 0c243f82)
 com.google.cloud:google-cloud-nio:0.126.16 (1 constraints: cd0e267b)
 com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
-com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)
-com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410)
-com.nimbusds:oauth2-oidc-sdk:9.22.2 (1 constraints: f50ebb71)
-com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)
-io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
-io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
+com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb)
+com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10)
+com.nimbusds:oauth2-oidc-sdk:10.10.1 (1 constraints: 190f9b80)
+com.squareup.okhttp3:mockwebserver:4.11.0 (1 constraints: ec0e9471)
+io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162)
+io.github.microutils:kotlin-logging-jvm:3.0.5 (1 constraints: 810f8b7c)
 io.micrometer:micrometer-core:1.9.11 (1 constraints: fd162819)
 io.opentelemetry:opentelemetry-sdk-testing:1.30.1 (1 constraints: 920fe383)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
 javax.inject:javax.inject:1 (1 constraints: 7a0df617)
 net.bytebuddy:byte-buddy:1.14.6 (1 constraints: 460b44de)
-net.minidev:accessors-smart:2.4.7 (1 constraints: 4e0a90b8)
-net.minidev:json-smart:2.4.7 (1 constraints: 160e936e)
-no.nav.security:mock-oauth2-server:0.4.3 (1 constraints: 0905fa35)
+net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8)
+net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c)
+no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b)
 org.apache.hadoop:hadoop-client-minicluster:3.3.5 (1 constraints: 0d050836)
 org.apache.hadoop:hadoop-hdfs:3.3.5 (1 constraints: 0d050836)
 org.apache.hadoop:hadoop-minikdc:3.3.5 (1 constraints: 0d050836)
@@ -419,7 +419,7 @@ org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
 org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
 org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
 org.apache.tomcat.embed:tomcat-embed-el:9.0.75 (1 constraints: d31557cf)
-org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271)
+org.freemarker:freemarker:2.3.32 (1 constraints: f00e9371)
 org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
 org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
 org.glassfish.grizzly:grizzly-http-server:2.4.4 (2 constraints: bb2c391b)
@@ -433,7 +433,7 @@ org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constrain
 org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
 org.hsqldb:hsqldb:2.7.2 (1 constraints: 0d050c36)
-org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
+org.jetbrains.kotlin:kotlin-reflect:1.8.22 (2 constraints: 6724ece2)
 org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
 org.mockito:mockito-core:5.5.0 (2 constraints: d61174fd)
 org.mockito:mockito-subclass:5.5.0 (1 constraints: 0c051336)
diff --git a/versions.props b/versions.props
index c9283262a2f..fee3ed2976d 100644
--- a/versions.props
+++ b/versions.props
@@ -30,7 +30,7 @@ jakarta.ws.rs:jakarta.ws.rs-api=2.1.6
 junit:junit=4.13.2
 net.sourceforge.argparse4j:argparse4j=0.9.0
 net.thisptr:jackson-jq=0.0.13
-no.nav.security:mock-oauth2-server=0.4.3
+no.nav.security:mock-oauth2-server=0.5.10
 org.apache.calcite.avatica:avatica-core=1.23.0
 org.apache.calcite:*=1.34.0
 org.apache.commons:commons-collections4=4.4

From a03754c7d74cd71f1c9529b2f2e0d65aa2421297 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:11:11 +0200
Subject: [PATCH 138/160] Update software.amazon.awssdk:* to v2.20.155 (#1877)

---
 solr/licenses/annotations-2.20.128.jar.sha1   |  1 -
 solr/licenses/annotations-2.20.155.jar.sha1   |  1 +
 solr/licenses/apache-client-2.20.128.jar.sha1 |  1 -
 solr/licenses/apache-client-2.20.155.jar.sha1 |  1 +
 solr/licenses/arns-2.20.128.jar.sha1          |  1 -
 solr/licenses/arns-2.20.155.jar.sha1          |  1 +
 solr/licenses/auth-2.20.128.jar.sha1          |  1 -
 solr/licenses/auth-2.20.155.jar.sha1          |  1 +
 solr/licenses/aws-core-2.20.128.jar.sha1      |  1 -
 solr/licenses/aws-core-2.20.155.jar.sha1      |  1 +
 .../aws-query-protocol-2.20.128.jar.sha1      |  1 -
 .../aws-query-protocol-2.20.155.jar.sha1      |  1 +
 .../aws-xml-protocol-2.20.128.jar.sha1        |  1 -
 .../aws-xml-protocol-2.20.155.jar.sha1        |  1 +
 solr/licenses/crt-core-2.20.128.jar.sha1      |  1 -
 solr/licenses/crt-core-2.20.155.jar.sha1      |  1 +
 solr/licenses/endpoints-spi-2.20.128.jar.sha1 |  1 -
 solr/licenses/endpoints-spi-2.20.155.jar.sha1 |  1 +
 .../http-client-spi-2.20.128.jar.sha1         |  1 -
 .../http-client-spi-2.20.155.jar.sha1         |  1 +
 solr/licenses/json-utils-2.20.128.jar.sha1    |  1 -
 solr/licenses/json-utils-2.20.155.jar.sha1    |  1 +
 solr/licenses/metrics-spi-2.20.128.jar.sha1   |  1 -
 solr/licenses/metrics-spi-2.20.155.jar.sha1   |  1 +
 solr/licenses/profiles-2.20.128.jar.sha1      |  1 -
 solr/licenses/profiles-2.20.155.jar.sha1      |  1 +
 solr/licenses/protocol-core-2.20.128.jar.sha1 |  1 -
 solr/licenses/protocol-core-2.20.155.jar.sha1 |  1 +
 solr/licenses/reactive-streams-1.0.3.jar.sha1 |  1 -
 solr/licenses/reactive-streams-1.0.4.jar.sha1 |  1 +
 solr/licenses/regions-2.20.128.jar.sha1       |  1 -
 solr/licenses/regions-2.20.155.jar.sha1       |  1 +
 solr/licenses/s3-2.20.128.jar.sha1            |  1 -
 solr/licenses/s3-2.20.155.jar.sha1            |  1 +
 solr/licenses/sdk-core-2.20.128.jar.sha1      |  1 -
 solr/licenses/sdk-core-2.20.155.jar.sha1      |  1 +
 solr/licenses/sts-2.20.128.jar.sha1           |  1 -
 solr/licenses/sts-2.20.155.jar.sha1           |  1 +
 ...third-party-jackson-core-2.20.128.jar.sha1 |  1 -
 ...third-party-jackson-core-2.20.155.jar.sha1 |  1 +
 .../url-connection-client-2.20.128.jar.sha1   |  1 -
 .../url-connection-client-2.20.155.jar.sha1   |  1 +
 solr/licenses/utils-2.20.128.jar.sha1         |  1 -
 solr/licenses/utils-2.20.155.jar.sha1         |  1 +
 versions.lock                                 | 46 +++++++++----------
 versions.props                                |  2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 solr/licenses/annotations-2.20.128.jar.sha1
 create mode 100644 solr/licenses/annotations-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/apache-client-2.20.128.jar.sha1
 create mode 100644 solr/licenses/apache-client-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/arns-2.20.128.jar.sha1
 create mode 100644 solr/licenses/arns-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/auth-2.20.128.jar.sha1
 create mode 100644 solr/licenses/auth-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/aws-core-2.20.128.jar.sha1
 create mode 100644 solr/licenses/aws-core-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/aws-query-protocol-2.20.128.jar.sha1
 create mode 100644 solr/licenses/aws-query-protocol-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
 create mode 100644 solr/licenses/aws-xml-protocol-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/crt-core-2.20.128.jar.sha1
 create mode 100644 solr/licenses/crt-core-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/endpoints-spi-2.20.128.jar.sha1
 create mode 100644 solr/licenses/endpoints-spi-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/http-client-spi-2.20.128.jar.sha1
 create mode 100644 solr/licenses/http-client-spi-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/json-utils-2.20.128.jar.sha1
 create mode 100644 solr/licenses/json-utils-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/metrics-spi-2.20.128.jar.sha1
 create mode 100644 solr/licenses/metrics-spi-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/profiles-2.20.128.jar.sha1
 create mode 100644 solr/licenses/profiles-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/protocol-core-2.20.128.jar.sha1
 create mode 100644 solr/licenses/protocol-core-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/reactive-streams-1.0.3.jar.sha1
 create mode 100644 solr/licenses/reactive-streams-1.0.4.jar.sha1
 delete mode 100644 solr/licenses/regions-2.20.128.jar.sha1
 create mode 100644 solr/licenses/regions-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/s3-2.20.128.jar.sha1
 create mode 100644 solr/licenses/s3-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/sdk-core-2.20.128.jar.sha1
 create mode 100644 solr/licenses/sdk-core-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/sts-2.20.128.jar.sha1
 create mode 100644 solr/licenses/sts-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
 create mode 100644 solr/licenses/third-party-jackson-core-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/url-connection-client-2.20.128.jar.sha1
 create mode 100644 solr/licenses/url-connection-client-2.20.155.jar.sha1
 delete mode 100644 solr/licenses/utils-2.20.128.jar.sha1
 create mode 100644 solr/licenses/utils-2.20.155.jar.sha1

diff --git a/solr/licenses/annotations-2.20.128.jar.sha1 b/solr/licenses/annotations-2.20.128.jar.sha1
deleted file mode 100644
index f669d174c70..00000000000
--- a/solr/licenses/annotations-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4eba3312fad5b1b621fde4cfbf1b9780591589d5
diff --git a/solr/licenses/annotations-2.20.155.jar.sha1 b/solr/licenses/annotations-2.20.155.jar.sha1
new file mode 100644
index 00000000000..1bedca3dc8f
--- /dev/null
+++ b/solr/licenses/annotations-2.20.155.jar.sha1
@@ -0,0 +1 @@
+23b82843c50fa97f3cfe9b432b2b10f6800f045d
diff --git a/solr/licenses/apache-client-2.20.128.jar.sha1 b/solr/licenses/apache-client-2.20.128.jar.sha1
deleted file mode 100644
index 0ef9ff55ec0..00000000000
--- a/solr/licenses/apache-client-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b82f09fd66fbd3c0b27ff88f7eb2e9a78e9a080
diff --git a/solr/licenses/apache-client-2.20.155.jar.sha1 b/solr/licenses/apache-client-2.20.155.jar.sha1
new file mode 100644
index 00000000000..9ac8f5ec5d8
--- /dev/null
+++ b/solr/licenses/apache-client-2.20.155.jar.sha1
@@ -0,0 +1 @@
+7b87fc696d3eb2da22799a63a3eae86f2b323167
diff --git a/solr/licenses/arns-2.20.128.jar.sha1 b/solr/licenses/arns-2.20.128.jar.sha1
deleted file mode 100644
index 395694a27e7..00000000000
--- a/solr/licenses/arns-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e809b3b87e6f2806e0b67a390d3fe07fcaf7c5e
diff --git a/solr/licenses/arns-2.20.155.jar.sha1 b/solr/licenses/arns-2.20.155.jar.sha1
new file mode 100644
index 00000000000..3da1c11d488
--- /dev/null
+++ b/solr/licenses/arns-2.20.155.jar.sha1
@@ -0,0 +1 @@
+12d2da19cbd401871fe939859d4b7c1c0e46b547
diff --git a/solr/licenses/auth-2.20.128.jar.sha1 b/solr/licenses/auth-2.20.128.jar.sha1
deleted file mode 100644
index a7481505d04..00000000000
--- a/solr/licenses/auth-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a27499eb27835bb21f0a8f6d6df9b7dcd2725529
diff --git a/solr/licenses/auth-2.20.155.jar.sha1 b/solr/licenses/auth-2.20.155.jar.sha1
new file mode 100644
index 00000000000..5f4c800595a
--- /dev/null
+++ b/solr/licenses/auth-2.20.155.jar.sha1
@@ -0,0 +1 @@
+7050b40fc4577ed49e9d64283bf9d1baa1cac2d8
diff --git a/solr/licenses/aws-core-2.20.128.jar.sha1 b/solr/licenses/aws-core-2.20.128.jar.sha1
deleted file mode 100644
index 7d0e6e344c4..00000000000
--- a/solr/licenses/aws-core-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca2c9d71fe86609a6e69c7b770cb282f365ca054
diff --git a/solr/licenses/aws-core-2.20.155.jar.sha1 b/solr/licenses/aws-core-2.20.155.jar.sha1
new file mode 100644
index 00000000000..4b88c5c6d9d
--- /dev/null
+++ b/solr/licenses/aws-core-2.20.155.jar.sha1
@@ -0,0 +1 @@
+485b86eb7e5a3a04b5f80ed4a215d4b4813318aa
diff --git a/solr/licenses/aws-query-protocol-2.20.128.jar.sha1 b/solr/licenses/aws-query-protocol-2.20.128.jar.sha1
deleted file mode 100644
index 6c657e007e0..00000000000
--- a/solr/licenses/aws-query-protocol-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab36db110c976df57e6bf81b95a24b7736ddac43
diff --git a/solr/licenses/aws-query-protocol-2.20.155.jar.sha1 b/solr/licenses/aws-query-protocol-2.20.155.jar.sha1
new file mode 100644
index 00000000000..d0c47671302
--- /dev/null
+++ b/solr/licenses/aws-query-protocol-2.20.155.jar.sha1
@@ -0,0 +1 @@
+c08373623985f9d7ab79d1012fc924280deeeeb9
diff --git a/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1 b/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
deleted file mode 100644
index 4c0615d9097..00000000000
--- a/solr/licenses/aws-xml-protocol-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca6a04c0b1d5b492612e5b8816aedfc5895733cf
diff --git a/solr/licenses/aws-xml-protocol-2.20.155.jar.sha1 b/solr/licenses/aws-xml-protocol-2.20.155.jar.sha1
new file mode 100644
index 00000000000..69b91a9eea0
--- /dev/null
+++ b/solr/licenses/aws-xml-protocol-2.20.155.jar.sha1
@@ -0,0 +1 @@
+6a36a0ba4a6c2e15653865a528e81972cd97d931
diff --git a/solr/licenses/crt-core-2.20.128.jar.sha1 b/solr/licenses/crt-core-2.20.128.jar.sha1
deleted file mode 100644
index 8fd66294823..00000000000
--- a/solr/licenses/crt-core-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa7c6f4f1037479c021d90d14ec58c55c72f7c4f
diff --git a/solr/licenses/crt-core-2.20.155.jar.sha1 b/solr/licenses/crt-core-2.20.155.jar.sha1
new file mode 100644
index 00000000000..1112d6cb8a9
--- /dev/null
+++ b/solr/licenses/crt-core-2.20.155.jar.sha1
@@ -0,0 +1 @@
+7224f8d29a70b7a4f3deabcebd0d6656f5392f0a
diff --git a/solr/licenses/endpoints-spi-2.20.128.jar.sha1 b/solr/licenses/endpoints-spi-2.20.128.jar.sha1
deleted file mode 100644
index 04050c7defd..00000000000
--- a/solr/licenses/endpoints-spi-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2761b9d660eb3db814d4078eb1e7ee53515effd0
diff --git a/solr/licenses/endpoints-spi-2.20.155.jar.sha1 b/solr/licenses/endpoints-spi-2.20.155.jar.sha1
new file mode 100644
index 00000000000..a68d9951f1e
--- /dev/null
+++ b/solr/licenses/endpoints-spi-2.20.155.jar.sha1
@@ -0,0 +1 @@
+e711926386d09f10fa92242062f35e4190061fcd
diff --git a/solr/licenses/http-client-spi-2.20.128.jar.sha1 b/solr/licenses/http-client-spi-2.20.128.jar.sha1
deleted file mode 100644
index b7986560ff0..00000000000
--- a/solr/licenses/http-client-spi-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d614e5750362fabb312ccb4f2db440d22ed95c72
diff --git a/solr/licenses/http-client-spi-2.20.155.jar.sha1 b/solr/licenses/http-client-spi-2.20.155.jar.sha1
new file mode 100644
index 00000000000..0d7dbf46368
--- /dev/null
+++ b/solr/licenses/http-client-spi-2.20.155.jar.sha1
@@ -0,0 +1 @@
+637e98fa218ae01d561f61659bb2cb996c7089aa
diff --git a/solr/licenses/json-utils-2.20.128.jar.sha1 b/solr/licenses/json-utils-2.20.128.jar.sha1
deleted file mode 100644
index 3eb1f4fc2e3..00000000000
--- a/solr/licenses/json-utils-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f00a80b03dde32f1d7aca472516b6e45e4a8959
diff --git a/solr/licenses/json-utils-2.20.155.jar.sha1 b/solr/licenses/json-utils-2.20.155.jar.sha1
new file mode 100644
index 00000000000..2a5a51baad8
--- /dev/null
+++ b/solr/licenses/json-utils-2.20.155.jar.sha1
@@ -0,0 +1 @@
+7052c4be474575352783fd923177709b0148f38a
diff --git a/solr/licenses/metrics-spi-2.20.128.jar.sha1 b/solr/licenses/metrics-spi-2.20.128.jar.sha1
deleted file mode 100644
index 83880b2a032..00000000000
--- a/solr/licenses/metrics-spi-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d59e5e2264e03fe27cd1ab1843ccc2984636bc3c
diff --git a/solr/licenses/metrics-spi-2.20.155.jar.sha1 b/solr/licenses/metrics-spi-2.20.155.jar.sha1
new file mode 100644
index 00000000000..17ab8dce39c
--- /dev/null
+++ b/solr/licenses/metrics-spi-2.20.155.jar.sha1
@@ -0,0 +1 @@
+9f0e01d7d299c9c10da744142a07126bf447fe4d
diff --git a/solr/licenses/profiles-2.20.128.jar.sha1 b/solr/licenses/profiles-2.20.128.jar.sha1
deleted file mode 100644
index 1d15205ac83..00000000000
--- a/solr/licenses/profiles-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbc0b7b6e98b9e168b96ef92c41f3d274b3d403b
diff --git a/solr/licenses/profiles-2.20.155.jar.sha1 b/solr/licenses/profiles-2.20.155.jar.sha1
new file mode 100644
index 00000000000..095a469e4a0
--- /dev/null
+++ b/solr/licenses/profiles-2.20.155.jar.sha1
@@ -0,0 +1 @@
+f1ceb3c36aad301cc5155ba3a21cd85a0b1758c7
diff --git a/solr/licenses/protocol-core-2.20.128.jar.sha1 b/solr/licenses/protocol-core-2.20.128.jar.sha1
deleted file mode 100644
index 42e13ee9ab0..00000000000
--- a/solr/licenses/protocol-core-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a79cb2c8d2d4399ccbc1f432d23d2b6413c09396
diff --git a/solr/licenses/protocol-core-2.20.155.jar.sha1 b/solr/licenses/protocol-core-2.20.155.jar.sha1
new file mode 100644
index 00000000000..e59b7061c93
--- /dev/null
+++ b/solr/licenses/protocol-core-2.20.155.jar.sha1
@@ -0,0 +1 @@
+7a2fdbb394288c060f9a0ddd3162335e276d4178
diff --git a/solr/licenses/reactive-streams-1.0.3.jar.sha1 b/solr/licenses/reactive-streams-1.0.3.jar.sha1
deleted file mode 100644
index b0ab77dad6b..00000000000
--- a/solr/licenses/reactive-streams-1.0.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d9fb7a7926ffa635b3dcaa5049fb2bfa25b3e7d0
diff --git a/solr/licenses/reactive-streams-1.0.4.jar.sha1 b/solr/licenses/reactive-streams-1.0.4.jar.sha1
new file mode 100644
index 00000000000..bdec756fb5c
--- /dev/null
+++ b/solr/licenses/reactive-streams-1.0.4.jar.sha1
@@ -0,0 +1 @@
+3864a1320d97d7b045f729a326e1e077661f31b7
diff --git a/solr/licenses/regions-2.20.128.jar.sha1 b/solr/licenses/regions-2.20.128.jar.sha1
deleted file mode 100644
index ea8ed851217..00000000000
--- a/solr/licenses/regions-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f9cdaff8fc49e3b3473fb741d70f6458bdd1d108
diff --git a/solr/licenses/regions-2.20.155.jar.sha1 b/solr/licenses/regions-2.20.155.jar.sha1
new file mode 100644
index 00000000000..d3b9c6f276d
--- /dev/null
+++ b/solr/licenses/regions-2.20.155.jar.sha1
@@ -0,0 +1 @@
+60b72f79911729c2e06b752f7719b54f40e8de01
diff --git a/solr/licenses/s3-2.20.128.jar.sha1 b/solr/licenses/s3-2.20.128.jar.sha1
deleted file mode 100644
index c233b710661..00000000000
--- a/solr/licenses/s3-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0eae09026984386b3b657c76952f1c33980cc60b
diff --git a/solr/licenses/s3-2.20.155.jar.sha1 b/solr/licenses/s3-2.20.155.jar.sha1
new file mode 100644
index 00000000000..00ae7ec21d1
--- /dev/null
+++ b/solr/licenses/s3-2.20.155.jar.sha1
@@ -0,0 +1 @@
+9d62bf97dfa923b65c1c42c3531281a56dbdd677
diff --git a/solr/licenses/sdk-core-2.20.128.jar.sha1 b/solr/licenses/sdk-core-2.20.128.jar.sha1
deleted file mode 100644
index a7feb66351b..00000000000
--- a/solr/licenses/sdk-core-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d2681298b8364b10e8e448c7cfb38a0c57ea137
diff --git a/solr/licenses/sdk-core-2.20.155.jar.sha1 b/solr/licenses/sdk-core-2.20.155.jar.sha1
new file mode 100644
index 00000000000..9357808ddc5
--- /dev/null
+++ b/solr/licenses/sdk-core-2.20.155.jar.sha1
@@ -0,0 +1 @@
+9389a25abe2dc80ea04037a0fa71f272aad7f060
diff --git a/solr/licenses/sts-2.20.128.jar.sha1 b/solr/licenses/sts-2.20.128.jar.sha1
deleted file mode 100644
index e42ac3530a8..00000000000
--- a/solr/licenses/sts-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5091ddfe486a878fbca7f7068e4d781109129d47
diff --git a/solr/licenses/sts-2.20.155.jar.sha1 b/solr/licenses/sts-2.20.155.jar.sha1
new file mode 100644
index 00000000000..02dac52ee7d
--- /dev/null
+++ b/solr/licenses/sts-2.20.155.jar.sha1
@@ -0,0 +1 @@
+020ad26019c62c5991762a3545678c3f04be340a
diff --git a/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1 b/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
deleted file mode 100644
index 886d413afca..00000000000
--- a/solr/licenses/third-party-jackson-core-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9714093f164eac041f3f3af506a32ad61fc26e3f
diff --git a/solr/licenses/third-party-jackson-core-2.20.155.jar.sha1 b/solr/licenses/third-party-jackson-core-2.20.155.jar.sha1
new file mode 100644
index 00000000000..fb41ab87949
--- /dev/null
+++ b/solr/licenses/third-party-jackson-core-2.20.155.jar.sha1
@@ -0,0 +1 @@
+1986b118cccd01cfb6cba8a604c9a9536ce6abfb
diff --git a/solr/licenses/url-connection-client-2.20.128.jar.sha1 b/solr/licenses/url-connection-client-2.20.128.jar.sha1
deleted file mode 100644
index 89ad177e745..00000000000
--- a/solr/licenses/url-connection-client-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6fb7d2001efce42580c16b4ce4e55ebe556ab0b
diff --git a/solr/licenses/url-connection-client-2.20.155.jar.sha1 b/solr/licenses/url-connection-client-2.20.155.jar.sha1
new file mode 100644
index 00000000000..3f4cd754648
--- /dev/null
+++ b/solr/licenses/url-connection-client-2.20.155.jar.sha1
@@ -0,0 +1 @@
+81f132c193a7af8fea63e9d63a995d60becafa76
diff --git a/solr/licenses/utils-2.20.128.jar.sha1 b/solr/licenses/utils-2.20.128.jar.sha1
deleted file mode 100644
index 70c3f94382d..00000000000
--- a/solr/licenses/utils-2.20.128.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a63a7b5cefd69dc24fddc200d31d2f6ec613b513
diff --git a/solr/licenses/utils-2.20.155.jar.sha1 b/solr/licenses/utils-2.20.155.jar.sha1
new file mode 100644
index 00000000000..e2b6cb256e0
--- /dev/null
+++ b/solr/licenses/utils-2.20.155.jar.sha1
@@ -0,0 +1 @@
+2c3bbf9f8902402d40fc9a87b64139d109290f1e
diff --git a/versions.lock b/versions.lock
index ad5240b1019..f91e806a80b 100644
--- a/versions.lock
+++ b/versions.lock
@@ -342,7 +342,7 @@ org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)
 org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
 org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
-org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
+org.reactivestreams:reactive-streams:1.0.4 (3 constraints: 3f2b77fd)
 org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
 org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
 org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
@@ -354,27 +354,27 @@ org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
 org.threeten:threetenbp:1.6.8 (4 constraints: 2433e267)
 org.tukaani:xz:1.9 (1 constraints: 030c5be9)
 org.xerial.snappy:snappy-java:1.1.10.4 (4 constraints: b4381fff)
-software.amazon.awssdk:annotations:2.20.128 (20 constraints: 812e7fc3)
-software.amazon.awssdk:apache-client:2.20.128 (4 constraints: bd2a0169)
-software.amazon.awssdk:arns:2.20.128 (2 constraints: 791848ec)
-software.amazon.awssdk:auth:2.20.128 (5 constraints: 28393d1f)
-software.amazon.awssdk:aws-core:2.20.128 (6 constraints: 064f9593)
-software.amazon.awssdk:aws-query-protocol:2.20.128 (3 constraints: df2a3b4b)
-software.amazon.awssdk:aws-xml-protocol:2.20.128 (2 constraints: 791848ec)
-software.amazon.awssdk:bom:2.20.128 (1 constraints: a1053e46)
-software.amazon.awssdk:crt-core:2.20.128 (1 constraints: f10b8205)
-software.amazon.awssdk:endpoints-spi:2.20.128 (4 constraints: 6235767a)
-software.amazon.awssdk:http-client-spi:2.20.128 (11 constraints: bfa7e005)
-software.amazon.awssdk:json-utils:2.20.128 (5 constraints: 5a407940)
-software.amazon.awssdk:metrics-spi:2.20.128 (7 constraints: 7163ee3b)
-software.amazon.awssdk:profiles:2.20.128 (8 constraints: c76252a3)
-software.amazon.awssdk:protocol-core:2.20.128 (5 constraints: 66496c88)
-software.amazon.awssdk:regions:2.20.128 (7 constraints: 4b518731)
-software.amazon.awssdk:s3:2.20.128 (3 constraints: 1025d161)
-software.amazon.awssdk:sdk-core:2.20.128 (10 constraints: 40897300)
-software.amazon.awssdk:sts:2.20.128 (2 constraints: 29121c33)
-software.amazon.awssdk:third-party-jackson-core:2.20.128 (2 constraints: eb1bd4d7)
-software.amazon.awssdk:utils:2.20.128 (19 constraints: 961bfbe5)
+software.amazon.awssdk:annotations:2.20.155 (20 constraints: 812ebbc3)
+software.amazon.awssdk:apache-client:2.20.155 (4 constraints: bd2a0d69)
+software.amazon.awssdk:arns:2.20.155 (2 constraints: 79184eec)
+software.amazon.awssdk:auth:2.20.155 (5 constraints: 28394c1f)
+software.amazon.awssdk:aws-core:2.20.155 (6 constraints: 064fa793)
+software.amazon.awssdk:aws-query-protocol:2.20.155 (3 constraints: df2a444b)
+software.amazon.awssdk:aws-xml-protocol:2.20.155 (2 constraints: 79184eec)
+software.amazon.awssdk:bom:2.20.155 (1 constraints: a1054146)
+software.amazon.awssdk:crt-core:2.20.155 (1 constraints: f10b8505)
+software.amazon.awssdk:endpoints-spi:2.20.155 (4 constraints: 6235827a)
+software.amazon.awssdk:http-client-spi:2.20.155 (11 constraints: bfa70106)
+software.amazon.awssdk:json-utils:2.20.155 (5 constraints: 5a408840)
+software.amazon.awssdk:metrics-spi:2.20.155 (7 constraints: 7163033c)
+software.amazon.awssdk:profiles:2.20.155 (8 constraints: c7626aa3)
+software.amazon.awssdk:protocol-core:2.20.155 (5 constraints: 66497b88)
+software.amazon.awssdk:regions:2.20.155 (7 constraints: 4b519931)
+software.amazon.awssdk:s3:2.20.155 (3 constraints: 1025d761)
+software.amazon.awssdk:sdk-core:2.20.155 (10 constraints: 40899100)
+software.amazon.awssdk:sts:2.20.155 (2 constraints: 29122233)
+software.amazon.awssdk:third-party-jackson-core:2.20.155 (2 constraints: eb1bdad7)
+software.amazon.awssdk:utils:2.20.155 (19 constraints: 961b31e6)
 software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
 xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
@@ -457,5 +457,5 @@ org.springframework.boot:spring-boot-starter-json:2.7.12 (1 constraints: d814669
 org.springframework.boot:spring-boot-starter-logging:2.7.12 (1 constraints: 6d138b46)
 org.springframework.boot:spring-boot-starter-web:2.7.12 (1 constraints: f20a38d6)
 org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f)
-software.amazon.awssdk:url-connection-client:2.20.128 (2 constraints: 701ff515)
+software.amazon.awssdk:url-connection-client:2.20.155 (2 constraints: 701ff815)
 software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index fee3ed2976d..caad3851993 100644
--- a/versions.props
+++ b/versions.props
@@ -69,4 +69,4 @@ org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=5.1.0
 org.slf4j:*=2.0.9
 org.xerial.snappy:snappy-java=1.1.10.4
-software.amazon.awssdk:*=2.20.128
+software.amazon.awssdk:*=2.20.155

From 69e85dcb7636d6f9555e99b4f0070280a04a8858 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:11:34 +0200
Subject: [PATCH 139/160] Update dependency
 com.github.ben-manes.caffeine:caffeine to v3.1.8 (#1812)

---
 solr/licenses/caffeine-3.1.6.jar.sha1      | 1 -
 solr/licenses/caffeine-3.1.8.jar.sha1      | 1 +
 solr/licenses/checker-qual-3.33.0.jar.sha1 | 1 -
 solr/licenses/checker-qual-3.37.0.jar.sha1 | 1 +
 versions.lock                              | 6 +++---
 versions.props                             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 solr/licenses/caffeine-3.1.6.jar.sha1
 create mode 100644 solr/licenses/caffeine-3.1.8.jar.sha1
 delete mode 100644 solr/licenses/checker-qual-3.33.0.jar.sha1
 create mode 100644 solr/licenses/checker-qual-3.37.0.jar.sha1

diff --git a/solr/licenses/caffeine-3.1.6.jar.sha1 b/solr/licenses/caffeine-3.1.6.jar.sha1
deleted file mode 100644
index cb11a82e23b..00000000000
--- a/solr/licenses/caffeine-3.1.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3646a0d1b1abe6a31f72f2237d9004d10a5be91d
diff --git a/solr/licenses/caffeine-3.1.8.jar.sha1 b/solr/licenses/caffeine-3.1.8.jar.sha1
new file mode 100644
index 00000000000..15ff311e979
--- /dev/null
+++ b/solr/licenses/caffeine-3.1.8.jar.sha1
@@ -0,0 +1 @@
+24795585df8afaf70a2cd534786904ea5889c047
diff --git a/solr/licenses/checker-qual-3.33.0.jar.sha1 b/solr/licenses/checker-qual-3.33.0.jar.sha1
deleted file mode 100644
index 602b1bd5b66..00000000000
--- a/solr/licenses/checker-qual-3.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de2b60b62da487644fc11f734e73c8b0b431238f
diff --git a/solr/licenses/checker-qual-3.37.0.jar.sha1 b/solr/licenses/checker-qual-3.37.0.jar.sha1
new file mode 100644
index 00000000000..4cdb4ca2f97
--- /dev/null
+++ b/solr/licenses/checker-qual-3.37.0.jar.sha1
@@ -0,0 +1 @@
+ba74746d38026581c12166e164bb3c15e90cc4ea
diff --git a/versions.lock b/versions.lock
index f91e806a80b..8d984ed1a55 100644
--- a/versions.lock
+++ b/versions.lock
@@ -14,7 +14,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints:
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)
 com.fasterxml.woodstox:woodstox-core:6.5.1 (2 constraints: a0239c84)
-com.github.ben-manes.caffeine:caffeine:3.1.6 (1 constraints: 0c050336)
+com.github.ben-manes.caffeine:caffeine:3.1.8 (1 constraints: 0e050536)
 com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
 com.github.junrar:junrar:7.5.3 (1 constraints: 660c1102)
 com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
@@ -42,7 +42,7 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
 com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: bb893df4)
+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: b689f8ec)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
 com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
@@ -269,7 +269,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.33.0 (5 constraints: 0e494d11)
+org.checkerframework:checker-qual:3.37.0 (5 constraints: 12490114)
 org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
 org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
diff --git a/versions.props b/versions.props
index caad3851993..6b2cbedc45f 100644
--- a/versions.props
+++ b/versions.props
@@ -6,7 +6,7 @@ com.carrotsearch.randomizedtesting:*=2.8.1
 com.carrotsearch:hppc=0.9.1
 com.cybozu.labs:langdetect=1.1-20120112
 com.fasterxml.jackson:jackson-bom=2.15.2
-com.github.ben-manes.caffeine:caffeine=3.1.6
+com.github.ben-manes.caffeine:caffeine=3.1.8
 com.github.spotbugs:*=4.7.3
 com.github.stephenc.jcip:jcip-annotations=1.0-1
 com.google.cloud:google-cloud-bom=0.197.0

From f05bf8a3631c9d02475eca6efe142f9f20eaf7ee Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 02:18:22 +0200
Subject: [PATCH 140/160] Update dependency
 io.swagger.core.v3:swagger-annotations to v2.2.16 (#1953)

---
 solr/licenses/swagger-annotations-2.2.15.jar.sha1 | 1 -
 solr/licenses/swagger-annotations-2.2.16.jar.sha1 | 1 +
 versions.lock                                     | 2 +-
 versions.props                                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/swagger-annotations-2.2.15.jar.sha1
 create mode 100644 solr/licenses/swagger-annotations-2.2.16.jar.sha1

diff --git a/solr/licenses/swagger-annotations-2.2.15.jar.sha1 b/solr/licenses/swagger-annotations-2.2.15.jar.sha1
deleted file mode 100644
index 227c8839b8e..00000000000
--- a/solr/licenses/swagger-annotations-2.2.15.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-35779fede334507bc368392051b8a89ed42c0784
diff --git a/solr/licenses/swagger-annotations-2.2.16.jar.sha1 b/solr/licenses/swagger-annotations-2.2.16.jar.sha1
new file mode 100644
index 00000000000..e5990cfe995
--- /dev/null
+++ b/solr/licenses/swagger-annotations-2.2.16.jar.sha1
@@ -0,0 +1 @@
+baff53b8f5e2c6ee186a3913b3c1a06d92c79bb9
diff --git a/versions.lock b/versions.lock
index 8d984ed1a55..da859b701d2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -148,7 +148,7 @@ io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
 io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
 io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
 io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
-io.swagger.core.v3:swagger-annotations:2.2.15 (1 constraints: 3c05383b)
+io.swagger.core.v3:swagger-annotations:2.2.16 (1 constraints: 3d05393b)
 jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe)
 jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
 jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
diff --git a/versions.props b/versions.props
index 6b2cbedc45f..c8926148cf2 100644
--- a/versions.props
+++ b/versions.props
@@ -25,7 +25,7 @@ io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.97.Final
 io.opentelemetry:opentelemetry-bom=1.30.1
 io.prometheus:*=0.16.0
-io.swagger.core.v3:*=2.2.15
+io.swagger.core.v3:*=2.2.16
 jakarta.ws.rs:jakarta.ws.rs-api=2.1.6
 junit:junit=4.13.2
 net.sourceforge.argparse4j:argparse4j=0.9.0

From 9f7053802c57154ff1a74ecd26113946fabfdd83 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 02:18:34 +0200
Subject: [PATCH 141/160] Update dependency org.xerial.snappy:snappy-java to
 v1.1.10.5 (#1966)

---
 solr/licenses/snappy-java-1.1.10.4.jar.sha1 | 1 -
 solr/licenses/snappy-java-1.1.10.5.jar.sha1 | 1 +
 versions.lock                               | 2 +-
 versions.props                              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/snappy-java-1.1.10.4.jar.sha1
 create mode 100644 solr/licenses/snappy-java-1.1.10.5.jar.sha1

diff --git a/solr/licenses/snappy-java-1.1.10.4.jar.sha1 b/solr/licenses/snappy-java-1.1.10.4.jar.sha1
deleted file mode 100644
index 3022bc5d1fd..00000000000
--- a/solr/licenses/snappy-java-1.1.10.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50d0390056017158bdc75c063efd5c2a898d5f0c
diff --git a/solr/licenses/snappy-java-1.1.10.5.jar.sha1 b/solr/licenses/snappy-java-1.1.10.5.jar.sha1
new file mode 100644
index 00000000000..f7332452398
--- /dev/null
+++ b/solr/licenses/snappy-java-1.1.10.5.jar.sha1
@@ -0,0 +1 @@
+ac605269f3598506196e469f1fb0d7ed5c55059e
diff --git a/versions.lock b/versions.lock
index da859b701d2..5a12da605b9 100644
--- a/versions.lock
+++ b/versions.lock
@@ -353,7 +353,7 @@ org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
 org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
 org.threeten:threetenbp:1.6.8 (4 constraints: 2433e267)
 org.tukaani:xz:1.9 (1 constraints: 030c5be9)
-org.xerial.snappy:snappy-java:1.1.10.4 (4 constraints: b4381fff)
+org.xerial.snappy:snappy-java:1.1.10.5 (4 constraints: b538b6ff)
 software.amazon.awssdk:annotations:2.20.155 (20 constraints: 812ebbc3)
 software.amazon.awssdk:apache-client:2.20.155 (4 constraints: bd2a0d69)
 software.amazon.awssdk:arns:2.20.155 (2 constraints: 79184eec)
diff --git a/versions.props b/versions.props
index c8926148cf2..5e65facd843 100644
--- a/versions.props
+++ b/versions.props
@@ -68,5 +68,5 @@ org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
 org.semver4j:semver4j=5.1.0
 org.slf4j:*=2.0.9
-org.xerial.snappy:snappy-java=1.1.10.4
+org.xerial.snappy:snappy-java=1.1.10.5
 software.amazon.awssdk:*=2.20.155

From 8dbe6df2af902409d2741f22055118dda4f17656 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 02:18:44 +0200
Subject: [PATCH 142/160] Update io.dropwizard.metrics:* to v4.2.20 (#1970)

---
 .../metrics-annotation-4.2.19.jar.sha1        |  1 -
 .../metrics-annotation-4.2.20.jar.sha1        |  1 +
 solr/licenses/metrics-core-4.2.19.jar.sha1    |  1 -
 solr/licenses/metrics-core-4.2.20.jar.sha1    |  1 +
 .../licenses/metrics-graphite-4.2.19.jar.sha1 |  1 -
 .../licenses/metrics-graphite-4.2.20.jar.sha1 |  1 +
 solr/licenses/metrics-jetty10-4.2.19.jar.sha1 |  1 -
 solr/licenses/metrics-jetty10-4.2.20.jar.sha1 |  1 +
 solr/licenses/metrics-jmx-4.2.19.jar.sha1     |  1 -
 solr/licenses/metrics-jmx-4.2.20.jar.sha1     |  1 +
 solr/licenses/metrics-jvm-4.2.19.jar.sha1     |  1 -
 solr/licenses/metrics-jvm-4.2.20.jar.sha1     |  1 +
 versions.lock                                 | 22 +++++++++----------
 versions.props                                |  2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 solr/licenses/metrics-annotation-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-annotation-4.2.20.jar.sha1
 delete mode 100644 solr/licenses/metrics-core-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-core-4.2.20.jar.sha1
 delete mode 100644 solr/licenses/metrics-graphite-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-graphite-4.2.20.jar.sha1
 delete mode 100644 solr/licenses/metrics-jetty10-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-jetty10-4.2.20.jar.sha1
 delete mode 100644 solr/licenses/metrics-jmx-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-jmx-4.2.20.jar.sha1
 delete mode 100644 solr/licenses/metrics-jvm-4.2.19.jar.sha1
 create mode 100644 solr/licenses/metrics-jvm-4.2.20.jar.sha1

diff --git a/solr/licenses/metrics-annotation-4.2.19.jar.sha1 b/solr/licenses/metrics-annotation-4.2.19.jar.sha1
deleted file mode 100644
index ffb6cdc5e33..00000000000
--- a/solr/licenses/metrics-annotation-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bfbad2f37e1affa62daa4e9e33c50bf48060db91
diff --git a/solr/licenses/metrics-annotation-4.2.20.jar.sha1 b/solr/licenses/metrics-annotation-4.2.20.jar.sha1
new file mode 100644
index 00000000000..f7fee757d07
--- /dev/null
+++ b/solr/licenses/metrics-annotation-4.2.20.jar.sha1
@@ -0,0 +1 @@
+356a49a3146af00df245c24d18860503a84a3b18
diff --git a/solr/licenses/metrics-core-4.2.19.jar.sha1 b/solr/licenses/metrics-core-4.2.19.jar.sha1
deleted file mode 100644
index 8d18a26cfed..00000000000
--- a/solr/licenses/metrics-core-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d32b4c3f3e733bf4cb239ca4204fbed8464973a5
diff --git a/solr/licenses/metrics-core-4.2.20.jar.sha1 b/solr/licenses/metrics-core-4.2.20.jar.sha1
new file mode 100644
index 00000000000..436e7cf8294
--- /dev/null
+++ b/solr/licenses/metrics-core-4.2.20.jar.sha1
@@ -0,0 +1 @@
+b3eb1b408021950fab1e22b2a851a109470064a9
diff --git a/solr/licenses/metrics-graphite-4.2.19.jar.sha1 b/solr/licenses/metrics-graphite-4.2.19.jar.sha1
deleted file mode 100644
index e6518b4c772..00000000000
--- a/solr/licenses/metrics-graphite-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c8ed09f56bca464c136066bedbac86f451aa7f20
diff --git a/solr/licenses/metrics-graphite-4.2.20.jar.sha1 b/solr/licenses/metrics-graphite-4.2.20.jar.sha1
new file mode 100644
index 00000000000..69f94d82ce3
--- /dev/null
+++ b/solr/licenses/metrics-graphite-4.2.20.jar.sha1
@@ -0,0 +1 @@
+e650d3670e1537b5ed99b8a83f7e13c95517c530
diff --git a/solr/licenses/metrics-jetty10-4.2.19.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.19.jar.sha1
deleted file mode 100644
index d30edbb6217..00000000000
--- a/solr/licenses/metrics-jetty10-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f935bcc4510089f216695fd6d14f14607685747
diff --git a/solr/licenses/metrics-jetty10-4.2.20.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.20.jar.sha1
new file mode 100644
index 00000000000..eaed525eb99
--- /dev/null
+++ b/solr/licenses/metrics-jetty10-4.2.20.jar.sha1
@@ -0,0 +1 @@
+d01cfde5cbf2231e13001f2b0c98f869246aa727
diff --git a/solr/licenses/metrics-jmx-4.2.19.jar.sha1 b/solr/licenses/metrics-jmx-4.2.19.jar.sha1
deleted file mode 100644
index 3b9015caae4..00000000000
--- a/solr/licenses/metrics-jmx-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-474c1c764df01a0d93fc268da1f779ab97fe99ae
diff --git a/solr/licenses/metrics-jmx-4.2.20.jar.sha1 b/solr/licenses/metrics-jmx-4.2.20.jar.sha1
new file mode 100644
index 00000000000..be81afcc3ca
--- /dev/null
+++ b/solr/licenses/metrics-jmx-4.2.20.jar.sha1
@@ -0,0 +1 @@
+6723adff28670f900e37fea60d9a6abc7537e78f
diff --git a/solr/licenses/metrics-jvm-4.2.19.jar.sha1 b/solr/licenses/metrics-jvm-4.2.19.jar.sha1
deleted file mode 100644
index 8a49e3c5de4..00000000000
--- a/solr/licenses/metrics-jvm-4.2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13bb7b51914d43a7709f7b477b98f3732aaa03e4
diff --git a/solr/licenses/metrics-jvm-4.2.20.jar.sha1 b/solr/licenses/metrics-jvm-4.2.20.jar.sha1
new file mode 100644
index 00000000000..32a1659499c
--- /dev/null
+++ b/solr/licenses/metrics-jvm-4.2.20.jar.sha1
@@ -0,0 +1 @@
+b6f1bdd9046a2e2c33f66a5865cf5c9187ddfc9e
diff --git a/versions.lock b/versions.lock
index 5a12da605b9..8b681b8fa53 100644
--- a/versions.lock
+++ b/versions.lock
@@ -88,12 +88,12 @@ edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
 edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
 edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
 edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
-io.dropwizard.metrics:metrics-annotation:4.2.19 (1 constraints: 381074b0)
-io.dropwizard.metrics:metrics-core:4.2.19 (5 constraints: 5b44b70a)
-io.dropwizard.metrics:metrics-graphite:4.2.19 (1 constraints: 4205483b)
-io.dropwizard.metrics:metrics-jetty10:4.2.19 (1 constraints: 4205483b)
-io.dropwizard.metrics:metrics-jmx:4.2.19 (1 constraints: 4205483b)
-io.dropwizard.metrics:metrics-jvm:4.2.19 (1 constraints: 4205483b)
+io.dropwizard.metrics:metrics-annotation:4.2.20 (1 constraints: 30106db0)
+io.dropwizard.metrics:metrics-core:4.2.20 (5 constraints: 3344adfc)
+io.dropwizard.metrics:metrics-graphite:4.2.20 (1 constraints: 3a05413b)
+io.dropwizard.metrics:metrics-jetty10:4.2.20 (1 constraints: 3a05413b)
+io.dropwizard.metrics:metrics-jmx:4.2.20 (1 constraints: 3a05413b)
+io.dropwizard.metrics:metrics-jvm:4.2.20 (1 constraints: 3a05413b)
 io.grpc:grpc-alts:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-api:1.56.0 (5 constraints: a43684b7)
 io.grpc:grpc-auth:1.56.0 (1 constraints: 20100fa6)
@@ -281,15 +281,15 @@ org.eclipse.jetty:jetty-alpn-java-server:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty:jetty-alpn-server:10.0.16 (2 constraints: f7164449)
 org.eclipse.jetty:jetty-client:10.0.16 (2 constraints: 211bd36e)
 org.eclipse.jetty:jetty-deploy:10.0.16 (1 constraints: 6a059240)
-org.eclipse.jetty:jetty-http:10.0.16 (6 constraints: 7b4faa8e)
-org.eclipse.jetty:jetty-io:10.0.16 (9 constraints: bd7d6ce8)
+org.eclipse.jetty:jetty-http:10.0.16 (6 constraints: 7c4f568f)
+org.eclipse.jetty:jetty-io:10.0.16 (9 constraints: be7da0e9)
 org.eclipse.jetty:jetty-jmx:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty:jetty-rewrite:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty:jetty-security:10.0.16 (2 constraints: be134779)
-org.eclipse.jetty:jetty-server:10.0.16 (7 constraints: d76dba26)
+org.eclipse.jetty:jetty-server:10.0.16 (7 constraints: d86dbc27)
 org.eclipse.jetty:jetty-servlet:10.0.16 (2 constraints: 38137261)
 org.eclipse.jetty:jetty-servlets:10.0.16 (1 constraints: 6a059240)
-org.eclipse.jetty:jetty-util:10.0.16 (9 constraints: ac815797)
+org.eclipse.jetty:jetty-util:10.0.16 (9 constraints: ad819898)
 org.eclipse.jetty:jetty-webapp:10.0.16 (2 constraints: 4613fa61)
 org.eclipse.jetty:jetty-xml:10.0.16 (3 constraints: 142134bb)
 org.eclipse.jetty.http2:http2-client:10.0.16 (2 constraints: 211bd36e)
@@ -346,7 +346,7 @@ org.reactivestreams:reactive-streams:1.0.4 (3 constraints: 3f2b77fd)
 org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
 org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
 org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
-org.slf4j:slf4j-api:2.0.9 (59 constraints: db106466)
+org.slf4j:slf4j-api:2.0.9 (59 constraints: dd104075)
 org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
 org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
 org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index 5e65facd843..dcb252f6ee2 100644
--- a/versions.props
+++ b/versions.props
@@ -20,7 +20,7 @@ commons-cli:commons-cli=1.5.0
 commons-codec:commons-codec=1.16.0
 commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.14.0
-io.dropwizard.metrics:*=4.2.19
+io.dropwizard.metrics:*=4.2.20
 io.grpc:grpc-*=1.56.0
 io.netty:*=4.1.97.Final
 io.opentelemetry:opentelemetry-bom=1.30.1

From ff6f601822a4fd1cd87d26a6d17409f234f9f5b6 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 02:19:07 +0200
Subject: [PATCH 143/160] Update org.apache.calcite to v1.35.0 (#1815)

---
 solr/licenses/calcite-core-1.34.0.jar.sha1    |  1 -
 solr/licenses/calcite-core-1.35.0.jar.sha1    |  1 +
 solr/licenses/calcite-linq4j-1.34.0.jar.sha1  |  1 -
 solr/licenses/calcite-linq4j-1.35.0.jar.sha1  |  1 +
 solr/licenses/commons-compiler-3.1.8.jar.sha1 |  1 -
 solr/licenses/commons-compiler-3.1.9.jar.sha1 |  1 +
 solr/licenses/janino-3.1.8.jar.sha1           |  1 -
 solr/licenses/janino-3.1.9.jar.sha1           |  1 +
 versions.lock                                 | 20 +++++++++----------
 versions.props                                |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 solr/licenses/calcite-core-1.34.0.jar.sha1
 create mode 100644 solr/licenses/calcite-core-1.35.0.jar.sha1
 delete mode 100644 solr/licenses/calcite-linq4j-1.34.0.jar.sha1
 create mode 100644 solr/licenses/calcite-linq4j-1.35.0.jar.sha1
 delete mode 100644 solr/licenses/commons-compiler-3.1.8.jar.sha1
 create mode 100644 solr/licenses/commons-compiler-3.1.9.jar.sha1
 delete mode 100644 solr/licenses/janino-3.1.8.jar.sha1
 create mode 100644 solr/licenses/janino-3.1.9.jar.sha1

diff --git a/solr/licenses/calcite-core-1.34.0.jar.sha1 b/solr/licenses/calcite-core-1.34.0.jar.sha1
deleted file mode 100644
index c560453cbfc..00000000000
--- a/solr/licenses/calcite-core-1.34.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0fd918fd56baa3c6ebb34676b9aeeb05ce9d94d
diff --git a/solr/licenses/calcite-core-1.35.0.jar.sha1 b/solr/licenses/calcite-core-1.35.0.jar.sha1
new file mode 100644
index 00000000000..6be3a0c88b8
--- /dev/null
+++ b/solr/licenses/calcite-core-1.35.0.jar.sha1
@@ -0,0 +1 @@
+6014fcd74ebe58230becef8265d9b06f5f490a5f
diff --git a/solr/licenses/calcite-linq4j-1.34.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.34.0.jar.sha1
deleted file mode 100644
index 86dacd11c46..00000000000
--- a/solr/licenses/calcite-linq4j-1.34.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-505eea67a7a11e002c6c760914c369bccef0330b
diff --git a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
new file mode 100644
index 00000000000..8d51929b52d
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
@@ -0,0 +1 @@
+2484ad1caf702341023883ed500f499aadfc1519
diff --git a/solr/licenses/commons-compiler-3.1.8.jar.sha1 b/solr/licenses/commons-compiler-3.1.8.jar.sha1
deleted file mode 100644
index 4b5f44e7699..00000000000
--- a/solr/licenses/commons-compiler-3.1.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93a17483c93f7a5f6ca5c2af7173c9c0841294b2
diff --git a/solr/licenses/commons-compiler-3.1.9.jar.sha1 b/solr/licenses/commons-compiler-3.1.9.jar.sha1
new file mode 100644
index 00000000000..ed7b96ad89e
--- /dev/null
+++ b/solr/licenses/commons-compiler-3.1.9.jar.sha1
@@ -0,0 +1 @@
+f0d70bb319e9339aea90a8665693e69848acc598
diff --git a/solr/licenses/janino-3.1.8.jar.sha1 b/solr/licenses/janino-3.1.8.jar.sha1
deleted file mode 100644
index 09e48c471f2..00000000000
--- a/solr/licenses/janino-3.1.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8dd648976fe0ea36918756b2257b183157d6e543
diff --git a/solr/licenses/janino-3.1.9.jar.sha1 b/solr/licenses/janino-3.1.9.jar.sha1
new file mode 100644
index 00000000000..720933abedd
--- /dev/null
+++ b/solr/licenses/janino-3.1.9.jar.sha1
@@ -0,0 +1 @@
+536fb0c44627faae32ca7a8a24734f4aab38c878
diff --git a/versions.lock b/versions.lock
index 8b681b8fa53..e327c46bedf 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,9 +7,9 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
 com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55)
-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6617)
-com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42025e28)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63008e)
+com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6817)
+com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42026028)
+com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63028e)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)
@@ -42,9 +42,9 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
 com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: b689f8ec)
+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 8a894b63)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
+com.google.guava:guava:32.1.2-jre (25 constraints: 646b5109)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
@@ -164,8 +164,8 @@ net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc)
 net.sourceforge.argparse4j:argparse4j:0.9.0 (1 constraints: 0b050636)
 net.thisptr:jackson-jq:0.0.13 (1 constraints: 3605223b)
 org.antlr:antlr4-runtime:4.11.1 (1 constraints: f70fbd96)
-org.apache.calcite:calcite-core:1.34.0 (1 constraints: 3a053d3b)
-org.apache.calcite:calcite-linq4j:1.34.0 (2 constraints: c912b74b)
+org.apache.calcite:calcite-core:1.35.0 (1 constraints: 3b05403b)
+org.apache.calcite:calcite-linq4j:1.35.0 (2 constraints: cb12e64b)
 org.apache.calcite.avatica:avatica-core:1.23.0 (3 constraints: fb20cdcb)
 org.apache.calcite.avatica:avatica-metrics:1.23.0 (1 constraints: 991049c4)
 org.apache.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
@@ -269,9 +269,9 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.37.0 (5 constraints: 12490114)
-org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
-org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
+org.checkerframework:checker-qual:3.37.0 (5 constraints: 0e499f13)
+org.codehaus.janino:commons-compiler:3.1.9 (2 constraints: 3119a8ec)
+org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
 org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
diff --git a/versions.props b/versions.props
index dcb252f6ee2..50389930120 100644
--- a/versions.props
+++ b/versions.props
@@ -32,7 +32,7 @@ net.sourceforge.argparse4j:argparse4j=0.9.0
 net.thisptr:jackson-jq=0.0.13
 no.nav.security:mock-oauth2-server=0.5.10
 org.apache.calcite.avatica:avatica-core=1.23.0
-org.apache.calcite:*=1.34.0
+org.apache.calcite:*=1.35.0
 org.apache.commons:commons-collections4=4.4
 org.apache.commons:commons-compress=1.24.0
 org.apache.commons:commons-configuration2=2.9.0

From de234cb9a30d28dd46f3c1eb96732a0bd0f08b8d Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 02:19:14 +0200
Subject: [PATCH 144/160] Update dependency org.semver4j:semver4j to v5.2.1
 (#1968)

---
 solr/licenses/semver4j-5.1.0.jar.sha1 | 1 -
 solr/licenses/semver4j-5.2.1.jar.sha1 | 1 +
 versions.lock                         | 2 +-
 versions.props                        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/semver4j-5.1.0.jar.sha1
 create mode 100644 solr/licenses/semver4j-5.2.1.jar.sha1

diff --git a/solr/licenses/semver4j-5.1.0.jar.sha1 b/solr/licenses/semver4j-5.1.0.jar.sha1
deleted file mode 100644
index 69c3649226d..00000000000
--- a/solr/licenses/semver4j-5.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4afaf5d7297c8fbb67517ba6f1150b50e034b84
diff --git a/solr/licenses/semver4j-5.2.1.jar.sha1 b/solr/licenses/semver4j-5.2.1.jar.sha1
new file mode 100644
index 00000000000..dcd8c33033f
--- /dev/null
+++ b/solr/licenses/semver4j-5.2.1.jar.sha1
@@ -0,0 +1 @@
+e5942160167e4f9adfa49a59de1066442b980b5a
diff --git a/versions.lock b/versions.lock
index e327c46bedf..88e9d364432 100644
--- a/versions.lock
+++ b/versions.lock
@@ -343,7 +343,7 @@ org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
 org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
 org.reactivestreams:reactive-streams:1.0.4 (3 constraints: 3f2b77fd)
-org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
+org.semver4j:semver4j:5.2.1 (1 constraints: 0a050b36)
 org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
 org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
 org.slf4j:slf4j-api:2.0.9 (59 constraints: dd104075)
diff --git a/versions.props b/versions.props
index 50389930120..9a8a0fa543a 100644
--- a/versions.props
+++ b/versions.props
@@ -66,7 +66,7 @@ org.mockito:mockito*=5.5.0
 org.openjdk.jmh:*=1.37
 org.osgi:osgi.annotation=8.1.0
 org.quicktheories:quicktheories=0.26
-org.semver4j:semver4j=5.1.0
+org.semver4j:semver4j=5.2.1
 org.slf4j:*=2.0.9
 org.xerial.snappy:snappy-java=1.1.10.5
 software.amazon.awssdk:*=2.20.155

From 42c64d4f672e67f87fefdf6350b75acd19011b74 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:00:09 +0200
Subject: [PATCH 145/160] Update io.netty:* to v4.1.99.Final (#1967)

---
 .../netty-buffer-4.1.97.Final.jar.sha1        |  1 -
 .../netty-buffer-4.1.99.Final.jar.sha1        |  1 +
 .../netty-codec-4.1.97.Final.jar.sha1         |  1 -
 .../netty-codec-4.1.99.Final.jar.sha1         |  1 +
 .../netty-codec-http-4.1.97.Final.jar.sha1    |  1 -
 .../netty-codec-http-4.1.99.Final.jar.sha1    |  1 +
 .../netty-codec-http2-4.1.97.Final.jar.sha1   |  1 -
 .../netty-codec-http2-4.1.99.Final.jar.sha1   |  1 +
 .../netty-codec-socks-4.1.97.Final.jar.sha1   |  1 -
 .../netty-codec-socks-4.1.99.Final.jar.sha1   |  1 +
 .../netty-common-4.1.97.Final.jar.sha1        |  1 -
 .../netty-common-4.1.99.Final.jar.sha1        |  1 +
 .../netty-handler-4.1.97.Final.jar.sha1       |  1 -
 .../netty-handler-4.1.99.Final.jar.sha1       |  1 +
 .../netty-handler-proxy-4.1.97.Final.jar.sha1 |  1 -
 .../netty-handler-proxy-4.1.99.Final.jar.sha1 |  1 +
 .../netty-resolver-4.1.97.Final.jar.sha1      |  1 -
 .../netty-resolver-4.1.99.Final.jar.sha1      |  1 +
 .../netty-transport-4.1.97.Final.jar.sha1     |  1 -
 .../netty-transport-4.1.99.Final.jar.sha1     |  1 +
 ...nsport-classes-epoll-4.1.97.Final.jar.sha1 |  1 -
 ...nsport-classes-epoll-4.1.99.Final.jar.sha1 |  1 +
 ...e-epoll-4.1.97.Final-linux-x86_64.jar.sha1 |  1 -
 ...e-epoll-4.1.99.Final-linux-x86_64.jar.sha1 |  1 +
 ...t-native-unix-common-4.1.97.Final.jar.sha1 |  1 -
 ...t-native-unix-common-4.1.99.Final.jar.sha1 |  1 +
 versions.lock                                 | 26 +++++++++----------
 versions.props                                |  2 +-
 28 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http2-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-socks-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-proxy-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.99.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.99.Final-linux-x86_64.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.99.Final.jar.sha1

diff --git a/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
deleted file mode 100644
index 31cefc05102..00000000000
--- a/solr/licenses/netty-buffer-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
diff --git a/solr/licenses/netty-buffer-4.1.99.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..f14bb02dd1f
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+9f02dcb9b15a647a56af210dffdc294a57922fb0
diff --git a/solr/licenses/netty-codec-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.97.Final.jar.sha1
deleted file mode 100644
index 25a34c88211..00000000000
--- a/solr/licenses/netty-codec-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-384ba4d75670befbedb45c4d3b497a93639c206d
diff --git a/solr/licenses/netty-codec-4.1.99.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..b170f6974ac
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+9984cbd6e5d55c768f198e975d8aaf7fd42a4602
diff --git a/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
deleted file mode 100644
index 03518cdaa81..00000000000
--- a/solr/licenses/netty-codec-http-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af78acec783ffd77c63d8aeecc21041fd39ac54f
diff --git a/solr/licenses/netty-codec-http-4.1.99.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..752680c6c41
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+7142095066eaebd5f29b88c41af7b383b6a953f6
diff --git a/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
deleted file mode 100644
index 670f254bd80..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-893888d09a7bef0d0ba973d7471943e765d0fd08
diff --git a/solr/licenses/netty-codec-http2-4.1.99.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..a21d6a7d697
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+c5a3481c4bb9732a3a94fb63cf916141a1a14669
diff --git a/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
deleted file mode 100644
index e0fa273a8f6..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30e8fa29a349db5a933225d61891b8802836bb79
diff --git a/solr/licenses/netty-codec-socks-4.1.99.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..dfbc3112d39
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+259bf1c5178c3e23bb89a2fab59b6d22846e3fa6
diff --git a/solr/licenses/netty-common-4.1.97.Final.jar.sha1 b/solr/licenses/netty-common-4.1.97.Final.jar.sha1
deleted file mode 100644
index 5d1fecee719..00000000000
--- a/solr/licenses/netty-common-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cceacaf11df8dc63f23d0fb58e9d4640fc88404
diff --git a/solr/licenses/netty-common-4.1.99.Final.jar.sha1 b/solr/licenses/netty-common-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..25f26d8d00c
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+278f6dfa49d6bd75c40ae1470eb165716f87dce0
diff --git a/solr/licenses/netty-handler-4.1.97.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.97.Final.jar.sha1
deleted file mode 100644
index 97d7df5d06b..00000000000
--- a/solr/licenses/netty-handler-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
diff --git a/solr/licenses/netty-handler-4.1.99.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..1c796882bcc
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+742693761d7ea4c038bccfda96bb38194720b80d
diff --git a/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
deleted file mode 100644
index c64fc038ff4..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a99ecef0e1d86a92e40a7c89805c236d9cd7493e
diff --git a/solr/licenses/netty-handler-proxy-4.1.99.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..0abb815a06a
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+8c8a89ea89b06e120c57bdb3db14b9a47ca30bb3
diff --git a/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
deleted file mode 100644
index 2ff3f5b0501..00000000000
--- a/solr/licenses/netty-resolver-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cec8348108dc76c47cf87c669d514be52c922144
diff --git a/solr/licenses/netty-resolver-4.1.99.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..28c9a8f0ca9
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+080e45397d9d5b134477de3ffd0f94283b908621
diff --git a/solr/licenses/netty-transport-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.97.Final.jar.sha1
deleted file mode 100644
index 3684e33df42..00000000000
--- a/solr/licenses/netty-transport-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f37380d23c9bb079bc702910833b2fd532c9abd0
diff --git a/solr/licenses/netty-transport-4.1.99.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..39497e8367d
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+9ca2e3ae19a6713b749df154622115f480b6716c
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
deleted file mode 100644
index 298772c96c7..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-795da37ded759e862457a82d9d92c4d39ce8ecee
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.99.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..3e46f9468f0
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+961bd5b8d97ea6a07168176462f398089a24b5c8
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
deleted file mode 100644
index 8b48e808dd0..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-54188f271e388e7f313aea995e82f58ce2cdb809
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.99.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.99.Final-linux-x86_64.jar.sha1
new file mode 100644
index 00000000000..793b61695d9
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.99.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+49105fe39f6065dd3634d28fa755a708b237ce58
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
deleted file mode 100644
index 28b685bdafd..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d469d84265ab70095b01b40886cabdd433b6e664
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.99.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.99.Final.jar.sha1
new file mode 100644
index 00000000000..6429f60aea4
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.99.Final.jar.sha1
@@ -0,0 +1 @@
+cb0fc6c31c387404212949c57950b5d72ce908b9
diff --git a/versions.lock b/versions.lock
index 88e9d364432..0e374c36140 100644
--- a/versions.lock
+++ b/versions.lock
@@ -109,21 +109,21 @@ io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)
 io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)
 io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)
-io.netty:netty-buffer:4.1.97.Final (10 constraints: ca99e90a)
-io.netty:netty-codec:4.1.97.Final (5 constraints: 6f459f85)
-io.netty:netty-codec-http:4.1.97.Final (3 constraints: 5b24cdee)
-io.netty:netty-codec-http2:4.1.97.Final (1 constraints: ed0a94cb)
-io.netty:netty-codec-socks:4.1.97.Final (1 constraints: 170fc06c)
-io.netty:netty-common:4.1.97.Final (12 constraints: 48b3098a)
-io.netty:netty-handler:4.1.97.Final (3 constraints: 742be33d)
-io.netty:netty-handler-proxy:4.1.97.Final (1 constraints: ed0a94cb)
-io.netty:netty-resolver:4.1.97.Final (2 constraints: 5e1ab932)
+io.netty:netty-buffer:4.1.99.Final (10 constraints: de999d1c)
+io.netty:netty-codec:4.1.99.Final (5 constraints: 79452589)
+io.netty:netty-codec-http:4.1.99.Final (3 constraints: 6124fbef)
+io.netty:netty-codec-http2:4.1.99.Final (1 constraints: ed0a94cb)
+io.netty:netty-codec-socks:4.1.99.Final (1 constraints: 190fce6c)
+io.netty:netty-common:4.1.99.Final (12 constraints: 60b319a3)
+io.netty:netty-handler:4.1.99.Final (3 constraints: 782b0b3f)
+io.netty:netty-handler-proxy:4.1.99.Final (1 constraints: ed0a94cb)
+io.netty:netty-resolver:4.1.99.Final (2 constraints: 621a2533)
 io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)
 io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)
-io.netty:netty-transport:4.1.97.Final (9 constraints: 148cac46)
-io.netty:netty-transport-classes-epoll:4.1.97.Final (1 constraints: b4120d1f)
-io.netty:netty-transport-native-epoll:4.1.97.Final (1 constraints: da0f128f)
-io.netty:netty-transport-native-unix-common:4.1.97.Final (4 constraints: 613dce97)
+io.netty:netty-transport:4.1.99.Final (9 constraints: 268c2655)
+io.netty:netty-transport-classes-epoll:4.1.99.Final (1 constraints: b6121b1f)
+io.netty:netty-transport-native-epoll:4.1.99.Final (1 constraints: da0f128f)
+io.netty:netty-transport-native-unix-common:4.1.99.Final (4 constraints: 673d3899)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index 9a8a0fa543a..767d5e526b5 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.14.0
 io.dropwizard.metrics:*=4.2.20
 io.grpc:grpc-*=1.56.0
-io.netty:*=4.1.97.Final
+io.netty:*=4.1.99.Final
 io.opentelemetry:opentelemetry-bom=1.30.1
 io.prometheus:*=0.16.0
 io.swagger.core.v3:*=2.2.16

From bde1feda0d02a73850dc47dbe2b98b8b26cceb40 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:22:06 +0200
Subject: [PATCH 146/160] Update dependency com.adobe.testing:s3mock-junit4 to
 v2.17.0 (#1741)

---
 .../aws-java-sdk-core-1.12.488.jar.sha1       |  1 -
 .../aws-java-sdk-core-1.12.501.jar.sha1       |  1 +
 .../aws-java-sdk-kms-1.12.488.jar.sha1        |  1 -
 .../aws-java-sdk-kms-1.12.501.jar.sha1        |  1 +
 .../aws-java-sdk-s3-1.12.488.jar.sha1         |  1 -
 .../aws-java-sdk-s3-1.12.501.jar.sha1         |  1 +
 solr/licenses/jmespath-java-1.12.488.jar.sha1 |  1 -
 solr/licenses/jmespath-java-1.12.501.jar.sha1 |  1 +
 solr/licenses/micrometer-core-1.9.11.jar.sha1 |  1 -
 solr/licenses/micrometer-core-1.9.12.jar.sha1 |  1 +
 solr/licenses/s3mock-2.13.0.jar.sha1          |  1 -
 solr/licenses/s3mock-2.17.0.jar.sha1          |  1 +
 solr/licenses/s3mock-junit4-2.13.0.jar.sha1   |  1 -
 solr/licenses/s3mock-junit4-2.17.0.jar.sha1   |  1 +
 .../s3mock-testsupport-common-2.13.0.jar.sha1 |  1 -
 .../s3mock-testsupport-common-2.17.0.jar.sha1 |  1 +
 solr/licenses/spring-aop-5.3.27.jar.sha1      |  1 -
 solr/licenses/spring-aop-5.3.28.jar.sha1      |  1 +
 solr/licenses/spring-beans-5.3.27.jar.sha1    |  1 -
 solr/licenses/spring-beans-5.3.28.jar.sha1    |  1 +
 solr/licenses/spring-boot-2.7.12.jar.sha1     |  1 -
 solr/licenses/spring-boot-2.7.13.jar.sha1     |  1 +
 .../spring-boot-actuator-2.7.12.jar.sha1      |  1 -
 .../spring-boot-actuator-2.7.13.jar.sha1      |  1 +
 ...oot-actuator-autoconfigure-2.7.12.jar.sha1 |  1 -
 ...oot-actuator-autoconfigure-2.7.13.jar.sha1 |  1 +
 .../spring-boot-autoconfigure-2.7.12.jar.sha1 |  1 -
 .../spring-boot-autoconfigure-2.7.13.jar.sha1 |  1 +
 .../spring-boot-starter-2.7.12.jar.sha1       |  1 -
 .../spring-boot-starter-2.7.13.jar.sha1       |  1 +
 ...ring-boot-starter-actuator-2.7.12.jar.sha1 |  1 -
 ...ring-boot-starter-actuator-2.7.13.jar.sha1 |  1 +
 .../spring-boot-starter-jetty-2.7.12.jar.sha1 |  1 -
 .../spring-boot-starter-jetty-2.7.13.jar.sha1 |  1 +
 .../spring-boot-starter-json-2.7.12.jar.sha1  |  1 -
 .../spring-boot-starter-json-2.7.13.jar.sha1  |  1 +
 ...pring-boot-starter-logging-2.7.12.jar.sha1 |  1 -
 ...pring-boot-starter-logging-2.7.13.jar.sha1 |  1 +
 .../spring-boot-starter-web-2.7.12.jar.sha1   |  1 -
 .../spring-boot-starter-web-2.7.13.jar.sha1   |  1 +
 solr/licenses/spring-context-5.3.27.jar.sha1  |  1 -
 solr/licenses/spring-context-5.3.28.jar.sha1  |  1 +
 solr/licenses/spring-core-5.3.27.jar.sha1     |  1 -
 solr/licenses/spring-core-5.3.28.jar.sha1     |  1 +
 .../spring-expression-5.3.27.jar.sha1         |  1 -
 .../spring-expression-5.3.28.jar.sha1         |  1 +
 solr/licenses/spring-jcl-5.3.27.jar.sha1      |  1 -
 solr/licenses/spring-jcl-5.3.28.jar.sha1      |  1 +
 solr/licenses/spring-web-5.3.27.jar.sha1      |  1 -
 solr/licenses/spring-web-5.3.28.jar.sha1      |  1 +
 solr/licenses/spring-webmvc-5.3.27.jar.sha1   |  1 -
 solr/licenses/spring-webmvc-5.3.28.jar.sha1   |  1 +
 solr/licenses/tomcat-embed-el-9.0.75.jar.sha1 |  1 -
 solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 |  1 +
 versions.lock                                 | 62 +++++++++----------
 versions.props                                |  2 +-
 56 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 solr/licenses/aws-java-sdk-core-1.12.488.jar.sha1
 create mode 100644 solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1
 delete mode 100644 solr/licenses/aws-java-sdk-kms-1.12.488.jar.sha1
 create mode 100644 solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1
 delete mode 100644 solr/licenses/aws-java-sdk-s3-1.12.488.jar.sha1
 create mode 100644 solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1
 delete mode 100644 solr/licenses/jmespath-java-1.12.488.jar.sha1
 create mode 100644 solr/licenses/jmespath-java-1.12.501.jar.sha1
 delete mode 100644 solr/licenses/micrometer-core-1.9.11.jar.sha1
 create mode 100644 solr/licenses/micrometer-core-1.9.12.jar.sha1
 delete mode 100644 solr/licenses/s3mock-2.13.0.jar.sha1
 create mode 100644 solr/licenses/s3mock-2.17.0.jar.sha1
 delete mode 100644 solr/licenses/s3mock-junit4-2.13.0.jar.sha1
 create mode 100644 solr/licenses/s3mock-junit4-2.17.0.jar.sha1
 delete mode 100644 solr/licenses/s3mock-testsupport-common-2.13.0.jar.sha1
 create mode 100644 solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1
 delete mode 100644 solr/licenses/spring-aop-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-aop-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-beans-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-beans-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-actuator-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-actuator-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-actuator-autoconfigure-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-autoconfigure-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-actuator-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-jetty-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-json-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-logging-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-boot-starter-web-2.7.12.jar.sha1
 create mode 100644 solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1
 delete mode 100644 solr/licenses/spring-context-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-context-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-core-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-core-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-expression-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-expression-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-jcl-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-jcl-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-web-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-web-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/spring-webmvc-5.3.27.jar.sha1
 create mode 100644 solr/licenses/spring-webmvc-5.3.28.jar.sha1
 delete mode 100644 solr/licenses/tomcat-embed-el-9.0.75.jar.sha1
 create mode 100644 solr/licenses/tomcat-embed-el-9.0.76.jar.sha1

diff --git a/solr/licenses/aws-java-sdk-core-1.12.488.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.488.jar.sha1
deleted file mode 100644
index cb7febc35e2..00000000000
--- a/solr/licenses/aws-java-sdk-core-1.12.488.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d79bcf0286a38bd88b1db79fa369fcf453df0afa
diff --git a/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1
new file mode 100644
index 00000000000..af7f788dfc0
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1
@@ -0,0 +1 @@
+96e3be3b38003a161ee52393974a507797a50d16
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.488.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.488.jar.sha1
deleted file mode 100644
index 5ee719c62c7..00000000000
--- a/solr/licenses/aws-java-sdk-kms-1.12.488.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c7adf0ec67903ec46ecd5de0e334b93963980ff3
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1
new file mode 100644
index 00000000000..69086477449
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1
@@ -0,0 +1 @@
+ad3cef50677ecead50802b0dc5830c6e2034166f
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.488.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.488.jar.sha1
deleted file mode 100644
index 48847665b64..00000000000
--- a/solr/licenses/aws-java-sdk-s3-1.12.488.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6718ba6a6f62aacd21b21707eb94511a0b9beeb3
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1
new file mode 100644
index 00000000000..5a18ae623b1
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1
@@ -0,0 +1 @@
+e085a735bc14c56899f2fdd1beb051505351aa25
diff --git a/solr/licenses/jmespath-java-1.12.488.jar.sha1 b/solr/licenses/jmespath-java-1.12.488.jar.sha1
deleted file mode 100644
index 2d47bac4d23..00000000000
--- a/solr/licenses/jmespath-java-1.12.488.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2c903a2416a5f90094c3c574d14ba208be346b9e
diff --git a/solr/licenses/jmespath-java-1.12.501.jar.sha1 b/solr/licenses/jmespath-java-1.12.501.jar.sha1
new file mode 100644
index 00000000000..baf747d0cf3
--- /dev/null
+++ b/solr/licenses/jmespath-java-1.12.501.jar.sha1
@@ -0,0 +1 @@
+941d0bade80af32bb3ac0fc77ae3691ef6515af8
diff --git a/solr/licenses/micrometer-core-1.9.11.jar.sha1 b/solr/licenses/micrometer-core-1.9.11.jar.sha1
deleted file mode 100644
index 5dd8a9d25bb..00000000000
--- a/solr/licenses/micrometer-core-1.9.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9c51ffe93b55af9deb2e77ac2fa1777b9ee1c14
diff --git a/solr/licenses/micrometer-core-1.9.12.jar.sha1 b/solr/licenses/micrometer-core-1.9.12.jar.sha1
new file mode 100644
index 00000000000..9f3ee82e101
--- /dev/null
+++ b/solr/licenses/micrometer-core-1.9.12.jar.sha1
@@ -0,0 +1 @@
+1077e4cce74894bbe96c79d380781820ba3dfd44
diff --git a/solr/licenses/s3mock-2.13.0.jar.sha1 b/solr/licenses/s3mock-2.13.0.jar.sha1
deleted file mode 100644
index c491c13b255..00000000000
--- a/solr/licenses/s3mock-2.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-66e841499e85580a23f9a1a4a1a452154f14754e
diff --git a/solr/licenses/s3mock-2.17.0.jar.sha1 b/solr/licenses/s3mock-2.17.0.jar.sha1
new file mode 100644
index 00000000000..878d6fb5886
--- /dev/null
+++ b/solr/licenses/s3mock-2.17.0.jar.sha1
@@ -0,0 +1 @@
+e5857753b28d06f6728f6200f94e5be299c8631c
diff --git a/solr/licenses/s3mock-junit4-2.13.0.jar.sha1 b/solr/licenses/s3mock-junit4-2.13.0.jar.sha1
deleted file mode 100644
index 67bc0a08e9d..00000000000
--- a/solr/licenses/s3mock-junit4-2.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96fa0a977b2fb6510c95e9e2e3fa47e516cbcbcc
diff --git a/solr/licenses/s3mock-junit4-2.17.0.jar.sha1 b/solr/licenses/s3mock-junit4-2.17.0.jar.sha1
new file mode 100644
index 00000000000..7533e674ae3
--- /dev/null
+++ b/solr/licenses/s3mock-junit4-2.17.0.jar.sha1
@@ -0,0 +1 @@
+e9601a823ef3648544d0c1d0ff14517c1feb0969
diff --git a/solr/licenses/s3mock-testsupport-common-2.13.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.13.0.jar.sha1
deleted file mode 100644
index 99ea84a688e..00000000000
--- a/solr/licenses/s3mock-testsupport-common-2.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-785f534d2d5e9ec962b76780334f2e36dfbb60f5
diff --git a/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1
new file mode 100644
index 00000000000..792568cba32
--- /dev/null
+++ b/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1
@@ -0,0 +1 @@
+a3af9b0bf0bdb001463356c8ebc2569b9ba478f1
diff --git a/solr/licenses/spring-aop-5.3.27.jar.sha1 b/solr/licenses/spring-aop-5.3.27.jar.sha1
deleted file mode 100644
index 69f7603ae19..00000000000
--- a/solr/licenses/spring-aop-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecae2962d53c587fd0e405cd60dc8415d1b9e12d
diff --git a/solr/licenses/spring-aop-5.3.28.jar.sha1 b/solr/licenses/spring-aop-5.3.28.jar.sha1
new file mode 100644
index 00000000000..5ce207bde99
--- /dev/null
+++ b/solr/licenses/spring-aop-5.3.28.jar.sha1
@@ -0,0 +1 @@
+aada0ea72a3efee5f02f264f90329f7eddedf321
diff --git a/solr/licenses/spring-beans-5.3.27.jar.sha1 b/solr/licenses/spring-beans-5.3.27.jar.sha1
deleted file mode 100644
index 7c09b141146..00000000000
--- a/solr/licenses/spring-beans-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-46e7d917551ffcc0a104fd971d1fa207b30d7761
diff --git a/solr/licenses/spring-beans-5.3.28.jar.sha1 b/solr/licenses/spring-beans-5.3.28.jar.sha1
new file mode 100644
index 00000000000..0391b770009
--- /dev/null
+++ b/solr/licenses/spring-beans-5.3.28.jar.sha1
@@ -0,0 +1 @@
+4d232acbb7031963688cf28b1b34134937892c4f
diff --git a/solr/licenses/spring-boot-2.7.12.jar.sha1 b/solr/licenses/spring-boot-2.7.12.jar.sha1
deleted file mode 100644
index f14f7f17d63..00000000000
--- a/solr/licenses/spring-boot-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-888c3545dc3c6ca791753c7ad621a2d03f222732
diff --git a/solr/licenses/spring-boot-2.7.13.jar.sha1 b/solr/licenses/spring-boot-2.7.13.jar.sha1
new file mode 100644
index 00000000000..9868e93593d
--- /dev/null
+++ b/solr/licenses/spring-boot-2.7.13.jar.sha1
@@ -0,0 +1 @@
+d009fa51c7792c9e510da7e69329baf39591707d
diff --git a/solr/licenses/spring-boot-actuator-2.7.12.jar.sha1 b/solr/licenses/spring-boot-actuator-2.7.12.jar.sha1
deleted file mode 100644
index 2de5e2e1354..00000000000
--- a/solr/licenses/spring-boot-actuator-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5b5961120028a8a7db9b2d5b4f5f926fd0b0b15
diff --git a/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1
new file mode 100644
index 00000000000..e21fd0ffce2
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1
@@ -0,0 +1 @@
+fff492093093c580ed528e115a01ae3158f4b674
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.12.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.12.jar.sha1
deleted file mode 100644
index b06d09a061b..00000000000
--- a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18f55d22dc8d23f46f6dfd8dd352f3ae0bc8587c
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1
new file mode 100644
index 00000000000..41e04eafd02
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1
@@ -0,0 +1 @@
+d6d16648726ee7dafcd5435f4f66d02ff3338f5f
diff --git a/solr/licenses/spring-boot-autoconfigure-2.7.12.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.7.12.jar.sha1
deleted file mode 100644
index a9d9d59d1db..00000000000
--- a/solr/licenses/spring-boot-autoconfigure-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb8661bba72f7ca353ae486ccb06285f0ed84eb
diff --git a/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1
new file mode 100644
index 00000000000..63a1f63afbf
--- /dev/null
+++ b/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1
@@ -0,0 +1 @@
+1b6b9605b1b116e32c372f3b9e15abf7bb17038c
diff --git a/solr/licenses/spring-boot-starter-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-2.7.12.jar.sha1
deleted file mode 100644
index aef33915fb5..00000000000
--- a/solr/licenses/spring-boot-starter-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a5f6a95e4e4a50cfaf0f14c86240d8be49637141
diff --git a/solr/licenses/spring-boot-starter-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-2.7.13.jar.sha1
new file mode 100644
index 00000000000..77381975a2e
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-2.7.13.jar.sha1
@@ -0,0 +1 @@
+5617ca04b06778877fb80d146dd2d0dd6adb23a8
diff --git a/solr/licenses/spring-boot-starter-actuator-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.7.12.jar.sha1
deleted file mode 100644
index b38b6a5e399..00000000000
--- a/solr/licenses/spring-boot-starter-actuator-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3f66262d4b856db3afbb55e4c04446b24b085d6
diff --git a/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1
new file mode 100644
index 00000000000..00cd8b33892
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1
@@ -0,0 +1 @@
+9e21e7d8fe52e5a2c58adf631a14b21ea6b08cbf
diff --git a/solr/licenses/spring-boot-starter-jetty-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.7.12.jar.sha1
deleted file mode 100644
index f7764cf0f9f..00000000000
--- a/solr/licenses/spring-boot-starter-jetty-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-12c93e9376bfb45f8eab849eb380137722f93c46
diff --git a/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1
new file mode 100644
index 00000000000..c6d33b2af97
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1
@@ -0,0 +1 @@
+1bf057f189e6b511428857c853f7faf6f0591299
diff --git a/solr/licenses/spring-boot-starter-json-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.7.12.jar.sha1
deleted file mode 100644
index d96990b6418..00000000000
--- a/solr/licenses/spring-boot-starter-json-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-863c30cf3a7858421d71762e1632d887cdb0866f
diff --git a/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1
new file mode 100644
index 00000000000..51408cd2fa1
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1
@@ -0,0 +1 @@
+2fc4c73e9b8602e57d2ffc37545cc2822e948322
diff --git a/solr/licenses/spring-boot-starter-logging-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.7.12.jar.sha1
deleted file mode 100644
index e9aa96cf811..00000000000
--- a/solr/licenses/spring-boot-starter-logging-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6590492b4d92baebb4ac7c1b5db11fc3488e347
diff --git a/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1
new file mode 100644
index 00000000000..7de4ef8057a
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1
@@ -0,0 +1 @@
+8a5e9bd6fa8341193a977d408b9a44faaa684c8d
diff --git a/solr/licenses/spring-boot-starter-web-2.7.12.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.7.12.jar.sha1
deleted file mode 100644
index 920b5538fcb..00000000000
--- a/solr/licenses/spring-boot-starter-web-2.7.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aba3f96331e2cfa316d8ec7446804721120a0552
diff --git a/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1
new file mode 100644
index 00000000000..7f8538e5c66
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1
@@ -0,0 +1 @@
+707bd743fa544ca06a78a657465c1ca0f5084ea4
diff --git a/solr/licenses/spring-context-5.3.27.jar.sha1 b/solr/licenses/spring-context-5.3.27.jar.sha1
deleted file mode 100644
index 6f6cccb3162..00000000000
--- a/solr/licenses/spring-context-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0251162aa2fe5cb374a482ae87fa6e8e8e747d72
diff --git a/solr/licenses/spring-context-5.3.28.jar.sha1 b/solr/licenses/spring-context-5.3.28.jar.sha1
new file mode 100644
index 00000000000..7edc60f960b
--- /dev/null
+++ b/solr/licenses/spring-context-5.3.28.jar.sha1
@@ -0,0 +1 @@
+edf8ebfd637e3e10ec7fed697eb69f2a5229748a
diff --git a/solr/licenses/spring-core-5.3.27.jar.sha1 b/solr/licenses/spring-core-5.3.27.jar.sha1
deleted file mode 100644
index 41cad273635..00000000000
--- a/solr/licenses/spring-core-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff5e35f2d4f72d22c476ff9b7bce1de25c980ebd
diff --git a/solr/licenses/spring-core-5.3.28.jar.sha1 b/solr/licenses/spring-core-5.3.28.jar.sha1
new file mode 100644
index 00000000000..b2b8b266a61
--- /dev/null
+++ b/solr/licenses/spring-core-5.3.28.jar.sha1
@@ -0,0 +1 @@
+5b7ec246fef72fdfbb0b4123956715ca89cc6ddf
diff --git a/solr/licenses/spring-expression-5.3.27.jar.sha1 b/solr/licenses/spring-expression-5.3.27.jar.sha1
deleted file mode 100644
index c2c59add74e..00000000000
--- a/solr/licenses/spring-expression-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6225619970e8376df5c3d777610d9d03b977063b
diff --git a/solr/licenses/spring-expression-5.3.28.jar.sha1 b/solr/licenses/spring-expression-5.3.28.jar.sha1
new file mode 100644
index 00000000000..1f8325901d5
--- /dev/null
+++ b/solr/licenses/spring-expression-5.3.28.jar.sha1
@@ -0,0 +1 @@
+d049216b1a73b939b36bbf5cc7ce734cace7b245
diff --git a/solr/licenses/spring-jcl-5.3.27.jar.sha1 b/solr/licenses/spring-jcl-5.3.27.jar.sha1
deleted file mode 100644
index cef4cecae97..00000000000
--- a/solr/licenses/spring-jcl-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-09698ea7d5361b5e3a27ed08beb7770279bd2397
diff --git a/solr/licenses/spring-jcl-5.3.28.jar.sha1 b/solr/licenses/spring-jcl-5.3.28.jar.sha1
new file mode 100644
index 00000000000..88be4456192
--- /dev/null
+++ b/solr/licenses/spring-jcl-5.3.28.jar.sha1
@@ -0,0 +1 @@
+d67e8b213aa08a0f3d71e547fb4345372d819d36
diff --git a/solr/licenses/spring-web-5.3.27.jar.sha1 b/solr/licenses/spring-web-5.3.27.jar.sha1
deleted file mode 100644
index 6b2d692cc30..00000000000
--- a/solr/licenses/spring-web-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a51c45a8602052a2a90f7e645a47ba8df1547795
diff --git a/solr/licenses/spring-web-5.3.28.jar.sha1 b/solr/licenses/spring-web-5.3.28.jar.sha1
new file mode 100644
index 00000000000..5a49ed29aa1
--- /dev/null
+++ b/solr/licenses/spring-web-5.3.28.jar.sha1
@@ -0,0 +1 @@
+e15c861a248f5ba41dd1ebc691e582bb5f3a2813
diff --git a/solr/licenses/spring-webmvc-5.3.27.jar.sha1 b/solr/licenses/spring-webmvc-5.3.27.jar.sha1
deleted file mode 100644
index 5c353cce07c..00000000000
--- a/solr/licenses/spring-webmvc-5.3.27.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8beabbb0cb64c448b39df790b62e342245ee7971
diff --git a/solr/licenses/spring-webmvc-5.3.28.jar.sha1 b/solr/licenses/spring-webmvc-5.3.28.jar.sha1
new file mode 100644
index 00000000000..2d4af9abee1
--- /dev/null
+++ b/solr/licenses/spring-webmvc-5.3.28.jar.sha1
@@ -0,0 +1 @@
+688bde13678e86028062f01dbcdf301308c449e7
diff --git a/solr/licenses/tomcat-embed-el-9.0.75.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.75.jar.sha1
deleted file mode 100644
index 695d5914abc..00000000000
--- a/solr/licenses/tomcat-embed-el-9.0.75.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8b97771742cbd402ad1350190f8d08b240e1793b
diff --git a/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1
new file mode 100644
index 00000000000..9b324f897ba
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1
@@ -0,0 +1 @@
+74bf8925f713a52c2af19fff6df55d80ef87166c
diff --git a/versions.lock b/versions.lock
index 0e374c36140..f3b7fda9835 100644
--- a/versions.lock
+++ b/versions.lock
@@ -369,24 +369,24 @@ software.amazon.awssdk:json-utils:2.20.155 (5 constraints: 5a408840)
 software.amazon.awssdk:metrics-spi:2.20.155 (7 constraints: 7163033c)
 software.amazon.awssdk:profiles:2.20.155 (8 constraints: c7626aa3)
 software.amazon.awssdk:protocol-core:2.20.155 (5 constraints: 66497b88)
-software.amazon.awssdk:regions:2.20.155 (7 constraints: 4b519931)
-software.amazon.awssdk:s3:2.20.155 (3 constraints: 1025d761)
+software.amazon.awssdk:regions:2.20.155 (7 constraints: 4e51e633)
+software.amazon.awssdk:s3:2.20.155 (4 constraints: 3d30f50b)
 software.amazon.awssdk:sdk-core:2.20.155 (10 constraints: 40899100)
 software.amazon.awssdk:sts:2.20.155 (2 constraints: 29122233)
 software.amazon.awssdk:third-party-jackson-core:2.20.155 (2 constraints: eb1bdad7)
-software.amazon.awssdk:utils:2.20.155 (19 constraints: 961b31e6)
+software.amazon.awssdk:utils:2.20.155 (19 constraints: 991b9bef)
 software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
 xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
 
 [Test dependencies]
-com.adobe.testing:s3mock:2.13.0 (1 constraints: ac12841d)
-com.adobe.testing:s3mock-junit4:2.13.0 (1 constraints: 3805383b)
-com.adobe.testing:s3mock-testsupport-common:2.13.0 (1 constraints: 770d8c39)
-com.amazonaws:aws-java-sdk-core:1.12.488 (2 constraints: cc1a98b5)
-com.amazonaws:aws-java-sdk-kms:1.12.488 (1 constraints: 140dd137)
-com.amazonaws:aws-java-sdk-s3:1.12.488 (1 constraints: 1e138343)
-com.amazonaws:jmespath-java:1.12.488 (2 constraints: cc1a98b5)
+com.adobe.testing:s3mock:2.17.0 (1 constraints: b012901d)
+com.adobe.testing:s3mock-junit4:2.17.0 (1 constraints: 3c05443b)
+com.adobe.testing:s3mock-testsupport-common:2.17.0 (1 constraints: 7b0d9839)
+com.amazonaws:aws-java-sdk-core:1.12.501 (2 constraints: b01a32b3)
+com.amazonaws:aws-java-sdk-kms:1.12.501 (1 constraints: 060dbd37)
+com.amazonaws:aws-java-sdk-s3:1.12.501 (1 constraints: 10136f43)
+com.amazonaws:jmespath-java:1.12.501 (2 constraints: b01a32b3)
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2 (2 constraints: aa195413)
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2 (3 constraints: fc2e56b4)
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 (4 constraints: 6d485635)
@@ -400,7 +400,7 @@ com.nimbusds:oauth2-oidc-sdk:10.10.1 (1 constraints: 190f9b80)
 com.squareup.okhttp3:mockwebserver:4.11.0 (1 constraints: ec0e9471)
 io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162)
 io.github.microutils:kotlin-logging-jvm:3.0.5 (1 constraints: 810f8b7c)
-io.micrometer:micrometer-core:1.9.11 (1 constraints: fd162819)
+io.micrometer:micrometer-core:1.9.12 (1 constraints: fe162919)
 io.opentelemetry:opentelemetry-sdk-testing:1.30.1 (1 constraints: 920fe383)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
@@ -418,7 +418,7 @@ org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)
 org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
 org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
 org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
-org.apache.tomcat.embed:tomcat-embed-el:9.0.75 (1 constraints: d31557cf)
+org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf)
 org.freemarker:freemarker:2.3.32 (1 constraints: f00e9371)
 org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
 org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
@@ -438,24 +438,24 @@ org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
 org.mockito:mockito-core:5.5.0 (2 constraints: d61174fd)
 org.mockito:mockito-subclass:5.5.0 (1 constraints: 0c051336)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
-org.springframework:spring-aop:5.3.27 (2 constraints: dc1e629a)
-org.springframework:spring-beans:5.3.27 (4 constraints: ac3ac2c8)
-org.springframework:spring-context:5.3.27 (2 constraints: 6d1f9ed2)
-org.springframework:spring-core:5.3.27 (8 constraints: 077e17c3)
-org.springframework:spring-expression:5.3.27 (2 constraints: dc1e629a)
-org.springframework:spring-jcl:5.3.27 (1 constraints: 530ea34f)
-org.springframework:spring-web:5.3.27 (3 constraints: 6239118e)
-org.springframework:spring-webmvc:5.3.27 (1 constraints: dd146f9e)
-org.springframework.boot:spring-boot:2.7.12 (4 constraints: 8b566345)
-org.springframework.boot:spring-boot-actuator:2.7.12 (1 constraints: 7319a2b8)
-org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.12 (1 constraints: fd162719)
-org.springframework.boot:spring-boot-autoconfigure:2.7.12 (2 constraints: df2c935d)
-org.springframework.boot:spring-boot-starter:2.7.12 (3 constraints: 274138c5)
-org.springframework.boot:spring-boot-starter-actuator:2.7.12 (2 constraints: 6e188cd0)
-org.springframework.boot:spring-boot-starter-jetty:2.7.12 (1 constraints: f20a38d6)
-org.springframework.boot:spring-boot-starter-json:2.7.12 (1 constraints: d814669e)
-org.springframework.boot:spring-boot-starter-logging:2.7.12 (1 constraints: 6d138b46)
-org.springframework.boot:spring-boot-starter-web:2.7.12 (1 constraints: f20a38d6)
+org.springframework:spring-aop:5.3.28 (2 constraints: de1e8f9a)
+org.springframework:spring-beans:5.3.28 (4 constraints: b03ac3c9)
+org.springframework:spring-context:5.3.28 (2 constraints: 6f1fced2)
+org.springframework:spring-core:5.3.28 (8 constraints: 0f7e33c8)
+org.springframework:spring-expression:5.3.28 (2 constraints: de1e8f9a)
+org.springframework:spring-jcl:5.3.28 (1 constraints: 540ea44f)
+org.springframework:spring-web:5.3.28 (3 constraints: 6539c38e)
+org.springframework:spring-webmvc:5.3.28 (1 constraints: de14709e)
+org.springframework.boot:spring-boot:2.7.13 (4 constraints: 8f56c646)
+org.springframework.boot:spring-boot-actuator:2.7.13 (1 constraints: 7419a3b8)
+org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.13 (1 constraints: fe162819)
+org.springframework.boot:spring-boot-autoconfigure:2.7.13 (2 constraints: e12ccb5d)
+org.springframework.boot:spring-boot-starter:2.7.13 (3 constraints: 2a41eac5)
+org.springframework.boot:spring-boot-starter-actuator:2.7.13 (2 constraints: 7018b7d0)
+org.springframework.boot:spring-boot-starter-jetty:2.7.13 (1 constraints: f30a39d6)
+org.springframework.boot:spring-boot-starter-json:2.7.13 (1 constraints: d914679e)
+org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e138c46)
+org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6)
 org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f)
-software.amazon.awssdk:url-connection-client:2.20.155 (2 constraints: 701ff815)
+software.amazon.awssdk:url-connection-client:2.20.155 (2 constraints: 731f6e16)
 software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index 767d5e526b5..20fb9924ae3 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
 # The lines in this file needs to be lexicographically sorted.
 # Please only add direct dependencies. Overrides of transitive versions should be called out in a comment.
 biz.aQute.bnd:biz.aQute.bnd.annotation=6.4.1
-com.adobe.testing:s3mock-junit4=2.13.0
+com.adobe.testing:s3mock-junit4=2.17.0
 com.carrotsearch.randomizedtesting:*=2.8.1
 com.carrotsearch:hppc=0.9.1
 com.cybozu.labs:langdetect=1.1-20120112

From 9c70ac0de5d8365f11d921f7f89429f5b4e5b049 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:43:47 +0200
Subject: [PATCH 147/160] Update org.glassfish.jersey*:* to v2.39.1 (#1676)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Høydahl <janhoy@users.noreply.github.com>
Co-authored-by: Kevin Risden <krisden@apache.org>
---
 solr/licenses/javassist-3.25.0-GA.jar.sha1    |   1 -
 solr/licenses/javassist-3.29.0-GA.jar.sha1    |   1 +
 solr/licenses/jersey-client-2.35.jar.sha1     |   1 -
 solr/licenses/jersey-client-2.39.1.jar.sha1   |   1 +
 solr/licenses/jersey-common-2.35.jar.sha1     |   1 -
 solr/licenses/jersey-common-2.39.1.jar.sha1   |   1 +
 ...rsey-container-grizzly2-http-2.35.jar.sha1 |   1 -
 ...ey-container-grizzly2-http-2.39.1.jar.sha1 |   1 +
 ...y-container-grizzly2-servlet-2.35.jar.sha1 |   1 -
 ...container-grizzly2-servlet-2.39.1.jar.sha1 |   1 +
 .../jersey-container-jetty-http-2.35.jar.sha1 |   1 -
 ...ersey-container-jetty-http-2.39.1.jar.sha1 |   1 +
 .../jersey-container-servlet-2.35.jar.sha1    |   1 -
 .../jersey-container-servlet-2.39.1.jar.sha1  |   1 +
 ...ersey-container-servlet-core-2.35.jar.sha1 |   1 -
 ...sey-container-servlet-core-2.39.1.jar.sha1 |   1 +
 .../jersey-entity-filtering-2.35.jar.sha1     |   1 -
 .../jersey-entity-filtering-2.39.1.jar.sha1   |   1 +
 solr/licenses/jersey-hk2-2.35.jar.sha1        |   1 -
 solr/licenses/jersey-hk2-2.39.1.jar.sha1      |   1 +
 solr/licenses/jersey-media-jaxb-2.35.jar.sha1 |   1 -
 .../jersey-media-jaxb-2.39.1.jar.sha1         |   1 +
 .../jersey-media-json-jackson-2.35.jar.sha1   |   1 -
 .../jersey-media-json-jackson-2.39.1.jar.sha1 |   1 +
 solr/licenses/jersey-server-2.35.jar.sha1     |   1 -
 solr/licenses/jersey-server-2.39.1.jar.sha1   |   1 +
 .../jersey-test-framework-core-2.35.jar.sha1  |   1 -
 ...jersey-test-framework-core-2.39.1.jar.sha1 |   1 +
 ...-framework-provider-grizzly2-2.35.jar.sha1 |   1 -
 ...ramework-provider-grizzly2-2.39.1.jar.sha1 |   1 +
 solr/licenses/junit-jupiter-5.9.1.jar.sha1    |   1 +
 .../licenses/junit-jupiter-api-5.9.1.jar.sha1 |   1 +
 .../junit-jupiter-engine-5.9.1.jar.sha1       |   1 +
 .../junit-jupiter-params-5.9.1.jar.sha1       |   1 +
 .../junit-platform-commons-1.9.1.jar.sha1     |   1 +
 .../junit-platform-engine-1.9.1.jar.sha1      |   1 +
 solr/licenses/opentest4j-1.2.0.jar.sha1       |   1 +
 solr/licenses/opentest4j-LICENSE-ASL.txt      | 201 ++++++++++++++++++
 solr/licenses/opentest4j-NOTICE.txt           |  13 ++
 versions.lock                                 |  57 ++---
 versions.props                                |   2 +-
 41 files changed, 269 insertions(+), 41 deletions(-)
 delete mode 100644 solr/licenses/javassist-3.25.0-GA.jar.sha1
 create mode 100644 solr/licenses/javassist-3.29.0-GA.jar.sha1
 delete mode 100644 solr/licenses/jersey-client-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-client-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-common-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-common-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-container-grizzly2-http-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-container-grizzly2-servlet-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-container-jetty-http-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-container-servlet-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-container-servlet-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-container-servlet-core-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-container-servlet-core-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-entity-filtering-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-entity-filtering-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-hk2-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-hk2-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-media-jaxb-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-media-jaxb-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-media-json-jackson-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-media-json-jackson-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-server-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-server-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-test-framework-core-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-test-framework-core-2.39.1.jar.sha1
 delete mode 100644 solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1
 create mode 100644 solr/licenses/jersey-test-framework-provider-grizzly2-2.39.1.jar.sha1
 create mode 100644 solr/licenses/junit-jupiter-5.9.1.jar.sha1
 create mode 100644 solr/licenses/junit-jupiter-api-5.9.1.jar.sha1
 create mode 100644 solr/licenses/junit-jupiter-engine-5.9.1.jar.sha1
 create mode 100644 solr/licenses/junit-jupiter-params-5.9.1.jar.sha1
 create mode 100644 solr/licenses/junit-platform-commons-1.9.1.jar.sha1
 create mode 100644 solr/licenses/junit-platform-engine-1.9.1.jar.sha1
 create mode 100644 solr/licenses/opentest4j-1.2.0.jar.sha1
 create mode 100644 solr/licenses/opentest4j-LICENSE-ASL.txt
 create mode 100644 solr/licenses/opentest4j-NOTICE.txt

diff --git a/solr/licenses/javassist-3.25.0-GA.jar.sha1 b/solr/licenses/javassist-3.25.0-GA.jar.sha1
deleted file mode 100644
index 26c87b892ee..00000000000
--- a/solr/licenses/javassist-3.25.0-GA.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-442dc1f9fd520130bd18da938622f4f9b2e5fba3
diff --git a/solr/licenses/javassist-3.29.0-GA.jar.sha1 b/solr/licenses/javassist-3.29.0-GA.jar.sha1
new file mode 100644
index 00000000000..fc0df45f52f
--- /dev/null
+++ b/solr/licenses/javassist-3.29.0-GA.jar.sha1
@@ -0,0 +1 @@
+d3959fa7e00bf04dbe519228a23213d2afb625d8
diff --git a/solr/licenses/jersey-client-2.35.jar.sha1 b/solr/licenses/jersey-client-2.35.jar.sha1
deleted file mode 100644
index 32c2fe8ba1e..00000000000
--- a/solr/licenses/jersey-client-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea92be0dd34d0b298930a7514e715783f4eaba97
diff --git a/solr/licenses/jersey-client-2.39.1.jar.sha1 b/solr/licenses/jersey-client-2.39.1.jar.sha1
new file mode 100644
index 00000000000..00277c9f7d1
--- /dev/null
+++ b/solr/licenses/jersey-client-2.39.1.jar.sha1
@@ -0,0 +1 @@
+2b1187bf77721c050bf68829918a1b3cd8be904e
diff --git a/solr/licenses/jersey-common-2.35.jar.sha1 b/solr/licenses/jersey-common-2.35.jar.sha1
deleted file mode 100644
index 4209b8b2e4e..00000000000
--- a/solr/licenses/jersey-common-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f15ec1b3a3598d6b12d4b0c6ff6f0905f5e5b4c
diff --git a/solr/licenses/jersey-common-2.39.1.jar.sha1 b/solr/licenses/jersey-common-2.39.1.jar.sha1
new file mode 100644
index 00000000000..07ad665cf97
--- /dev/null
+++ b/solr/licenses/jersey-common-2.39.1.jar.sha1
@@ -0,0 +1 @@
+39198bdead74896267646795a7e4b1d86c10e039
diff --git a/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1 b/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1
deleted file mode 100644
index 5d5c4e8dd53..00000000000
--- a/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d92badfba931ffd878c0101a7f7178c5dd22a9a
diff --git a/solr/licenses/jersey-container-grizzly2-http-2.39.1.jar.sha1 b/solr/licenses/jersey-container-grizzly2-http-2.39.1.jar.sha1
new file mode 100644
index 00000000000..d8007f1b7e5
--- /dev/null
+++ b/solr/licenses/jersey-container-grizzly2-http-2.39.1.jar.sha1
@@ -0,0 +1 @@
+b6575a1bd698708332765c71d0c241823ec4fee0
diff --git a/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1 b/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1
deleted file mode 100644
index 3493de1f8c5..00000000000
--- a/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a28778963eb317ace1858e3d76bac70b8defe45
diff --git a/solr/licenses/jersey-container-grizzly2-servlet-2.39.1.jar.sha1 b/solr/licenses/jersey-container-grizzly2-servlet-2.39.1.jar.sha1
new file mode 100644
index 00000000000..ad83808cf8a
--- /dev/null
+++ b/solr/licenses/jersey-container-grizzly2-servlet-2.39.1.jar.sha1
@@ -0,0 +1 @@
+a61d090ed1e7b0c93e905f0826c9eda40bab8717
diff --git a/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1 b/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1
deleted file mode 100644
index 056f05adfb3..00000000000
--- a/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f9d90b34746e47ada8be42295e1cc51484b5f461
diff --git a/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1 b/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1
new file mode 100644
index 00000000000..7b88cb1acff
--- /dev/null
+++ b/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1
@@ -0,0 +1 @@
+24bf9bf446f1899b35e7e70c930951f3f70453e4
diff --git a/solr/licenses/jersey-container-servlet-2.35.jar.sha1 b/solr/licenses/jersey-container-servlet-2.35.jar.sha1
deleted file mode 100644
index a8a8f6d4139..00000000000
--- a/solr/licenses/jersey-container-servlet-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-898ef84b72e75788811dd709fe7c7051f61a943e
diff --git a/solr/licenses/jersey-container-servlet-2.39.1.jar.sha1 b/solr/licenses/jersey-container-servlet-2.39.1.jar.sha1
new file mode 100644
index 00000000000..228a887c300
--- /dev/null
+++ b/solr/licenses/jersey-container-servlet-2.39.1.jar.sha1
@@ -0,0 +1 @@
+333caae8d3581430e6251e57182af1141a72df82
diff --git a/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1 b/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1
deleted file mode 100644
index 52d7651efdd..00000000000
--- a/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cc48f2529b921f25a020c821dde23753f6e60bb
diff --git a/solr/licenses/jersey-container-servlet-core-2.39.1.jar.sha1 b/solr/licenses/jersey-container-servlet-core-2.39.1.jar.sha1
new file mode 100644
index 00000000000..2ea9ba15fc0
--- /dev/null
+++ b/solr/licenses/jersey-container-servlet-core-2.39.1.jar.sha1
@@ -0,0 +1 @@
+2270e8c8b3553fb4b3ac132212642c58f16488f9
diff --git a/solr/licenses/jersey-entity-filtering-2.35.jar.sha1 b/solr/licenses/jersey-entity-filtering-2.35.jar.sha1
deleted file mode 100644
index 4ff86887191..00000000000
--- a/solr/licenses/jersey-entity-filtering-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2fbe9e89f6597e10976d1431dde64b282a761aeb
diff --git a/solr/licenses/jersey-entity-filtering-2.39.1.jar.sha1 b/solr/licenses/jersey-entity-filtering-2.39.1.jar.sha1
new file mode 100644
index 00000000000..f5517b54d3a
--- /dev/null
+++ b/solr/licenses/jersey-entity-filtering-2.39.1.jar.sha1
@@ -0,0 +1 @@
+d6cabcbea3885de33e1b0c96ba02752d92884ea4
diff --git a/solr/licenses/jersey-hk2-2.35.jar.sha1 b/solr/licenses/jersey-hk2-2.35.jar.sha1
deleted file mode 100644
index 979fe69fc16..00000000000
--- a/solr/licenses/jersey-hk2-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2be6d2227081028566e8e2b0fc6a1abbaecf56f7
diff --git a/solr/licenses/jersey-hk2-2.39.1.jar.sha1 b/solr/licenses/jersey-hk2-2.39.1.jar.sha1
new file mode 100644
index 00000000000..238b6ba9232
--- /dev/null
+++ b/solr/licenses/jersey-hk2-2.39.1.jar.sha1
@@ -0,0 +1 @@
+992005ae2e8ec3b215b2daa788c09eb902ef814b
diff --git a/solr/licenses/jersey-media-jaxb-2.35.jar.sha1 b/solr/licenses/jersey-media-jaxb-2.35.jar.sha1
deleted file mode 100644
index 6e52afe8c6d..00000000000
--- a/solr/licenses/jersey-media-jaxb-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06580e05acec50cc2f7c300d9e59925122fc3a0c
diff --git a/solr/licenses/jersey-media-jaxb-2.39.1.jar.sha1 b/solr/licenses/jersey-media-jaxb-2.39.1.jar.sha1
new file mode 100644
index 00000000000..6c5eac2da7c
--- /dev/null
+++ b/solr/licenses/jersey-media-jaxb-2.39.1.jar.sha1
@@ -0,0 +1 @@
+8285a8c287866e22c06f42ba3ae4170ff931be18
diff --git a/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1 b/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1
deleted file mode 100644
index c547eb7dc09..00000000000
--- a/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6383927e15ecb4baeef2cf0d3373b1ff1795c062
diff --git a/solr/licenses/jersey-media-json-jackson-2.39.1.jar.sha1 b/solr/licenses/jersey-media-json-jackson-2.39.1.jar.sha1
new file mode 100644
index 00000000000..ec34674ec6d
--- /dev/null
+++ b/solr/licenses/jersey-media-json-jackson-2.39.1.jar.sha1
@@ -0,0 +1 @@
+3520363b7ac30d97ece9a6ae188c0d343cbad691
diff --git a/solr/licenses/jersey-server-2.35.jar.sha1 b/solr/licenses/jersey-server-2.35.jar.sha1
deleted file mode 100644
index 8ed257c297f..00000000000
--- a/solr/licenses/jersey-server-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c6efc2ee82d2550e6385a7f7b1c08651f71afb7a
diff --git a/solr/licenses/jersey-server-2.39.1.jar.sha1 b/solr/licenses/jersey-server-2.39.1.jar.sha1
new file mode 100644
index 00000000000..ab9b47e3450
--- /dev/null
+++ b/solr/licenses/jersey-server-2.39.1.jar.sha1
@@ -0,0 +1 @@
+62324128215827bd646ddaac8f26cb2bdfe8e999
diff --git a/solr/licenses/jersey-test-framework-core-2.35.jar.sha1 b/solr/licenses/jersey-test-framework-core-2.35.jar.sha1
deleted file mode 100644
index 0f4e2b12651..00000000000
--- a/solr/licenses/jersey-test-framework-core-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec314b4c0902cef2b797f8be932e80da2af90c10
diff --git a/solr/licenses/jersey-test-framework-core-2.39.1.jar.sha1 b/solr/licenses/jersey-test-framework-core-2.39.1.jar.sha1
new file mode 100644
index 00000000000..ef71f9a1a63
--- /dev/null
+++ b/solr/licenses/jersey-test-framework-core-2.39.1.jar.sha1
@@ -0,0 +1 @@
+f42fd388041b5afe9284fae7b368bf1ac0e30caf
diff --git a/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1 b/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1
deleted file mode 100644
index 22efa71f64f..00000000000
--- a/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e181f98bb40784961ce6fbcecf7529f4a452bda3
diff --git a/solr/licenses/jersey-test-framework-provider-grizzly2-2.39.1.jar.sha1 b/solr/licenses/jersey-test-framework-provider-grizzly2-2.39.1.jar.sha1
new file mode 100644
index 00000000000..968fbaf41e2
--- /dev/null
+++ b/solr/licenses/jersey-test-framework-provider-grizzly2-2.39.1.jar.sha1
@@ -0,0 +1 @@
+fcf8d4c4be70ae6cfb5a95fe67686267f39de1de
diff --git a/solr/licenses/junit-jupiter-5.9.1.jar.sha1 b/solr/licenses/junit-jupiter-5.9.1.jar.sha1
new file mode 100644
index 00000000000..08e99f5789e
--- /dev/null
+++ b/solr/licenses/junit-jupiter-5.9.1.jar.sha1
@@ -0,0 +1 @@
+9274d3757e224bc02eae367bd481062a263c150b
diff --git a/solr/licenses/junit-jupiter-api-5.9.1.jar.sha1 b/solr/licenses/junit-jupiter-api-5.9.1.jar.sha1
new file mode 100644
index 00000000000..7735f632280
--- /dev/null
+++ b/solr/licenses/junit-jupiter-api-5.9.1.jar.sha1
@@ -0,0 +1 @@
+7bb53fbc0173e9f6a9d21d58297af94b1f2f9ce1
diff --git a/solr/licenses/junit-jupiter-engine-5.9.1.jar.sha1 b/solr/licenses/junit-jupiter-engine-5.9.1.jar.sha1
new file mode 100644
index 00000000000..f4d83b9a976
--- /dev/null
+++ b/solr/licenses/junit-jupiter-engine-5.9.1.jar.sha1
@@ -0,0 +1 @@
+1bf771097bde296c3ab174861954e8aafaaf2e94
diff --git a/solr/licenses/junit-jupiter-params-5.9.1.jar.sha1 b/solr/licenses/junit-jupiter-params-5.9.1.jar.sha1
new file mode 100644
index 00000000000..c2bcc47b3c9
--- /dev/null
+++ b/solr/licenses/junit-jupiter-params-5.9.1.jar.sha1
@@ -0,0 +1 @@
+ffcd1013edaeee112be11fcddeb38882d79238de
diff --git a/solr/licenses/junit-platform-commons-1.9.1.jar.sha1 b/solr/licenses/junit-platform-commons-1.9.1.jar.sha1
new file mode 100644
index 00000000000..b2c2116cf63
--- /dev/null
+++ b/solr/licenses/junit-platform-commons-1.9.1.jar.sha1
@@ -0,0 +1 @@
+3145f821b5cd10abcdc5f925baa5fffa6f1b628f
diff --git a/solr/licenses/junit-platform-engine-1.9.1.jar.sha1 b/solr/licenses/junit-platform-engine-1.9.1.jar.sha1
new file mode 100644
index 00000000000..b927d3730e8
--- /dev/null
+++ b/solr/licenses/junit-platform-engine-1.9.1.jar.sha1
@@ -0,0 +1 @@
+83591e5089d6cea5f324aa3ecca9b19d5a275803
diff --git a/solr/licenses/opentest4j-1.2.0.jar.sha1 b/solr/licenses/opentest4j-1.2.0.jar.sha1
new file mode 100644
index 00000000000..1d8cede8888
--- /dev/null
+++ b/solr/licenses/opentest4j-1.2.0.jar.sha1
@@ -0,0 +1 @@
+28c11eb91f9b6d8e200631d46e20a7f407f2a046
diff --git a/solr/licenses/opentest4j-LICENSE-ASL.txt b/solr/licenses/opentest4j-LICENSE-ASL.txt
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/solr/licenses/opentest4j-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+                                 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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed 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.
diff --git a/solr/licenses/opentest4j-NOTICE.txt b/solr/licenses/opentest4j-NOTICE.txt
new file mode 100644
index 00000000000..c84bc566aa3
--- /dev/null
+++ b/solr/licenses/opentest4j-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright 2015-2023 the original author or authors.
+
+Licensed 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.
\ No newline at end of file
diff --git a/versions.lock b/versions.lock
index f3b7fda9835..89aeb26dba5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,12 +7,12 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
 com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55)
-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6817)
+com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9cbe6d17)
 com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42026028)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63028e)
+com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8d63878e)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a724cae0)
 com.fasterxml.woodstox:woodstox-core:6.5.1 (2 constraints: a0239c84)
 com.github.ben-manes.caffeine:caffeine:3.1.8 (1 constraints: 0e050536)
 com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
@@ -149,14 +149,14 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
 io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
 io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
 io.swagger.core.v3:swagger-annotations:2.2.16 (1 constraints: 3d05393b)
-jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe)
+jakarta.activation:jakarta.activation-api:1.2.2 (1 constraints: 8e0f4791)
 jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
 jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
 jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec)
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (5 constraints: c45d665e)
 javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
 joda-time:joda-time:2.8.1 (3 constraints: d61aef93)
-junit:junit:4.13.2 (9 constraints: d5aafc9f)
+junit:junit:4.13.2 (7 constraints: 136d2cb8)
 net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb)
 net.java.dev.jna:jna:5.12.1 (1 constraints: 900c8e0e)
 net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d)
@@ -286,10 +286,10 @@ org.eclipse.jetty:jetty-io:10.0.16 (9 constraints: be7da0e9)
 org.eclipse.jetty:jetty-jmx:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty:jetty-rewrite:10.0.16 (1 constraints: 6a059240)
 org.eclipse.jetty:jetty-security:10.0.16 (2 constraints: be134779)
-org.eclipse.jetty:jetty-server:10.0.16 (7 constraints: d86dbc27)
+org.eclipse.jetty:jetty-server:10.0.16 (7 constraints: e46d1928)
 org.eclipse.jetty:jetty-servlet:10.0.16 (2 constraints: 38137261)
 org.eclipse.jetty:jetty-servlets:10.0.16 (1 constraints: 6a059240)
-org.eclipse.jetty:jetty-util:10.0.16 (9 constraints: ad819898)
+org.eclipse.jetty:jetty-util:10.0.16 (9 constraints: b981f598)
 org.eclipse.jetty:jetty-webapp:10.0.16 (2 constraints: 4613fa61)
 org.eclipse.jetty:jetty-xml:10.0.16 (3 constraints: 142134bb)
 org.eclipse.jetty.http2:http2-client:10.0.16 (2 constraints: 211bd36e)
@@ -308,18 +308,18 @@ org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277
 org.glassfish.hk2.external:jakarta.inject:2.6.1 (11 constraints: 2cbae60f)
 org.glassfish.jaxb:jaxb-runtime:2.3.8 (2 constraints: 23175d5b)
 org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35)
-org.glassfish.jersey.containers:jersey-container-jetty-http:2.35 (1 constraints: de04fe30)
-org.glassfish.jersey.core:jersey-client:2.35 (1 constraints: d510c6b2)
-org.glassfish.jersey.core:jersey-common:2.35 (11 constraints: d3ddca6a)
-org.glassfish.jersey.core:jersey-server:2.35 (7 constraints: 169eb83e)
-org.glassfish.jersey.ext:jersey-entity-filtering:2.35 (1 constraints: 92156fbd)
-org.glassfish.jersey.inject:jersey-hk2:2.35 (1 constraints: de04fe30)
-org.glassfish.jersey.media:jersey-media-json-jackson:2.35 (1 constraints: de04fe30)
-org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25)
+org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1 (1 constraints: 4105533b)
+org.glassfish.jersey.core:jersey-client:2.39.1 (1 constraints: 381109d5)
+org.glassfish.jersey.core:jersey-common:2.39.1 (11 constraints: 14e24daa)
+org.glassfish.jersey.core:jersey-server:2.39.1 (7 constraints: cba0adfa)
+org.glassfish.jersey.ext:jersey-entity-filtering:2.39.1 (1 constraints: f5152ce9)
+org.glassfish.jersey.inject:jersey-hk2:2.39.1 (1 constraints: 4105533b)
+org.glassfish.jersey.media:jersey-media-json-jackson:2.39.1 (1 constraints: 4105533b)
+org.hamcrest:hamcrest:2.2 (5 constraints: 125db3af)
 org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f)
 org.immutables:value-annotations:2.9.3 (1 constraints: 10051336)
 org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
-org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)
+org.javassist:javassist:3.29.0-GA (1 constraints: 2e1126f1)
 org.jctools:jctools-core:4.0.1 (1 constraints: 07050036)
 org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
 org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
@@ -327,7 +327,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (5 constraints: 7a4c42d2)
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 (3 constraints: 3a2cc871)
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 (1 constraints: b01019c2)
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (4 constraints: dd389ae5)
-org.junit:junit-bom:5.9.1 (1 constraints: c8116ede)
+org.junit:junit-bom:5.9.1 (7 constraints: 1974131b)
 org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
 org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
 org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)
@@ -402,7 +402,7 @@ io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162)
 io.github.microutils:kotlin-logging-jvm:3.0.5 (1 constraints: 810f8b7c)
 io.micrometer:micrometer-core:1.9.12 (1 constraints: fe162919)
 io.opentelemetry:opentelemetry-sdk-testing:1.30.1 (1 constraints: 920fe383)
-jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
+jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 5b6ed66b)
 jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
 javax.inject:javax.inject:1 (1 constraints: 7a0df617)
 net.bytebuddy:byte-buddy:1.14.6 (1 constraints: 460b44de)
@@ -424,20 +424,27 @@ org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
 org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
 org.glassfish.grizzly:grizzly-http-server:2.4.4 (2 constraints: bb2c391b)
 org.glassfish.grizzly:grizzly-http-servlet:2.4.4 (1 constraints: 681bda3f)
-org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.35 (2 constraints: 623ed2c2)
-org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.35 (1 constraints: 292310ba)
-org.glassfish.jersey.containers:jersey-container-servlet:2.35 (1 constraints: 3a1b7724)
-org.glassfish.jersey.containers:jersey-container-servlet-core:2.35 (2 constraints: a031bd78)
-org.glassfish.jersey.media:jersey-media-jaxb:2.35 (1 constraints: e11958ca)
-org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constraints: 062875af)
-org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
+org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.39.1 (2 constraints: 283f089c)
+org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.39.1 (1 constraints: 8c230a01)
+org.glassfish.jersey.containers:jersey-container-servlet:2.39.1 (1 constraints: 9d1b845b)
+org.glassfish.jersey.containers:jersey-container-servlet-core:2.39.1 (2 constraints: 66329628)
+org.glassfish.jersey.media:jersey-media-jaxb:2.39.1 (1 constraints: 441ab3fe)
+org.glassfish.jersey.test-framework:jersey-test-framework-core:2.39.1 (2 constraints: cc283b2f)
+org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.39.1 (1 constraints: 4105533b)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
 org.hsqldb:hsqldb:2.7.2 (1 constraints: 0d050c36)
 org.jetbrains.kotlin:kotlin-reflect:1.8.22 (2 constraints: 6724ece2)
+org.junit.jupiter:junit-jupiter:5.9.1 (3 constraints: 844699a3)
+org.junit.jupiter:junit-jupiter-api:5.9.1 (4 constraints: 8b386434)
+org.junit.jupiter:junit-jupiter-engine:5.9.1 (2 constraints: 2117d63c)
+org.junit.jupiter:junit-jupiter-params:5.9.1 (2 constraints: 2117d63c)
+org.junit.platform:junit-platform-commons:1.9.1 (3 constraints: ee29f32b)
+org.junit.platform:junit-platform-engine:1.9.1 (2 constraints: bc19e1f3)
 org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
 org.mockito:mockito-core:5.5.0 (2 constraints: d61174fd)
 org.mockito:mockito-subclass:5.5.0 (1 constraints: 0c051336)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
+org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
 org.springframework:spring-aop:5.3.28 (2 constraints: de1e8f9a)
 org.springframework:spring-beans:5.3.28 (4 constraints: b03ac3c9)
 org.springframework:spring-context:5.3.28 (2 constraints: 6f1fced2)
diff --git a/versions.props b/versions.props
index 20fb9924ae3..4ced9981429 100644
--- a/versions.props
+++ b/versions.props
@@ -57,7 +57,7 @@ org.codehaus.woodstox:stax2-api=4.2.1
 org.eclipse.jetty*:*=10.0.16
 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
 org.glassfish.hk2*:*=2.6.1
-org.glassfish.jersey*:*=2.35
+org.glassfish.jersey*:*=2.39.1
 org.hamcrest:*=2.2
 org.hsqldb:hsqldb=2.7.2
 org.immutables:value-annotations=2.9.3

From 90bf56c1d69bedb25569d733318fd1987f5b1403 Mon Sep 17 00:00:00 2001
From: Alex Deparvu <adeparvu@apple.com>
Date: Tue, 3 Oct 2023 10:54:34 -0700
Subject: [PATCH 148/160] Add next minor version 9.5.0

---
 solr/CHANGES.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d9e18452386..bc1564fc028 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -65,6 +65,31 @@ Other Changes
 
 * SOLR-16911: Establish /solr as the only host context supported by Solr, removing legacy ability to change this.  Solr paths will only be either /solr or /api now.  (Eric Pugh)
 
+==================  9.5.0 ==================
+New Features
+---------------------
+(No changes)
+
+Improvements
+---------------------
+(No changes)
+
+Optimizations
+---------------------
+(No changes)
+
+Bug Fixes
+---------------------
+(No changes)
+
+Dependency Upgrades
+---------------------
+(No changes)
+
+Other Changes
+---------------------
+(No changes)
+
 ==================  9.4.0 ==================
 New Features
 ---------------------

From fe55f7cd2465176105146b0ad5b9e39269c60bde Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <gerlowskija@apache.org>
Date: Tue, 3 Oct 2023 14:38:47 -0400
Subject: [PATCH 149/160] SOLR-16825: Migrate v2 definitions to 'api' module,
 pt 4  (#1960)

This commit covers the create APIs for collections, shards and replicas.
It also covers the collection and core level "install-shard-data" APIs.

Extracting annotated interfaces for these APIs includes them in the SolrRequest-
generation we now do in SolrJ
---
 .../api/endpoint/CreateCollectionApi.java     |  34 ++
 .../client/api/endpoint/CreateReplicaApi.java |  44 +++
 .../client/api/endpoint/CreateShardApi.java   |  37 +++
 .../api/endpoint/InstallCoreDataApi.java      |  42 +++
 .../api/endpoint/InstallShardDataApi.java     |  38 +++
 .../model/CreateCollectionRequestBody.java    |  63 ++++
 .../CreateCollectionRouterProperties.java     |  25 ++
 .../api/model/CreateReplicaRequestBody.java   |  48 +++
 .../api/model/CreateShardRequestBody.java     |  50 +++
 .../api/model/InstallCoreDataRequestBody.java |  30 ++
 .../model/InstallShardDataRequestBody.java    |  28 ++
 .../solr/cloud/api/collections/AliasCmd.java  |   9 +-
 .../handler/admin/CollectionsHandler.java     |  37 ++-
 .../solr/handler/admin/CoreAdminHandler.java  |   4 +-
 .../solr/handler/admin/InstallCoreDataOp.java |  12 +-
 .../handler/admin/api/CreateAliasAPI.java     |  12 +-
 ...llectionAPI.java => CreateCollection.java} | 303 +++++++-----------
 ...eateReplicaAPI.java => CreateReplica.java} | 108 ++-----
 .../{CreateShardAPI.java => CreateShard.java} | 113 ++-----
 ...lCoreDataAPI.java => InstallCoreData.java} |  41 +--
 ...hardDataAPI.java => InstallShardData.java} |  45 +--
 .../admin/api/RestoreCollectionAPI.java       |  11 +-
 .../solr/jersey/PostRequestLoggingFilter.java |  27 +-
 .../handler/admin/api/CreateAliasAPITest.java |  15 +-
 .../admin/api/CreateCollectionAPITest.java    |  34 +-
 .../admin/api/CreateReplicaAPITest.java       |  23 +-
 .../handler/admin/api/CreateShardAPITest.java |  27 +-
 .../admin/api/RestoreCollectionAPITest.java   |   3 +-
 .../jersey/PostRequestLoggingFilterTest.java  |   6 +-
 .../apache/solr/gcs/GCSInstallShardTest.java  |   3 +-
 .../apache/solr/s3/S3InstallShardTest.java    |   3 +-
 .../src/resources/java-template/api.mustache  |  19 +-
 .../collections/AbstractInstallShardTest.java |   3 +-
 33 files changed, 778 insertions(+), 519 deletions(-)
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/CreateCollectionApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/CreateReplicaApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/CreateShardApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/InstallCoreDataApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/endpoint/InstallShardDataApi.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRouterProperties.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/InstallCoreDataRequestBody.java
 create mode 100644 solr/api/src/java/org/apache/solr/client/api/model/InstallShardDataRequestBody.java
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{CreateCollectionAPI.java => CreateCollection.java} (62%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{CreateReplicaAPI.java => CreateReplica.java} (65%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{CreateShardAPI.java => CreateShard.java} (69%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{InstallCoreDataAPI.java => InstallCoreData.java} (73%)
 rename solr/core/src/java/org/apache/solr/handler/admin/api/{InstallShardDataAPI.java => InstallShardData.java} (78%)

diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateCollectionApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateCollectionApi.java
new file mode 100644
index 00000000000..748b27972e6
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateCollectionApi.java
@@ -0,0 +1,34 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/** V2 API definition for creating a SolrCloud collection */
+@Path("/collections")
+public interface CreateCollectionApi {
+  @POST
+  @Operation(
+      summary = "Creates a new SolrCloud collection.",
+      tags = {"collections"})
+  SubResponseAccumulatingJerseyResponse createCollection(CreateCollectionRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateReplicaApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateReplicaApi.java
new file mode 100644
index 00000000000..21c26ea8f49
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateReplicaApi.java
@@ -0,0 +1,44 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.CreateReplicaRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/**
+ * V2 API definition for adding a new replica to an existing shard.
+ *
+ * <p>This API (POST /v2/collections/cName/shards/sName/replicas {...}) is analogous to the v1
+ * /admin/collections?action=ADDREPLICA command.
+ */
+@Path("/collections/{collectionName}/shards/{shardName}/replicas")
+public interface CreateReplicaApi {
+
+  @POST
+  @Operation(
+      summary = "Creates a new replica of an existing shard.",
+      tags = {"replicas"})
+  SubResponseAccumulatingJerseyResponse createReplica(
+      @PathParam("collectionName") String collectionName,
+      @PathParam("shardName") String shardName,
+      CreateReplicaRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateShardApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateShardApi.java
new file mode 100644
index 00000000000..0bd30763811
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/CreateShardApi.java
@@ -0,0 +1,37 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.CreateShardRequestBody;
+import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
+
+/** V2 API definition for creating a new shard in a collection. */
+@Path("/collections/{collectionName}/shards")
+public interface CreateShardApi {
+
+  @POST
+  @Operation(
+      summary = "Create a new shard in an existing collection",
+      tags = {"shards"})
+  SubResponseAccumulatingJerseyResponse createShard(
+      @PathParam("collectionName") String collectionName, CreateShardRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallCoreDataApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallCoreDataApi.java
new file mode 100644
index 00000000000..4ee95539571
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallCoreDataApi.java
@@ -0,0 +1,42 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.InstallCoreDataRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/**
+ * V2 API definition for installing an offline index to a single core of a shard.
+ *
+ * <p>This is an internal API intended for use only by the Collection Admin "Install Shard Data"
+ * API.
+ */
+@Path("/cores/{coreName}/install")
+public interface InstallCoreDataApi {
+
+  @POST
+  @Operation(
+      summary = "Install an offline index to a specified core",
+      tags = {"cores"})
+  SolrJerseyResponse installCoreData(
+      @PathParam("coreName") String coreName, InstallCoreDataRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallShardDataApi.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallShardDataApi.java
new file mode 100644
index 00000000000..65648ad9117
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/InstallShardDataApi.java
@@ -0,0 +1,38 @@
+/*
+ * 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.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.apache.solr.client.api.model.InstallShardDataRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/** V2 API definition allowing users to import offline-constructed index into a shard. */
+@Path("/collections/{collName}/shards/{shardName}/install")
+public interface InstallShardDataApi {
+  @POST
+  @Operation(
+      summary = "Install offline index into an existing shard",
+      tags = {"shards"})
+  SolrJerseyResponse installShardData(
+      @PathParam("collName") String collName,
+      @PathParam("shardName") String shardName,
+      InstallShardDataRequestBody requestBody)
+      throws Exception;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java
new file mode 100644
index 00000000000..5881708ee34
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java
@@ -0,0 +1,63 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+
+/** Request body for v2 "create collection" requests */
+public class CreateCollectionRequestBody {
+  @JsonProperty public String name;
+
+  @JsonProperty public Integer replicationFactor;
+
+  @JsonProperty public String config;
+
+  @JsonProperty public Integer numShards;
+
+  @JsonProperty public List<String> shardNames;
+
+  @JsonProperty public Integer pullReplicas;
+
+  @JsonProperty public Integer tlogReplicas;
+
+  @JsonProperty public Integer nrtReplicas;
+
+  @JsonProperty public Boolean waitForFinalState;
+
+  @JsonProperty public Boolean perReplicaState;
+
+  @JsonProperty public String alias;
+
+  @JsonProperty public Map<String, String> properties;
+
+  @JsonProperty public String async;
+
+  @JsonProperty public CreateCollectionRouterProperties router;
+
+  // Parameters below differ from v1 API
+  // V1 API uses createNodeSet
+  @JsonProperty("nodeSet")
+  public List<String> nodeSet;
+  // v1 API uses createNodeSet=EMPTY
+  @JsonProperty("createReplicas")
+  public Boolean createReplicas;
+  // V1 API uses 'createNodeSet.shuffle'
+  @JsonProperty("shuffleNodes")
+  public Boolean shuffleNodes;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRouterProperties.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRouterProperties.java
new file mode 100644
index 00000000000..382091ee60c
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRouterProperties.java
@@ -0,0 +1,25 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CreateCollectionRouterProperties {
+  @JsonProperty public String name;
+
+  @JsonProperty public String field;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java
new file mode 100644
index 00000000000..a669cdaf414
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java
@@ -0,0 +1,48 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+
+public class CreateReplicaRequestBody {
+  @JsonProperty public String name;
+  @JsonProperty public String type; // TODO Make this an enum - see SOLR-15796
+  @JsonProperty public String instanceDir;
+  @JsonProperty public String dataDir;
+  @JsonProperty public String ulogDir;
+  @JsonProperty public String route;
+  @JsonProperty public Integer nrtReplicas;
+  @JsonProperty public Integer tlogReplicas;
+  @JsonProperty public Integer pullReplicas;
+  @JsonProperty public Boolean waitForFinalState;
+  @JsonProperty public Boolean followAliases;
+
+  @JsonProperty public String async;
+
+  // TODO This cluster of properties could probably be simplified down to just "nodeSet".  See
+  // SOLR-15542
+  @JsonProperty public String node;
+
+  @JsonProperty("nodeSet")
+  public List<String> nodeSet;
+
+  @JsonProperty public Boolean skipNodeAssignment;
+
+  @JsonProperty public Map<String, String> properties;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java
new file mode 100644
index 00000000000..ea871998cca
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import java.util.Map;
+
+public class CreateShardRequestBody {
+  @Schema(name = "shardName")
+  @JsonProperty("name")
+  public String shardName;
+
+  @JsonProperty public Integer replicationFactor;
+
+  @JsonProperty public Integer nrtReplicas;
+
+  @JsonProperty public Integer tlogReplicas;
+
+  @JsonProperty public Integer pullReplicas;
+
+  @JsonProperty("createReplicas")
+  public Boolean createReplicas;
+
+  @JsonProperty("nodeSet")
+  public List<String> nodeSet;
+
+  @JsonProperty public Boolean waitForFinalState;
+
+  @JsonProperty public Boolean followAliases;
+
+  @JsonProperty public String async;
+
+  @JsonProperty public Map<String, String> properties;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/InstallCoreDataRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/InstallCoreDataRequestBody.java
new file mode 100644
index 00000000000..2ba9d09c1f6
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/InstallCoreDataRequestBody.java
@@ -0,0 +1,30 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class InstallCoreDataRequestBody {
+  // Expected to point to an index directory (e.g. data/techproducts_shard1_replica_n1/data/index)
+  // for a single core that has previously been uploaded to the backup repository previously
+  // uploaded to the backup repository.
+  @JsonProperty public String location;
+
+  @JsonProperty public String repository;
+
+  @JsonProperty public String asyncId;
+}
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/InstallShardDataRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/InstallShardDataRequestBody.java
new file mode 100644
index 00000000000..31bec8eb434
--- /dev/null
+++ b/solr/api/src/java/org/apache/solr/client/api/model/InstallShardDataRequestBody.java
@@ -0,0 +1,28 @@
+/*
+ * 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.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class InstallShardDataRequestBody {
+  @JsonProperty(value = "location", required = true)
+  public String location;
+
+  @JsonProperty public String repository;
+
+  @JsonProperty public String async;
+}
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
index 92b18b53a74..4815a76b807 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
@@ -31,7 +31,7 @@
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.handler.admin.api.CreateCollectionAPI;
+import org.apache.solr.handler.admin.api.CreateCollection;
 
 /**
  * Common superclass for commands that maintain or manipulate aliases. In the routed alias parlance,
@@ -73,10 +73,9 @@ static NamedList<Object> createCollectionAndWait(
     // a CollectionOperation reads params and produces a message (Map) that is supposed to be sent
     // to the Overseer. Although we could create the Map without it, there are a fair amount of
     // rules we don't want to reproduce.
-    final var createReqBody =
-        CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(createReqParams, true);
-    CreateCollectionAPI.populateDefaultsIfNecessary(ccc.getCoreContainer(), createReqBody);
-    final ZkNodeProps createMessage = CreateCollectionAPI.createRemoteMessage(createReqBody);
+    final var createReqBody = CreateCollection.createRequestBodyFromV1Params(createReqParams, true);
+    CreateCollection.populateDefaultsIfNecessary(ccc.getCoreContainer(), createReqBody);
+    final ZkNodeProps createMessage = CreateCollection.createRemoteMessage(createReqBody);
 
     NamedList<Object> results = new NamedList<>();
     try {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 97de7a36bb3..d91f4e1914b 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -123,6 +123,7 @@
 import org.apache.solr.api.Api;
 import org.apache.solr.api.JerseyResource;
 import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody;
+import org.apache.solr.client.api.model.InstallShardDataRequestBody;
 import org.apache.solr.client.api.model.ReplaceNodeRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.UpdateAliasPropertiesRequestBody;
@@ -172,11 +173,11 @@
 import org.apache.solr.handler.admin.api.CollectionPropertyAPI;
 import org.apache.solr.handler.admin.api.CollectionStatusAPI;
 import org.apache.solr.handler.admin.api.CreateAliasAPI;
-import org.apache.solr.handler.admin.api.CreateCollectionAPI;
+import org.apache.solr.handler.admin.api.CreateCollection;
 import org.apache.solr.handler.admin.api.CreateCollectionBackupAPI;
 import org.apache.solr.handler.admin.api.CreateCollectionSnapshotAPI;
-import org.apache.solr.handler.admin.api.CreateReplicaAPI;
-import org.apache.solr.handler.admin.api.CreateShardAPI;
+import org.apache.solr.handler.admin.api.CreateReplica;
+import org.apache.solr.handler.admin.api.CreateShard;
 import org.apache.solr.handler.admin.api.DeleteAlias;
 import org.apache.solr.handler.admin.api.DeleteCollection;
 import org.apache.solr.handler.admin.api.DeleteCollectionBackup;
@@ -186,7 +187,7 @@
 import org.apache.solr.handler.admin.api.DeleteReplicaProperty;
 import org.apache.solr.handler.admin.api.DeleteShardAPI;
 import org.apache.solr.handler.admin.api.ForceLeader;
-import org.apache.solr.handler.admin.api.InstallShardDataAPI;
+import org.apache.solr.handler.admin.api.InstallShardData;
 import org.apache.solr.handler.admin.api.ListAliases;
 import org.apache.solr.handler.admin.api.ListCollectionBackups;
 import org.apache.solr.handler.admin.api.ListCollectionSnapshotsAPI;
@@ -507,9 +508,9 @@ public enum CollectionOperation implements CollectionOp {
     CREATE_OP(
         CREATE,
         (req, rsp, h) -> {
-          final CreateCollectionAPI.CreateCollectionRequestBody requestBody =
-              CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(req.getParams(), true);
-          final CreateCollectionAPI createApi = new CreateCollectionAPI(h.coreContainer, req, rsp);
+          final var requestBody =
+              CreateCollection.createRequestBodyFromV1Params(req.getParams(), true);
+          final CreateCollection createApi = new CreateCollection(h.coreContainer, req, rsp);
           final SolrJerseyResponse response = createApi.createCollection(requestBody);
 
           // 'rsp' may be null, as when overseer commands execute CollectionAction impl's directly.
@@ -729,7 +730,7 @@ public enum CollectionOperation implements CollectionOp {
     CREATESHARD_OP(
         CREATESHARD,
         (req, rsp, h) -> {
-          CreateShardAPI.invokeFromV1Params(h.coreContainer, req, rsp);
+          CreateShard.invokeFromV1Params(h.coreContainer, req, rsp);
           return null;
         }),
     DELETEREPLICA_OP(
@@ -942,9 +943,8 @@ public Map<String, Object> execute(
           final var params = req.getParams();
           params.required().check(COLLECTION_PROP, SHARD_ID_PROP);
 
-          final var api = new CreateReplicaAPI(h.coreContainer, req, rsp);
-          final var requestBody =
-              CreateReplicaAPI.AddReplicaRequestBody.fromV1Params(req.getParams());
+          final var api = new CreateReplica(h.coreContainer, req, rsp);
+          final var requestBody = CreateReplica.createRequestBodyFromV1Params(req.getParams());
           final var response =
               api.createReplica(
                   params.get(COLLECTION_PROP), params.get(SHARD_ID_PROP), requestBody);
@@ -1081,13 +1081,12 @@ public Map<String, Object> execute(
           req.getParams().required().check(COLLECTION, SHARD);
           final String collectionName = req.getParams().get(COLLECTION);
           final String shardName = req.getParams().get(SHARD);
-          final InstallShardDataAPI.InstallShardRequestBody reqBody =
-              new InstallShardDataAPI.InstallShardRequestBody();
-          reqBody.asyncId = req.getParams().get(ASYNC);
+          final InstallShardDataRequestBody reqBody = new InstallShardDataRequestBody();
+          reqBody.async = req.getParams().get(ASYNC);
           reqBody.repository = req.getParams().get(BACKUP_REPOSITORY);
           reqBody.location = req.getParams().get(BACKUP_LOCATION);
 
-          final InstallShardDataAPI installApi = new InstallShardDataAPI(h.coreContainer, req, rsp);
+          final InstallShardData installApi = new InstallShardData(h.coreContainer, req, rsp);
           final SolrJerseyResponse installResponse =
               installApi.installShardData(collectionName, shardName, reqBody);
           V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, installResponse);
@@ -1362,13 +1361,13 @@ public Boolean registerV2() {
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
     return List.of(
-        CreateReplicaAPI.class,
+        CreateReplica.class,
         AddReplicaProperty.class,
         BalanceShardUniqueAPI.class,
         CreateAliasAPI.class,
-        CreateCollectionAPI.class,
+        CreateCollection.class,
         CreateCollectionBackupAPI.class,
-        CreateShardAPI.class,
+        CreateShard.class,
         DeleteAlias.class,
         DeleteCollectionBackup.class,
         DeleteCollection.class,
@@ -1376,7 +1375,7 @@ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
         DeleteReplicaProperty.class,
         DeleteShardAPI.class,
         ForceLeader.class,
-        InstallShardDataAPI.class,
+        InstallShardData.class,
         ListCollections.class,
         ListCollectionBackups.class,
         ReloadCollectionAPI.class,
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index d928282df5c..d9ece272f75 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -58,7 +58,7 @@
 import org.apache.solr.handler.admin.api.BackupCoreAPI;
 import org.apache.solr.handler.admin.api.CoreSnapshotAPI;
 import org.apache.solr.handler.admin.api.CreateCoreAPI;
-import org.apache.solr.handler.admin.api.InstallCoreDataAPI;
+import org.apache.solr.handler.admin.api.InstallCoreData;
 import org.apache.solr.handler.admin.api.MergeIndexesAPI;
 import org.apache.solr.handler.admin.api.OverseerOperationAPI;
 import org.apache.solr.handler.admin.api.PrepareCoreRecoveryAPI;
@@ -403,7 +403,7 @@ public Collection<Api> getApis() {
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
     return List.of(
         CoreSnapshotAPI.class,
-        InstallCoreDataAPI.class,
+        InstallCoreData.class,
         BackupCoreAPI.class,
         RestoreCoreAPI.class,
         ReloadCoreAPI.class);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InstallCoreDataOp.java b/solr/core/src/java/org/apache/solr/handler/admin/InstallCoreDataOp.java
index c115739f6a8..7d7ada266a3 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/InstallCoreDataOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/InstallCoreDataOp.java
@@ -21,9 +21,10 @@
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_LOCATION;
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_REPOSITORY;
 
+import org.apache.solr.client.api.model.InstallCoreDataRequestBody;
 import org.apache.solr.common.params.CoreAdminParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.handler.admin.api.InstallCoreDataAPI;
+import org.apache.solr.handler.admin.api.InstallCoreData;
 import org.apache.solr.handler.api.V2ApiUtils;
 
 /**
@@ -31,7 +32,7 @@
  * "Install Shard Data" Collection-Admin functionality
  *
  * <p>Converts v1-style query parameters into a v2-style request body and delegating to {@link
- * InstallCoreDataAPI}.
+ * InstallCoreData}.
  */
 public class InstallCoreDataOp implements CoreAdminHandler.CoreAdminOp {
   @Override
@@ -39,11 +40,10 @@ public void execute(CoreAdminHandler.CallInfo it) throws Exception {
     final SolrParams params = it.req.getParams();
     final String coreName = params.required().get(CoreAdminParams.CORE);
 
-    final InstallCoreDataAPI api =
-        new InstallCoreDataAPI(
+    final InstallCoreData api =
+        new InstallCoreData(
             it.handler.getCoreContainer(), it.handler.getCoreAdminAsyncTracker(), it.req, it.rsp);
-    final InstallCoreDataAPI.InstallCoreDataRequestBody requestBody =
-        new InstallCoreDataAPI.InstallCoreDataRequestBody();
+    final InstallCoreDataRequestBody requestBody = new InstallCoreDataRequestBody();
     requestBody.repository = params.get(BACKUP_REPOSITORY);
     requestBody.location = params.get(BACKUP_LOCATION);
     requestBody.asyncId = params.get(ASYNC);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java
index ad3f300b7c9..dfc09e917c1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java
@@ -47,6 +47,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.RoutedAliasTypes;
@@ -159,8 +160,8 @@ public static ZkNodeProps createRemoteMessageForRoutedAlias(CreateAliasRequestBo
     }
 
     if (requestBody.collCreationParameters != null) {
-      requestBody.collCreationParameters.addToRemoteMessageWithPrefix(
-          remoteMessage, "create-collection.");
+      CreateCollection.addToRemoteMessageWithPrefix(
+          requestBody.collCreationParameters, remoteMessage, "create-collection.");
     }
     return new ZkNodeProps(remoteMessage);
   }
@@ -203,7 +204,7 @@ public static CreateAliasRequestBody createFromSolrParams(SolrParams params) {
     final SolrParams createCollectionParams =
         getHierarchicalParametersByPrefix(params, CREATE_COLLECTION_PREFIX);
     createBody.collCreationParameters =
-        CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(createCollectionParams, false);
+        CreateCollection.createRequestBodyFromV1Params(createCollectionParams, false);
 
     return createBody;
   }
@@ -239,7 +240,7 @@ public static class CreateAliasRequestBody implements JacksonReflectMapWriter {
     public List<RoutedAliasProperties> routers;
 
     @JsonProperty("create-collection")
-    public CreateCollectionAPI.CreateCollectionRequestBody collCreationParameters;
+    public CreateCollectionRequestBody collCreationParameters;
 
     public void validate() {
       SolrIdentifierValidator.validateAliasName(name);
@@ -257,8 +258,7 @@ public void validate() {
               BAD_REQUEST, "Collections cannot be specified when creating a routed alias.");
         }
 
-        final CreateCollectionAPI.CreateCollectionRequestBody createCollReqBody =
-            collCreationParameters;
+        final var createCollReqBody = collCreationParameters;
         if (createCollReqBody != null) {
           if (createCollReqBody.name != null) {
             throw new SolrException(
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java
similarity index 62%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java
index b8ae2dca46f..8ce1eca623e 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.client.solrj.request.beans.V2ApiConstants.ROUTER_KEY;
 import static org.apache.solr.client.solrj.request.beans.V2ApiConstants.SHARD_NAMES;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
@@ -36,15 +35,12 @@
 import static org.apache.solr.common.params.CollectionAdminParams.TLOG_REPLICAS;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CommonAdminParams.WAIT_FOR_FINAL_STATE;
-import static org.apache.solr.common.params.CoreAdminParams.CONFIG;
 import static org.apache.solr.common.params.CoreAdminParams.NAME;
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.handler.admin.CollectionsHandler.waitForActiveCollection;
 import static org.apache.solr.handler.api.V2ApiUtils.flattenMapWithPrefix;
-import static org.apache.solr.schema.IndexSchema.FIELD;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -57,10 +53,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import org.apache.solr.client.api.endpoint.CreateCollectionApi;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
+import org.apache.solr.client.api.model.CreateCollectionRouterProperties;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.request.beans.V2ApiConstants;
@@ -76,9 +71,9 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.CollectionUtil;
+import org.apache.solr.common.util.Utils;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -90,19 +85,17 @@
  *
  * <p>This API is analogous to the v1 /admin/collections?action=CREATE command.
  */
-@Path("/collections")
-public class CreateCollectionAPI extends AdminAPIBase {
+public class CreateCollection extends AdminAPIBase implements CreateCollectionApi {
 
   @Inject
-  public CreateCollectionAPI(
+  public CreateCollection(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse createCollection(
       CreateCollectionRequestBody requestBody) throws Exception {
@@ -123,7 +116,7 @@ public SubResponseAccumulatingJerseyResponse createCollection(
       createSysConfigSet(coreContainer);
     }
 
-    requestBody.validate();
+    validateRequestBody(requestBody);
 
     // Populate any 'null' creation parameters that support COLLECTIONPROP defaults.
     populateDefaultsIfNecessary(coreContainer, requestBody);
@@ -224,7 +217,7 @@ public static ZkNodeProps createRemoteMessage(CreateCollectionRequestBody reqBod
     }
 
     if (reqBody.router != null) {
-      final RouterProperties routerProps = reqBody.router;
+      final var routerProps = reqBody.router;
       rawProperties.put("router.name", routerProps.name);
       rawProperties.put("router.field", routerProps.field);
     }
@@ -297,185 +290,127 @@ private static void createSysConfigSet(CoreContainer coreContainer)
     }
   }
 
-  /** Request body for v2 "create collection" requests */
-  public static class CreateCollectionRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(NAME)
-    public String name;
-
-    @JsonProperty(REPLICATION_FACTOR)
-    public Integer replicationFactor;
-
-    @JsonProperty(CONFIG)
-    public String config;
-
-    @JsonProperty(NUM_SLICES)
-    public Integer numShards;
-
-    @JsonProperty(SHARD_NAMES)
-    public List<String> shardNames;
-
-    @JsonProperty(PULL_REPLICAS)
-    public Integer pullReplicas;
-
-    @JsonProperty(TLOG_REPLICAS)
-    public Integer tlogReplicas;
-
-    @JsonProperty(NRT_REPLICAS)
-    public Integer nrtReplicas;
-
-    @JsonProperty(WAIT_FOR_FINAL_STATE)
-    public Boolean waitForFinalState;
-
-    @JsonProperty(PER_REPLICA_STATE)
-    public Boolean perReplicaState;
-
-    @JsonProperty(ALIAS)
-    public String alias;
-
-    @JsonProperty("properties")
-    public Map<String, String> properties;
-
-    @JsonProperty(ASYNC)
-    public String async;
-
-    @JsonProperty("router")
-    public RouterProperties router;
-
-    // Parameters below differ from v1 API
-    // V1 API uses createNodeSet
-    @JsonProperty("nodeSet")
-    public List<String> nodeSet;
-    // v1 API uses createNodeSet=EMPTY
-    @JsonProperty("createReplicas")
-    public Boolean createReplicas;
-    // V1 API uses 'createNodeSet.shuffle'
-    @JsonProperty("shuffleNodes")
-    public Boolean shuffleNodes;
-
-    public static CreateCollectionRequestBody fromV1Params(
-        SolrParams params, boolean nameRequired) {
-      final var requestBody = new CreateCollectionRequestBody();
-      requestBody.name =
-          nameRequired ? params.required().get(CommonParams.NAME) : params.get(CommonParams.NAME);
-      requestBody.replicationFactor = params.getInt(ZkStateReader.REPLICATION_FACTOR);
-      requestBody.config = params.get(COLL_CONF);
-      requestBody.numShards = params.getInt(NUM_SLICES);
-      if (params.get(CREATE_NODE_SET) != null) {
-        final String commaDelimNodeSet = params.get(CREATE_NODE_SET);
-        if ("EMPTY".equals(commaDelimNodeSet)) {
-          requestBody.createReplicas = false;
-        } else {
-          requestBody.nodeSet = Arrays.asList(params.get(CREATE_NODE_SET).split(","));
-        }
-      }
-      requestBody.shuffleNodes = params.getBool(CREATE_NODE_SET_SHUFFLE);
-      requestBody.shardNames =
-          params.get(SHARDS_PROP) != null
-              ? Arrays.stream(params.get(SHARDS_PROP).split(",")).collect(Collectors.toList())
-              : new ArrayList<>();
-      requestBody.tlogReplicas = params.getInt(ZkStateReader.TLOG_REPLICAS);
-      requestBody.pullReplicas = params.getInt(ZkStateReader.PULL_REPLICAS);
-      requestBody.nrtReplicas = params.getInt(ZkStateReader.NRT_REPLICAS);
-      requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
-      requestBody.perReplicaState = params.getBool(PER_REPLICA_STATE);
-      requestBody.alias = params.get(ALIAS);
-      requestBody.async = params.get(ASYNC);
-      requestBody.properties =
-          copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
-      if (params.get("router.name") != null || params.get("router.field") != null) {
-        final RouterProperties routerProperties = new RouterProperties();
-        routerProperties.name = params.get("router.name");
-        routerProperties.field = params.get("router.field");
-        requestBody.router = routerProperties;
+  public static CreateCollectionRequestBody createRequestBodyFromV1Params(
+      SolrParams params, boolean nameRequired) {
+    final var requestBody = new CreateCollectionRequestBody();
+    requestBody.name =
+        nameRequired ? params.required().get(CommonParams.NAME) : params.get(CommonParams.NAME);
+    requestBody.replicationFactor = params.getInt(ZkStateReader.REPLICATION_FACTOR);
+    requestBody.config = params.get(COLL_CONF);
+    requestBody.numShards = params.getInt(NUM_SLICES);
+    if (params.get(CREATE_NODE_SET) != null) {
+      final String commaDelimNodeSet = params.get(CREATE_NODE_SET);
+      if ("EMPTY".equals(commaDelimNodeSet)) {
+        requestBody.createReplicas = false;
+      } else {
+        requestBody.nodeSet = Arrays.asList(params.get(CREATE_NODE_SET).split(","));
       }
-
-      return requestBody;
+    }
+    requestBody.shuffleNodes = params.getBool(CREATE_NODE_SET_SHUFFLE);
+    requestBody.shardNames =
+        params.get(SHARDS_PROP) != null
+            ? Arrays.stream(params.get(SHARDS_PROP).split(",")).collect(Collectors.toList())
+            : new ArrayList<>();
+    requestBody.tlogReplicas = params.getInt(ZkStateReader.TLOG_REPLICAS);
+    requestBody.pullReplicas = params.getInt(ZkStateReader.PULL_REPLICAS);
+    requestBody.nrtReplicas = params.getInt(ZkStateReader.NRT_REPLICAS);
+    requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
+    requestBody.perReplicaState = params.getBool(PER_REPLICA_STATE);
+    requestBody.alias = params.get(ALIAS);
+    requestBody.async = params.get(ASYNC);
+    requestBody.properties =
+        copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
+    if (params.get("router.name") != null || params.get("router.field") != null) {
+      final var routerProperties = new CreateCollectionRouterProperties();
+      routerProperties.name = params.get("router.name");
+      routerProperties.field = params.get("router.field");
+      requestBody.router = routerProperties;
     }
 
-    public void validate() {
-      if (replicationFactor != null
-          && nrtReplicas != null
-          && (!replicationFactor.equals(nrtReplicas))) {
-        throw new SolrException(
-            SolrException.ErrorCode.BAD_REQUEST,
-            "Cannot specify both replicationFactor and nrtReplicas as they mean the same thing");
-      }
-
-      SolrIdentifierValidator.validateCollectionName(name);
+    return requestBody;
+  }
 
-      if (shardNames != null && !shardNames.isEmpty()) {
-        verifyShardsParam(shardNames);
-      }
+  public static void validateRequestBody(CreateCollectionRequestBody requestBody) {
+    if (requestBody.replicationFactor != null
+        && requestBody.nrtReplicas != null
+        && (!requestBody.replicationFactor.equals(requestBody.nrtReplicas))) {
+      throw new SolrException(
+          SolrException.ErrorCode.BAD_REQUEST,
+          "Cannot specify both replicationFactor and nrtReplicas as they mean the same thing");
     }
 
-    public void addToRemoteMessageWithPrefix(Map<String, Object> remoteMessage, String prefix) {
-      final Map<String, Object> v1Params = toMap(new HashMap<>());
-      convertV2CreateCollectionMapToV1ParamMap(v1Params);
-      for (Map.Entry<String, Object> v1Param : v1Params.entrySet()) {
-        remoteMessage.put(prefix + v1Param.getKey(), v1Param.getValue());
-      }
+    SolrIdentifierValidator.validateCollectionName(requestBody.name);
+
+    if (requestBody.shardNames != null && !requestBody.shardNames.isEmpty()) {
+      verifyShardsParam(requestBody.shardNames);
     }
+  }
 
-    /**
-     * Convert a map representing the v2 request body into v1-appropriate query-parameters.
-     *
-     * <p>Most v2 APIs using the legacy (i.e. non-JAX-RS) framework implement the v2 API by
-     * restructuring the provided parameters so that the v1 codepath can be called. This utility
-     * method is provided in pursuit of that usecase. It's not used directly CreateCollectionAPI,
-     * which uses the JAX-RS framework, but it's kept here so that logic surrounding
-     * collection-creation parameters can be kept in a single place.
-     */
-    @SuppressWarnings("unchecked")
-    public static void convertV2CreateCollectionMapToV1ParamMap(Map<String, Object> v2MapVals) {
-      // Keys are copied so that map can be modified as keys are looped through.
-      final Set<String> v2Keys = v2MapVals.keySet().stream().collect(Collectors.toSet());
-      for (String key : v2Keys) {
-        switch (key) {
-          case V2ApiConstants.PROPERTIES_KEY:
-            final Map<String, Object> propertiesMap =
-                (Map<String, Object>) v2MapVals.remove(V2ApiConstants.PROPERTIES_KEY);
-            flattenMapWithPrefix(propertiesMap, v2MapVals, CollectionAdminParams.PROPERTY_PREFIX);
-            break;
-          case ROUTER_KEY:
-            final Map<String, Object> routerProperties =
-                (Map<String, Object>) v2MapVals.remove(V2ApiConstants.ROUTER_KEY);
-            flattenMapWithPrefix(routerProperties, v2MapVals, CollectionAdminParams.ROUTER_PREFIX);
-            break;
-          case V2ApiConstants.CONFIG:
-            v2MapVals.put(CollectionAdminParams.COLL_CONF, v2MapVals.remove(V2ApiConstants.CONFIG));
-            break;
-          case SHARD_NAMES:
-            final String shardsValue =
-                String.join(",", (Collection<String>) v2MapVals.remove(SHARD_NAMES));
-            v2MapVals.put(SHARDS_PROP, shardsValue);
-            break;
-          case V2ApiConstants.SHUFFLE_NODES:
-            v2MapVals.put(
-                CollectionAdminParams.CREATE_NODE_SET_SHUFFLE_PARAM,
-                v2MapVals.remove(V2ApiConstants.SHUFFLE_NODES));
-            break;
-          case V2ApiConstants.NODE_SET:
-            final Object nodeSetValUncast = v2MapVals.remove(V2ApiConstants.NODE_SET);
-            if (nodeSetValUncast instanceof String) {
-              v2MapVals.put(CollectionAdminParams.CREATE_NODE_SET_PARAM, nodeSetValUncast);
-            } else {
-              final List<String> nodeSetList = (List<String>) nodeSetValUncast;
-              final String nodeSetStr = String.join(",", nodeSetList);
-              v2MapVals.put(CollectionAdminParams.CREATE_NODE_SET_PARAM, nodeSetStr);
-            }
-            break;
-          default:
-            break;
-        }
+  /**
+   * Convert a map representing the v2 request body into v1-appropriate query-parameters.
+   *
+   * <p>Most v2 APIs using the legacy (i.e. non-JAX-RS) framework implement the v2 API by
+   * restructuring the provided parameters so that the v1 codepath can be called. This utility
+   * method is provided in pursuit of that usecase. It's not used directly CreateCollectionAPI,
+   * which uses the JAX-RS framework, but it's kept here so that logic surrounding
+   * collection-creation parameters can be kept in a single place.
+   */
+  @SuppressWarnings("unchecked")
+  public static void convertV2CreateCollectionMapToV1ParamMap(Map<String, Object> v2MapVals) {
+    // Keys are copied so that map can be modified as keys are looped through.
+    final Set<String> v2Keys = v2MapVals.keySet().stream().collect(Collectors.toSet());
+    for (String key : v2Keys) {
+      switch (key) {
+        case V2ApiConstants.PROPERTIES_KEY:
+          final Map<String, Object> propertiesMap =
+              (Map<String, Object>) v2MapVals.remove(V2ApiConstants.PROPERTIES_KEY);
+          flattenMapWithPrefix(propertiesMap, v2MapVals, CollectionAdminParams.PROPERTY_PREFIX);
+          break;
+        case ROUTER_KEY:
+          final var routerProperties =
+              (CreateCollectionRouterProperties) v2MapVals.remove(ROUTER_KEY);
+          final Map<String, Object> routerPropertiesAsMap =
+              ((Utils.DelegateReflectWriter) Utils.getReflectWriter(routerProperties))
+                  .toMap(new HashMap<>());
+          flattenMapWithPrefix(
+              routerPropertiesAsMap, v2MapVals, CollectionAdminParams.ROUTER_PREFIX);
+          break;
+        case V2ApiConstants.CONFIG:
+          v2MapVals.put(CollectionAdminParams.COLL_CONF, v2MapVals.remove(V2ApiConstants.CONFIG));
+          break;
+        case SHARD_NAMES:
+          final String shardsValue =
+              String.join(",", (Collection<String>) v2MapVals.remove(SHARD_NAMES));
+          v2MapVals.put(SHARDS_PROP, shardsValue);
+          break;
+        case V2ApiConstants.SHUFFLE_NODES:
+          v2MapVals.put(
+              CollectionAdminParams.CREATE_NODE_SET_SHUFFLE_PARAM,
+              v2MapVals.remove(V2ApiConstants.SHUFFLE_NODES));
+          break;
+        case V2ApiConstants.NODE_SET:
+          final Object nodeSetValUncast = v2MapVals.remove(V2ApiConstants.NODE_SET);
+          if (nodeSetValUncast instanceof String) {
+            v2MapVals.put(CollectionAdminParams.CREATE_NODE_SET_PARAM, nodeSetValUncast);
+          } else {
+            final List<String> nodeSetList = (List<String>) nodeSetValUncast;
+            final String nodeSetStr = String.join(",", nodeSetList);
+            v2MapVals.put(CollectionAdminParams.CREATE_NODE_SET_PARAM, nodeSetStr);
+          }
+          break;
+        default:
+          break;
       }
     }
   }
 
-  public static class RouterProperties implements JacksonReflectMapWriter {
-    @JsonProperty(NAME)
-    public String name;
-
-    @JsonProperty(FIELD)
-    public String field;
+  public static void addToRemoteMessageWithPrefix(
+      CreateCollectionRequestBody requestBody, Map<String, Object> remoteMessage, String prefix) {
+    final Map<String, Object> v1Params =
+        ((Utils.DelegateReflectWriter) Utils.getReflectWriter(requestBody)).toMap(new HashMap<>());
+    convertV2CreateCollectionMapToV1ParamMap(v1Params);
+    for (Map.Entry<String, Object> v1Param : v1Params.entrySet()) {
+      remoteMessage.put(prefix + v1Param.getKey(), v1Param.getValue());
+    }
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplicaAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java
similarity index 65%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplicaAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java
index c119f27db60..180a0a335d4 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplicaAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
@@ -38,19 +37,15 @@
 import static org.apache.solr.common.params.CoreAdminParams.NODE;
 import static org.apache.solr.common.params.CoreAdminParams.ULOG_DIR;
 import static org.apache.solr.common.params.ShardParams._ROUTE_;
-import static org.apache.solr.handler.admin.api.CreateCollectionAPI.copyPrefixedPropertiesWithoutPrefix;
+import static org.apache.solr.handler.admin.api.CreateCollection.copyPrefixedPropertiesWithoutPrefix;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.CreateReplicaApi;
+import org.apache.solr.client.api.model.CreateReplicaRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkNodeProps;
@@ -59,35 +54,30 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.CollectionUtil;
 import org.apache.solr.core.CoreContainer;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
 
 /**
- * V2 API for adding a new replica to an existing shard.
+ * V2 API implementation for adding a new replica to an existing shard.
  *
  * <p>This API (POST /v2/collections/cName/shards/sName/replicas {...}) is analogous to the v1
  * /admin/collections?action=ADDREPLICA command.
  */
-@Path("/collections/{collectionName}/shards/{shardName}/replicas")
-public class CreateReplicaAPI extends AdminAPIBase {
+public class CreateReplica extends AdminAPIBase implements CreateReplicaApi {
 
   @Inject
-  public CreateReplicaAPI(
+  public CreateReplica(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse createReplica(
-      @PathParam("collectionName") String collectionName,
-      @PathParam("shardName") String shardName,
-      AddReplicaRequestBody requestBody)
+      String collectionName, String shardName, CreateReplicaRequestBody requestBody)
       throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     if (requestBody == null) {
@@ -103,12 +93,12 @@ public SubResponseAccumulatingJerseyResponse createReplica(
     final ZkNodeProps remoteMessage =
         createRemoteMessage(resolvedCollectionName, shardName, requestBody);
     submitRemoteMessageAndHandleResponse(
-        response, CollectionParams.CollectionAction.ADDREPLICA, remoteMessage, requestBody.asyncId);
+        response, CollectionParams.CollectionAction.ADDREPLICA, remoteMessage, requestBody.async);
     return response;
   }
 
   public static ZkNodeProps createRemoteMessage(
-      String collectionName, String shardName, AddReplicaRequestBody requestBody) {
+      String collectionName, String shardName, CreateReplicaRequestBody requestBody) {
     final Map<String, Object> remoteMessage = new HashMap<>();
     remoteMessage.put(QUEUE_OPERATION, CollectionParams.CollectionAction.ADDREPLICA.toLower());
     remoteMessage.put(COLLECTION_PROP, collectionName);
@@ -129,7 +119,7 @@ public static ZkNodeProps createRemoteMessage(
     insertIfNotNull(remoteMessage, TLOG_REPLICAS, requestBody.tlogReplicas);
     insertIfNotNull(remoteMessage, PULL_REPLICAS, requestBody.pullReplicas);
     insertIfNotNull(remoteMessage, FOLLOW_ALIASES, requestBody.followAliases);
-    insertIfNotNull(remoteMessage, ASYNC, requestBody.asyncId);
+    insertIfNotNull(remoteMessage, ASYNC, requestBody.async);
 
     if (requestBody.properties != null) {
       requestBody
@@ -144,59 +134,31 @@ public static ZkNodeProps createRemoteMessage(
     return new ZkNodeProps(remoteMessage);
   }
 
-  public static class AddReplicaRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty public String name;
-    @JsonProperty public String type; // TODO Make this an enum - see SOLR-15796
-    @JsonProperty public String instanceDir;
-    @JsonProperty public String dataDir;
-    @JsonProperty public String ulogDir;
-    @JsonProperty public String route;
-    @JsonProperty public Integer nrtReplicas;
-    @JsonProperty public Integer tlogReplicas;
-    @JsonProperty public Integer pullReplicas;
-    @JsonProperty public Boolean waitForFinalState;
-    @JsonProperty public Boolean followAliases;
-
-    @JsonProperty(ASYNC)
-    public String asyncId;
-
-    // TODO This cluster of properties could probably be simplified down to just "nodeSet".  See
-    // SOLR-15542
-    @JsonProperty public String node;
-
-    @JsonProperty("nodeSet")
-    public List<String> nodeSet;
-
-    @JsonProperty public Boolean skipNodeAssignment;
-
-    @JsonProperty public Map<String, String> properties;
-
-    public static AddReplicaRequestBody fromV1Params(SolrParams params) {
-      final var requestBody = new AddReplicaRequestBody();
-
-      requestBody.name = params.get(NAME);
-      requestBody.type = params.get(REPLICA_TYPE);
-      requestBody.instanceDir = params.get(INSTANCE_DIR);
-      requestBody.dataDir = params.get(DATA_DIR);
-      requestBody.ulogDir = params.get(ULOG_DIR);
-      requestBody.route = params.get(_ROUTE_);
-      requestBody.nrtReplicas = params.getInt(NRT_REPLICAS);
-      requestBody.tlogReplicas = params.getInt(TLOG_REPLICAS);
-      requestBody.pullReplicas = params.getInt(PULL_REPLICAS);
-      requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
-      requestBody.followAliases = params.getBool(FOLLOW_ALIASES);
-      requestBody.asyncId = params.get(ASYNC);
-
-      requestBody.node = params.get(NODE);
-      if (params.get(CREATE_NODE_SET_PARAM) != null) {
-        requestBody.nodeSet = Arrays.asList(params.get(CREATE_NODE_SET).split(","));
-      }
-      requestBody.skipNodeAssignment = params.getBool(SKIP_NODE_ASSIGNMENT);
+  public static CreateReplicaRequestBody createRequestBodyFromV1Params(SolrParams params) {
+    final var requestBody = new CreateReplicaRequestBody();
+
+    requestBody.name = params.get(NAME);
+    requestBody.type = params.get(REPLICA_TYPE);
+    requestBody.instanceDir = params.get(INSTANCE_DIR);
+    requestBody.dataDir = params.get(DATA_DIR);
+    requestBody.ulogDir = params.get(ULOG_DIR);
+    requestBody.route = params.get(_ROUTE_);
+    requestBody.nrtReplicas = params.getInt(NRT_REPLICAS);
+    requestBody.tlogReplicas = params.getInt(TLOG_REPLICAS);
+    requestBody.pullReplicas = params.getInt(PULL_REPLICAS);
+    requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
+    requestBody.followAliases = params.getBool(FOLLOW_ALIASES);
+    requestBody.async = params.get(ASYNC);
+
+    requestBody.node = params.get(NODE);
+    if (params.get(CREATE_NODE_SET_PARAM) != null) {
+      requestBody.nodeSet = Arrays.asList(params.get(CREATE_NODE_SET).split(","));
+    }
+    requestBody.skipNodeAssignment = params.getBool(SKIP_NODE_ASSIGNMENT);
 
-      requestBody.properties =
-          copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
+    requestBody.properties =
+        copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
 
-      return requestBody;
-    }
+    return requestBody;
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java
similarity index 69%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java
index 41be6e672d7..ffa2f55ef25 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java
@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
 import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET;
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
@@ -34,19 +33,15 @@
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CommonAdminParams.WAIT_FOR_FINAL_STATE;
 import static org.apache.solr.common.params.CommonParams.NAME;
-import static org.apache.solr.handler.admin.api.CreateCollectionAPI.copyPrefixedPropertiesWithoutPrefix;
+import static org.apache.solr.handler.admin.api.CreateCollection.copyPrefixedPropertiesWithoutPrefix;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.CreateShardApi;
+import org.apache.solr.client.api.model.CreateShardRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.util.SolrIdentifierValidator;
 import org.apache.solr.common.SolrException;
@@ -58,7 +53,6 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.api.V2ApiUtils;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -69,23 +63,20 @@
  * <p>This API (POST /v2/collections/collectionName/shards {...}) is analogous to the v1
  * /admin/collections?action=CREATESHARD command.
  */
-@Path("/collections/{collectionName}/shards")
-public class CreateShardAPI extends AdminAPIBase {
+public class CreateShard extends AdminAPIBase implements CreateShardApi {
 
   @Inject
-  public CreateShardAPI(
+  public CreateShard(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SubResponseAccumulatingJerseyResponse createShard(
-      @PathParam("collectionName") String collectionName, CreateShardRequestBody requestBody)
-      throws Exception {
+      String collectionName, CreateShardRequestBody requestBody) throws Exception {
     final var response = instantiateJerseyResponse(SubResponseAccumulatingJerseyResponse.class);
     if (requestBody == null) {
       throw new SolrException(
@@ -101,71 +92,34 @@ public SubResponseAccumulatingJerseyResponse createShard(
 
     final ZkNodeProps remoteMessage = createRemoteMessage(resolvedCollectionName, requestBody);
     submitRemoteMessageAndHandleResponse(
-        response,
-        CollectionParams.CollectionAction.CREATESHARD,
-        remoteMessage,
-        requestBody.asyncId);
+        response, CollectionParams.CollectionAction.CREATESHARD, remoteMessage, requestBody.async);
     return response;
   }
 
-  public static class CreateShardRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(NAME)
-    public String shardName;
-
-    @JsonProperty(REPLICATION_FACTOR)
-    public Integer replicationFactor;
-
-    @JsonProperty(NRT_REPLICAS)
-    public Integer nrtReplicas;
-
-    @JsonProperty(TLOG_REPLICAS)
-    public Integer tlogReplicas;
-
-    @JsonProperty(PULL_REPLICAS)
-    public Integer pullReplicas;
-
-    @JsonProperty("createReplicas")
-    public Boolean createReplicas;
-
-    @JsonProperty("nodeSet")
-    public List<String> nodeSet;
-
-    @JsonProperty(WAIT_FOR_FINAL_STATE)
-    public Boolean waitForFinalState;
-
-    @JsonProperty(FOLLOW_ALIASES)
-    public Boolean followAliases;
-
-    @JsonProperty(ASYNC)
-    public String asyncId;
-
-    @JsonProperty public Map<String, String> properties;
-
-    public static CreateShardRequestBody fromV1Params(SolrParams params) {
-      params.required().check(COLLECTION, SHARD);
-
-      final var requestBody = new CreateShardRequestBody();
-      requestBody.shardName = params.get(SHARD);
-      requestBody.replicationFactor = params.getInt(REPLICATION_FACTOR);
-      requestBody.nrtReplicas = params.getInt(NRT_REPLICAS);
-      requestBody.tlogReplicas = params.getInt(TLOG_REPLICAS);
-      requestBody.pullReplicas = params.getInt(PULL_REPLICAS);
-      if (params.get(CREATE_NODE_SET_PARAM) != null) {
-        final String nodeSetStr = params.get(CREATE_NODE_SET_PARAM);
-        if ("EMPTY".equals(nodeSetStr)) {
-          requestBody.createReplicas = false;
-        } else {
-          requestBody.nodeSet = Arrays.asList(nodeSetStr.split(","));
-        }
+  public static CreateShardRequestBody createRequestBodyFromV1Params(SolrParams params) {
+    params.required().check(COLLECTION, SHARD);
+
+    final var requestBody = new CreateShardRequestBody();
+    requestBody.shardName = params.get(SHARD);
+    requestBody.replicationFactor = params.getInt(REPLICATION_FACTOR);
+    requestBody.nrtReplicas = params.getInt(NRT_REPLICAS);
+    requestBody.tlogReplicas = params.getInt(TLOG_REPLICAS);
+    requestBody.pullReplicas = params.getInt(PULL_REPLICAS);
+    if (params.get(CREATE_NODE_SET_PARAM) != null) {
+      final String nodeSetStr = params.get(CREATE_NODE_SET_PARAM);
+      if ("EMPTY".equals(nodeSetStr)) {
+        requestBody.createReplicas = false;
+      } else {
+        requestBody.nodeSet = Arrays.asList(nodeSetStr.split(","));
       }
-      requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
-      requestBody.followAliases = params.getBool(FOLLOW_ALIASES);
-      requestBody.asyncId = params.get(ASYNC);
-      requestBody.properties =
-          copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
-
-      return requestBody;
     }
+    requestBody.waitForFinalState = params.getBool(WAIT_FOR_FINAL_STATE);
+    requestBody.followAliases = params.getBool(FOLLOW_ALIASES);
+    requestBody.async = params.get(ASYNC);
+    requestBody.properties =
+        copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
+
+    return requestBody;
   }
 
   public static void invokeFromV1Params(
@@ -173,9 +127,8 @@ public static void invokeFromV1Params(
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse)
       throws Exception {
-    final var requestBody = CreateShardRequestBody.fromV1Params(solrQueryRequest.getParams());
-    final var createShardApi =
-        new CreateShardAPI(coreContainer, solrQueryRequest, solrQueryResponse);
+    final var requestBody = CreateShard.createRequestBodyFromV1Params(solrQueryRequest.getParams());
+    final var createShardApi = new CreateShard(coreContainer, solrQueryRequest, solrQueryResponse);
     final var response =
         createShardApi.createShard(solrQueryRequest.getParams().get(COLLECTION), requestBody);
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(solrQueryResponse, response);
@@ -201,7 +154,7 @@ public static ZkNodeProps createRemoteMessage(
     insertIfNotNull(remoteMessage, PULL_REPLICAS, requestBody.pullReplicas);
     insertIfNotNull(remoteMessage, WAIT_FOR_FINAL_STATE, requestBody.waitForFinalState);
     insertIfNotNull(remoteMessage, FOLLOW_ALIASES, requestBody.followAliases);
-    insertIfNotNull(remoteMessage, ASYNC, requestBody.asyncId);
+    insertIfNotNull(remoteMessage, ASYNC, requestBody.async);
 
     if (requestBody.properties != null) {
       requestBody
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreDataAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java
similarity index 73%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreDataAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java
index c0cd11b3451..a91a0688e0a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreDataAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java
@@ -17,16 +17,11 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.lang.invoke.MethodHandles;
 import java.net.URI;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.InstallCoreDataApi;
+import org.apache.solr.client.api.model.InstallCoreDataRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.cloud.CloudDescriptor;
 import org.apache.solr.cloud.ZkController;
@@ -36,25 +31,19 @@
 import org.apache.solr.core.backup.repository.BackupRepository;
 import org.apache.solr.handler.RestoreCore;
 import org.apache.solr.handler.admin.CoreAdminHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * v2 implementation of the "Install Core Data" Core-Admin API
+ * V2 API implementation of the "Install Core Data" Core-Admin API
  *
  * <p>This is an internal API intended for use only by the Collection Admin "Install Shard Data"
  * API.
  */
-@Path("/cores/{coreName}/install")
-public class InstallCoreDataAPI extends CoreAdminAPIBase {
+public class InstallCoreData extends CoreAdminAPIBase implements InstallCoreDataApi {
 
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  public InstallCoreDataAPI(
+  public InstallCoreData(
       CoreContainer coreContainer,
       CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker,
       SolrQueryRequest req,
@@ -62,11 +51,9 @@ public InstallCoreDataAPI(
     super(coreContainer, coreAdminAsyncTracker, req, rsp);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(CORE_EDIT_PERM)
-  public SolrJerseyResponse installCoreData(
-      @PathParam("coreName") String coreName, InstallCoreDataRequestBody requestBody)
+  public SolrJerseyResponse installCoreData(String coreName, InstallCoreDataRequestBody requestBody)
       throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
 
@@ -118,18 +105,4 @@ public SolrJerseyResponse installCoreData(
 
     return response;
   }
-
-  public static class InstallCoreDataRequestBody implements JacksonReflectMapWriter {
-    // Expected to point to an index directory (e.g. data/techproducts_shard1_replica_n1/data/index)
-    // for a single core that has previously been uploaded to the backup repository previously
-    // uploaded to the backup repository.
-    @JsonProperty("location")
-    public String location;
-
-    @JsonProperty("repository")
-    public String repository;
-
-    @JsonProperty("async")
-    public String asyncId;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardDataAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java
similarity index 78%
rename from solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardDataAPI.java
rename to solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java
index fa400835a4f..33844b28608 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardDataAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java
@@ -17,18 +17,13 @@
 
 package org.apache.solr.handler.admin.api;
 
-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import org.apache.solr.client.api.endpoint.InstallShardDataApi;
+import org.apache.solr.client.api.model.InstallShardDataRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.cloud.api.collections.InstallShardDataCmd;
@@ -41,42 +36,31 @@
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.CollectionsHandler;
-import org.apache.solr.jersey.JacksonReflectMapWriter;
 import org.apache.solr.jersey.PermissionName;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * A V2 API that allows users to import an index constructed offline into a shard of their
- * collection
+ * V2 API implementation allowing users to import offline-constructed index into a shard.
  *
  * <p>Particularly useful for installing (per-shard) indices constructed offline into a SolrCloud
  * deployment. Callers are required to put the collection into read-only mode prior to installing
  * data into any shards of that collection, and should exit read only mode when completed.
  */
-@Path("/collections/{collName}/shards/{shardName}/install")
-public class InstallShardDataAPI extends AdminAPIBase {
-
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+public class InstallShardData extends AdminAPIBase implements InstallShardDataApi {
 
   @Inject
-  public InstallShardDataAPI(
+  public InstallShardData(
       CoreContainer coreContainer,
       SolrQueryRequest solrQueryRequest,
       SolrQueryResponse solrQueryResponse) {
     super(coreContainer, solrQueryRequest, solrQueryResponse);
   }
 
-  @POST
-  @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+  @Override
   @PermissionName(COLL_EDIT_PERM)
   public SolrJerseyResponse installShardData(
-      @PathParam("collName") String collName,
-      @PathParam("shardName") String shardName,
-      InstallShardRequestBody requestBody)
-      throws Exception {
+      String collName, String shardName, InstallShardDataRequestBody requestBody) throws Exception {
     final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);
     final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();
     recordCollectionForLogAndTracing(collName, solrQueryRequest);
@@ -130,28 +114,17 @@ public static void ensureCollectionAndShardExist(
   }
 
   public static ZkNodeProps createRemoteMessage(
-      String collectionName, String shardName, InstallShardRequestBody requestBody) {
+      String collectionName, String shardName, InstallShardDataRequestBody requestBody) {
     final InstallShardDataCmd.RemoteMessage messageTyped = new InstallShardDataCmd.RemoteMessage();
     messageTyped.collection = collectionName;
     messageTyped.shard = shardName;
     if (requestBody != null) {
       messageTyped.location = requestBody.location;
       messageTyped.repository = requestBody.repository;
-      messageTyped.asyncId = requestBody.asyncId;
+      messageTyped.asyncId = requestBody.async;
     }
 
     messageTyped.validate();
     return new ZkNodeProps(messageTyped.toMap(new HashMap<>()));
   }
-
-  public static class InstallShardRequestBody implements JacksonReflectMapWriter {
-    @JsonProperty(defaultValue = "location", required = true)
-    public String location;
-
-    @JsonProperty("repository")
-    public String repository;
-
-    @JsonProperty("async")
-    public String asyncId;
-  }
 }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
index 1809d83f6b9..b950abf44ec 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java
@@ -46,6 +46,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 import org.apache.solr.client.solrj.SolrResponse;
@@ -121,8 +122,8 @@ public SubResponseAccumulatingJerseyResponse restoreCollection(
 
     final var createRequestBody = requestBody.createCollectionParams;
     if (createRequestBody != null) {
-      CreateCollectionAPI.populateDefaultsIfNecessary(coreContainer, createRequestBody);
-      createRequestBody.validate();
+      CreateCollection.populateDefaultsIfNecessary(coreContainer, createRequestBody);
+      CreateCollection.validateRequestBody(createRequestBody);
       if (Boolean.FALSE.equals(createRequestBody.createReplicas)) {
         throw new SolrException(
             SolrException.ErrorCode.BAD_REQUEST,
@@ -160,7 +161,7 @@ public static ZkNodeProps createRemoteMessage(
       // RESTORE only supports a subset of collection-creation params, so filter by those when
       // constructing the remote message
       remoteMessage.remove("create-collection");
-      CreateCollectionAPI.createRemoteMessage(createReqBody).getProperties().entrySet().stream()
+      CreateCollection.createRemoteMessage(createReqBody).getProperties().entrySet().stream()
           .filter(
               e ->
                   CREATE_PARAM_ALLOWLIST.contains(e.getKey())
@@ -204,7 +205,7 @@ public static class RestoreCollectionRequestBody implements JacksonReflectMapWri
     @JsonProperty public Integer backupId;
 
     @JsonProperty(CREATE_COLLECTION_KEY)
-    public CreateCollectionAPI.CreateCollectionRequestBody createCollectionParams;
+    public CreateCollectionRequestBody createCollectionParams;
 
     @JsonProperty public String async;
 
@@ -217,7 +218,7 @@ public static RestoreCollectionRequestBody fromV1Params(SolrParams solrParams) {
       restoreBody.async = solrParams.get(ASYNC);
 
       restoreBody.createCollectionParams =
-          CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(solrParams, false);
+          CreateCollection.createRequestBodyFromV1Params(solrParams, false);
 
       return restoreBody;
     }
diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
index 3925b297d6a..a7a6632fa65 100644
--- a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
@@ -41,6 +41,7 @@
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.common.util.CollectionUtil;
 import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.servlet.HttpSolrCall;
@@ -141,19 +142,23 @@ public static String buildRequestBodyString(ContainerRequestContext requestConte
       return "{}";
     }
 
-    if (!(requestContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY)
-        instanceof JacksonReflectMapWriter)) {
-      log.warn(
-          "Encountered unexpected request-body type {} for request {}; only {} expected.",
-          requestContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY).getClass().getName(),
-          requestContext.getUriInfo().getPath(),
-          JacksonReflectMapWriter.class.getName());
-      return "{}";
+    final Object deserializedBody = requestContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY);
+    if (deserializedBody instanceof JacksonReflectMapWriter) {
+      return ((JacksonReflectMapWriter) requestContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY))
+          .jsonStr()
+          .replace("\n", "");
+    }
+
+    final Object reflectWritable = Utils.getReflectWriter(deserializedBody);
+    if (reflectWritable instanceof Utils.DelegateReflectWriter) {
+      return Utils.toJSONString(reflectWritable).replaceAll("\n", "");
     }
 
-    return ((JacksonReflectMapWriter) requestContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY))
-        .jsonStr()
-        .replace("\n", "");
+    log.warn(
+        "No reflection data found for request-body type {} for request {}; omitting request-body details from logging",
+        deserializedBody.getClass().getName(),
+        requestContext.getUriInfo().getPath());
+    return "{}";
   }
 
   public static String filterAndStringifyQueryParameters(
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateAliasAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateAliasAPITest.java
index ce4b5b51544..1e97d61a543 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateAliasAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateAliasAPITest.java
@@ -24,6 +24,7 @@
 
 import java.util.List;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.hamcrest.MatcherAssert;
@@ -95,7 +96,7 @@ public void testRoutedAliasesMustProvideAConfigsetToUseOnCreatedCollections() {
     final var categoryRouter = new CreateAliasAPI.CategoryRoutedAliasProperties();
     categoryRouter.field = "someField";
     requestBody.routers = List.of(categoryRouter);
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     requestBody.collCreationParameters = createParams;
 
@@ -112,7 +113,7 @@ public void testRoutedAliasesMustNotSpecifyANameInCollectionCreationParams() {
     final var categoryRouter = new CreateAliasAPI.CategoryRoutedAliasProperties();
     categoryRouter.field = "someField";
     requestBody.routers = List.of(categoryRouter);
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     // Not allowed since routed-aliases-created collections have semantically meaningful names
@@ -130,7 +131,7 @@ public void testRoutedAliasesMustNotSpecifyANameInCollectionCreationParams() {
   public void testReportsErrorIfCategoryRoutedAliasDoesntSpecifyAllRequiredParameters() {
     final var requestBody = new CreateAliasAPI.CreateAliasRequestBody();
     requestBody.name = "validName";
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     requestBody.collCreationParameters = createParams;
@@ -212,7 +213,7 @@ public void testRemoteMessageCreationForCategoryRoutedAlias() {
     final var categoryRouter = new CreateAliasAPI.CategoryRoutedAliasProperties();
     categoryRouter.field = "someField";
     requestBody.routers = List.of(categoryRouter);
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     requestBody.collCreationParameters = createParams;
@@ -239,7 +240,7 @@ public void testRemoteMessageCreationForTimeRoutedAlias() {
     timeRouter.interval = "+1MONTH";
     timeRouter.maxFutureMs = 123456L;
     requestBody.routers = List.of(timeRouter);
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     requestBody.collCreationParameters = createParams;
@@ -271,7 +272,7 @@ public void testRemoteMessageCreationForMultiDimensionalRoutedAlias() {
     final var categoryRouter = new CreateAliasAPI.CategoryRoutedAliasProperties();
     categoryRouter.field = "someField";
     requestBody.routers = List.of(timeRouter, categoryRouter);
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     requestBody.collCreationParameters = createParams;
@@ -297,7 +298,7 @@ private CreateAliasAPI.CreateAliasRequestBody requestBodyWithProvidedRouter(
       CreateAliasAPI.RoutedAliasProperties router) {
     final var requestBody = new CreateAliasAPI.CreateAliasRequestBody();
     requestBody.name = "validName";
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     createParams.numShards = 3;
     createParams.config = "someConfig";
     requestBody.collCreationParameters = createParams;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateCollectionAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateCollectionAPITest.java
index c5eb27f0835..80a2200131a 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateCollectionAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateCollectionAPITest.java
@@ -37,11 +37,13 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
+import org.apache.solr.client.api.model.CreateCollectionRouterProperties;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.junit.Test;
 
-/** Unit tests for {@link CreateCollectionAPI}. */
+/** Unit tests for {@link CreateCollection}. */
 public class CreateCollectionAPITest extends SolrTestCaseJ4 {
 
   @Test
@@ -50,7 +52,7 @@ public void testReportsErrorIfRequestBodyMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateCollectionAPI(null, null, null);
+              final var api = new CreateCollection(null, null, null);
               api.createCollection(null);
             });
 
@@ -61,7 +63,7 @@ public void testReportsErrorIfRequestBodyMissing() {
   @Test
   public void testReportsErrorIfReplicationFactorAndNrtReplicasConflict() {
     // Valid request body...
-    final var requestBody = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var requestBody = new CreateCollectionRequestBody();
     requestBody.name = "someName";
     requestBody.config = "someConfig";
     // ...except for a replicationFactor and nrtReplicas conflicting
@@ -72,7 +74,7 @@ public void testReportsErrorIfReplicationFactorAndNrtReplicasConflict() {
         expectThrows(
             SolrException.class,
             () -> {
-              requestBody.validate();
+              CreateCollection.validateRequestBody(requestBody);
             });
 
     assertEquals(400, thrown.code());
@@ -83,7 +85,7 @@ public void testReportsErrorIfReplicationFactorAndNrtReplicasConflict() {
 
   @Test
   public void testReportsErrorIfCollectionNameInvalid() {
-    final var requestBody = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var requestBody = new CreateCollectionRequestBody();
     requestBody.name = "$invalid@collection+name";
     requestBody.config = "someConfig";
 
@@ -91,7 +93,7 @@ public void testReportsErrorIfCollectionNameInvalid() {
         expectThrows(
             SolrException.class,
             () -> {
-              requestBody.validate();
+              CreateCollection.validateRequestBody(requestBody);
             });
 
     assertEquals(400, thrown.code());
@@ -103,7 +105,7 @@ public void testReportsErrorIfCollectionNameInvalid() {
   @Test
   public void testReportsErrorIfShardNamesInvalid() {
     // Valid request body...
-    final var requestBody = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var requestBody = new CreateCollectionRequestBody();
     requestBody.name = "someName";
     requestBody.config = "someConfig";
     // ...except for a bad shard name
@@ -113,7 +115,7 @@ public void testReportsErrorIfShardNamesInvalid() {
         expectThrows(
             SolrException.class,
             () -> {
-              requestBody.validate();
+              CreateCollection.validateRequestBody(requestBody);
             });
 
     assertEquals(400, thrown.code());
@@ -124,7 +126,7 @@ public void testReportsErrorIfShardNamesInvalid() {
 
   @Test
   public void testCreateRemoteMessageAllProperties() {
-    final var requestBody = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var requestBody = new CreateCollectionRequestBody();
     requestBody.name = "someName";
     requestBody.replicationFactor = 123;
     requestBody.config = "someConfig";
@@ -137,13 +139,13 @@ public void testCreateRemoteMessageAllProperties() {
     requestBody.alias = "someAliasName";
     requestBody.properties = Map.of("propName", "propValue");
     requestBody.async = "someAsyncId";
-    requestBody.router = new CreateCollectionAPI.RouterProperties();
+    requestBody.router = new CreateCollectionRouterProperties();
     requestBody.router.name = "someRouterName";
     requestBody.router.field = "someField";
     requestBody.nodeSet = List.of("node1", "node2");
     requestBody.shuffleNodes = false;
 
-    final var remoteMessage = CreateCollectionAPI.createRemoteMessage(requestBody).getProperties();
+    final var remoteMessage = CreateCollection.createRemoteMessage(requestBody).getProperties();
 
     assertEquals("create", remoteMessage.get(QUEUE_OPERATION));
     assertEquals("true", remoteMessage.get("fromApi"));
@@ -168,11 +170,11 @@ public void testCreateRemoteMessageAllProperties() {
 
   @Test
   public void testNoReplicaCreationMessage() {
-    final var requestBody = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var requestBody = new CreateCollectionRequestBody();
     requestBody.name = "someName";
     requestBody.createReplicas = false;
 
-    final var remoteMessage = CreateCollectionAPI.createRemoteMessage(requestBody).getProperties();
+    final var remoteMessage = CreateCollection.createRemoteMessage(requestBody).getProperties();
 
     assertEquals("create", remoteMessage.get(QUEUE_OPERATION));
     assertEquals("someName", remoteMessage.get(NAME));
@@ -196,8 +198,7 @@ public void testV1ParamsCanBeConvertedIntoV2RequestBody() {
     solrParams.set("router.field", "someField");
     solrParams.set("property.somePropName", "somePropValue");
 
-    final var v2RequestBody =
-        CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(solrParams, true);
+    final var v2RequestBody = CreateCollection.createRequestBodyFromV1Params(solrParams, true);
 
     assertEquals("someName", v2RequestBody.name);
     assertEquals(Integer.valueOf(123), v2RequestBody.numShards);
@@ -223,8 +224,7 @@ public void testV1ParamsWithEmptyNodeSetCanBeConvertedIntoV2RequestBody() {
     solrParams.set(NAME, "someName");
     solrParams.set(CREATE_NODE_SET, "EMPTY");
 
-    final var v2RequestBody =
-        CreateCollectionAPI.CreateCollectionRequestBody.fromV1Params(solrParams, true);
+    final var v2RequestBody = CreateCollection.createRequestBodyFromV1Params(solrParams, true);
 
     assertEquals("someName", v2RequestBody.name);
     assertEquals(Boolean.FALSE, v2RequestBody.createReplicas);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateReplicaAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateReplicaAPITest.java
index d4e9772e866..2abe5d13397 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateReplicaAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateReplicaAPITest.java
@@ -39,11 +39,12 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.CreateReplicaRequestBody;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.junit.Test;
 
-/** Unit tests for {@link CreateReplicaAPI} */
+/** Unit tests for {@link CreateReplica} */
 public class CreateReplicaAPITest extends SolrTestCaseJ4 {
   @Test
   public void testReportsErrorIfRequestBodyMissing() {
@@ -51,7 +52,7 @@ public void testReportsErrorIfRequestBodyMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateReplicaAPI(null, null, null);
+              final var api = new CreateReplica(null, null, null);
               api.createReplica("someCollName", "someShardName", null);
             });
 
@@ -61,12 +62,12 @@ public void testReportsErrorIfRequestBodyMissing() {
 
   @Test
   public void testReportsErrorIfCollectionNameMissing() {
-    final var requestBody = new CreateReplicaAPI.AddReplicaRequestBody();
+    final var requestBody = new CreateReplicaRequestBody();
     final SolrException thrown =
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateReplicaAPI(null, null, null);
+              final var api = new CreateReplica(null, null, null);
               api.createReplica(null, "shardName", requestBody);
             });
 
@@ -76,12 +77,12 @@ public void testReportsErrorIfCollectionNameMissing() {
 
   @Test
   public void testReportsErrorIfShardNameMissing() {
-    final var requestBody = new CreateReplicaAPI.AddReplicaRequestBody();
+    final var requestBody = new CreateReplicaRequestBody();
     final SolrException thrown =
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateReplicaAPI(null, null, null);
+              final var api = new CreateReplica(null, null, null);
               api.createReplica("someCollectionName", null, requestBody);
             });
 
@@ -91,7 +92,7 @@ public void testReportsErrorIfShardNameMissing() {
 
   @Test
   public void testCreateRemoteMessageAllProperties() {
-    final var requestBody = new CreateReplicaAPI.AddReplicaRequestBody();
+    final var requestBody = new CreateReplicaRequestBody();
     requestBody.name = "someName";
     requestBody.type = "NRT";
     requestBody.instanceDir = "/some/dir1";
@@ -106,11 +107,11 @@ public void testCreateRemoteMessageAllProperties() {
     requestBody.skipNodeAssignment = Boolean.TRUE;
     requestBody.waitForFinalState = true;
     requestBody.followAliases = true;
-    requestBody.asyncId = "someAsyncId";
+    requestBody.async = "someAsyncId";
     requestBody.properties = Map.of("propName1", "propVal1", "propName2", "propVal2");
 
     final var remoteMessage =
-        CreateReplicaAPI.createRemoteMessage("someCollectionName", "someShardName", requestBody)
+        CreateReplica.createRemoteMessage("someCollectionName", "someShardName", requestBody)
             .getProperties();
 
     assertEquals(20, remoteMessage.size());
@@ -159,7 +160,7 @@ public void testCanConvertV1ParamsToV2RequestBody() {
     v1Params.add("property.propName1", "propVal1");
     v1Params.add("property.propName2", "propVal2");
 
-    final var requestBody = CreateReplicaAPI.AddReplicaRequestBody.fromV1Params(v1Params);
+    final var requestBody = CreateReplica.createRequestBodyFromV1Params(v1Params);
 
     assertEquals("someName", requestBody.name);
     assertEquals("NRT", requestBody.type);
@@ -175,7 +176,7 @@ public void testCanConvertV1ParamsToV2RequestBody() {
     assertEquals(Boolean.TRUE, requestBody.skipNodeAssignment);
     assertEquals(Boolean.TRUE, requestBody.waitForFinalState);
     assertEquals(Boolean.TRUE, requestBody.followAliases);
-    assertEquals("someAsyncId", requestBody.asyncId);
+    assertEquals("someAsyncId", requestBody.async);
     assertEquals("propVal1", requestBody.properties.get("propName1"));
     assertEquals("propVal2", requestBody.properties.get("propName2"));
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateShardAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateShardAPITest.java
index 07b71d8a805..bb89fd326b5 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/CreateShardAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/CreateShardAPITest.java
@@ -33,12 +33,13 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.CreateShardRequestBody;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
-/** Unit tests for {@link CreateShardAPI} */
+/** Unit tests for {@link CreateShard} */
 public class CreateShardAPITest extends SolrTestCaseJ4 {
 
   @Test
@@ -47,7 +48,7 @@ public void testReportsErrorIfRequestBodyMissing() {
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateShardAPI(null, null, null);
+              final var api = new CreateShard(null, null, null);
               api.createShard("someCollName", null);
             });
 
@@ -57,13 +58,13 @@ public void testReportsErrorIfRequestBodyMissing() {
 
   @Test
   public void testReportsErrorIfCollectionNameMissing() {
-    final var requestBody = new CreateShardAPI.CreateShardRequestBody();
+    final var requestBody = new CreateShardRequestBody();
     requestBody.shardName = "someShardName";
     final SolrException thrown =
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateShardAPI(null, null, null);
+              final var api = new CreateShard(null, null, null);
               api.createShard(null, requestBody);
             });
 
@@ -73,13 +74,13 @@ public void testReportsErrorIfCollectionNameMissing() {
 
   @Test
   public void testReportsErrorIfShardNameMissing() {
-    final var requestBody = new CreateShardAPI.CreateShardRequestBody();
+    final var requestBody = new CreateShardRequestBody();
     requestBody.shardName = null;
     final SolrException thrown =
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateShardAPI(null, null, null);
+              final var api = new CreateShard(null, null, null);
               api.createShard("someCollectionName", requestBody);
             });
 
@@ -89,13 +90,13 @@ public void testReportsErrorIfShardNameMissing() {
 
   @Test
   public void testReportsErrorIfShardNameIsInvalid() {
-    final var requestBody = new CreateShardAPI.CreateShardRequestBody();
+    final var requestBody = new CreateShardRequestBody();
     requestBody.shardName = "invalid$shard@name";
     final SolrException thrown =
         expectThrows(
             SolrException.class,
             () -> {
-              final var api = new CreateShardAPI(null, null, null);
+              final var api = new CreateShard(null, null, null);
               api.createShard("someCollectionName", requestBody);
             });
 
@@ -106,7 +107,7 @@ public void testReportsErrorIfShardNameIsInvalid() {
 
   @Test
   public void testCreateRemoteMessageAllProperties() {
-    final var requestBody = new CreateShardAPI.CreateShardRequestBody();
+    final var requestBody = new CreateShardRequestBody();
     requestBody.shardName = "someShardName";
     requestBody.replicationFactor = 123;
     requestBody.nrtReplicas = 123;
@@ -116,11 +117,11 @@ public void testCreateRemoteMessageAllProperties() {
     requestBody.nodeSet = List.of("node1", "node2");
     requestBody.waitForFinalState = true;
     requestBody.followAliases = true;
-    requestBody.asyncId = "someAsyncId";
+    requestBody.async = "someAsyncId";
     requestBody.properties = Map.of("propName1", "propVal1", "propName2", "propVal2");
 
     final var remoteMessage =
-        CreateShardAPI.createRemoteMessage("someCollectionName", requestBody).getProperties();
+        CreateShard.createRemoteMessage("someCollectionName", requestBody).getProperties();
 
     assertEquals(13, remoteMessage.size());
     assertEquals("createshard", remoteMessage.get(QUEUE_OPERATION));
@@ -154,7 +155,7 @@ public void testCanConvertV1ParamsToV2RequestBody() {
     v1Params.add("property.propName1", "propVal1");
     v1Params.add("property.propName2", "propVal2");
 
-    final var requestBody = CreateShardAPI.CreateShardRequestBody.fromV1Params(v1Params);
+    final var requestBody = CreateShard.createRequestBodyFromV1Params(v1Params);
 
     assertEquals("someShardName", requestBody.shardName);
     assertEquals(Integer.valueOf(123), requestBody.replicationFactor);
@@ -165,7 +166,7 @@ public void testCanConvertV1ParamsToV2RequestBody() {
     assertEquals(List.of("node1", "node2"), requestBody.nodeSet);
     assertEquals(Boolean.TRUE, requestBody.waitForFinalState);
     assertEquals(Boolean.TRUE, requestBody.followAliases);
-    assertEquals("someAsyncId", requestBody.asyncId);
+    assertEquals("someAsyncId", requestBody.async);
     assertEquals("propVal1", requestBody.properties.get("propName1"));
     assertEquals("propVal2", requestBody.properties.get("propName2"));
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java
index 52321b3f3c8..d4a303f2599 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java
@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.api.model.CreateCollectionRequestBody;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.hamcrest.MatcherAssert;
@@ -136,7 +137,7 @@ public void testCreatesValidRemoteMessageForNewCollectionRestore() {
     requestBody.backupId = 123;
     requestBody.repository = "someRepositoryName";
     requestBody.async = "someAsyncId";
-    final var createParams = new CreateCollectionAPI.CreateCollectionRequestBody();
+    final var createParams = new CreateCollectionRequestBody();
     requestBody.createCollectionParams = createParams;
     createParams.config = "someConfig";
     createParams.nrtReplicas = 123;
diff --git a/solr/core/src/test/org/apache/solr/jersey/PostRequestLoggingFilterTest.java b/solr/core/src/test/org/apache/solr/jersey/PostRequestLoggingFilterTest.java
index c0770c4912e..985085b7829 100644
--- a/solr/core/src/test/org/apache/solr/jersey/PostRequestLoggingFilterTest.java
+++ b/solr/core/src/test/org/apache/solr/jersey/PostRequestLoggingFilterTest.java
@@ -26,7 +26,7 @@
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.UriInfo;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.handler.admin.api.CreateReplicaAPI;
+import org.apache.solr.client.api.model.CreateReplicaRequestBody;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -122,10 +122,10 @@ public void testRequestBodyStringIsEmptyIfRequestBodyWasUnexpectedType() {
 
   @Test
   public void testRequestBodyRepresentedAsJsonWhenFound() {
-    final var requestBody = new CreateReplicaAPI.AddReplicaRequestBody();
+    final var requestBody = new CreateReplicaRequestBody();
     requestBody.name = "someReplicaName";
     requestBody.type = "NRT";
-    requestBody.asyncId = "someAsyncId";
+    requestBody.async = "someAsyncId";
     final var mockContext = mock(ContainerRequestContext.class);
     when(mockContext.getProperty(DESERIALIZED_REQUEST_BODY_KEY)).thenReturn(requestBody);
 
diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java
index 51dc59d2ea0..3d0d30262ed 100644
--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java
+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java
@@ -20,6 +20,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.cloud.api.collections.AbstractInstallShardTest;
+import org.apache.solr.handler.admin.api.InstallShardData;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
@@ -27,7 +28,7 @@
  * Tests validating that the 'Install Shard API' works when used with {@link GCSBackupRepository}
  *
  * @see org.apache.solr.cloud.api.collections.AbstractInstallShardTest
- * @see org.apache.solr.handler.admin.api.InstallShardDataAPI
+ * @see InstallShardData
  */
 // Backups do checksum validation against a footer value not present in 'SimpleText'
 @LuceneTestCase.SuppressCodecs({"SimpleText"})
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
index 189928f3dbb..ea21cb58877 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
@@ -21,6 +21,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.cloud.api.collections.AbstractInstallShardTest;
+import org.apache.solr.handler.admin.api.InstallShardData;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import software.amazon.awssdk.regions.Region;
@@ -29,7 +30,7 @@
  * Tests validating that the 'Install Shard API' works when used with {@link S3BackupRepository}
  *
  * @see org.apache.solr.cloud.api.collections.AbstractInstallShardTest
- * @see org.apache.solr.handler.admin.api.InstallShardDataAPI
+ * @see InstallShardData
  */
 // Backups do checksum validation against a footer value not present in 'SimpleText'
 @LuceneTestCase.SuppressCodecs({"SimpleText"})
diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustache
index 93108eae513..7f40f2332d7 100644
--- a/solr/solrj/src/resources/java-template/api.mustache
+++ b/solr/solrj/src/resources/java-template/api.mustache
@@ -34,13 +34,26 @@ import org.apache.solr.client.solrj.JacksonContentWriter;
 import org.apache.solr.client.solrj.request.RequestWriter.ContentWriter;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.ResponseParser;
-{{#operations}}
-{{#operation}}
+
+{{! Covers all top-level request/response model classes, but not necessarily any types nested in those classes }}
 {{#imports}}
-import {{modelPackage}}.{{.}};
+import {{import}};
 {{/imports}}
+
+{{! Imports any model types nested in request body POJOs }}
+{{#operations}}
+{{#operation}}
+{{#bodyParam}}
+{{#vars}}
+{{#isModel}}
+import {{modelPackage}}.{{dataType}};
+{{/isModel}}
+{{/vars}}
+{{/bodyParam}}
 {{/operation}}
+{{/operations}}
 
+{{#operations}}
 // WARNING: This class is generated from a Mustache template; any intended
 // changes should be made to the underlying template and not this file directly.
 
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
index 70f1a38e18e..cc9d655f04c 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
@@ -48,6 +48,7 @@
 import org.apache.solr.core.DirectoryFactory;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.core.backup.repository.BackupRepository;
+import org.apache.solr.handler.admin.api.InstallShardData;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -62,7 +63,7 @@
  * repository. This base-class will populate that backup repository all data necessary for these
  * tests.
  *
- * @see org.apache.solr.handler.admin.api.InstallShardDataAPI
+ * @see InstallShardData
  */
 public abstract class AbstractInstallShardTest extends SolrCloudTestCase {
 

From 3d120f586d079f3bb354ab5ed92ec4acad212c2b Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 20:46:47 +0200
Subject: [PATCH 150/160] Update io.grpc:grpc-* to v1.58.0 (#1769)

Co-authored-by: Kevin Risden <krisden@apache.org>
---
 gradle/validation/jar-checks.gradle           |  9 +++-
 solr/licenses/grpc-alts-1.56.0.jar.sha1       |  1 -
 solr/licenses/grpc-alts-1.58.0.jar.sha1       |  1 +
 solr/licenses/grpc-api-1.56.0.jar.sha1        |  1 -
 solr/licenses/grpc-api-1.58.0.jar.sha1        |  1 +
 solr/licenses/grpc-auth-1.56.0.jar.sha1       |  1 -
 solr/licenses/grpc-auth-1.58.0.jar.sha1       |  1 +
 solr/licenses/grpc-context-1.56.0.jar.sha1    |  1 -
 solr/licenses/grpc-context-1.58.0.jar.sha1    |  1 +
 solr/licenses/grpc-core-1.56.0.jar.sha1       |  1 -
 solr/licenses/grpc-core-1.58.0.jar.sha1       |  1 +
 solr/licenses/grpc-googleapis-1.56.0.jar.sha1 |  1 -
 solr/licenses/grpc-googleapis-1.58.0.jar.sha1 |  1 +
 solr/licenses/grpc-grpclb-1.56.0.jar.sha1     |  1 -
 solr/licenses/grpc-grpclb-1.58.0.jar.sha1     |  1 +
 solr/licenses/grpc-netty-1.56.0.jar.sha1      |  1 -
 solr/licenses/grpc-netty-1.58.0.jar.sha1      |  1 +
 .../grpc-netty-shaded-1.56.0.jar.sha1         |  1 -
 .../grpc-netty-shaded-1.58.0.jar.sha1         |  1 +
 solr/licenses/grpc-protobuf-1.56.0.jar.sha1   |  1 -
 solr/licenses/grpc-protobuf-1.58.0.jar.sha1   |  1 +
 .../grpc-protobuf-lite-1.56.0.jar.sha1        |  1 -
 .../grpc-protobuf-lite-1.58.0.jar.sha1        |  1 +
 solr/licenses/grpc-rls-1.56.0.jar.sha1        |  1 -
 solr/licenses/grpc-rls-1.58.0.jar.sha1        |  1 +
 solr/licenses/grpc-services-1.56.0.jar.sha1   |  1 -
 solr/licenses/grpc-services-1.58.0.jar.sha1   |  1 +
 solr/licenses/grpc-stub-1.56.0.jar.sha1       |  1 -
 solr/licenses/grpc-stub-1.58.0.jar.sha1       |  1 +
 solr/licenses/grpc-util-1.58.0.jar.sha1       |  1 +
 solr/licenses/grpc-xds-1.56.0.jar.sha1        |  1 -
 solr/licenses/grpc-xds-1.58.0.jar.sha1        |  1 +
 ...proto-google-common-protos-2.19.1.jar.sha1 |  1 -
 ...proto-google-common-protos-2.22.0.jar.sha1 |  1 +
 solr/licenses/protobuf-java-3.23.1.jar.sha1   |  1 -
 solr/licenses/protobuf-java-3.24.0.jar.sha1   |  1 +
 versions.lock                                 | 49 ++++++++++---------
 versions.props                                |  2 +-
 38 files changed, 52 insertions(+), 43 deletions(-)
 delete mode 100644 solr/licenses/grpc-alts-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-alts-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-api-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-api-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-auth-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-auth-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-context-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-context-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-core-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-core-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-googleapis-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-googleapis-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-grpclb-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-grpclb-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-netty-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-netty-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-protobuf-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-protobuf-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-rls-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-rls-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-services-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-services-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-stub-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-stub-1.58.0.jar.sha1
 create mode 100644 solr/licenses/grpc-util-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/grpc-xds-1.56.0.jar.sha1
 create mode 100644 solr/licenses/grpc-xds-1.58.0.jar.sha1
 delete mode 100644 solr/licenses/proto-google-common-protos-2.19.1.jar.sha1
 create mode 100644 solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
 delete mode 100644 solr/licenses/protobuf-java-3.23.1.jar.sha1
 create mode 100644 solr/licenses/protobuf-java-3.24.0.jar.sha1

diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradle
index da555ce9165..c3372b45c06 100644
--- a/gradle/validation/jar-checks.gradle
+++ b/gradle/validation/jar-checks.gradle
@@ -122,17 +122,24 @@ subprojects {
       }
 
       def visited = new HashSet<>()
+      def seenDeps = new HashSet<>()
       def infos = []
 
       while (!queue.isEmpty()) {
         def dep = queue.removeFirst()
+        seenDeps.add(dep)
 
         // Skip any artifacts from other Solr Modules (they will be resolved there).
         if (dep.moduleGroup == "org.apache.solr") {
           continue
         }
 
-        queue.addAll(dep.children)
+        // Make sure we don't keep visiting the same children over and over again
+        dep.children.each { child ->
+          if (!seenDeps.contains(child)) {
+            queue.add(child)
+          }
+        }
         dep.moduleArtifacts.each { resolvedArtifact ->
           def file = resolvedArtifact.file
           if (visited.add(file)) {
diff --git a/solr/licenses/grpc-alts-1.56.0.jar.sha1 b/solr/licenses/grpc-alts-1.56.0.jar.sha1
deleted file mode 100644
index f0bd97feeda..00000000000
--- a/solr/licenses/grpc-alts-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33ad69068719833876c4dee260ff1a07c6305a40
diff --git a/solr/licenses/grpc-alts-1.58.0.jar.sha1 b/solr/licenses/grpc-alts-1.58.0.jar.sha1
new file mode 100644
index 00000000000..6019d9701e6
--- /dev/null
+++ b/solr/licenses/grpc-alts-1.58.0.jar.sha1
@@ -0,0 +1 @@
+7e5ae496f9d7ae266abe30aa2848cbb3426b244e
diff --git a/solr/licenses/grpc-api-1.56.0.jar.sha1 b/solr/licenses/grpc-api-1.56.0.jar.sha1
deleted file mode 100644
index b31f565d65e..00000000000
--- a/solr/licenses/grpc-api-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2149f665531882aa758dab24ba2556197c2c1fa6
diff --git a/solr/licenses/grpc-api-1.58.0.jar.sha1 b/solr/licenses/grpc-api-1.58.0.jar.sha1
new file mode 100644
index 00000000000..e3782a67a1c
--- /dev/null
+++ b/solr/licenses/grpc-api-1.58.0.jar.sha1
@@ -0,0 +1 @@
+1f761949cdfd418a5f662e0d22d2c95f60099c0b
diff --git a/solr/licenses/grpc-auth-1.56.0.jar.sha1 b/solr/licenses/grpc-auth-1.56.0.jar.sha1
deleted file mode 100644
index 39dead62065..00000000000
--- a/solr/licenses/grpc-auth-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6b9e8782b4ec666e684f7480cd3a9e1602e5cb41
diff --git a/solr/licenses/grpc-auth-1.58.0.jar.sha1 b/solr/licenses/grpc-auth-1.58.0.jar.sha1
new file mode 100644
index 00000000000..15e05883800
--- /dev/null
+++ b/solr/licenses/grpc-auth-1.58.0.jar.sha1
@@ -0,0 +1 @@
+d7489cc1fc90658d43bf18307972db6b5305bb45
diff --git a/solr/licenses/grpc-context-1.56.0.jar.sha1 b/solr/licenses/grpc-context-1.56.0.jar.sha1
deleted file mode 100644
index a91833df30d..00000000000
--- a/solr/licenses/grpc-context-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f690e203247b54cb120fbd6885e829c23385872
diff --git a/solr/licenses/grpc-context-1.58.0.jar.sha1 b/solr/licenses/grpc-context-1.58.0.jar.sha1
new file mode 100644
index 00000000000..1a6b8003aa9
--- /dev/null
+++ b/solr/licenses/grpc-context-1.58.0.jar.sha1
@@ -0,0 +1 @@
+eae1e3ed15e40e3bd5c080a9bbb9a8eb1770afb7
diff --git a/solr/licenses/grpc-core-1.56.0.jar.sha1 b/solr/licenses/grpc-core-1.56.0.jar.sha1
deleted file mode 100644
index f98291cb245..00000000000
--- a/solr/licenses/grpc-core-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f9515b43a4f7a2d09c712cb6bce2659f036b2aa6
diff --git a/solr/licenses/grpc-core-1.58.0.jar.sha1 b/solr/licenses/grpc-core-1.58.0.jar.sha1
new file mode 100644
index 00000000000..2c7016d5ee4
--- /dev/null
+++ b/solr/licenses/grpc-core-1.58.0.jar.sha1
@@ -0,0 +1 @@
+5a0fa4249397504443f7609754bf0acb50e0a0c5
diff --git a/solr/licenses/grpc-googleapis-1.56.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.56.0.jar.sha1
deleted file mode 100644
index 535c95c2076..00000000000
--- a/solr/licenses/grpc-googleapis-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e0bfd8c00c14a7eb49914af818222f0fce900ec
diff --git a/solr/licenses/grpc-googleapis-1.58.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.58.0.jar.sha1
new file mode 100644
index 00000000000..60cd4edc0cd
--- /dev/null
+++ b/solr/licenses/grpc-googleapis-1.58.0.jar.sha1
@@ -0,0 +1 @@
+2327b1875165d99a9b0fe2b52e257dfe0af29d6a
diff --git a/solr/licenses/grpc-grpclb-1.56.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.56.0.jar.sha1
deleted file mode 100644
index c60f086ea29..00000000000
--- a/solr/licenses/grpc-grpclb-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a035c18bf9f9bb7b44a829f3079379deb95f8a47
diff --git a/solr/licenses/grpc-grpclb-1.58.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.58.0.jar.sha1
new file mode 100644
index 00000000000..1760630283e
--- /dev/null
+++ b/solr/licenses/grpc-grpclb-1.58.0.jar.sha1
@@ -0,0 +1 @@
+1d4e60a8053e583fd23b002c468df715ce7ffdab
diff --git a/solr/licenses/grpc-netty-1.56.0.jar.sha1 b/solr/licenses/grpc-netty-1.56.0.jar.sha1
deleted file mode 100644
index fdf976d6acb..00000000000
--- a/solr/licenses/grpc-netty-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c3dfd5fe8d47a45fb9bcb3e35d8af38c415c773
diff --git a/solr/licenses/grpc-netty-1.58.0.jar.sha1 b/solr/licenses/grpc-netty-1.58.0.jar.sha1
new file mode 100644
index 00000000000..6f2a083cf72
--- /dev/null
+++ b/solr/licenses/grpc-netty-1.58.0.jar.sha1
@@ -0,0 +1 @@
+96ae48464ce0496e08c6a1c27a75e2135214fc7a
diff --git a/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1
deleted file mode 100644
index fca54546cd5..00000000000
--- a/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c58703fd48769bc0e1629369c59c5a8a195fd8a8
diff --git a/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1
new file mode 100644
index 00000000000..f37324555bc
--- /dev/null
+++ b/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1
@@ -0,0 +1 @@
+942622d5b4d908f9474ce5dbbdaa587e606cd9ed
diff --git a/solr/licenses/grpc-protobuf-1.56.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.56.0.jar.sha1
deleted file mode 100644
index 95c72e81fcc..00000000000
--- a/solr/licenses/grpc-protobuf-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de43cf4ba0773cb1d6a32444ca487e3f35e6c6ac
diff --git a/solr/licenses/grpc-protobuf-1.58.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.58.0.jar.sha1
new file mode 100644
index 00000000000..a9934c4200b
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-1.58.0.jar.sha1
@@ -0,0 +1 @@
+2e16536d0b9c27e7b28bf916a528aa92e9ea872d
diff --git a/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1
deleted file mode 100644
index 656ee7e8096..00000000000
--- a/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58e5b214be5422d5c217389617e5e760451e8abb
diff --git a/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1
new file mode 100644
index 00000000000..2f6c58b87af
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1
@@ -0,0 +1 @@
+60498c6688075a698ea3285587ed318aaf18d9db
diff --git a/solr/licenses/grpc-rls-1.56.0.jar.sha1 b/solr/licenses/grpc-rls-1.56.0.jar.sha1
deleted file mode 100644
index 8769d38f5b8..00000000000
--- a/solr/licenses/grpc-rls-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c7752ad0fab7ca0e88eb2b00d4c1f49c3168a46a
diff --git a/solr/licenses/grpc-rls-1.58.0.jar.sha1 b/solr/licenses/grpc-rls-1.58.0.jar.sha1
new file mode 100644
index 00000000000..dd79cc96487
--- /dev/null
+++ b/solr/licenses/grpc-rls-1.58.0.jar.sha1
@@ -0,0 +1 @@
+705efa0a05acc2df20e369817f091bba59235d9f
diff --git a/solr/licenses/grpc-services-1.56.0.jar.sha1 b/solr/licenses/grpc-services-1.56.0.jar.sha1
deleted file mode 100644
index bcdd9e8af99..00000000000
--- a/solr/licenses/grpc-services-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c9b37b8228796c302a11b91d29775001082ab3f
diff --git a/solr/licenses/grpc-services-1.58.0.jar.sha1 b/solr/licenses/grpc-services-1.58.0.jar.sha1
new file mode 100644
index 00000000000..593048c5127
--- /dev/null
+++ b/solr/licenses/grpc-services-1.58.0.jar.sha1
@@ -0,0 +1 @@
+2dbe016ee80160b4dbb283ef8fc46a00294d952a
diff --git a/solr/licenses/grpc-stub-1.56.0.jar.sha1 b/solr/licenses/grpc-stub-1.56.0.jar.sha1
deleted file mode 100644
index 9cd1024d906..00000000000
--- a/solr/licenses/grpc-stub-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-46e5bc1caa5fc3ea50aaf386658a1c2bb57d84c8
diff --git a/solr/licenses/grpc-stub-1.58.0.jar.sha1 b/solr/licenses/grpc-stub-1.58.0.jar.sha1
new file mode 100644
index 00000000000..b40e8a44d5a
--- /dev/null
+++ b/solr/licenses/grpc-stub-1.58.0.jar.sha1
@@ -0,0 +1 @@
+6bba82c4e3298ffbc2faa182821c98f6e3903d77
diff --git a/solr/licenses/grpc-util-1.58.0.jar.sha1 b/solr/licenses/grpc-util-1.58.0.jar.sha1
new file mode 100644
index 00000000000..4b3ffa0ade4
--- /dev/null
+++ b/solr/licenses/grpc-util-1.58.0.jar.sha1
@@ -0,0 +1 @@
+1e95f31fe99adb642ec9d800ed950b438dfd0e50
diff --git a/solr/licenses/grpc-xds-1.56.0.jar.sha1 b/solr/licenses/grpc-xds-1.56.0.jar.sha1
deleted file mode 100644
index 76138252a99..00000000000
--- a/solr/licenses/grpc-xds-1.56.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2898653c90c8202ee1038d28d81f5cbedf2af545
diff --git a/solr/licenses/grpc-xds-1.58.0.jar.sha1 b/solr/licenses/grpc-xds-1.58.0.jar.sha1
new file mode 100644
index 00000000000..3effe9ca8af
--- /dev/null
+++ b/solr/licenses/grpc-xds-1.58.0.jar.sha1
@@ -0,0 +1 @@
+2d60586187fb19850ee49e28b1664f7a539a6f66
diff --git a/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1
deleted file mode 100644
index e8153102f9a..00000000000
--- a/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-77e361812583ea07ee248054ac5bd9f41dfa7532
diff --git a/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
new file mode 100644
index 00000000000..190d72d40b2
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
@@ -0,0 +1 @@
+627126f6a05085dab0caba68dcdad118512975ef
diff --git a/solr/licenses/protobuf-java-3.23.1.jar.sha1 b/solr/licenses/protobuf-java-3.23.1.jar.sha1
deleted file mode 100644
index be0b48e1975..00000000000
--- a/solr/licenses/protobuf-java-3.23.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06a138d6bb6b7554b0999300ef8340d134d5575d
diff --git a/solr/licenses/protobuf-java-3.24.0.jar.sha1 b/solr/licenses/protobuf-java-3.24.0.jar.sha1
new file mode 100644
index 00000000000..b1ebca307bd
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.24.0.jar.sha1
@@ -0,0 +1 @@
+850a0efbee73911b2c30fa2238a549244524d31e
diff --git a/versions.lock b/versions.lock
index 89aeb26dba5..b85e90cd52d 100644
--- a/versions.lock
+++ b/versions.lock
@@ -30,7 +30,7 @@ com.google.api-client:google-api-client:2.2.0 (3 constraints: a132abfa)
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
 com.google.api.grpc:grpc-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
 com.google.api.grpc:proto-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
-com.google.api.grpc:proto-google-common-protos:2.19.1 (6 constraints: 334e2e90)
+com.google.api.grpc:proto-google-common-protos:2.22.0 (6 constraints: 2f4e2390)
 com.google.api.grpc:proto-google-iam-v1:1.14.1 (2 constraints: e91ef3cc)
 com.google.apis:google-api-services-storage:v1-rev20230301-2.0.0 (2 constraints: ce258747)
 com.google.auth:google-auth-library-credentials:1.16.0 (6 constraints: 42584e93)
@@ -41,10 +41,10 @@ com.google.cloud:google-cloud-core:2.18.1 (3 constraints: 502f7757)
 com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
 com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
-com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)
-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 8a894b63)
+com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)
+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 6e891f5a)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.1.2-jre (25 constraints: 646b5109)
+com.google.guava:guava:32.1.2-jre (26 constraints: fc7838d4)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
@@ -52,9 +52,9 @@ com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620e
 com.google.http-client:google-http-client-appengine:1.43.1 (2 constraints: da207181)
 com.google.http-client:google-http-client-gson:1.43.1 (7 constraints: 5a70c647)
 com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)
-com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 3a3da718)
+com.google.j2objc:j2objc-annotations:2.8 (5 constraints: a6460661)
 com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.23.1 (11 constraints: d095caae)
+com.google.protobuf:protobuf-java:3.24.0 (11 constraints: d095beaf)
 com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)
 com.google.re2j:re2j:1.7 (2 constraints: 3814d46f)
 com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
@@ -94,36 +94,37 @@ io.dropwizard.metrics:metrics-graphite:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jetty10:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jmx:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jvm:4.2.20 (1 constraints: 3a05413b)
-io.grpc:grpc-alts:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-api:1.56.0 (5 constraints: a43684b7)
-io.grpc:grpc-auth:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-context:1.56.0 (4 constraints: 2f2a2aec)
-io.grpc:grpc-core:1.56.0 (2 constraints: ec1894f9)
-io.grpc:grpc-googleapis:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-grpclb:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-netty:1.56.0 (1 constraints: 3e054b3b)
-io.grpc:grpc-netty-shaded:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-protobuf:1.56.0 (2 constraints: 5d159cd7)
-io.grpc:grpc-protobuf-lite:1.56.0 (2 constraints: 291aeb4d)
-io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)
-io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)
-io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)
+io.grpc:grpc-alts:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-api:1.58.0 (6 constraints: 4b405ed0)
+io.grpc:grpc-auth:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-context:1.58.0 (4 constraints: a22a191e)
+io.grpc:grpc-core:1.58.0 (3 constraints: 4621731f)
+io.grpc:grpc-googleapis:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-grpclb:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-netty:1.58.0 (1 constraints: 4005513b)
+io.grpc:grpc-netty-shaded:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-protobuf:1.58.0 (2 constraints: 5f1500d8)
+io.grpc:grpc-protobuf-lite:1.58.0 (2 constraints: 2b1af14d)
+io.grpc:grpc-rls:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-services:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-stub:1.58.0 (2 constraints: 5f1500d8)
+io.grpc:grpc-util:1.58.0 (3 constraints: 2d1a087d)
+io.grpc:grpc-xds:1.58.0 (1 constraints: 20100fa6)
 io.netty:netty-buffer:4.1.99.Final (10 constraints: de999d1c)
 io.netty:netty-codec:4.1.99.Final (5 constraints: 79452589)
 io.netty:netty-codec-http:4.1.99.Final (3 constraints: 6124fbef)
-io.netty:netty-codec-http2:4.1.99.Final (1 constraints: ed0a94cb)
+io.netty:netty-codec-http2:4.1.99.Final (1 constraints: ea0a80cb)
 io.netty:netty-codec-socks:4.1.99.Final (1 constraints: 190fce6c)
 io.netty:netty-common:4.1.99.Final (12 constraints: 60b319a3)
 io.netty:netty-handler:4.1.99.Final (3 constraints: 782b0b3f)
-io.netty:netty-handler-proxy:4.1.99.Final (1 constraints: ed0a94cb)
+io.netty:netty-handler-proxy:4.1.99.Final (1 constraints: ea0a80cb)
 io.netty:netty-resolver:4.1.99.Final (2 constraints: 621a2533)
 io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)
 io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)
 io.netty:netty-transport:4.1.99.Final (9 constraints: 268c2655)
 io.netty:netty-transport-classes-epoll:4.1.99.Final (1 constraints: b6121b1f)
 io.netty:netty-transport-native-epoll:4.1.99.Final (1 constraints: da0f128f)
-io.netty:netty-transport-native-unix-common:4.1.99.Final (4 constraints: 673d3899)
+io.netty:netty-transport-native-unix-common:4.1.99.Final (4 constraints: 643d7197)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index 4ced9981429..cc43d9abc31 100644
--- a/versions.props
+++ b/versions.props
@@ -21,7 +21,7 @@ commons-codec:commons-codec=1.16.0
 commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.14.0
 io.dropwizard.metrics:*=4.2.20
-io.grpc:grpc-*=1.56.0
+io.grpc:grpc-*=1.58.0
 io.netty:*=4.1.99.Final
 io.opentelemetry:opentelemetry-bom=1.30.1
 io.prometheus:*=0.16.0

From 97c752f796253efac5aadc81570f6530de715425 Mon Sep 17 00:00:00 2001
From: Ovidiu M <ovidiu@faction.ro>
Date: Tue, 3 Oct 2023 22:54:06 +0300
Subject: [PATCH 151/160] Fixed API examples for node-roles (#1825)

---
 .../modules/deployment-guide/pages/node-roles.adoc            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adoc
index a6fff6c814e..a261d23e70c 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adoc
@@ -165,7 +165,7 @@ Fetches the current node roles assignment for a specified role.
 *Input*
 [source,text]
 ----
-http://localhost:8983/api/node-roles/role/data
+http://localhost:8983/api/cluster/node-roles/role/data
 ----
 
 *Output*
@@ -184,7 +184,7 @@ http://localhost:8983/api/node-roles/role/data
 *Input*
 [source,text]
 ----
-http://localhost:8983/api/node-roles/role/data/off
+http://localhost:8983/api/cluster/node-roles/role/data/off
 ----
 
 *Output*

From 0c7832057925c1aee14c77de53b6165e4b13cb49 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 22:02:04 +0200
Subject: [PATCH 152/160] Update dependency com.google.cloud:google-cloud-bom
 to v0.204.0 (#1745)

---
 solr/licenses/api-common-2.11.1.jar.sha1      |  1 -
 solr/licenses/api-common-2.16.0.jar.sha1      |  1 +
 .../auto-value-annotations-1.10.1.jar.sha1    |  1 -
 .../auto-value-annotations-1.10.2.jar.sha1    |  1 +
 ...gle-cloud-storage-v2-2.22.3-alpha.jar.sha1 |  1 -
 ...gle-cloud-storage-v2-2.27.0-alpha.jar.sha1 |  1 +
 solr/licenses/gax-2.28.1.jar.sha1             |  1 -
 solr/licenses/gax-2.33.0.jar.sha1             |  1 +
 solr/licenses/gax-grpc-2.28.1.jar.sha1        |  1 -
 solr/licenses/gax-grpc-2.33.0.jar.sha1        |  1 +
 solr/licenses/gax-httpjson-0.113.1.jar.sha1   |  1 -
 solr/licenses/gax-httpjson-2.33.0.jar.sha1    |  1 +
 ...ices-storage-v1-rev20230301-2.0.0.jar.sha1 |  1 -
 ...ices-storage-v1-rev20230907-2.0.0.jar.sha1 |  1 +
 ...e-auth-library-credentials-1.16.0.jar.sha1 |  1 -
 ...e-auth-library-credentials-1.19.0.jar.sha1 |  1 +
 ...e-auth-library-oauth2-http-1.16.0.jar.sha1 |  1 -
 ...e-auth-library-oauth2-http-1.19.0.jar.sha1 |  1 +
 .../google-cloud-core-2.18.1.jar.sha1         |  1 -
 .../google-cloud-core-2.23.0.jar.sha1         |  1 +
 .../google-cloud-core-grpc-2.18.1.jar.sha1    |  1 -
 .../google-cloud-core-grpc-2.23.0.jar.sha1    |  1 +
 .../google-cloud-core-http-2.18.1.jar.sha1    |  1 -
 .../google-cloud-core-http-2.23.0.jar.sha1    |  1 +
 .../google-cloud-nio-0.126.16.jar.sha1        |  1 -
 .../google-cloud-nio-0.127.3.jar.sha1         |  1 +
 .../google-cloud-storage-2.22.3.jar.sha1      |  1 -
 .../google-cloud-storage-2.27.0.jar.sha1      |  1 +
 .../google-http-client-1.43.1.jar.sha1        |  1 -
 .../google-http-client-1.43.3.jar.sha1        |  1 +
 ...ogle-http-client-apache-v2-1.43.1.jar.sha1 |  1 -
 ...ogle-http-client-apache-v2-1.43.3.jar.sha1 |  1 +
 ...ogle-http-client-appengine-1.43.1.jar.sha1 |  1 -
 ...ogle-http-client-appengine-1.43.3.jar.sha1 |  1 +
 .../google-http-client-gson-1.43.1.jar.sha1   |  1 -
 .../google-http-client-gson-1.43.3.jar.sha1   |  1 +
 ...oogle-http-client-jackson2-1.43.1.jar.sha1 |  1 -
 ...oogle-http-client-jackson2-1.43.3.jar.sha1 |  1 +
 ...gle-cloud-storage-v2-2.22.3-alpha.jar.sha1 |  1 -
 ...gle-cloud-storage-v2-2.27.0-alpha.jar.sha1 |  1 +
 ...gle-cloud-storage-v2-2.22.3-alpha.jar.sha1 |  1 -
 ...gle-cloud-storage-v2-2.27.0-alpha.jar.sha1 |  1 +
 ...proto-google-common-protos-2.22.0.jar.sha1 |  1 -
 ...proto-google-common-protos-2.24.0.jar.sha1 |  1 +
 .../proto-google-iam-v1-1.14.1.jar.sha1       |  1 -
 .../proto-google-iam-v1-1.19.0.jar.sha1       |  1 +
 .../protobuf-java-util-3.23.1.jar.sha1        |  1 -
 .../protobuf-java-util-3.23.2.jar.sha1        |  1 +
 versions.lock                                 | 90 +++++++++----------
 versions.props                                |  2 +-
 50 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100644 solr/licenses/api-common-2.11.1.jar.sha1
 create mode 100644 solr/licenses/api-common-2.16.0.jar.sha1
 delete mode 100644 solr/licenses/auto-value-annotations-1.10.1.jar.sha1
 create mode 100644 solr/licenses/auto-value-annotations-1.10.2.jar.sha1
 delete mode 100644 solr/licenses/gapic-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
 create mode 100644 solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/gax-2.28.1.jar.sha1
 create mode 100644 solr/licenses/gax-2.33.0.jar.sha1
 delete mode 100644 solr/licenses/gax-grpc-2.28.1.jar.sha1
 create mode 100644 solr/licenses/gax-grpc-2.33.0.jar.sha1
 delete mode 100644 solr/licenses/gax-httpjson-0.113.1.jar.sha1
 create mode 100644 solr/licenses/gax-httpjson-2.33.0.jar.sha1
 delete mode 100644 solr/licenses/google-api-services-storage-v1-rev20230301-2.0.0.jar.sha1
 create mode 100644 solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1
 delete mode 100644 solr/licenses/google-auth-library-credentials-1.16.0.jar.sha1
 create mode 100644 solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1
 delete mode 100644 solr/licenses/google-auth-library-oauth2-http-1.16.0.jar.sha1
 create mode 100644 solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1
 delete mode 100644 solr/licenses/google-cloud-core-2.18.1.jar.sha1
 create mode 100644 solr/licenses/google-cloud-core-2.23.0.jar.sha1
 delete mode 100644 solr/licenses/google-cloud-core-grpc-2.18.1.jar.sha1
 create mode 100644 solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1
 delete mode 100644 solr/licenses/google-cloud-core-http-2.18.1.jar.sha1
 create mode 100644 solr/licenses/google-cloud-core-http-2.23.0.jar.sha1
 delete mode 100644 solr/licenses/google-cloud-nio-0.126.16.jar.sha1
 create mode 100644 solr/licenses/google-cloud-nio-0.127.3.jar.sha1
 delete mode 100644 solr/licenses/google-cloud-storage-2.22.3.jar.sha1
 create mode 100644 solr/licenses/google-cloud-storage-2.27.0.jar.sha1
 delete mode 100644 solr/licenses/google-http-client-1.43.1.jar.sha1
 create mode 100644 solr/licenses/google-http-client-1.43.3.jar.sha1
 delete mode 100644 solr/licenses/google-http-client-apache-v2-1.43.1.jar.sha1
 create mode 100644 solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1
 delete mode 100644 solr/licenses/google-http-client-appengine-1.43.1.jar.sha1
 create mode 100644 solr/licenses/google-http-client-appengine-1.43.3.jar.sha1
 delete mode 100644 solr/licenses/google-http-client-gson-1.43.1.jar.sha1
 create mode 100644 solr/licenses/google-http-client-gson-1.43.3.jar.sha1
 delete mode 100644 solr/licenses/google-http-client-jackson2-1.43.1.jar.sha1
 create mode 100644 solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1
 delete mode 100644 solr/licenses/grpc-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
 create mode 100644 solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/proto-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
 create mode 100644 solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
 delete mode 100644 solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
 create mode 100644 solr/licenses/proto-google-common-protos-2.24.0.jar.sha1
 delete mode 100644 solr/licenses/proto-google-iam-v1-1.14.1.jar.sha1
 create mode 100644 solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1
 delete mode 100644 solr/licenses/protobuf-java-util-3.23.1.jar.sha1
 create mode 100644 solr/licenses/protobuf-java-util-3.23.2.jar.sha1

diff --git a/solr/licenses/api-common-2.11.1.jar.sha1 b/solr/licenses/api-common-2.11.1.jar.sha1
deleted file mode 100644
index 2d55b0c7e00..00000000000
--- a/solr/licenses/api-common-2.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6eeccbe67f09b0dc8d40e303b8be59584738f37d
diff --git a/solr/licenses/api-common-2.16.0.jar.sha1 b/solr/licenses/api-common-2.16.0.jar.sha1
new file mode 100644
index 00000000000..65835e41761
--- /dev/null
+++ b/solr/licenses/api-common-2.16.0.jar.sha1
@@ -0,0 +1 @@
+95ff9321582d6e85b1630ce8ab89abc37d39eecd
diff --git a/solr/licenses/auto-value-annotations-1.10.1.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.1.jar.sha1
deleted file mode 100644
index 37b6969245f..00000000000
--- a/solr/licenses/auto-value-annotations-1.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e5162c15f6033c524134cba05a5e93dc1d37c4b
diff --git a/solr/licenses/auto-value-annotations-1.10.2.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.2.jar.sha1
new file mode 100644
index 00000000000..4a00a46e814
--- /dev/null
+++ b/solr/licenses/auto-value-annotations-1.10.2.jar.sha1
@@ -0,0 +1 @@
+337954851fc17058d9b4b692b6e67e57b20e14f0
diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.22.3-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
deleted file mode 100644
index 20012e8766d..00000000000
--- a/solr/licenses/gapic-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ef0839383d64cbcaada169ac10fd911b3841d3b
diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
new file mode 100644
index 00000000000..9a336ff34fa
--- /dev/null
+++ b/solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
@@ -0,0 +1 @@
+4f3f76da0bc8327372db9c1c3c62eee0fb61a6c9
diff --git a/solr/licenses/gax-2.28.1.jar.sha1 b/solr/licenses/gax-2.28.1.jar.sha1
deleted file mode 100644
index 15fcbeb1c2b..00000000000
--- a/solr/licenses/gax-2.28.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-065730f8cba57358044ff3e2dc3992e75d83ed0a
diff --git a/solr/licenses/gax-2.33.0.jar.sha1 b/solr/licenses/gax-2.33.0.jar.sha1
new file mode 100644
index 00000000000..9813a7e06ec
--- /dev/null
+++ b/solr/licenses/gax-2.33.0.jar.sha1
@@ -0,0 +1 @@
+951807b1ee6facb792aa112d2be6536edc42fd5e
diff --git a/solr/licenses/gax-grpc-2.28.1.jar.sha1 b/solr/licenses/gax-grpc-2.28.1.jar.sha1
deleted file mode 100644
index cb93e16e027..00000000000
--- a/solr/licenses/gax-grpc-2.28.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b0454f2102378bae52fdc201923336efef99caee
diff --git a/solr/licenses/gax-grpc-2.33.0.jar.sha1 b/solr/licenses/gax-grpc-2.33.0.jar.sha1
new file mode 100644
index 00000000000..dcfb107d016
--- /dev/null
+++ b/solr/licenses/gax-grpc-2.33.0.jar.sha1
@@ -0,0 +1 @@
+a13dfd511f62fe0c85036ab5207553974ba08d4d
diff --git a/solr/licenses/gax-httpjson-0.113.1.jar.sha1 b/solr/licenses/gax-httpjson-0.113.1.jar.sha1
deleted file mode 100644
index a6364d2fb27..00000000000
--- a/solr/licenses/gax-httpjson-0.113.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-312c7e5d0ebc5d407c99a73c76e2e076e818da14
diff --git a/solr/licenses/gax-httpjson-2.33.0.jar.sha1 b/solr/licenses/gax-httpjson-2.33.0.jar.sha1
new file mode 100644
index 00000000000..74d7c9fa04e
--- /dev/null
+++ b/solr/licenses/gax-httpjson-2.33.0.jar.sha1
@@ -0,0 +1 @@
+7107021ac58453dd7372f9e2be2c8419cd0b7c6e
diff --git a/solr/licenses/google-api-services-storage-v1-rev20230301-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20230301-2.0.0.jar.sha1
deleted file mode 100644
index 9e01e2a9005..00000000000
--- a/solr/licenses/google-api-services-storage-v1-rev20230301-2.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9960d48021675f902c2a281af0aa1f1f247d4fd
diff --git a/solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1
new file mode 100644
index 00000000000..0901e2c84a7
--- /dev/null
+++ b/solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1
@@ -0,0 +1 @@
+2253d11659564359b9a540f7ff7cc6b60ac6176f
diff --git a/solr/licenses/google-auth-library-credentials-1.16.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.16.0.jar.sha1
deleted file mode 100644
index cea743caeeb..00000000000
--- a/solr/licenses/google-auth-library-credentials-1.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ae88acbd572253c99c36e22b17efff388db3d12
diff --git a/solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1
new file mode 100644
index 00000000000..714d8f41c18
--- /dev/null
+++ b/solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1
@@ -0,0 +1 @@
+403601f0f42fb7099236a76188cd69c03d4fba11
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.16.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.16.0.jar.sha1
deleted file mode 100644
index 5cad6eb7366..00000000000
--- a/solr/licenses/google-auth-library-oauth2-http-1.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4eeb81450d4f61725cbd047393ff5243c7cc6bd7
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1
new file mode 100644
index 00000000000..89ff91d1ef8
--- /dev/null
+++ b/solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1
@@ -0,0 +1 @@
+bcfcec571016784a2b5d45b8493204b77fade9fc
diff --git a/solr/licenses/google-cloud-core-2.18.1.jar.sha1 b/solr/licenses/google-cloud-core-2.18.1.jar.sha1
deleted file mode 100644
index 8241cc2036a..00000000000
--- a/solr/licenses/google-cloud-core-2.18.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4da4cd01c39f333eb5bf8d581111dbf56b7cb3cd
diff --git a/solr/licenses/google-cloud-core-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-2.23.0.jar.sha1
new file mode 100644
index 00000000000..fb3bc37c93c
--- /dev/null
+++ b/solr/licenses/google-cloud-core-2.23.0.jar.sha1
@@ -0,0 +1 @@
+199634a25d1ad967c85323664b3cdb44bc518525
diff --git a/solr/licenses/google-cloud-core-grpc-2.18.1.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.18.1.jar.sha1
deleted file mode 100644
index 65a4de8b46d..00000000000
--- a/solr/licenses/google-cloud-core-grpc-2.18.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-209135ed06ac92a6a684d0fda8b773253979409a
diff --git a/solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1
new file mode 100644
index 00000000000..e56c965ac15
--- /dev/null
+++ b/solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1
@@ -0,0 +1 @@
+59b8ba75c618b6cffbff301dfaa15913d0e28596
diff --git a/solr/licenses/google-cloud-core-http-2.18.1.jar.sha1 b/solr/licenses/google-cloud-core-http-2.18.1.jar.sha1
deleted file mode 100644
index c18176dbbd4..00000000000
--- a/solr/licenses/google-cloud-core-http-2.18.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9285b97a567c58662d056eb43979136b1724f3ce
diff --git a/solr/licenses/google-cloud-core-http-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.23.0.jar.sha1
new file mode 100644
index 00000000000..ee345535581
--- /dev/null
+++ b/solr/licenses/google-cloud-core-http-2.23.0.jar.sha1
@@ -0,0 +1 @@
+9913d0806fcfbfbc4a775f29865126ed8465464b
diff --git a/solr/licenses/google-cloud-nio-0.126.16.jar.sha1 b/solr/licenses/google-cloud-nio-0.126.16.jar.sha1
deleted file mode 100644
index ba549a6191a..00000000000
--- a/solr/licenses/google-cloud-nio-0.126.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c8ac53c0bd52e0889c745c963484e4571f92049
diff --git a/solr/licenses/google-cloud-nio-0.127.3.jar.sha1 b/solr/licenses/google-cloud-nio-0.127.3.jar.sha1
new file mode 100644
index 00000000000..23fb86e05ca
--- /dev/null
+++ b/solr/licenses/google-cloud-nio-0.127.3.jar.sha1
@@ -0,0 +1 @@
+e90d79e85b9651b47a3a364d42d261a132f4cce9
diff --git a/solr/licenses/google-cloud-storage-2.22.3.jar.sha1 b/solr/licenses/google-cloud-storage-2.22.3.jar.sha1
deleted file mode 100644
index 980f8f7b50b..00000000000
--- a/solr/licenses/google-cloud-storage-2.22.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b8b634a1537ca1dfda8d959e6eae47a5dec9b7b
diff --git a/solr/licenses/google-cloud-storage-2.27.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.27.0.jar.sha1
new file mode 100644
index 00000000000..525565d7743
--- /dev/null
+++ b/solr/licenses/google-cloud-storage-2.27.0.jar.sha1
@@ -0,0 +1 @@
+930b523d460ff88e0d9305b8133e125e8f62340e
diff --git a/solr/licenses/google-http-client-1.43.1.jar.sha1 b/solr/licenses/google-http-client-1.43.1.jar.sha1
deleted file mode 100644
index 848698f60db..00000000000
--- a/solr/licenses/google-http-client-1.43.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2ef9413e65319ac448534b424522a2c48087d884
diff --git a/solr/licenses/google-http-client-1.43.3.jar.sha1 b/solr/licenses/google-http-client-1.43.3.jar.sha1
new file mode 100644
index 00000000000..c181604002e
--- /dev/null
+++ b/solr/licenses/google-http-client-1.43.3.jar.sha1
@@ -0,0 +1 @@
+a758b82e55a2f5f681e289c5ed384d3dbda6f3cd
diff --git a/solr/licenses/google-http-client-apache-v2-1.43.1.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.43.1.jar.sha1
deleted file mode 100644
index 0ac157ef935..00000000000
--- a/solr/licenses/google-http-client-apache-v2-1.43.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de73ac2958a45ca67651ce30f47eefa1f7497a6d
diff --git a/solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1
new file mode 100644
index 00000000000..895f6f53ef1
--- /dev/null
+++ b/solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1
@@ -0,0 +1 @@
+3e224b1b9e18dd28c89a764b1feea498ba952579
diff --git a/solr/licenses/google-http-client-appengine-1.43.1.jar.sha1 b/solr/licenses/google-http-client-appengine-1.43.1.jar.sha1
deleted file mode 100644
index 0b258e7fbb4..00000000000
--- a/solr/licenses/google-http-client-appengine-1.43.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c408b784269b46028c133768a439c266f8cbf553
diff --git a/solr/licenses/google-http-client-appengine-1.43.3.jar.sha1 b/solr/licenses/google-http-client-appengine-1.43.3.jar.sha1
new file mode 100644
index 00000000000..d30ff0dade7
--- /dev/null
+++ b/solr/licenses/google-http-client-appengine-1.43.3.jar.sha1
@@ -0,0 +1 @@
+09d6cbdde6ea3469a67601a811b4e83de3e68a79
diff --git a/solr/licenses/google-http-client-gson-1.43.1.jar.sha1 b/solr/licenses/google-http-client-gson-1.43.1.jar.sha1
deleted file mode 100644
index 6202dd6c2ff..00000000000
--- a/solr/licenses/google-http-client-gson-1.43.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06f000784f9813ee33f976e42822d98ffacf3dbd
diff --git a/solr/licenses/google-http-client-gson-1.43.3.jar.sha1 b/solr/licenses/google-http-client-gson-1.43.3.jar.sha1
new file mode 100644
index 00000000000..1c41c903a2a
--- /dev/null
+++ b/solr/licenses/google-http-client-gson-1.43.3.jar.sha1
@@ -0,0 +1 @@
+252e267acf720ef6333488740a696a1d5e204639
diff --git a/solr/licenses/google-http-client-jackson2-1.43.1.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.43.1.jar.sha1
deleted file mode 100644
index 35d9ae1d516..00000000000
--- a/solr/licenses/google-http-client-jackson2-1.43.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-995fbf865361d905218e486eb19313d4408ccfd9
diff --git a/solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1
new file mode 100644
index 00000000000..36ee05dbdb8
--- /dev/null
+++ b/solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1
@@ -0,0 +1 @@
+689da86469d19a01c726c8c24477b95c8a834bbe
diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.22.3-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
deleted file mode 100644
index c4a0d260b1b..00000000000
--- a/solr/licenses/grpc-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e35429d93ecf7ac9d418b485ed606f5dbb5ed6c
diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
new file mode 100644
index 00000000000..c47f217dbb2
--- /dev/null
+++ b/solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
@@ -0,0 +1 @@
+ea4b9de930aaf83060f43c47854753f448265bb1
diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.22.3-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
deleted file mode 100644
index fac06d6e306..00000000000
--- a/solr/licenses/proto-google-cloud-storage-v2-2.22.3-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4ab626fc5d55da6a0a82bc53e4fc3ba913bf01b6
diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
new file mode 100644
index 00000000000..6782c6f0a28
--- /dev/null
+++ b/solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
@@ -0,0 +1 @@
+f781a31010b2fe5d826542b9df5963fb46eedd62
diff --git a/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
deleted file mode 100644
index 190d72d40b2..00000000000
--- a/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-627126f6a05085dab0caba68dcdad118512975ef
diff --git a/solr/licenses/proto-google-common-protos-2.24.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.24.0.jar.sha1
new file mode 100644
index 00000000000..48d76edbf9e
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.24.0.jar.sha1
@@ -0,0 +1 @@
+de4fb1eb296934a504e2ee2e4463b2ebbc2105c6
diff --git a/solr/licenses/proto-google-iam-v1-1.14.1.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.14.1.jar.sha1
deleted file mode 100644
index 55bf279e359..00000000000
--- a/solr/licenses/proto-google-iam-v1-1.14.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c57a92ecad9a53693ace6315c0d1be33836d846e
diff --git a/solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1
new file mode 100644
index 00000000000..a238684629c
--- /dev/null
+++ b/solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1
@@ -0,0 +1 @@
+6550854f87febd902a5f1541086687212f3034b8
diff --git a/solr/licenses/protobuf-java-util-3.23.1.jar.sha1 b/solr/licenses/protobuf-java-util-3.23.1.jar.sha1
deleted file mode 100644
index 7aa51b1cd5f..00000000000
--- a/solr/licenses/protobuf-java-util-3.23.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca14f0e8d57274bd9c3c407da9738d477f27a0de
diff --git a/solr/licenses/protobuf-java-util-3.23.2.jar.sha1 b/solr/licenses/protobuf-java-util-3.23.2.jar.sha1
new file mode 100644
index 00000000000..df29f31e79c
--- /dev/null
+++ b/solr/licenses/protobuf-java-util-3.23.2.jar.sha1
@@ -0,0 +1 @@
+645a4c458c87399503a7a8e3d1dfbe043c94ea4d
diff --git a/versions.lock b/versions.lock
index b85e90cd52d..b1af4b4c1a8 100644
--- a/versions.lock
+++ b/versions.lock
@@ -8,7 +8,7 @@ com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
 com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55)
 com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9cbe6d17)
-com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42026028)
+com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 4302e328)
 com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8d63878e)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)
@@ -22,41 +22,41 @@ com.github.spotbugs:spotbugs-annotations:4.7.3 (1 constraints: 10051736)
 com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87)
 com.github.virtuald:curvesapi:1.07 (1 constraints: 9e0ac7c0)
 com.google.android:annotations:4.1.1.4 (2 constraints: b918820a)
-com.google.api:api-common:2.11.1 (5 constraints: 754453b0)
-com.google.api:gax:2.28.1 (5 constraints: 6e4a5b9d)
-com.google.api:gax-grpc:2.28.1 (1 constraints: 211012a6)
-com.google.api:gax-httpjson:0.113.1 (2 constraints: 3421b1bb)
+com.google.api:api-common:2.16.0 (5 constraints: 8944c9b7)
+com.google.api:gax:2.33.0 (5 constraints: 554a2894)
+com.google.api:gax-grpc:2.33.0 (1 constraints: 1c1006a6)
+com.google.api:gax-httpjson:2.33.0 (2 constraints: d8204481)
 com.google.api-client:google-api-client:2.2.0 (3 constraints: a132abfa)
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
-com.google.api.grpc:proto-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)
-com.google.api.grpc:proto-google-common-protos:2.22.0 (6 constraints: 2f4e2390)
-com.google.api.grpc:proto-google-iam-v1:1.14.1 (2 constraints: e91ef3cc)
-com.google.apis:google-api-services-storage:v1-rev20230301-2.0.0 (2 constraints: ce258747)
-com.google.auth:google-auth-library-credentials:1.16.0 (6 constraints: 42584e93)
-com.google.auth:google-auth-library-oauth2-http:1.16.0 (5 constraints: 8444dfb5)
-com.google.auto.value:auto-value-annotations:1.10.1 (5 constraints: 3f4c1051)
-com.google.cloud:google-cloud-bom:0.197.0 (1 constraints: 7305c140)
-com.google.cloud:google-cloud-core:2.18.1 (3 constraints: 502f7757)
-com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
-com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
-com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.27.0-alpha (2 constraints: ec228039)
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.27.0-alpha (2 constraints: ec228039)
+com.google.api.grpc:proto-google-cloud-storage-v2:2.27.0-alpha (2 constraints: ec228039)
+com.google.api.grpc:proto-google-common-protos:2.24.0 (6 constraints: 164efd83)
+com.google.api.grpc:proto-google-iam-v1:1.19.0 (2 constraints: f11ecbcd)
+com.google.apis:google-api-services-storage:v1-rev20230907-2.0.0 (2 constraints: e625234b)
+com.google.auth:google-auth-library-credentials:1.19.0 (6 constraints: 5458e29b)
+com.google.auth:google-auth-library-oauth2-http:1.19.0 (5 constraints: 934470bb)
+com.google.auto.value:auto-value-annotations:1.10.2 (5 constraints: 434c5d52)
+com.google.cloud:google-cloud-bom:0.204.0 (1 constraints: 68059940)
+com.google.cloud:google-cloud-core:2.23.0 (3 constraints: 412fa654)
+com.google.cloud:google-cloud-core-grpc:2.23.0 (1 constraints: 1b1002a6)
+com.google.cloud:google-cloud-core-http:2.23.0 (1 constraints: 1b1002a6)
+com.google.cloud:google-cloud-storage:2.27.0 (2 constraints: d71c8a27)
 com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)
 com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 6e891f5a)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.1.2-jre (26 constraints: fc7838d4)
+com.google.guava:guava:32.1.2-jre (26 constraints: a37b7b56)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
-com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
-com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620e575)
-com.google.http-client:google-http-client-appengine:1.43.1 (2 constraints: da207181)
-com.google.http-client:google-http-client-gson:1.43.1 (7 constraints: 5a70c647)
-com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)
-com.google.j2objc:j2objc-annotations:2.8 (5 constraints: a6460661)
+com.google.http-client:google-http-client:1.43.3 (11 constraints: 3fbf96b4)
+com.google.http-client:google-http-client-apache-v2:1.43.3 (2 constraints: b820e775)
+com.google.http-client:google-http-client-appengine:1.43.3 (2 constraints: de20d381)
+com.google.http-client:google-http-client-gson:1.43.3 (7 constraints: 6270684c)
+com.google.http-client:google-http-client-jackson2:1.43.3 (1 constraints: 1f1007a6)
+com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 87367e23)
 com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.24.0 (11 constraints: d095beaf)
-com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)
-com.google.re2j:re2j:1.7 (2 constraints: 3814d46f)
+com.google.protobuf:protobuf-java:3.24.0 (11 constraints: d6952db6)
+com.google.protobuf:protobuf-java-util:3.23.2 (3 constraints: 332b702b)
+com.google.re2j:re2j:1.7 (2 constraints: 3914d56f)
 com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 5b0ce401)
 com.googlecode.plist:dd-plist:1.24 (1 constraints: 300c84f5)
@@ -94,22 +94,22 @@ io.dropwizard.metrics:metrics-graphite:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jetty10:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jmx:4.2.20 (1 constraints: 3a05413b)
 io.dropwizard.metrics:metrics-jvm:4.2.20 (1 constraints: 3a05413b)
-io.grpc:grpc-alts:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-api:1.58.0 (6 constraints: 4b405ed0)
-io.grpc:grpc-auth:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-context:1.58.0 (4 constraints: a22a191e)
-io.grpc:grpc-core:1.58.0 (3 constraints: 4621731f)
-io.grpc:grpc-googleapis:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-grpclb:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-alts:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-api:1.58.0 (6 constraints: 4c40f8d0)
+io.grpc:grpc-auth:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-context:1.58.0 (4 constraints: a32a5d1e)
+io.grpc:grpc-core:1.58.0 (3 constraints: 4721ad1f)
+io.grpc:grpc-googleapis:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-grpclb:1.58.0 (1 constraints: 211012a6)
 io.grpc:grpc-netty:1.58.0 (1 constraints: 4005513b)
-io.grpc:grpc-netty-shaded:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-protobuf:1.58.0 (2 constraints: 5f1500d8)
-io.grpc:grpc-protobuf-lite:1.58.0 (2 constraints: 2b1af14d)
-io.grpc:grpc-rls:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-services:1.58.0 (1 constraints: 20100fa6)
-io.grpc:grpc-stub:1.58.0 (2 constraints: 5f1500d8)
+io.grpc:grpc-netty-shaded:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-protobuf:1.58.0 (2 constraints: 601503d8)
+io.grpc:grpc-protobuf-lite:1.58.0 (2 constraints: 2c1a134e)
+io.grpc:grpc-rls:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-services:1.58.0 (1 constraints: 211012a6)
+io.grpc:grpc-stub:1.58.0 (2 constraints: 601503d8)
 io.grpc:grpc-util:1.58.0 (3 constraints: 2d1a087d)
-io.grpc:grpc-xds:1.58.0 (1 constraints: 20100fa6)
+io.grpc:grpc-xds:1.58.0 (1 constraints: 211012a6)
 io.netty:netty-buffer:4.1.99.Final (10 constraints: de999d1c)
 io.netty:netty-codec:4.1.99.Final (5 constraints: 79452589)
 io.netty:netty-codec-http:4.1.99.Final (3 constraints: 6124fbef)
@@ -270,7 +270,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.37.0 (5 constraints: 0e499f13)
+org.checkerframework:checker-qual:3.37.0 (5 constraints: 0f491d14)
 org.codehaus.janino:commons-compiler:3.1.9 (2 constraints: 3119a8ec)
 org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
@@ -393,7 +393,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2 (3 constraints: fc2e
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 (4 constraints: 6d485635)
 com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2 (2 constraints: a91d3a60)
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.2 (2 constraints: 0c243f82)
-com.google.cloud:google-cloud-nio:0.126.16 (1 constraints: cd0e267b)
+com.google.cloud:google-cloud-nio:0.127.3 (1 constraints: 9a0e5e6c)
 com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
 com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb)
 com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10)
diff --git a/versions.props b/versions.props
index cc43d9abc31..d12da6f2b50 100644
--- a/versions.props
+++ b/versions.props
@@ -9,7 +9,7 @@ com.fasterxml.jackson:jackson-bom=2.15.2
 com.github.ben-manes.caffeine:caffeine=3.1.8
 com.github.spotbugs:*=4.7.3
 com.github.stephenc.jcip:jcip-annotations=1.0-1
-com.google.cloud:google-cloud-bom=0.197.0
+com.google.cloud:google-cloud-bom=0.204.0
 com.google.errorprone:*=2.22.0
 com.google.guava:guava=32.1.2-jre
 com.google.re2j:re2j=1.7

From 70abd8db8980a91913f28771247a3c8418e2840e Mon Sep 17 00:00:00 2001
From: Chris Hostetter <hossman@apache.org>
Date: Tue, 3 Oct 2023 13:35:10 -0700
Subject: [PATCH 153/160] SOLR-17000: Fix ExecutorUtilTest to eliminate
 concurrency assumptions

---
 .../solr/common/util/ExecutorUtilTest.java    | 180 ++++++++++++------
 1 file changed, 124 insertions(+), 56 deletions(-)

diff --git a/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java b/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
index c3fc2137018..a9df98a296b 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/ExecutorUtilTest.java
@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -32,74 +33,141 @@
 import org.junit.Test;
 
 public class ExecutorUtilTest extends SolrTestCase {
+
+  private static final long MAX_AWAIT_TERMINATION_ARG_MS = 100;
+
+  /**
+   * The maximum amount of time we're willing to let the test wait for any type of blocking action,
+   * no matter ow slow our CPU is. Any thing that exceeds this time is presumably a bug
+   */
+  private static final long MAX_SANE_WAIT_DURRATION_MS = 2_000;
+
+  /** Test that if there is a non interruptable thread that awaitTermination eventually returns. */
   @Test
   // Must prevent runaway failures so limit this to short timeframe in case of failure
-  @Timeout(millis = 3000)
-  public void testExecutorUtilAwaitsTerminationEnds() throws Exception {
-    final long awaitTerminationTimeout = 100;
-    final long threadTimeoutDuration = 3 * awaitTerminationTimeout;
-    final TimeUnit testTimeUnit = TimeUnit.MILLISECONDS;
+  @Timeout(millis = 5_000)
+  public void testExecutorUtilAwaitsTerminationWhenTaskIgnoresInterupt() throws Exception {
 
-    // check that if there is a non interruptable thread that awaitTermination eventually returns.
-
-    ExecutorService executorService =
+    final Worker w = new Worker(false);
+    final ExecutorService executorService =
         ExecutorUtil.newMDCAwareSingleThreadExecutor(
             new SolrNamedThreadFactory(this.getClass().getSimpleName() + "non-interruptable"));
-    final AtomicInteger interruptCount = new AtomicInteger();
-    Future<Boolean> nonInterruptableFuture =
-        executorService.submit(
-            () -> getTestThread(threadTimeoutDuration, testTimeUnit, interruptCount, false));
-    executorService.shutdownNow();
-    assertThrows(
-        RuntimeException.class,
-        () ->
-            ExecutorUtil.awaitTermination(executorService, awaitTerminationTimeout, testTimeUnit));
-
-    // Thread should not have finished in await termination.
-    assertFalse(nonInterruptableFuture.isDone());
-    assertTrue(interruptCount.get() > 0);
-
-    // Thread should have finished by now.
-    Thread.sleep(TimeUnit.MILLISECONDS.convert(threadTimeoutDuration, testTimeUnit));
-    assertTrue(nonInterruptableFuture.isDone());
-    assertTrue(nonInterruptableFuture.get());
-
-    // check that if there is an interruptable thread that awaitTermination forcefully returns.
-
-    ExecutorService executorService2 =
+    try {
+      final Future<Boolean> f = executorService.submit(w);
+
+      assertTrue("Worker didn't start in a sane amount of time", w.awaitWorkerStart());
+      executorService.shutdownNow();
+      assertTrue(
+          "Worker not interupted by shutdown in a sane amount of time",
+          w.awaitWorkerInteruptedAtLeastOnce());
+      assertThrows(
+          RuntimeException.class,
+          () ->
+              ExecutorUtil.awaitTermination(
+                  executorService, MAX_AWAIT_TERMINATION_ARG_MS, TimeUnit.MILLISECONDS));
+
+      assertFalse("Worker should not finish due to shutdown or awaitTermination", f.isDone());
+      assertTrue("test sanity check: WTF? how did we get here?", w.getNumberOfInterupts() > 0);
+
+      // Worker should finish if we let it
+      w.tellWorkerToFinish();
+      assertTrue(f.get(MAX_SANE_WAIT_DURRATION_MS, TimeUnit.MILLISECONDS));
+    } finally {
+      w.tellWorkerToFinish();
+      ExecutorUtil.shutdownNowAndAwaitTermination(executorService);
+    }
+  }
+
+  /** Test that if there is an interruptable thread that awaitTermination forcefully returns. */
+  @Test
+  // Must prevent runaway failures so limit this to short timeframe in case of failure
+  @Timeout(millis = 5_000)
+  public void testExecutorUtilAwaitsTerminationWhenTaskRespectsInterupt() throws Exception {
+
+    final Worker w = new Worker(true);
+    final ExecutorService executorService =
         ExecutorUtil.newMDCAwareSingleThreadExecutor(
             new SolrNamedThreadFactory(this.getClass().getSimpleName() + "interruptable"));
-    interruptCount.set(0);
-    Future<Boolean> interruptableFuture =
-        executorService2.submit(
-            () -> getTestThread(threadTimeoutDuration, testTimeUnit, interruptCount, true));
-    executorService2.shutdownNow();
-    ExecutorUtil.awaitTermination(executorService2, awaitTerminationTimeout, testTimeUnit);
-
-    // Thread should have been interrupted.
-    assertTrue(interruptableFuture.isDone());
-    assertTrue(interruptCount.get() > 0);
-    assertFalse(interruptableFuture.get());
+    try {
+      final Future<Boolean> f = executorService.submit(w);
+
+      assertTrue("Worker didn't start in a sane amount of time", w.awaitWorkerStart());
+      executorService.shutdownNow();
+      ExecutorUtil.awaitTermination(
+          executorService, MAX_AWAIT_TERMINATION_ARG_MS, TimeUnit.MILLISECONDS);
+
+      // Worker should finish on it's own after the interupt
+      assertTrue(
+          "Worker not interupted in a sane amount of time", w.awaitWorkerInteruptedAtLeastOnce());
+      assertFalse(f.get(MAX_SANE_WAIT_DURRATION_MS, TimeUnit.MILLISECONDS));
+      assertTrue("test sanity check: WTF? how did we get here?", w.getNumberOfInterupts() > 0);
+
+    } finally {
+      w.tellWorkerToFinish();
+      ExecutorUtil.shutdownNowAndAwaitTermination(executorService);
+    }
   }
 
-  private boolean getTestThread(
-      long threadTimeoutDuration,
-      TimeUnit testTimeUnit,
-      AtomicInteger interruptCount,
-      boolean interruptable) {
-    TimeOut threadTimeout = new TimeOut(threadTimeoutDuration, testTimeUnit, TimeSource.NANO_TIME);
-    while (!threadTimeout.hasTimedOut()) {
-      try {
-        threadTimeout.sleep(TimeUnit.MILLISECONDS.convert(threadTimeoutDuration, testTimeUnit));
-      } catch (InterruptedException interruptedException) {
-        interruptCount.incrementAndGet();
-        if (interruptable) {
-          Thread.currentThread().interrupt();
-          return false; // didn't run full time
+  private static final class Worker implements Callable<Boolean> {
+    // how we communiate out to our caller
+    private final CountDownLatch taskStartedLatch = new CountDownLatch(1);
+    private final CountDownLatch gotFirstInteruptLatch = new CountDownLatch(1);
+    private final AtomicInteger interruptCount = new AtomicInteger(0);
+
+    // how our caller communicates with us
+    private final CountDownLatch allowedToFinishLatch = new CountDownLatch(1);
+    private final boolean interruptable;
+
+    public Worker(final boolean interruptable) {
+      this.interruptable = interruptable;
+    }
+
+    /** Returns false if worker doesn't start in a sane amount of time */
+    public boolean awaitWorkerStart() throws InterruptedException {
+      return taskStartedLatch.await(MAX_SANE_WAIT_DURRATION_MS, TimeUnit.MILLISECONDS);
+    }
+
+    /** Returns false if worker didn't recieve interupt in a sane amount of time */
+    public boolean awaitWorkerInteruptedAtLeastOnce() throws InterruptedException {
+      return gotFirstInteruptLatch.await(MAX_SANE_WAIT_DURRATION_MS, TimeUnit.MILLISECONDS);
+    }
+
+    public int getNumberOfInterupts() {
+      return interruptCount.get();
+    }
+
+    public void tellWorkerToFinish() {
+      allowedToFinishLatch.countDown();
+    }
+
+    @Override
+    public Boolean call() {
+      // aboslute last resort timeout to prevent infinite while loop
+      final TimeOut threadTimeout =
+          new TimeOut(MAX_SANE_WAIT_DURRATION_MS, TimeUnit.MILLISECONDS, TimeSource.NANO_TIME);
+
+      while (!threadTimeout.hasTimedOut()) {
+        try {
+
+          // this must be inside the try block, so we'll still catch the InterruptedException if our
+          // caller shutsdown & awaits termination before we get a chance to start await'ing...
+          taskStartedLatch.countDown();
+
+          if (allowedToFinishLatch.await(
+              threadTimeout.timeLeft(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)) {
+            return true; // ran until we were told to stop
+          }
+        } catch (InterruptedException interruptedException) {
+          interruptCount.incrementAndGet();
+          gotFirstInteruptLatch.countDown();
+          if (interruptable) {
+            Thread.currentThread().interrupt();
+            return false; // was explicitly interupted
+          }
         }
       }
+      throw new RuntimeException("Sane timeout elapsed before worker finished");
     }
-    return true; // ran full time
   }
 
   @Test

From f88891e6bb80c3003ca6ba76c55db3f4159cf524 Mon Sep 17 00:00:00 2001
From: Tomas Eduardo Fernandez Lobbe <tflobbe@apache.org>
Date: Tue, 3 Oct 2023 15:02:56 -0700
Subject: [PATCH 154/160] SOLR-16852: Let backups have custom key/values
 (#1739)

---
 solr/CHANGES.txt                              |  2 +
 .../api/model/CollectionBackupDetails.java    |  1 +
 .../solr/cloud/api/collections/BackupCmd.java | 10 ++-
 .../solr/core/backup/BackupProperties.java    | 68 +++++++++++++++----
 .../admin/api/CreateCollectionBackupAPI.java  |  7 ++
 .../LocalFSCloudIncrementalBackupTest.java    | 68 +++++++++++++++++++
 .../cloud/api/collections/PurgeGraphTest.java |  6 +-
 .../pages/collection-management.adoc          | 10 ++-
 .../solrj/request/CollectionAdminRequest.java |  9 +++
 .../AbstractIncrementalBackupTest.java        | 33 ++++++++-
 10 files changed, 198 insertions(+), 16 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bc1564fc028..ef7e37ea61e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -105,6 +105,8 @@ New Features
 
 * SOLR-15367: Convert "rid" functionality into a default Tracer (Alex Deparvu, David Smiley)
 
+* SOLR-16852: Backups now allow metadata to be added as key-values (Tomás Fernández Löbbe)
+
 Improvements
 ---------------------
 * SOLR-16490: `/admin/cores?action=backupcore` now has a v2 equivalent, available at
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java b/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
index a46529baab4..94d18f8682f 100644
--- a/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CollectionBackupDetails.java
@@ -35,4 +35,5 @@ public class CollectionBackupDetails {
   public String configsetName;
 
   @JsonProperty public String collectionAlias;
+  @JsonProperty public Map<String, String> extraProperties;
 }
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
index 5d4aaf7fd79..151cbeeee1a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
@@ -29,6 +29,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import org.apache.solr.cloud.api.collections.CollectionHandlingUtils.ShardRequestTracker;
 import org.apache.solr.common.SolrException;
@@ -68,6 +69,7 @@ public BackupCmd(CollectionCommandContext ccc) {
     this.ccc = ccc;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results)
       throws Exception {
@@ -91,8 +93,11 @@ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> resu
             .getCollection(collectionName)
             .getConfigName();
 
+    Map<String, String> customProps = (Map<String, String>) message.get("extraProperties");
+
     BackupProperties backupProperties =
-        BackupProperties.create(backupName, collectionName, extCollectionName, configName);
+        BackupProperties.create(
+            backupName, collectionName, extCollectionName, configName, customProps);
 
     CoreContainer cc = ccc.getCoreContainer();
     try (BackupRepository repository = cc.newBackupRepository(repo)) {
@@ -367,6 +372,9 @@ private NamedList<Object> aggregateResults(
     }
     aggRsp.add("indexVersion", backupProps.getIndexVersion());
     aggRsp.add("startTime", backupProps.getStartTime());
+    if (backupProps.getExtraProperties() != null) {
+      aggRsp.add("extraProperties", backupProps.getExtraProperties());
+    }
 
     // Optional options for backups
     Optional<Integer> indexFileCount = Optional.empty();
diff --git a/solr/core/src/java/org/apache/solr/core/backup/BackupProperties.java b/solr/core/src/java/org/apache/solr/core/backup/BackupProperties.java
index 1e452bb516d..dcc8509b574 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/BackupProperties.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/BackupProperties.java
@@ -48,18 +48,33 @@
  */
 public class BackupProperties {
 
+  private static final String EXTRA_PROPERTY_PREFIX = "property.";
+
   private double indexSizeMB;
   private int indexFileCount;
 
-  private Properties properties;
+  private final Properties properties;
+
+  private final Map<String, String> extraProperties;
 
-  private BackupProperties(Properties properties) {
+  private BackupProperties(Properties properties, Map<String, String> extraProperties) {
     this.properties = properties;
+    if (extraProperties == null) {
+      extraProperties = Map.of();
+    } else if (extraProperties.keySet().stream().anyMatch(String::isEmpty)) {
+      throw new IllegalArgumentException("Can't have an extra property with an empty key");
+    }
+    this.extraProperties = extraProperties;
   }
 
   public static BackupProperties create(
-      String backupName, String collectionName, String extCollectionName, String configName) {
-    Properties properties = new Properties();
+      String backupName,
+      String collectionName,
+      String extCollectionName,
+      String configName,
+      Map<String, String> extraProperties) {
+    final Properties properties = new Properties();
+
     properties.put(BackupManager.BACKUP_NAME_PROP, backupName);
     properties.put(BackupManager.COLLECTION_NAME_PROP, collectionName);
     properties.put(BackupManager.COLLECTION_ALIAS_PROP, extCollectionName);
@@ -67,7 +82,7 @@ public static BackupProperties create(
     properties.put(BackupManager.START_TIME_PROP, Instant.now().toString());
     properties.put(BackupManager.INDEX_VERSION_PROP, Version.LATEST.toString());
 
-    return new BackupProperties(properties);
+    return new BackupProperties(properties, extraProperties);
   }
 
   public static Optional<BackupProperties> readFromLatest(
@@ -93,10 +108,29 @@ public static BackupProperties readFrom(
                 repository.openInput(backupPath, fileName, IOContext.DEFAULT)),
             StandardCharsets.UTF_8)) {
       props.load(is);
-      return new BackupProperties(props);
+      Map<String, String> extraProperties = extractExtraProperties(props);
+      return new BackupProperties(props, extraProperties);
     }
   }
 
+  private static Map<String, String> extractExtraProperties(Properties props) {
+    Map<String, String> extraProperties = new HashMap<>();
+    props
+        .entrySet()
+        .removeIf(
+            e -> {
+              String entryKey = e.getKey().toString();
+              if (entryKey.startsWith(EXTRA_PROPERTY_PREFIX)) {
+                extraProperties.put(
+                    entryKey.substring(EXTRA_PROPERTY_PREFIX.length()),
+                    String.valueOf(e.getValue()));
+                return true;
+              }
+              return false;
+            });
+    return extraProperties;
+  }
+
   public List<String> getAllShardBackupMetadataFiles() {
     return properties.entrySet().stream()
         .filter(entry -> entry.getKey().toString().endsWith(".md"))
@@ -128,10 +162,14 @@ private String getKeyForShardBackupId(String shardName) {
   }
 
   public void store(Writer propsWriter) throws IOException {
-    properties.put("indexSizeMB", String.valueOf(indexSizeMB));
-    properties.put("indexFileCount", String.valueOf(indexFileCount));
-    properties.put(BackupManager.END_TIME_PROP, Instant.now().toString());
-    properties.store(propsWriter, "Backup properties file");
+    Properties propertiesCopy = (Properties) properties.clone();
+    propertiesCopy.put("indexSizeMB", String.valueOf(indexSizeMB));
+    propertiesCopy.put("indexFileCount", String.valueOf(indexFileCount));
+    propertiesCopy.put(BackupManager.END_TIME_PROP, Instant.now().toString());
+    if (extraProperties != null && !extraProperties.isEmpty()) {
+      extraProperties.forEach((k, v) -> propertiesCopy.put(EXTRA_PROPERTY_PREFIX + k, v));
+    }
+    propertiesCopy.store(propsWriter, "Backup properties file");
   }
 
   public String getCollection() {
@@ -158,14 +196,20 @@ public String getIndexVersion() {
     return properties.getProperty(BackupManager.INDEX_VERSION_PROP);
   }
 
+  public Map<String, String> getExtraProperties() {
+    return extraProperties;
+  }
+
   public Map<String, Object> getDetails() {
     final Map<String, Object> result = new HashMap<>();
-    properties.entrySet().stream()
-        .forEach(entry -> result.put(entry.getKey().toString(), entry.getValue()));
+    properties.entrySet().forEach(entry -> result.put(entry.getKey().toString(), entry.getValue()));
     result.remove(BackupManager.BACKUP_NAME_PROP);
     result.remove(BackupManager.COLLECTION_NAME_PROP);
     result.put("indexSizeMB", Double.valueOf(properties.getProperty("indexSizeMB")));
     result.put("indexFileCount", Integer.valueOf(properties.getProperty("indexFileCount")));
+    if (extraProperties != null && !extraProperties.isEmpty()) {
+      result.put("extraProperties", extraProperties);
+    }
 
     Map<String, String> shardBackupIds = new HashMap<>();
     Iterator<String> keyIt = result.keySet().iterator();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
index 0339b29a887..d37688f2162 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackupAPI.java
@@ -22,6 +22,7 @@
 import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
 import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;
 import static org.apache.solr.common.params.CollectionAdminParams.INDEX_BACKUP_STRATEGY;
+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;
 import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
 import static org.apache.solr.common.params.CommonParams.NAME;
 import static org.apache.solr.common.params.CoreAdminParams.BACKUP_CONFIGSET;
@@ -31,6 +32,7 @@
 import static org.apache.solr.common.params.CoreAdminParams.COMMIT_NAME;
 import static org.apache.solr.common.params.CoreAdminParams.MAX_NUM_BACKUP_POINTS;
 import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT;
+import static org.apache.solr.handler.admin.api.CreateCollection.copyPrefixedPropertiesWithoutPrefix;
 import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -166,6 +168,9 @@ public static CreateCollectionBackupRequestBody createRequestBodyFromV1Params(So
     requestBody.incremental = params.getBool(BACKUP_INCREMENTAL);
     requestBody.backupConfigset = params.getBool(BACKUP_CONFIGSET);
     requestBody.maxNumBackupPoints = params.getInt(MAX_NUM_BACKUP_POINTS);
+    requestBody.extraProperties =
+        copyPrefixedPropertiesWithoutPrefix(params, new HashMap<>(), PROPERTY_PREFIX);
+
     requestBody.async = params.get(ASYNC);
 
     return requestBody;
@@ -192,6 +197,7 @@ public static class CreateCollectionBackupRequestBody implements JacksonReflectM
     @JsonProperty public Boolean backupConfigset;
     @JsonProperty public Integer maxNumBackupPoints;
     @JsonProperty public String async;
+    @JsonProperty public Map<String, String> extraProperties;
   }
 
   public static class CreateCollectionBackupResponseBody
@@ -215,6 +221,7 @@ public static class CollectionBackupDetails implements JacksonReflectMapWriter {
     @JsonProperty public Integer indexFileCount;
     @JsonProperty public Integer uploadedIndexFileCount;
     @JsonProperty public Double indexSizeMB;
+    @JsonProperty public Map<String, String> extraProperties;
 
     @JsonProperty("uploadedIndexFileMB")
     public Double uploadedIndexSizeMB;
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
index c6e52ffeab6..869c90fd67d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
@@ -17,8 +17,19 @@
 
 package org.apache.solr.cloud.api.collections;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.cloud.AbstractDistribZkTestBase;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.core.backup.repository.BackupRepository;
 import org.junit.BeforeClass;
+import org.junit.Test;
 
 // Backups do checksum validation against a footer value not present in 'SimpleText'
 @LuceneTestCase.SuppressCodecs({"SimpleText"})
@@ -84,4 +95,61 @@ public String getCollectionNamePrefix() {
   public String getBackupLocation() {
     return backupLocation;
   }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testCustomProperties() throws Exception {
+    setTestSuffix("testCustomProperties");
+    final String backupCollectionName = getCollectionName();
+    final String restoreCollectionName = backupCollectionName + "_restore";
+
+    CloudSolrClient solrClient = cluster.getSolrClient();
+
+    CollectionAdminRequest.createCollection(backupCollectionName, "conf1", NUM_SHARDS, 1)
+        .process(solrClient);
+    int numDocs = indexDocs(backupCollectionName, true);
+    String backupName = BACKUPNAME_PREFIX + testSuffix;
+    try (BackupRepository repository =
+        cluster.getJettySolrRunner(0).getCoreContainer().newBackupRepository(BACKUP_REPO_NAME)) {
+      String backupLocation = repository.getBackupLocation(getBackupLocation());
+      Properties extraProps = new Properties();
+      extraProps.putAll(Map.of("foo", "bar", "number", "12345"));
+      CollectionAdminRequest.backupCollection(backupCollectionName, backupName)
+          .setLocation(backupLocation)
+          .setExtraProperties(extraProps)
+          .setRepositoryName(BACKUP_REPO_NAME)
+          .processAndWait(cluster.getSolrClient(), 100);
+      CollectionAdminResponse response =
+          CollectionAdminRequest.listBackup(backupName)
+              .setBackupLocation(backupLocation)
+              .setBackupRepository(BACKUP_REPO_NAME)
+              .process(cluster.getSolrClient());
+      assertNotNull(response.getResponse().get("backups"));
+      assertTrue(response.getResponse().get("backups") instanceof List);
+      List<Map<String, Object>> backups =
+          (List<Map<String, Object>>) response.getResponse().get("backups");
+      assertEquals(1, backups.size());
+      Map<String, Object> backup0 = backups.get(0);
+      assertNotNull(backup0.get("extraProperties"));
+      assertTrue(backup0.get("extraProperties") instanceof Map);
+      Map<String, Object> extraProperties = (Map<String, Object>) backup0.get("extraProperties");
+      assertEquals("bar", extraProperties.get("foo"));
+      assertEquals("12345", extraProperties.get("number"));
+
+      CollectionAdminRequest.restoreCollection(restoreCollectionName, backupName)
+          .setLocation(backupLocation)
+          .setRepositoryName(BACKUP_REPO_NAME)
+          .processAndWait(solrClient, 500);
+
+      AbstractDistribZkTestBase.waitForRecoveriesToFinish(
+          restoreCollectionName, ZkStateReader.from(solrClient), false, false, 3);
+      assertEquals(
+          numDocs,
+          cluster
+              .getSolrClient()
+              .query(restoreCollectionName, new SolrQuery("*:*"))
+              .getResults()
+              .getNumFound());
+    }
+  }
 }
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
index 68599125f38..b2374f89a57 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
@@ -199,7 +199,11 @@ public void testUnreferencedShardMetadataFilesAreDeleted() throws Exception {
   private void createBackupIdFile(int backupId, String... shardNames) throws Exception {
     final BackupProperties createdProps =
         BackupProperties.create(
-            "someBackupName", "someCollectionName", "someExtCollectionName", "someConfigName");
+            "someBackupName",
+            "someCollectionName",
+            "someExtCollectionName",
+            "someConfigName",
+            null);
     for (String shardName : shardNames) {
       createdProps.putAndGetShardBackupIdFor(shardName, backupId);
     }
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc
index 12137859df3..107b4849209 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc
@@ -1668,11 +1668,19 @@ This parameter has no effect if `incremental=false` is specified.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: true
+|Optional |Default: `true`
 |===
 +
 Indicates if configset files should be included with the index backup or not. Note that in order to restore a collection, the configset must either exist in ZooKeeper or be part of the backup. Only set this to `false` if you can restore configsets by other means external to Solr (i.e. you have it stored with your application source code, is part of your ZooKeeper backups, etc).
 
+`property.<propertyName>` (V1), `extraProperties` (V2)::
+[%autowidth,frame=none]
+|===
+|Optional |Default: none
+|===
++
+Allows storing additional key/value pairs for custom information related to the backup. In v2, the value is a map of key-value pairs.
+
 `incremental`::
 +
 [%autowidth,frame=none]
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index c7814aab55b..db3ad4543c6 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -1111,6 +1111,7 @@ public static class Backup extends AsyncCollectionSpecificAdminRequest {
     protected boolean incremental = true;
     protected Optional<Integer> maxNumBackupPoints = Optional.empty();
     protected boolean backupConfigset = true;
+    protected Properties extraProperties;
 
     public Backup(String collection, String name) {
       super(CollectionAction.BACKUP, collection);
@@ -1205,9 +1206,17 @@ public Backup setBackupConfigset(boolean backupConfigset) {
       return this;
     }
 
+    public Backup setExtraProperties(Properties extraProperties) {
+      this.extraProperties = extraProperties;
+      return this;
+    }
+
     @Override
     public SolrParams getParams() {
       ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
+      if (extraProperties != null) {
+        addProperties(params, extraProperties);
+      }
       params.set(CoreAdminParams.COLLECTION, collection);
       params.set(CoreAdminParams.NAME, name);
       params.set(CoreAdminParams.BACKUP_LOCATION, location); // note: optional
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
index 3e8a8d9dbae..03acadab7ff 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
@@ -21,8 +21,11 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -456,6 +459,34 @@ public void testSkipConfigset() throws Exception {
     }
   }
 
+  public void testBackupProperties() throws IOException {
+    BackupProperties p =
+        BackupProperties.create(
+            "backupName",
+            "collection1",
+            "collection1-ext",
+            "conf1",
+            Map.of("foo", "bar", "aaa", "bbb"));
+    try (BackupRepository repository =
+        cluster.getJettySolrRunner(0).getCoreContainer().newBackupRepository(BACKUP_REPO_NAME)) {
+      String backupLocation = repository.getBackupLocation(getBackupLocation());
+      URI dest = repository.resolve(repository.createURI(backupLocation), "props-file.properties");
+      try (Writer propsWriter =
+          new OutputStreamWriter(repository.createOutput(dest), StandardCharsets.UTF_8)) {
+        p.store(propsWriter);
+      }
+      BackupProperties propsRead =
+          BackupProperties.readFrom(
+              repository, repository.createURI(backupLocation), "props-file.properties");
+      assertEquals(p.getCollection(), propsRead.getCollection());
+      assertEquals(p.getCollectionAlias(), propsRead.getCollectionAlias());
+      assertEquals(p.getConfigName(), propsRead.getConfigName());
+      assertEquals(p.getIndexVersion(), propsRead.getIndexVersion());
+      assertEquals(p.getExtraProperties(), propsRead.getExtraProperties());
+      assertEquals(p.getBackupName(), propsRead.getBackupName());
+    }
+  }
+
   protected void corruptIndexFiles() throws IOException {
     List<Slice> slices = new ArrayList<>(getCollectionState(getCollectionName()).getSlices());
     Replica leader = slices.get(random().nextInt(slices.size())).getLeader();
@@ -550,7 +581,7 @@ private void indexDocs(String collectionName, int numDocs, boolean useUUID) thro
     log.info("Indexed {} docs to collection: {}", numDocs, collectionName);
   }
 
-  private int indexDocs(String collectionName, boolean useUUID) throws Exception {
+  protected int indexDocs(String collectionName, boolean useUUID) throws Exception {
     Random random =
         new Random(
             docsSeed); // use a constant seed for the whole test run so that we can easily re-index.

From 6c5741d3646ce66c3f4b71ddf816df0b244694e7 Mon Sep 17 00:00:00 2001
From: Andrey Bozhko <andybozhko@gmail.com>
Date: Tue, 3 Oct 2023 17:51:16 -0500
Subject: [PATCH 155/160] Update indexing docs in Solr ref guide (#1961)

Wide variety of fixes to the docs related to indexing to account for evolution of Solr 9x and Lucene 9x
---------

Co-authored-by: Andrey Bozhko <abozhko@apple.com>
Co-authored-by: Eric Pugh <epugh@opensourceconnections.com>
---
 .../modules/indexing-guide/indexing-nav.adoc  |   2 +-
 .../indexing-guide/pages/analyzers.adoc       |   2 +-
 ...rfilterfactories.adoc => charfilters.adoc} |   2 +-
 .../pages/document-analysis.adoc              |   2 +-
 ...field-type-definitions-and-properties.adoc |   2 +-
 .../modules/indexing-guide/pages/filters.adoc | 150 +++++++---
 .../indexing-guide/pages/schema-elements.adoc |  11 +-
 .../indexing-guide/pages/tokenizers.adoc      | 264 ++++++++++++++++--
 8 files changed, 372 insertions(+), 63 deletions(-)
 rename solr/solr-ref-guide/modules/indexing-guide/pages/{charfilterfactories.adoc => charfilters.adoc} (99%)

diff --git a/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc b/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc
index 532f56eb10c..e78233d4a5d 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc
@@ -43,7 +43,7 @@
 ** xref:analyzers.adoc[]
 ** xref:tokenizers.adoc[]
 ** xref:filters.adoc[]
-** xref:charfilterfactories.adoc[]
+** xref:charfilters.adoc[]
 ** xref:language-analysis.adoc[]
 ** xref:phonetic-matching.adoc[]
 ** xref:analysis-screen.adoc[]
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adoc
index 280f9289ba3..876f15dc367 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adoc
@@ -180,7 +180,7 @@ For most use cases, this provides the best possible behavior, but if you wish fo
   </analyzer>
   <!-- No analysis at all when doing queries that involved Multi-Term expansion -->
   <analyzer type="multiterm">
-    <tokenizer class="solr.KeywordTokenizerFactory" />
+    <tokenizer name="keyword" />
   </analyzer>
 </fieldType>
 ----
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/charfilterfactories.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/charfilters.adoc
similarity index 99%
rename from solr/solr-ref-guide/modules/indexing-guide/pages/charfilterfactories.adoc
rename to solr/solr-ref-guide/modules/indexing-guide/pages/charfilters.adoc
index f20923fc034..abcf27c537d 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/charfilterfactories.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/charfilters.adoc
@@ -1,4 +1,4 @@
-= CharFilterFactories
+= CharFilters
 // 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
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adoc
index 5b56449c4d3..37d94f2ec63 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adoc
@@ -50,7 +50,7 @@ It also serves as a guide so that you can configure your own analysis classes if
 | xref:analyzers.adoc[]: Overview of Solr analyzers.
 | xref:tokenizers.adoc[]: Tokenizers and tokenizer factory classes.
 | xref:filters.adoc[]: Filters and filter factory classes.
-| xref:charfilterfactories.adoc[]: Filters for pre-processing input characters.
+| xref:charfilters.adoc[]: Filters for pre-processing input characters.
 | xref:language-analysis.adoc[]: Tokenizers and filters for character set conversion and specific languages.
 | xref:analysis-screen.adoc[]: Admin UI for testing field analysis.
 |===
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc
index e415023984e..39f2ee5751f 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc
@@ -201,7 +201,7 @@ The table below includes the default value for most `FieldType` implementations
 |`sortMissingFirst`, `sortMissingLast` |Control the placement of documents when a sort field is not present. |`false`
 |`multiValued` |If `true`, indicates that a single document might contain multiple values for this field type. |`false`
 |`uninvertible` |If `true`, indicates that an `indexed="true" docValues="false"` field can be "un-inverted" at query time to build up large in memory data structure to serve in place of xref:docvalues.adoc[]. *Defaults to `true` for historical reasons, but users are strongly encouraged to set this to `false` for stability and use `docValues="true"` as needed.* |`true`
-|`omitNorms` |If `true`, omits the norms associated with this field (this disables length normalization for the field, and saves some memory). *Defaults to true for all primitive (non-analyzed) field types, such as int, float, data, bool, and string.* Only full-text fields or fields need norms. |*
+|`omitNorms` |If `true`, omits the norms associated with this field (this disables length normalization for the field, and saves some memory). *Defaults to true for all primitive (non-analyzed) field types, such as int, float, data, bool, and string.* Only full-text fields or fields that need an index-time boost need norms. |*
 |`omitTermFreqAndPositions` |If `true`, omits term frequency, positions, and payloads from postings for this field. This can be a performance boost for fields that don't require that information. It also reduces the storage space required for the index. Queries that rely on position that are issued on a field with this option will silently fail to find documents. *This property defaults to true for all field types that are not text fields.* |*
 |`omitPositions` |Similar to `omitTermFreqAndPositions` but preserves term frequency information. |*
 |`termVectors`, `termPositions`, `termOffsets`, `termPayloads` |These options instruct Solr to maintain full term vectors for each document, optionally including position, offset, and payload information for each term occurrence in those vectors. These can be used to accelerate highlighting and other ancillary functionality, but impose a substantial cost in terms of index size. They are not necessary for typical uses of Solr. |`false`
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
index b9089f0c8d1..fa2c3365a56 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc
@@ -263,8 +263,7 @@ The value `auto` will allow the filter to identify the language, or a comma-sepa
 ----
 <analyzer>
   <tokenizer name="standard"/>
-  <filter name="beiderMorse" nameType="GENERIC" ruleType="APPROX" concat="true" languageSet="auto">
-  </filter>
+  <filter name="beiderMorse" nameType="GENERIC" ruleType="APPROX" concat="true" languageSet="auto"/>
 </analyzer>
 ----
 ====
@@ -275,8 +274,7 @@ The value `auto` will allow the filter to identify the language, or a comma-sepa
 ----
 <analyzer>
   <tokenizer class="solr.StandardTokenizerFactory"/>
-  <filter class="solr.BeiderMorseFilterFactory" nameType="GENERIC" ruleType="APPROX" concat="true" languageSet="auto">
-  </filter>
+  <filter class="solr.BeiderMorseFilterFactory" nameType="GENERIC" ruleType="APPROX" concat="true" languageSet="auto"/>
 </analyzer>
 ----
 ====
@@ -327,7 +325,7 @@ This filter takes the output of the xref:tokenizers.adoc#classic-tokenizer[Class
 == Common Grams Filter
 
 This filter for use in `index` time analysis creates word shingles by combining common tokens such as stop words with regular tokens.
-This can result in an index with more unique terms, but is useful for creating phrase queries containing common words, such as "the cat", in a way that will typically be much faster then if the combined tokens are not used, because only the term positions of documents containg both terms in sequence have to be considered.
+This can result in an index with more unique terms, but is useful for creating phrase queries containing common words, such as "the cat", in a way that will typically be much faster than if the combined tokens are not used, because only the term positions of documents containing both terms in sequence have to be considered.
 Correct usage requires being paired with <<Common Grams Query Filter>> during `query` analysis.
 
 These filters can also be combined with <<Stop Filter>> so searching for `"the cat"` would match different documents then `"a cat"`, while pathological searches for either `"the"` or `"a"` would not match any documents.
@@ -409,7 +407,7 @@ If `true`, the filter ignores the case of words when comparing them to the commo
 
 == Common Grams Query Filter
 
-This filter is used for the `query` time analysis aspect of <<Common Grams Filter>> -- see that filer for a description of arguments, example configuration, and sample input/output.
+This filter is used for the `query` time analysis aspect of <<Common Grams Filter>> -- see that filter for a description of arguments, example configuration, and sample input/output.
 
 == Collation Key Filter
 
@@ -580,8 +578,8 @@ The character used to separate the token and the boost.
 [source,xml]
 ----
 <analyzer>
-<tokenizer name="standard"/>
-<filter name="delimitedBoost"/>
+  <tokenizer name="standard"/>
+  <filter name="delimitedBoost"/>
 </analyzer>
 ----
 ====
@@ -591,8 +589,8 @@ The character used to separate the token and the boost.
 [source,xml]
 ----
 <analyzer>
-<tokenizer class="solr.StandardTokenizerFactory"/>
-<filter class="solr.DelimitedBoostTokenFilterFactory"/>
+  <tokenizer class="solr.StandardTokenizerFactory"/>
+  <filter class="solr.DelimitedBoostTokenFilterFactory"/>
 </analyzer>
 ----
 ====
@@ -613,8 +611,8 @@ Using a different delimiter (`delimiter="/"`).
 [source,xml]
 ----
 <analyzer>
-<tokenizer name="standard"/>
-<filter name="delimitedBoost" delimiter="/"/>
+  <tokenizer name="standard"/>
+  <filter name="delimitedBoost" delimiter="/"/>
 </analyzer>
 ----
 
@@ -638,17 +636,17 @@ This filter generates edge n-gram tokens of sizes within the given range.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: `1`
+|Required |Default: none
 |===
-The minimum gram size.
+The minimum gram size, must be > 0.
 
 `maxGramSize`::
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: `1`
+|Required |Default: none
 |===
-The maximum gram size.
+The maximum gram size, must be >= `minGramSize`.
 
 `preserveOriginal`::
 +
@@ -672,7 +670,7 @@ Default behavior.
 ----
 <analyzer>
   <tokenizer name="standard"/>
-  <filter name="edgeNGram"/>
+  <filter name="edgeNGram" minGramSize="1" maxGramSize="1"/>
 </analyzer>
 ----
 ====
@@ -683,7 +681,7 @@ Default behavior.
 ----
 <analyzer>
   <tokenizer class="solr.StandardTokenizerFactory"/>
-  <filter class="solr.EdgeNGramFilterFactory"/>
+  <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="1"/>
 </analyzer>
 ----
 ====
@@ -947,6 +945,15 @@ The path of a rules file.
 +
 Controls whether matching is case sensitive or not.
 
+`longestOnly`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `false`
+|===
++
+If `true`, only the longest term is emitted.
+
 `strictAffixParsing`::
 +
 [%autowidth,frame=none]
@@ -1108,7 +1115,7 @@ For detailed information on this normalization form, see http://www.unicode.org/
 
 == ICU Normalizer 2 Filter
 
-This filter factory normalizes text according to one of five Unicode Normalization Forms as described in http://unicode.org/reports/tr15/[Unicode Standard Annex #15]:
+This filter normalizes text according to one of five Unicode Normalization Forms as described in http://unicode.org/reports/tr15/[Unicode Standard Annex #15]:
 
 * NFC: (`name="nfc" mode="compose"`) Normalization Form C, canonical decomposition
 * NFD: (`name="nfc" mode="decompose"`) Normalization Form D, canonical decomposition, followed by canonical composition
@@ -1214,6 +1221,15 @@ s|Required |Default: none
 The identifier for the ICU System Transform you wish to apply with this filter.
 For a full list of ICU System Transforms, see http://demo.icu-project.org/icu-bin/translit?TEMPLATE_FILE=data/translit_rule_main.html.
 
+`direction`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `forward`
+|===
++
+The direction of the ICU transform. Valid options are `forward` and `reverse`.
+
 *Example:*
 
 [.dynamic-tabs]
@@ -1268,6 +1284,15 @@ Path to a text file containing the list of keep words, one per line.
 Blank lines and lines that begin with `\#` are ignored.
 This may be an absolute path, or a simple filename in the Solr `conf` directory.
 
+`format`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: none
+|===
++
+If the keepwords list has been formatted for Snowball, you can specify `format="snowball"` so Solr can read the keepwords file.
+
 `ignoreCase`::
 +
 [%autowidth,frame=none]
@@ -1467,12 +1492,14 @@ Tokens longer than this are discarded.
 This filter limits the number of accepted tokens, typically useful for index analysis.
 
 By default, this filter ignores any tokens in the wrapped `TokenStream` once the limit has been reached, which can result in `reset()` being called prior to `incrementToken()` returning `false`.
-For most `TokenStream` implementations this should be acceptable, and faster then consuming the full stream.
+For most `TokenStream` implementations this should be acceptable, and faster than consuming the full stream.
 If you are wrapping a `TokenStream` which requires that the full stream of tokens be exhausted in order to function properly, use the `consumeAllTokens="true"` option.
 
 *Factory class:* `solr.LimitTokenCountFilterFactory`
 
 *Arguments:*
+
+`maxTokenCount`::
 +
 [%autowidth,frame=none]
 |===
@@ -1534,14 +1561,21 @@ This filter limits tokens to those before a configured maximum start character o
 This can be useful to limit highlighting, for example.
 
 By default, this filter ignores any tokens in the wrapped `TokenStream` once the limit has been reached, which can result in `reset()` being called prior to `incrementToken()` returning `false`.
-For most `TokenStream` implementations this should be acceptable, and faster then consuming the full stream.
+For most `TokenStream` implementations this should be acceptable, and faster than consuming the full stream.
 If you are wrapping a `TokenStream` which requires that the full stream of tokens be exhausted in order to function properly, use the `consumeAllTokens="true"` option.
 
 *Factory class:* `solr.LimitTokenOffsetFilterFactory`
 
 *Arguments:*
 
-`maxStartOffset`:: (integer, required) Maximum token start character offset.
+`maxStartOffset`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+Maximum token start character offset.
 After this limit has been reached, tokens are discarded.
 
 `consumeAllTokens`::
@@ -1595,7 +1629,7 @@ See description above.
 This filter limits tokens to those before a configured maximum token position.
 
 By default, this filter ignores any tokens in the wrapped `TokenStream` once the limit has been reached, which can result in `reset()` being called prior to `incrementToken()` returning `false`.
-For most `TokenStream` implementations this should be acceptable, and faster then consuming the full stream.
+For most `TokenStream` implementations this should be acceptable, and faster than consuming the full stream.
 If you are wrapping a `TokenStream` which requires that the full stream of tokens be exhausted in order to function properly, use the `consumeAllTokens="true"` option.
 
 *Factory class:* `solr.LimitTokenPositionFilterFactory`
@@ -1628,7 +1662,7 @@ See description above.
 --
 [example.tab-pane#byname-filter-limittokenposition]
 ====
-[.tab-label]*With name)*
+[.tab-label]*With name*
 [source,xml]
 ----
 <analyzer>
@@ -1832,7 +1866,7 @@ This filter would normally be preceded by a <<Shingle Filter>>, as shown in the
 
 Each input token is hashed.
 It is subsequently "rehashed" `hashCount` times by combining with a set of precomputed hashes.
-For each of the resulting hashes, the hash space is divided in to `bucketCount` buckets.
+For each of the resulting hashes, the hash space is divided into `bucketCount` buckets.
 The lowest set of `hashSetSize` hashes (usually a set of one) is generated for each bucket.
 
 This filter generates one type of signature or sketch for the input tokens and can be used to compute Jaccard similarity between documents.
@@ -1881,6 +1915,24 @@ With the default settings for `withRotation`, the number of hashes generated is
 
 *Example:*
 
+[.dynamic-tabs]
+--
+[example.tab-pane#byname-filter-minhash]
+====
+[.tab-label]*With name*
+[source,xml]
+----
+<analyzer>
+  <tokenizer name="icu"/>
+  <filter name="icuFolding"/>
+  <filter name="shingle" minShingleSize="5" outputUnigrams="false" outputUnigramsIfNoShingles="false" maxShingleSize="5" tokenSeparator=" "/>
+  <filter name="minHash" bucketCount="512" hashSetSize="1" hashCount="1"/>
+</analyzer>
+----
+====
+[example.tab-pane#byclass-filter-minhash]
+====
+[.tab-label]*With class name (legacy)*
 [source,xml]
 ----
 <analyzer>
@@ -1890,6 +1942,8 @@ With the default settings for `withRotation`, the number of hashes generated is
   <filter class="org.apache.lucene.analysis.minhash.MinHashFilterFactory" bucketCount="512" hashSetSize="1" hashCount="1"/>
 </analyzer>
 ----
+====
+--
 
 *In:* "woof woof woof woof woof"
 
@@ -1910,18 +1964,18 @@ Note that tokens are ordered by position and then by gram size.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: `1`
+|Required |Default: none
 |===
-The minimum gram size.
+The minimum gram size, must be > 0.
 
 `maxGramSize`::
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: `2`
+|Required |Default: none
 |===
 +
-The maximum gram size.
+The maximum gram size, must be >= `minGramSize`.
 
 `preserveOriginal`::
 +
@@ -1945,7 +1999,7 @@ Default behavior.
 ----
 <analyzer>
   <tokenizer name="standard"/>
-  <filter name="nGram"/>
+  <filter name="nGram" minGramSize="1" maxGramSize="2"/>
 </analyzer>
 ----
 ====
@@ -1956,7 +2010,7 @@ Default behavior.
 ----
 <analyzer>
   <tokenizer class="solr.StandardTokenizerFactory"/>
-  <filter class="solr.NGramFilterFactory"/>
+  <filter class="solr.NGramFilterFactory" minGramSize="1" maxGramSize="2"/>
 </analyzer>
 ----
 ====
@@ -2087,7 +2141,7 @@ Tokens with a matching type name will have their payload set to the above floati
 == Pattern Replace Filter
 
 This filter applies a regular expression to each token and, for those that match, substitutes the given replacement string in place of the matched pattern.
-Tokens which do not match are passed though unchanged.
+Tokens which do not match are passed through unchanged.
 
 *Factory class:* `solr.PatternReplaceFilterFactory`
 
@@ -3096,10 +3150,10 @@ If `false`, all equivalent synonyms will be reduced to the first in the list.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: none
+|Optional |Default: `solr`
 |===
 +
-(optional; default: `solr`) Controls how the synonyms will be parsed.
+Controls how the synonyms will be parsed.
 The short names `solr` (for {lucene-javadocs}/analysis/common/org/apache/lucene/analysis/synonym/SolrSynonymParser.html[`SolrSynonymParser`] and `wordnet` (for {lucene-javadocs}/analysis/common/org/apache/lucene/analysis/synonym/WordnetSynonymParser.html[`WordnetSynonymParser`] ) are supported.
 You may alternatively supply the name of your own {lucene-javadocs}/analysis/common/org/apache/lucene/analysis/synonym/SynonymMap.Builder.html[`SynonymMap.Builder`] subclass.
 
@@ -3368,6 +3422,25 @@ This filter adds the token's type, as a token at the same position as the token,
 +
 The prefix to prepend to the token's type.
 
+`ignore`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: none
+|===
++
+A comma-separated list of types to ignore and not convert to synonyms.
+
+`synFlagsMask`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: see description
+|===
++
+A mask (provided as an integer) to control what flags are propagated to the synonyms.
+The default value is an integer `-1`, i.e., the mask `0xFFFFFFFF` - this mask propagates any flags as is.
+
 *Examples:*
 
 With the example below, each token's type will be emitted verbatim at the same position:
@@ -3614,6 +3687,15 @@ The path to a file that contains a list of protected words that should be passed
 +
 If `1`, strips the possessive `'s` from each subword.
 
+`adjustOffsets`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `true`
+|===
++
+If `true`, the offsets of partial terms are adjusted.
+
 `types`::
 +
 [%autowidth,frame=none]
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adoc
index abb1b7492cf..ee45819dab2 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adoc
@@ -95,18 +95,23 @@ However, `uniqueKey` will continue to work, as long as the field is properly use
 Similarity is a Lucene class used to score a document in searching.
 
 Each collection has one "global" Similarity.
-By default Solr uses an implicit {solr-javadocs}/core/org/apache/solr/search/similarities/SchemaSimilarityFactory.html[`SchemaSimilarityFactory`] which allows individual field types to be configured with a "per-type" specific Similarity and implicitly uses `BM25Similarity` for any field type which does not have an explicit Similarity.
+By default, Solr uses an implicit {solr-javadocs}/core/org/apache/solr/search/similarities/SchemaSimilarityFactory.html[`SchemaSimilarityFactory`] which allows individual field types to be configured with a "per-type" specific Similarity and implicitly uses `BM25Similarity` for any field type which does not have an explicit Similarity.
 
 This default behavior can be overridden by declaring a top level `<similarity/>` element in your schema, outside of any single field type.
 This similarity declaration can either refer directly to the name of a class with a no-argument constructor, such as in this example showing `BM25Similarity`:
 
 [source,xml]
 ----
-<similarity class="solr.BM25SimilarityFactory"/>
+<similarity class="org.apache.lucene.search.similarities.BM25Similarity"/>
 ----
 
-or by referencing a `SimilarityFactory` implementation, which may take optional initialization parameters:
+or by referencing a `SimilarityFactory` implementation:
+[source,xml]
+----
+<similarity class="solr.BM25SimilarityFactory"/>
+----
 
+When using the similarity factory, it is possible to specify optional initialization parameters:
 [source,xml]
 ----
 <similarity class="solr.DFRSimilarityFactory">
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adoc
index 24d04ec1802..fbb69399efc 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adoc
@@ -100,7 +100,7 @@ Arguments may be passed to tokenizer factories by setting attributes on the `<to
 
 === When to Use a CharFilter vs. a TokenFilter
 
-There are several pairs of CharFilters and TokenFilters that have related (i.e., `MappingCharFilter` and `ASCIIFoldingFilter`) or nearly identical (i.e., `PatternReplaceCharFilterFactory` and `PatternReplaceFilterFactory`) functionality and it may not always be obvious which is the best choice.
+There are several pairs of CharFilters and TokenFilters that have related (i.e., `MappingCharFilter` and `ASCIIFoldingFilter`) or nearly identical (i.e., `PatternReplaceCharFilterFactory` and `PatternReplaceFilterFactory`) functionality, and it may not always be obvious which is the best choice.
 
 The decision about which to use depends largely on which Tokenizer you are using, and whether you need to preprocess the stream of characters.
 
@@ -125,7 +125,14 @@ The Standard Tokenizer supports http://unicode.org/reports/tr29/#Word_Boundaries
 
 *Arguments:*
 
-`maxTokenLength`: (integer, default 255) Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
+`maxTokenLength`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
 
 *Example:*
 
@@ -174,7 +181,14 @@ Delimiter characters are discarded, with the following exceptions:
 
 *Arguments:*
 
-`maxTokenLength`: (integer, default 255) Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
+`maxTokenLength`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
 
 *Example:*
 
@@ -212,7 +226,16 @@ This tokenizer treats the entire text field as a single token.
 
 *Factory class:* `solr.KeywordTokenizerFactory`
 
-*Arguments:* None
+*Arguments:*
+
+`maxTokenLen`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `256`
+|===
++
+Maximum token length the tokenizer will emit.
 
 *Example:*
 
@@ -250,7 +273,16 @@ This tokenizer creates tokens from strings of contiguous letters, discarding all
 
 *Factory class:* `solr.LetterTokenizerFactory`
 
-*Arguments:* None
+*Arguments:*
+
+`maxTokenLen`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Maximum token length the tokenizer will emit.
 
 *Example:*
 
@@ -289,7 +321,16 @@ Whitespace and non-letters are discarded.
 
 *Factory class:* `solr.LowerCaseTokenizerFactory`
 
-*Arguments:* None
+*Arguments:*
+
+`maxTokenLen`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Maximum token length the tokenizer will emit.
 
 *Example:*
 
@@ -329,9 +370,23 @@ Reads the field text and generates n-gram tokens of sizes in the given range.
 
 *Arguments:*
 
-`minGramSize`: (integer, default 1) The minimum n-gram size, must be > 0.
+`minGramSize`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `1`
+|===
++
+The minimum n-gram size, must be > 0.
 
-`maxGramSize`: (integer, default 2) The maximum n-gram size, must be >= `minGramSize`.
+`maxGramSize`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `2`
+|===
++
+The maximum n-gram size, must be >= `minGramSize`.
 
 *Example:*
 
@@ -408,9 +463,23 @@ Reads the field text and generates edge n-gram tokens of sizes in the given rang
 
 *Arguments:*
 
-`minGramSize`: (integer, default is 1) The minimum n-gram size, must be > 0.
+`minGramSize`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `1`
+|===
++
+The minimum n-gram size, must be > 0.
 
-`maxGramSize`: (integer, default is 1) The maximum n-gram size, must be >= `minGramSize`.
+`maxGramSize`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `1`
+|===
++
+The maximum n-gram size, must be >= `minGramSize`.
 
 *Example:*
 
@@ -490,7 +559,33 @@ The default configuration for `solr.ICUTokenizerFactory` provides UAX#29 word br
 
 *Arguments:*
 
-`rulefile`: a comma-separated list of `code:rulefile` pairs in the following format: four-letter ISO 15924 script code, followed by a colon, then a resource path.
+`rulefile`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: none
+|===
++
+A comma-separated list of `code:rulefile` pairs in the following format: four-letter ISO 15924 script code, followed by a colon, then a resource path.
+
+`cjkAsWords`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `true`
+|===
++
+If `true`, CJK text would undergo dictionary-based segmentation, and all Han+Hiragana+Katakana words will be tagged as IDEOGRAPHIC.
+Otherwise, text will be segmented according to UAX#29 defaults.
+
+`myanmarAsWords`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `true`
+|===
++
+If `true`, Myanmar text would undergo dictionary-based segmentation, otherwise it will be tokenized as syllables.
 
 *Example:*
 
@@ -562,13 +657,47 @@ This tokenizer creates synonyms from file path hierarchies.
 
 *Arguments:*
 
-`delimiter`: (character, no default) You can specify the file path delimiter and replace it with a delimiter you provide.
+`delimiter`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+You can specify the file path delimiter and replace it with a delimiter you provide.
 This can be useful for working with backslash delimiters.
 
-`replace`: (character, no default) Specifies the delimiter character Solr uses in the tokenized output.
+`replace`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+Specifies the delimiter character Solr uses in the tokenized output.
+
+`reverse`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `false`
+|===
++
+If `true`, switch the tokenizer behavior to build the path hierarchy in "reversed" order.
+This is typically useful for tokenizing the URLs.
+
+`skip`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `0`
+|===
++
+Number of leftmost (or rightmost, if reverse=true) path elements to drop from each emitted token.
 
 *Example:*
 
+Default behavior
 [.dynamic-tabs]
 --
 [example.tab-pane#byname-tokenizer-pathhierarchy]
@@ -601,6 +730,41 @@ This can be useful for working with backslash delimiters.
 
 *Out:* "c:", "c:/usr", "c:/usr/local", "c:/usr/local/apache"
 
+*Example:*
+
+Reverse order
+[.dynamic-tabs]
+--
+[example.tab-pane#byname-tokenizer-pathhierarchy-reversed]
+====
+[.tab-label]*With name*
+[source,xml]
+----
+<fieldType name="text_path" class="solr.TextField" positionIncrementGap="100">
+  <analyzer>
+    <tokenizer name="pathHierarchy" delimiter="." replace="." reverse="true"/>
+  </analyzer>
+</fieldType>
+----
+====
+[example.tab-pane#byclass-tokenizer-pathhierarchy-reversed]
+====
+[.tab-label]*With class name (legacy)*
+[source,xml]
+----
+<fieldType name="text_path" class="solr.TextField" positionIncrementGap="100">
+  <analyzer>
+    <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="." replace="." reverse="true"/>
+  </analyzer>
+</fieldType>
+----
+====
+--
+
+*In:* "www.site.co.uk"
+
+*Out:* "www.site.co.uk", "site.co.uk", "co.uk", "uk"
+
 == Regular Expression Pattern Tokenizer
 
 This tokenizer uses a Java regular expression to break the input text stream into tokens.
@@ -612,9 +776,23 @@ See {java-javadocs}java/util/regex/Pattern.html[the Javadocs for `java.util.rege
 
 *Arguments:*
 
-`pattern`: (Required) The regular expression, as defined by in `java.util.regex.Pattern`.
+`pattern`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+The regular expression, as defined by in `java.util.regex.Pattern`.
 
-`group`: (Optional, default -1) Specifies which regex group to extract as the token(s).
+`group`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `-1`
+|===
++
+Specifies which regex group to extract as the token(s).
 The value -1 means the regex should be treated as a delimiter that separates tokens.
 Non-negative group numbers (>= 0) indicate that character sequences matching that regex group should be converted to tokens.
 Group zero refers to the entire regex, groups greater than zero refer to parenthesized sub-expressions of the regex, counted from left to right.
@@ -687,7 +865,7 @@ A sequence of at least one capital letter followed by zero or more letters of ei
 
 *Example:*
 
-Extract part numbers which are preceded by "SKU", "Part" or "Part Number", case sensitive, with an optional semi-colon separator.
+Extract part numbers which are preceded by "SKU", "Part" or "Part Number", case sensitive, with an optional semicolon separator.
 Part numbers must be all numeric digits, with an optional hyphen.
 Regex capture groups are numbered by counting left parenthesis from left to right.
 Group 3 is the subexpression "[0-9-]+", which matches one or more digits or hyphens.
@@ -729,11 +907,25 @@ The syntax is more limited than `PatternTokenizerFactory`, but the tokenization
 
 *Arguments:*
 
-`pattern`: (Required) The regular expression, as defined by in the {lucene-javadocs}/core/org/apache/lucene/util/automaton/RegExp.html[`RegExp`] javadocs, identifying the characters to include in tokens.
+`pattern`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+The regular expression, as defined in the {lucene-javadocs}/core/org/apache/lucene/util/automaton/RegExp.html[`RegExp`] javadocs, identifying the characters to include in tokens.
 The matching is greedy such that the longest token matching at a given point is created.
 Empty tokens are never created.
 
-`maxDeterminizedStates`: (Optional, default 10000) the limit on total state count for the determined automaton computed from the regexp.
+`determinizeWorkLimit`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `10000`
+|===
++
+The limit on total state count for the determined automaton computed from the regexp.
 
 *Example:*
 
@@ -772,11 +964,25 @@ The syntax is more limited than `PatternTokenizerFactory`, but the tokenization
 
 *Arguments:*
 
-`pattern`: (Required) The regular expression, as defined by in the {lucene-javadocs}/core/org/apache/lucene/util/automaton/RegExp.html[`RegExp`] javadocs, identifying the characters that should split tokens.
+`pattern`::
++
+[%autowidth,frame=none]
+|===
+s|Required |Default: none
+|===
++
+The regular expression, as defined by in the {lucene-javadocs}/core/org/apache/lucene/util/automaton/RegExp.html[`RegExp`] javadocs, identifying the characters that should split tokens.
 The matching is greedy such that the longest token separator matching at a given point is matched.
 Empty tokens are never created.
 
-`maxDeterminizedStates`: (Optional, default 10000) the limit on total state count for the determined automaton computed from the regexp.
+`determinizeWorkLimit`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `10000`
+|===
++
+The limit on total state count for the determined automaton computed from the regexp.
 
 *Example:*
 
@@ -827,7 +1033,14 @@ The UAX29 URL Email Tokenizer supports http://unicode.org/reports/tr29/#Word_Bou
 
 *Arguments:*
 
-`maxTokenLength`: (integer, default 255) Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
+`maxTokenLength`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Solr ignores tokens that exceed the number of characters specified by `maxTokenLength`.
 
 *Example:*
 
@@ -881,6 +1094,15 @@ Valid values:
 * `java`: Uses {java-javadocs}java/lang/Character.html#isWhitespace-int-[Character.isWhitespace(int)]
 * `unicode`: Uses Unicode's WHITESPACE property
 
+`maxTokenLen`::
++
+[%autowidth,frame=none]
+|===
+s|Optional |Default: `255`
+|===
++
+Maximum token length the tokenizer will emit.
+
 *Example:*
 
 [.dynamic-tabs]

From 74ad7bb029778e66576470419a29c04d4b6ecf17 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Wed, 4 Oct 2023 09:56:36 -0400
Subject: [PATCH 156/160] SOLR-16970: Fix windows script (#1975)

---
 solr/bin/solr.cmd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 6396646355e..3a19be2e366 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1167,19 +1167,19 @@ IF "%verbose%"=="1" (
   )
 
   IF NOT "%SOLR_OPTS%"=="" (
-    @echo     SOLR_OPTS (USER)   = %SOLR_OPTS%
+    CALL :safe_echo "    SOLR_OPTS (USER)   = %SOLR_OPTS%"
   )
 
   IF NOT "%SCRIPT_SOLR_OPTS%"=="" (
-    @echo     SOLR_OPTS (SCRIPT) = %SCRIPT_SOLR_OPTS%
+    CALL :safe_echo "    SOLR_OPTS (SCRIPT) = %SCRIPT_SOLR_OPTS%"
   )
 
   IF NOT "%SOLR_ADDL_ARGS%"=="" (
-    CALL :safe_echo "     SOLR_ADDL_ARGS    = %SOLR_ADDL_ARGS%"
+    CALL :safe_echo "    SOLR_ADDL_ARGS     = %SOLR_ADDL_ARGS%"
   )
 
   IF NOT "%SOLR_JETTY_ADDL_CONFIG%"=="" (
-    CALL :safe_echo "     SOLR_JETTY_ADDL_CONFIG    = %SOLR_JETTY_ADDL_CONFIG%"
+    CALL :safe_echo "    SOLR_JETTY_ADDL_CONFIG = %SOLR_JETTY_ADDL_CONFIG%"
   )
 
   IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (

From 540f61ce45e5baf04fef60f4e4fe15e523ef69c6 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 4 Oct 2023 08:31:52 -0700
Subject: [PATCH 157/160] SOLR-17009 json.wrf parameter ignored in
 JacksonJsonWriter (#1977)

---
 solr/CHANGES.txt                              |  2 ++
 .../solr/response/JacksonJsonWriter.java      |  6 ++++
 .../apache/solr/response/JSONWriterTest.java  | 32 +++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ef7e37ea61e..9a02f787bbe 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -256,6 +256,8 @@ Bug Fixes
 
 * SOLR-16644: Fixing the entropy warning threshold using scaling based on poolsize (Raghavan Muthuregunathan)
 
+* SOLR-17009: json.wrf parameter ignored in JacksonJsonWriter (Alex Deparvu)
+
 Dependency Upgrades
 ---------------------
 
diff --git a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
index 4de5039ba1e..79b09ae3bf4 100644
--- a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
@@ -79,7 +79,13 @@ public WriterImpl(
 
     @Override
     public void writeResponse() throws IOException {
+      if (wrapperFunction != null) {
+        writeStr(null, wrapperFunction + "(", false);
+      }
       super.writeNamedList(null, rsp.getValues());
+      if (wrapperFunction != null) {
+        writeStr(null, ")", false);
+      }
       gen.close();
     }
 
diff --git a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
index 9fcdcea4e5f..7d6e324a418 100644
--- a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.response;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
@@ -314,4 +315,35 @@ public void testConstantsUnchanged() {
     assertEquals("arrntv", JSONWriter.JSON_NL_ARROFNTV);
     assertEquals("json.wrf", JSONWriter.JSON_WRAPPER_FUNCTION);
   }
+
+  @Test
+  public void testWfrJacksonJsonWriter() throws IOException {
+    SolrQueryRequest req = req("wt", "json", JSONWriter.JSON_WRAPPER_FUNCTION, "testFun");
+    SolrQueryResponse rsp = new SolrQueryResponse();
+    rsp.add("param0", "v0");
+    rsp.add("param1", 42);
+
+    JacksonJsonWriter w = new JacksonJsonWriter();
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    w.write(baos, req, rsp);
+    String received = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+    String expected = "testFun( {\n  \"param0\":\"v0\",\n  \"param1\":42\n} )";
+    jsonEq(expected, received);
+    req.close();
+  }
+
+  @Test
+  public void testWfrJSONWriter() throws IOException {
+    SolrQueryRequest req = req("wt", "json", JSONWriter.JSON_WRAPPER_FUNCTION, "testFun");
+    SolrQueryResponse rsp = new SolrQueryResponse();
+    rsp.add("param0", "v0");
+    rsp.add("param1", 42);
+
+    JSONResponseWriter w = new JSONResponseWriter();
+    StringWriter buf = new StringWriter();
+    w.write(buf, req, rsp);
+    String expected = "testFun({\n  \"param0\":\"v0\",\n  \"param1\":42})";
+    jsonEq(expected, buf.toString());
+    req.close();
+  }
 }

From 621bc2a5deeae0d8616bd41180b5ffac2de4df34 Mon Sep 17 00:00:00 2001
From: Solr Bot <125606113+solrbot@users.noreply.github.com>
Date: Thu, 5 Oct 2023 01:25:57 +0200
Subject: [PATCH 158/160] SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache
 Curator to 5.5.0 (#1743)

Co-authored-by: Kevin Risden <krisden@apache.org>
---
 solr/CHANGES.txt                              |  2 +-
 solr/licenses/curator-client-4.3.0.jar.sha1   |  1 -
 solr/licenses/curator-client-5.5.0.jar.sha1   |  1 +
 .../licenses/curator-framework-4.3.0.jar.sha1 |  1 -
 .../licenses/curator-framework-5.5.0.jar.sha1 |  1 +
 solr/licenses/curator-recipes-4.3.0.jar.sha1  |  1 -
 solr/licenses/curator-recipes-5.5.0.jar.sha1  |  1 +
 .../hadoop-annotations-3.3.5.jar.sha1         |  1 -
 .../hadoop-annotations-3.3.6.jar.sha1         |  1 +
 solr/licenses/hadoop-auth-3.3.5.jar.sha1      |  1 -
 solr/licenses/hadoop-auth-3.3.6.jar.sha1      |  1 +
 .../licenses/hadoop-client-api-3.3.5.jar.sha1 |  1 -
 .../licenses/hadoop-client-api-3.3.6.jar.sha1 |  1 +
 .../hadoop-client-minicluster-3.3.5.jar.sha1  |  1 -
 .../hadoop-client-minicluster-3.3.6.jar.sha1  |  1 +
 .../hadoop-client-runtime-3.3.5.jar.sha1      |  1 -
 .../hadoop-client-runtime-3.3.6.jar.sha1      |  1 +
 solr/licenses/hadoop-common-3.3.5.jar.sha1    |  1 -
 solr/licenses/hadoop-common-3.3.6.jar.sha1    |  1 +
 .../licenses/hadoop-hdfs-3.3.5-tests.jar.sha1 |  1 -
 solr/licenses/hadoop-hdfs-3.3.5.jar.sha1      |  1 -
 .../licenses/hadoop-hdfs-3.3.6-tests.jar.sha1 |  1 +
 solr/licenses/hadoop-hdfs-3.3.6.jar.sha1      |  1 +
 solr/licenses/hadoop-minikdc-3.3.5.jar.sha1   |  1 -
 solr/licenses/hadoop-minikdc-3.3.6.jar.sha1   |  1 +
 .../hadoop/DelegationTokenKerberosFilter.java | 54 +++++++++++++++++--
 .../security/hadoop/HadoopAuthFilter.java     | 53 +++++++++++++++---
 .../pages/major-changes-in-solr-9.adoc        |  4 ++
 versions.lock                                 | 26 ++++-----
 versions.props                                |  4 +-
 30 files changed, 127 insertions(+), 40 deletions(-)
 delete mode 100644 solr/licenses/curator-client-4.3.0.jar.sha1
 create mode 100644 solr/licenses/curator-client-5.5.0.jar.sha1
 delete mode 100644 solr/licenses/curator-framework-4.3.0.jar.sha1
 create mode 100644 solr/licenses/curator-framework-5.5.0.jar.sha1
 delete mode 100644 solr/licenses/curator-recipes-4.3.0.jar.sha1
 create mode 100644 solr/licenses/curator-recipes-5.5.0.jar.sha1
 delete mode 100644 solr/licenses/hadoop-annotations-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-annotations-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-auth-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-auth-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-client-api-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-client-api-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-client-minicluster-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-client-minicluster-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-client-runtime-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-client-runtime-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-common-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-common-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-hdfs-3.3.5-tests.jar.sha1
 delete mode 100644 solr/licenses/hadoop-hdfs-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-hdfs-3.3.6-tests.jar.sha1
 create mode 100644 solr/licenses/hadoop-hdfs-3.3.6.jar.sha1
 delete mode 100644 solr/licenses/hadoop-minikdc-3.3.5.jar.sha1
 create mode 100644 solr/licenses/hadoop-minikdc-3.3.6.jar.sha1

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9a02f787bbe..224e86baeca 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -84,7 +84,7 @@ Bug Fixes
 
 Dependency Upgrades
 ---------------------
-(No changes)
+* SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (Kevin Risden)
 
 Other Changes
 ---------------------
diff --git a/solr/licenses/curator-client-4.3.0.jar.sha1 b/solr/licenses/curator-client-4.3.0.jar.sha1
deleted file mode 100644
index c8c057968ae..00000000000
--- a/solr/licenses/curator-client-4.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3eacfe1f700d66e73b5eb9313af0945042327186
diff --git a/solr/licenses/curator-client-5.5.0.jar.sha1 b/solr/licenses/curator-client-5.5.0.jar.sha1
new file mode 100644
index 00000000000..e9ae641df79
--- /dev/null
+++ b/solr/licenses/curator-client-5.5.0.jar.sha1
@@ -0,0 +1 @@
+db2d83bdc0bac7b4f25fc113d8ce3eedc0a4e89c
diff --git a/solr/licenses/curator-framework-4.3.0.jar.sha1 b/solr/licenses/curator-framework-4.3.0.jar.sha1
deleted file mode 100644
index 9a6a844271d..00000000000
--- a/solr/licenses/curator-framework-4.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a05a339688b5e2f0db4416cb19bc340b68abdc9
diff --git a/solr/licenses/curator-framework-5.5.0.jar.sha1 b/solr/licenses/curator-framework-5.5.0.jar.sha1
new file mode 100644
index 00000000000..c5211cb22d0
--- /dev/null
+++ b/solr/licenses/curator-framework-5.5.0.jar.sha1
@@ -0,0 +1 @@
+b706a216e49352103bd2527e83b1ec2410924494
diff --git a/solr/licenses/curator-recipes-4.3.0.jar.sha1 b/solr/licenses/curator-recipes-4.3.0.jar.sha1
deleted file mode 100644
index dc098a6dd00..00000000000
--- a/solr/licenses/curator-recipes-4.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df60350024ccf98bdd9299b3e3c079aab5845d1f
diff --git a/solr/licenses/curator-recipes-5.5.0.jar.sha1 b/solr/licenses/curator-recipes-5.5.0.jar.sha1
new file mode 100644
index 00000000000..e19fcfe836c
--- /dev/null
+++ b/solr/licenses/curator-recipes-5.5.0.jar.sha1
@@ -0,0 +1 @@
+4aa0cfb129c36cd91528fc1b8775705280e60285
diff --git a/solr/licenses/hadoop-annotations-3.3.5.jar.sha1 b/solr/licenses/hadoop-annotations-3.3.5.jar.sha1
deleted file mode 100644
index 04087c5b808..00000000000
--- a/solr/licenses/hadoop-annotations-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b30e4d5ab2f77f47b6c3917f3286970979c6328a
diff --git a/solr/licenses/hadoop-annotations-3.3.6.jar.sha1 b/solr/licenses/hadoop-annotations-3.3.6.jar.sha1
new file mode 100644
index 00000000000..2829c60fc47
--- /dev/null
+++ b/solr/licenses/hadoop-annotations-3.3.6.jar.sha1
@@ -0,0 +1 @@
+451bc97f7519017cfa96c8f11d79e1e8027968b2
diff --git a/solr/licenses/hadoop-auth-3.3.5.jar.sha1 b/solr/licenses/hadoop-auth-3.3.5.jar.sha1
deleted file mode 100644
index a56612a55fb..00000000000
--- a/solr/licenses/hadoop-auth-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0aac338d2755e932f87f16cb3e73b42deb9d7699
diff --git a/solr/licenses/hadoop-auth-3.3.6.jar.sha1 b/solr/licenses/hadoop-auth-3.3.6.jar.sha1
new file mode 100644
index 00000000000..00c7261e985
--- /dev/null
+++ b/solr/licenses/hadoop-auth-3.3.6.jar.sha1
@@ -0,0 +1 @@
+066aaf67a580910de62f92f21f76e3df170483cf
diff --git a/solr/licenses/hadoop-client-api-3.3.5.jar.sha1 b/solr/licenses/hadoop-client-api-3.3.5.jar.sha1
deleted file mode 100644
index 6e51b9a630c..00000000000
--- a/solr/licenses/hadoop-client-api-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-caf698048b815044e0c89a42a27c17dc3dee55e3
diff --git a/solr/licenses/hadoop-client-api-3.3.6.jar.sha1 b/solr/licenses/hadoop-client-api-3.3.6.jar.sha1
new file mode 100644
index 00000000000..fa913d85daa
--- /dev/null
+++ b/solr/licenses/hadoop-client-api-3.3.6.jar.sha1
@@ -0,0 +1 @@
+12ac6f103a0ff29fce17a078c7c64d25320b6165
diff --git a/solr/licenses/hadoop-client-minicluster-3.3.5.jar.sha1 b/solr/licenses/hadoop-client-minicluster-3.3.5.jar.sha1
deleted file mode 100644
index a6a5b66254a..00000000000
--- a/solr/licenses/hadoop-client-minicluster-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-521d85134dc4afae1db84120cec5c1144f49a6fd
diff --git a/solr/licenses/hadoop-client-minicluster-3.3.6.jar.sha1 b/solr/licenses/hadoop-client-minicluster-3.3.6.jar.sha1
new file mode 100644
index 00000000000..b6d52bc82d6
--- /dev/null
+++ b/solr/licenses/hadoop-client-minicluster-3.3.6.jar.sha1
@@ -0,0 +1 @@
+1d7be37c806e6703ea672d0e5e47fd43ea721acc
diff --git a/solr/licenses/hadoop-client-runtime-3.3.5.jar.sha1 b/solr/licenses/hadoop-client-runtime-3.3.5.jar.sha1
deleted file mode 100644
index 170a4994686..00000000000
--- a/solr/licenses/hadoop-client-runtime-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ddffe0944281ccdcf11b9f94777654bf4cbe00b
diff --git a/solr/licenses/hadoop-client-runtime-3.3.6.jar.sha1 b/solr/licenses/hadoop-client-runtime-3.3.6.jar.sha1
new file mode 100644
index 00000000000..b487aec0964
--- /dev/null
+++ b/solr/licenses/hadoop-client-runtime-3.3.6.jar.sha1
@@ -0,0 +1 @@
+81065531e63fccbe85fb04a3274709593fb00d3c
diff --git a/solr/licenses/hadoop-common-3.3.5.jar.sha1 b/solr/licenses/hadoop-common-3.3.5.jar.sha1
deleted file mode 100644
index cd770cf992e..00000000000
--- a/solr/licenses/hadoop-common-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-915ebfe2334051a0516e39e47348be5704ef4ef4
diff --git a/solr/licenses/hadoop-common-3.3.6.jar.sha1 b/solr/licenses/hadoop-common-3.3.6.jar.sha1
new file mode 100644
index 00000000000..95d105bba1c
--- /dev/null
+++ b/solr/licenses/hadoop-common-3.3.6.jar.sha1
@@ -0,0 +1 @@
+09ca864bec94779e74b99e84ea02dba85a641233
diff --git a/solr/licenses/hadoop-hdfs-3.3.5-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.5-tests.jar.sha1
deleted file mode 100644
index e9a9148daf6..00000000000
--- a/solr/licenses/hadoop-hdfs-3.3.5-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-80384d0c998af7959da7a8cea0d9e9c259dd5048
diff --git a/solr/licenses/hadoop-hdfs-3.3.5.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.5.jar.sha1
deleted file mode 100644
index 10405cb8e43..00000000000
--- a/solr/licenses/hadoop-hdfs-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe4433c652ff21d393609fd0e37277bce05a4934
diff --git a/solr/licenses/hadoop-hdfs-3.3.6-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.6-tests.jar.sha1
new file mode 100644
index 00000000000..b464acdd272
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-3.3.6-tests.jar.sha1
@@ -0,0 +1 @@
+5058b645375c6a68f509e167ad6a6ada9642df09
diff --git a/solr/licenses/hadoop-hdfs-3.3.6.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.6.jar.sha1
new file mode 100644
index 00000000000..50f78c64c31
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-3.3.6.jar.sha1
@@ -0,0 +1 @@
+ba40aca60f39599d5b1f1d32b35295bfde1f3c8b
diff --git a/solr/licenses/hadoop-minikdc-3.3.5.jar.sha1 b/solr/licenses/hadoop-minikdc-3.3.5.jar.sha1
deleted file mode 100644
index a9e4dbab451..00000000000
--- a/solr/licenses/hadoop-minikdc-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2abae62fef3c36fbdadac89ea396be52e5b2f9b
diff --git a/solr/licenses/hadoop-minikdc-3.3.6.jar.sha1 b/solr/licenses/hadoop-minikdc-3.3.6.jar.sha1
new file mode 100644
index 00000000000..26f53c37c46
--- /dev/null
+++ b/solr/licenses/hadoop-minikdc-3.3.6.jar.sha1
@@ -0,0 +1 @@
+7f454a44beea61f42f37b414c0d73decbe61de32
diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java
index 7844c17a5eb..b0021c889a5 100644
--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java
+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java
@@ -16,10 +16,15 @@
  */
 package org.apache.solr.security.hadoop;
 
+import static org.apache.hadoop.security.token.delegation.ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH;
+import static org.apache.hadoop.security.token.delegation.ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -41,6 +46,8 @@
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkACLProvider;
 import org.apache.solr.common.cloud.ZkCredentialsProvider;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.ACL;
@@ -51,6 +58,7 @@
  * reuse the authentication of an end-user or another application.
  */
 public class DelegationTokenKerberosFilter extends DelegationTokenAuthenticationFilter {
+  private ExecutorService curatorSafeServiceExecutor;
   private CuratorFramework curatorFramework;
 
   @Override
@@ -62,7 +70,8 @@ public void init(FilterConfig conf) throws ServletException {
       try {
         conf.getServletContext()
             .setAttribute(
-                "signer.secret.provider.zookeeper.curator.client", getCuratorClient(zkClient));
+                "signer.secret.provider.zookeeper.curator.client",
+                getCuratorClientInternal(conf, zkClient));
       } catch (InterruptedException | KeeperException e) {
         throw new ServletException(e);
       }
@@ -123,8 +132,14 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
   @Override
   public void destroy() {
     super.destroy();
-    if (curatorFramework != null) curatorFramework.close();
-    curatorFramework = null;
+    if (curatorFramework != null) {
+      curatorFramework.close();
+      curatorFramework = null;
+    }
+    if (curatorSafeServiceExecutor != null) {
+      ExecutorUtil.shutdownNowAndAwaitTermination(curatorSafeServiceExecutor);
+      curatorSafeServiceExecutor = null;
+    }
   }
 
   @Override
@@ -141,6 +156,31 @@ protected void initializeAuthHandler(String authHandlerClassName, FilterConfig f
     newAuthHandler.setAuthHandler(authHandler);
   }
 
+  private CuratorFramework getCuratorClientInternal(FilterConfig conf, SolrZkClient zkClient)
+      throws KeeperException, InterruptedException {
+    // There is a race condition where the znodeWorking path used by ZKDelegationTokenSecretManager
+    // can be created by multiple nodes, but Hadoop doesn't handle this well. This explicitly
+    // creates it up front and handles if the znode already exists. This relates to HADOOP-18452
+    // but didn't solve the underlying issue of the race condition.
+
+    // If namespace parents are implicitly created, they won't have ACLs.
+    // So, let's explicitly create them.
+    CuratorFramework curatorFramework = getCuratorClient(zkClient);
+    CuratorFramework nullNsFw = curatorFramework.usingNamespace(null);
+    try {
+      String znodeWorkingPath =
+          '/'
+              + Objects.requireNonNullElse(
+                  conf.getInitParameter(ZK_DTSM_ZNODE_WORKING_PATH),
+                  ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT)
+              + "/ZKDTSMRoot";
+      nullNsFw.create().creatingParentContainersIfNeeded().forPath(znodeWorkingPath);
+    } catch (Exception ignore) {
+    }
+
+    return curatorFramework;
+  }
+
   protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
       throws InterruptedException, KeeperException {
     // should we try to build a RetryPolicy off of the ZkController?
@@ -163,10 +203,12 @@ protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
     try {
       zkClient.makePath(
           SecurityAwareZkACLProvider.SECURITY_ZNODE_PATH, CreateMode.PERSISTENT, true);
-    } catch (KeeperException.NodeExistsException ex) {
-      // ignore?
+    } catch (KeeperException.NodeExistsException ignore) {
     }
 
+    curatorSafeServiceExecutor =
+        ExecutorUtil.newMDCAwareSingleThreadExecutor(
+            new SolrNamedThreadFactory("delegationtokenkerberosfilter-curator-safeService"));
     curatorFramework =
         CuratorFrameworkFactory.builder()
             .namespace(zkNamespace)
@@ -176,8 +218,10 @@ protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
             .authorization(curatorToSolrZk.getAuthInfos())
             .sessionTimeoutMs(zkClient.getZkClientTimeout())
             .connectionTimeoutMs(connectionTimeoutMs)
+            .runSafeService(curatorSafeServiceExecutor)
             .build();
     curatorFramework.start();
+
     return curatorFramework;
   }
 
diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java
index 2c478821668..f462ad7e682 100644
--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java
+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java
@@ -16,9 +16,14 @@
  */
 package org.apache.solr.security.hadoop;
 
+import static org.apache.hadoop.security.token.delegation.ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH;
+import static org.apache.hadoop.security.token.delegation.ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -39,6 +44,8 @@
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkACLProvider;
 import org.apache.solr.common.cloud.ZkCredentialsProvider;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.ACL;
@@ -53,6 +60,7 @@ public class HadoopAuthFilter extends DelegationTokenAuthenticationFilter {
    */
   static final String DELEGATION_TOKEN_ZK_CLIENT = "solr.kerberos.delegation.token.zk.client";
 
+  private ExecutorService curatorSafeServiceExecutor;
   private CuratorFramework curatorFramework;
 
   @Override
@@ -63,7 +71,8 @@ public void init(FilterConfig conf) throws ServletException {
       try {
         conf.getServletContext()
             .setAttribute(
-                "signer.secret.provider.zookeeper.curator.client", getCuratorClient(zkClient));
+                "signer.secret.provider.zookeeper.curator.client",
+                getCuratorClientInternal(conf, zkClient));
       } catch (KeeperException | InterruptedException e) {
         throw new ServletException(e);
       }
@@ -104,8 +113,12 @@ public void destroy() {
     super.destroy();
     if (curatorFramework != null) {
       curatorFramework.close();
+      curatorFramework = null;
+    }
+    if (curatorSafeServiceExecutor != null) {
+      ExecutorUtil.shutdownNowAndAwaitTermination(curatorSafeServiceExecutor);
+      curatorSafeServiceExecutor = null;
     }
-    curatorFramework = null;
   }
 
   @Override
@@ -122,6 +135,31 @@ protected void initializeAuthHandler(String authHandlerClassName, FilterConfig f
     newAuthHandler.setAuthHandler(authHandler);
   }
 
+  private CuratorFramework getCuratorClientInternal(FilterConfig conf, SolrZkClient zkClient)
+      throws KeeperException, InterruptedException {
+    // There is a race condition where the znodeWorking path used by ZKDelegationTokenSecretManager
+    // can be created by multiple nodes, but Hadoop doesn't handle this well. This explicitly
+    // creates it up front and handles if the znode already exists. This relates to HADOOP-18452
+    // but didn't solve the underlying issue of the race condition.
+
+    // If namespace parents are implicitly created, they won't have ACLs.
+    // So, let's explicitly create them.
+    CuratorFramework curatorFramework = getCuratorClient(zkClient);
+    CuratorFramework nullNsFw = curatorFramework.usingNamespace(null);
+    try {
+      String znodeWorkingPath =
+          '/'
+              + Objects.requireNonNullElse(
+                  conf.getInitParameter(ZK_DTSM_ZNODE_WORKING_PATH),
+                  ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT)
+              + "/ZKDTSMRoot";
+      nullNsFw.create().creatingParentContainersIfNeeded().forPath(znodeWorkingPath);
+    } catch (Exception ignore) {
+    }
+
+    return curatorFramework;
+  }
+
   protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
       throws KeeperException, InterruptedException {
     // should we try to build a RetryPolicy off of the ZkController?
@@ -144,13 +182,12 @@ protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
     try {
       zkClient.makePath(
           SecurityAwareZkACLProvider.SECURITY_ZNODE_PATH, CreateMode.PERSISTENT, true);
-
-    } catch (KeeperException ex) {
-      if (ex.code() != KeeperException.Code.NODEEXISTS) {
-        throw ex;
-      }
+    } catch (KeeperException.NodeExistsException ignore) {
     }
 
+    curatorSafeServiceExecutor =
+        ExecutorUtil.newMDCAwareSingleThreadExecutor(
+            new SolrNamedThreadFactory("hadoopauthfilter-curator-safeService"));
     curatorFramework =
         CuratorFrameworkFactory.builder()
             .namespace(zkNamespace)
@@ -160,8 +197,10 @@ protected CuratorFramework getCuratorClient(SolrZkClient zkClient)
             .authorization(curatorToSolrZk.getAuthInfos())
             .sessionTimeoutMs(zkClient.getZkClientTimeout())
             .connectionTimeoutMs(connectionTimeoutMs)
+            .runSafeService(curatorSafeServiceExecutor)
             .build();
     curatorFramework.start();
+
     return curatorFramework;
   }
 
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index ee5bc9ed840..ad7649f6d54 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -64,6 +64,10 @@ It is always strongly recommended that you fully reindex your documents after a
 In Solr 8, it was possible to add docValues to a schema without re-indexing via `UninvertDocValuesMergePolicy`, an advanced/expert utility.
 Due to changes in Lucene 9, that isn't possible any more.
 
+== Solr 9.5
+=== Curator upgraded to 5.5.0 and requires Zookeeper 3.5.x or higher
+xref:upgrade-notes:major-changes-in-solr-9.html#solr-8-2[Solr 8.2 recommended using Zookeeper 3.5.5] and now with Curator 5.5.0 requires https://curator.apache.org/docs/breaking-changes/[Zookeeper 3.5.x or higher]. This primarily affects users of `hadoop-auth`, but usage of Curator could affect other parts of Solr.
+
 == Solr 9.4
 === The Built-In Config Sets
 * The build in ConfigSets (`_default` and `sample_techproducts_configs`), now use a default `autoSoftCommit` time of 3 seconds,
diff --git a/versions.lock b/versions.lock
index b1af4b4c1a8..442f19b8a5f 100644
--- a/versions.lock
+++ b/versions.lock
@@ -44,7 +44,7 @@ com.google.cloud:google-cloud-storage:2.27.0 (2 constraints: d71c8a27)
 com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)
 com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 6e891f5a)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.1.2-jre (26 constraints: a37b7b56)
+com.google.guava:guava:32.1.2-jre (26 constraints: 407b586c)
 com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.3 (11 constraints: 3fbf96b4)
@@ -177,14 +177,14 @@ org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
 org.apache.commons:commons-lang3:3.13.0 (5 constraints: 9c3eb936)
 org.apache.commons:commons-math3:3.6.1 (5 constraints: 57322799)
 org.apache.commons:commons-text:1.10.0 (1 constraints: d911adf8)
-org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
-org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)
-org.apache.curator:curator-recipes:4.3.0 (1 constraints: 09050836)
-org.apache.hadoop:hadoop-annotations:3.3.5 (1 constraints: 0d050836)
-org.apache.hadoop:hadoop-auth:3.3.5 (1 constraints: 0d050836)
-org.apache.hadoop:hadoop-client-api:3.3.5 (3 constraints: 22287160)
-org.apache.hadoop:hadoop-client-runtime:3.3.5 (2 constraints: 6d17a643)
-org.apache.hadoop:hadoop-common:3.3.5 (1 constraints: 0d050836)
+org.apache.curator:curator-client:5.5.0 (2 constraints: e81468a3)
+org.apache.curator:curator-framework:5.5.0 (2 constraints: 05144b75)
+org.apache.curator:curator-recipes:5.5.0 (1 constraints: 0c051336)
+org.apache.hadoop:hadoop-annotations:3.3.6 (1 constraints: 0e050936)
+org.apache.hadoop:hadoop-auth:3.3.6 (1 constraints: 0e050936)
+org.apache.hadoop:hadoop-client-api:3.3.6 (3 constraints: 25280861)
+org.apache.hadoop:hadoop-client-runtime:3.3.6 (2 constraints: 6f17dc43)
+org.apache.hadoop:hadoop-common:3.3.6 (1 constraints: 0e050936)
 org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
 org.apache.httpcomponents:httpclient:4.5.14 (9 constraints: 62806342)
 org.apache.httpcomponents:httpcore:4.4.16 (8 constraints: 256d4617)
@@ -256,7 +256,7 @@ org.apache.tika:tika-core:1.28.5 (2 constraints: d8118f11)
 org.apache.tika:tika-parsers:1.28.5 (1 constraints: 42054a3b)
 org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)
 org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
-org.apache.zookeeper:zookeeper:3.9.0 (2 constraints: a0134e5f)
+org.apache.zookeeper:zookeeper:3.9.0 (2 constraints: 9c134e5f)
 org.apache.zookeeper:zookeeper-jute:3.9.0 (2 constraints: 99125f23)
 org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
 org.bitbucket.b_c:jose4j:0.9.3 (1 constraints: 0e050936)
@@ -410,9 +410,9 @@ net.bytebuddy:byte-buddy:1.14.6 (1 constraints: 460b44de)
 net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8)
 net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c)
 no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b)
-org.apache.hadoop:hadoop-client-minicluster:3.3.5 (1 constraints: 0d050836)
-org.apache.hadoop:hadoop-hdfs:3.3.5 (1 constraints: 0d050836)
-org.apache.hadoop:hadoop-minikdc:3.3.5 (1 constraints: 0d050836)
+org.apache.hadoop:hadoop-client-minicluster:3.3.6 (1 constraints: 0e050936)
+org.apache.hadoop:hadoop-hdfs:3.3.6 (1 constraints: 0e050936)
+org.apache.hadoop:hadoop-minikdc:3.3.6 (1 constraints: 0e050936)
 org.apache.kerby:kerb-admin:1.0.1 (1 constraints: 840d892f)
 org.apache.kerby:kerb-client:1.0.1 (1 constraints: 840d892f)
 org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)
diff --git a/versions.props b/versions.props
index d12da6f2b50..a19f4b3f67c 100644
--- a/versions.props
+++ b/versions.props
@@ -39,9 +39,9 @@ org.apache.commons:commons-configuration2=2.9.0
 org.apache.commons:commons-exec=1.3
 org.apache.commons:commons-lang3=3.13.0
 org.apache.commons:commons-math3=3.6.1
-org.apache.curator:*=4.3.0
+org.apache.curator:*=5.5.0
 org.apache.hadoop.thirdparty:*=1.1.1
-org.apache.hadoop:*=3.3.5
+org.apache.hadoop:*=3.3.6
 org.apache.httpcomponents:httpclient=4.5.14
 org.apache.httpcomponents:httpcore=4.4.16
 org.apache.httpcomponents:httpmime=4.5.14

From 204ff1ddb7d3571ed15157a0254737085d3996b3 Mon Sep 17 00:00:00 2001
From: Alex D <stillalex@apache.org>
Date: Wed, 4 Oct 2023 17:14:27 -0700
Subject: [PATCH 159/160] SOLR-17009 json.wrf parameter ignored in
 JacksonJsonWriter (#1980)

---
 .../src/java/org/apache/solr/response/JacksonJsonWriter.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
index 79b09ae3bf4..611223fd216 100644
--- a/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JacksonJsonWriter.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,7 +35,8 @@ public class JacksonJsonWriter extends BinaryResponseWriter {
   protected static final DefaultPrettyPrinter pretty =
       new DefaultPrettyPrinter()
           .withoutSpacesInObjectEntries()
-          .withArrayIndenter(DefaultPrettyPrinter.NopIndenter.instance);
+          .withArrayIndenter(DefaultPrettyPrinter.NopIndenter.instance)
+          .withObjectIndenter(new DefaultIndenter().withLinefeed("\n"));
 
   public JacksonJsonWriter() {
     super();

From 9fde70b9e7fff2a1d24d55d23e38383daf642c10 Mon Sep 17 00:00:00 2001
From: Kevin Risden <risdenk@users.noreply.github.com>
Date: Thu, 5 Oct 2023 12:17:07 -0400
Subject: [PATCH 160/160] SOLR-17014: Ensure that injecting random recording
 flag only happens under randomized context SOLR-16960 (#1983)

---
 .../java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 75113bc5b66..3b8d4e1c774 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
@@ -1318,8 +1318,13 @@ public Builder withTraceIdGenerationDisabled() {
    * mechanics.
    */
   private static void injectRandomRecordingFlag() {
-    boolean isRecording = LuceneTestCase.rarely();
-    TraceUtils.IS_RECORDING = (ignored) -> isRecording;
+    try {
+      boolean isRecording = LuceneTestCase.rarely();
+      TraceUtils.IS_RECORDING = (ignored) -> isRecording;
+    } catch (IllegalStateException e) {
+      // This can happen in benchmarks or other places that aren't in a randomized test
+      log.warn("Unable to inject random recording flag due to outside randomized context", e);
+    }
   }
 
   private static void resetRecordingFlag() {