From 1b1c92596908457a8c1c1bccaaeee82c5f122fb2 Mon Sep 17 00:00:00 2001
From: Matthew Biscocho <54160956+mlbiscoc@users.noreply.github.com>
Date: Sat, 4 Jan 2025 13:54:55 -0500
Subject: [PATCH 01/16] SOLR-17582 Stream CLUSTERSTATUS API response (#2916)

The CLUSTERSTATUS API will now stream each collection's status to the response, fetching and computing it on the fly.  To avoid a backwards compatibility concern, this won't work for wt=javabin.
---
 solr/CHANGES.txt                              |   4 +-
 .../solr/handler/admin/ClusterStatus.java     | 158 ++++++++++--------
 .../api/collections/TestCollectionAPI.java    |  37 +++-
 3 files changed, 129 insertions(+), 70 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1fd659b966e..9ef3e302af9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -146,7 +146,9 @@ Other Changes
 ==================  9.9.0 ==================
 New Features
 ---------------------
-(No changes)
+* SOLR-17582: The CLUSTERSTATUS API will now stream each collection's status to the response,
+  fetching and computing it on the fly.  To avoid a backwards compatibilty concern, this won't work
+  for wt=javabin.  (Matthew Biscocho, David Smiley)
 
 Improvements
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
index 18c8843f916..7a8ecf9c850 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
@@ -17,7 +17,6 @@
 package org.apache.solr.handler.admin;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,15 +26,15 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
+import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.Aliases;
 import org.apache.solr.common.cloud.ClusterState;
 import org.apache.solr.common.cloud.DocCollection;
-import org.apache.solr.common.cloud.DocRouter;
 import org.apache.solr.common.cloud.PerReplicaStates;
 import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ShardParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
@@ -180,6 +179,8 @@ private void fetchClusterStatusForCollOrAlias(
     String routeKey = solrParams.get(ShardParams._ROUTE_);
     String shard = solrParams.get(ZkStateReader.SHARD_ID_PROP);
 
+    Set<String> requestedShards = (shard != null) ? Set.of(shard.split(",")) : null;
+
     Stream<DocCollection> collectionStream;
     if (collection == null) {
       collectionStream = clusterState.collectionStream();
@@ -205,54 +206,35 @@ private void fetchClusterStatusForCollOrAlias(
       }
     }
 
-    // TODO use an Iterable to stream the data to the client instead of gathering it all in mem
-
-    NamedList<Object> collectionProps = new SimpleOrderedMap<>();
-
-    collectionStream.forEach(
-        clusterStateCollection -> {
-          Map<String, Object> collectionStatus;
-          String name = clusterStateCollection.getName();
-
-          Set<String> requestedShards = new HashSet<>();
-          if (routeKey != null) {
-            DocRouter router = clusterStateCollection.getRouter();
-            Collection<Slice> slices =
-                router.getSearchSlices(routeKey, null, clusterStateCollection);
-            for (Slice slice : slices) {
-              requestedShards.add(slice.getName());
-            }
-          }
-          if (shard != null) {
-            String[] paramShards = shard.split(",");
-            requestedShards.addAll(Arrays.asList(paramShards));
-          }
-
-          byte[] bytes = Utils.toJSON(clusterStateCollection);
-          @SuppressWarnings("unchecked")
-          Map<String, Object> docCollection = (Map<String, Object>) Utils.fromJSON(bytes);
-          collectionStatus = getCollectionStatus(docCollection, name, requestedShards);
-
-          collectionStatus.put("znodeVersion", clusterStateCollection.getZNodeVersion());
-          collectionStatus.put(
-              "creationTimeMillis", clusterStateCollection.getCreationTime().toEpochMilli());
-
-          if (collectionVsAliases.containsKey(name) && !collectionVsAliases.get(name).isEmpty()) {
-            collectionStatus.put("aliases", collectionVsAliases.get(name));
-          }
-          String configName = clusterStateCollection.getConfigName();
-          collectionStatus.put("configName", configName);
-          if (solrParams.getBool("prs", false) && clusterStateCollection.isPerReplicaState()) {
-            PerReplicaStates prs = clusterStateCollection.getPerReplicaStates();
-            collectionStatus.put("PRS", prs);
-          }
-          collectionProps.add(name, collectionStatus);
-        });
-
-    // now we need to walk the collectionProps tree to cross-check replica state with live nodes
-    crossCheckReplicaStateWithLiveNodes(liveNodes, collectionProps);
-
-    clusterStatus.add("collections", collectionProps);
+    // Because of back-compat for SolrJ, create the whole response into a NamedList
+    // Otherwise stream with MapWriter to save memory
+    if (CommonParams.JAVABIN.equals(solrParams.get(CommonParams.WT))) {
+      NamedList<Object> collectionProps = new SimpleOrderedMap<>();
+      collectionStream.forEach(
+          collectionState -> {
+            collectionProps.add(
+                collectionState.getName(),
+                buildResponseForCollection(
+                    collectionState, collectionVsAliases, routeKey, liveNodes, requestedShards));
+          });
+      clusterStatus.add("collections", collectionProps);
+    } else {
+      MapWriter collectionPropsWriter =
+          ew -> {
+            collectionStream.forEach(
+                (collectionState) -> {
+                  ew.putNoEx(
+                      collectionState.getName(),
+                      buildResponseForCollection(
+                          collectionState,
+                          collectionVsAliases,
+                          routeKey,
+                          liveNodes,
+                          requestedShards));
+                });
+          };
+      clusterStatus.add("collections", collectionPropsWriter);
+    }
   }
 
   private void addAliasMap(Aliases aliases, NamedList<Object> clusterStatus) {
@@ -307,23 +289,20 @@ private Map<String, Object> getCollectionStatus(
    */
   @SuppressWarnings("unchecked")
   protected void crossCheckReplicaStateWithLiveNodes(
-      List<String> liveNodes, NamedList<Object> collectionProps) {
-    for (Map.Entry<String, Object> next : collectionProps) {
-      Map<String, Object> collMap = (Map<String, Object>) next.getValue();
-      Map<String, Object> shards = (Map<String, Object>) collMap.get("shards");
-      for (Object nextShard : shards.values()) {
-        Map<String, Object> shardMap = (Map<String, Object>) nextShard;
-        Map<String, Object> replicas = (Map<String, Object>) shardMap.get("replicas");
-        for (Object nextReplica : replicas.values()) {
-          Map<String, Object> replicaMap = (Map<String, Object>) nextReplica;
-          if (Replica.State.getState((String) replicaMap.get(ZkStateReader.STATE_PROP))
-              != Replica.State.DOWN) {
-            // not down, so verify the node is live
-            String node_name = (String) replicaMap.get(ZkStateReader.NODE_NAME_PROP);
-            if (!liveNodes.contains(node_name)) {
-              // node is not live, so this replica is actually down
-              replicaMap.put(ZkStateReader.STATE_PROP, Replica.State.DOWN.toString());
-            }
+      List<String> liveNodes, Map<String, Object> collectionProps) {
+    var shards = (Map<String, Object>) collectionProps.get("shards");
+    for (Object nextShard : shards.values()) {
+      var shardMap = (Map<String, Object>) nextShard;
+      var replicas = (Map<String, Object>) shardMap.get("replicas");
+      for (Object nextReplica : replicas.values()) {
+        var replicaMap = (Map<String, Object>) nextReplica;
+        if (Replica.State.getState((String) replicaMap.get(ZkStateReader.STATE_PROP))
+            != Replica.State.DOWN) {
+          // not down, so verify the node is live
+          String node_name = (String) replicaMap.get(ZkStateReader.NODE_NAME_PROP);
+          if (!liveNodes.contains(node_name)) {
+            // node is not live, so this replica is actually down
+            replicaMap.put(ZkStateReader.STATE_PROP, Replica.State.DOWN.toString());
           }
         }
       }
@@ -368,4 +347,47 @@ public static Map<String, Object> postProcessCollectionJSON(Map<String, Object>
     collection.put("health", Health.combine(healthStates).toString());
     return collection;
   }
+
+  private Map<String, Object> buildResponseForCollection(
+      DocCollection clusterStateCollection,
+      Map<String, List<String>> collectionVsAliases,
+      String routeKey,
+      List<String> liveNodes,
+      Set<String> requestedShards) {
+    Map<String, Object> collectionStatus;
+    Set<String> shards = new HashSet<>();
+    String name = clusterStateCollection.getName();
+
+    if (routeKey != null)
+      clusterStateCollection
+          .getRouter()
+          .getSearchSlices(routeKey, null, clusterStateCollection)
+          .forEach((slice) -> shards.add(slice.getName()));
+
+    if (requestedShards != null) shards.addAll(requestedShards);
+
+    byte[] bytes = Utils.toJSON(clusterStateCollection);
+    @SuppressWarnings("unchecked")
+    Map<String, Object> docCollection = (Map<String, Object>) Utils.fromJSON(bytes);
+    collectionStatus = getCollectionStatus(docCollection, name, shards);
+
+    collectionStatus.put("znodeVersion", clusterStateCollection.getZNodeVersion());
+    collectionStatus.put(
+        "creationTimeMillis", clusterStateCollection.getCreationTime().toEpochMilli());
+
+    if (collectionVsAliases.containsKey(name) && !collectionVsAliases.get(name).isEmpty()) {
+      collectionStatus.put("aliases", collectionVsAliases.get(name));
+    }
+    String configName = clusterStateCollection.getConfigName();
+    collectionStatus.put("configName", configName);
+    if (solrParams.getBool("prs", false) && clusterStateCollection.isPerReplicaState()) {
+      PerReplicaStates prs = clusterStateCollection.getPerReplicaStates();
+      collectionStatus.put("PRS", prs);
+    }
+
+    // now we need to walk the collectionProps tree to cross-check replica state with live nodes
+    crossCheckReplicaStateWithLiveNodes(liveNodes, collectionStatus);
+
+    return collectionStatus;
+  }
 }
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 760bf0bfe93..314655e85ce 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
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.cloud.api.collections;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -28,6 +29,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.NoOpResponseParser;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.CollectionAdminResponse;
@@ -81,7 +83,6 @@ public void test() throws Exception {
       client.request(req);
       createCollection(null, COLLECTION_NAME1, 1, 1, client, null, "conf1");
     }
-
     waitForCollection(ZkStateReader.from(cloudClient), COLLECTION_NAME, 2);
     waitForCollection(ZkStateReader.from(cloudClient), COLLECTION_NAME1, 1);
     waitForRecoveriesToFinish(COLLECTION_NAME, false);
@@ -91,6 +92,7 @@ public void test() throws Exception {
     clusterStatusNoCollection();
     clusterStatusWithCollection();
     clusterStatusWithCollectionAndShard();
+    clusterStatusWithCollectionAndShardJSON();
     clusterStatusWithCollectionAndMultipleShards();
     clusterStatusWithCollectionHealthState();
     clusterStatusWithRouteKey();
@@ -648,6 +650,39 @@ private void clusterStatusAliasTest() throws Exception {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private void clusterStatusWithCollectionAndShardJSON() throws IOException, SolrServerException {
+
+    try (CloudSolrClient client = createCloudClient(null)) {
+      ObjectMapper mapper = new ObjectMapper();
+
+      ModifiableSolrParams params = new ModifiableSolrParams();
+      params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
+      params.set("collection", COLLECTION_NAME);
+      params.set("shard", SHARD1);
+      params.set("wt", "json");
+      QueryRequest request = new QueryRequest(params);
+      request.setResponseParser(new NoOpResponseParser("json"));
+      request.setPath("/admin/collections");
+      NamedList<Object> rsp = client.request(request);
+      String actualResponse = (String) rsp.get("response");
+
+      Map<String, Object> result = mapper.readValue(actualResponse, Map.class);
+
+      var cluster = (Map<String, Object>) result.get("cluster");
+      assertNotNull("Cluster state should not be null", cluster);
+      var collections = (Map<String, Object>) cluster.get("collections");
+      assertNotNull("Collections should not be null in cluster state", collections);
+      assertNotNull(collections.get(COLLECTION_NAME));
+      assertEquals(1, collections.size());
+      var collection = (Map<String, Object>) collections.get(COLLECTION_NAME);
+      var shardStatus = (Map<String, Object>) collection.get("shards");
+      assertEquals(1, shardStatus.size());
+      Map<String, Object> selectedShardStatus = (Map<String, Object>) shardStatus.get(SHARD1);
+      assertNotNull(selectedShardStatus);
+    }
+  }
+
   private void clusterStatusRolesTest() throws Exception {
     try (CloudSolrClient client = createCloudClient(null)) {
       client.connect();

From 328cce634116df2ac1e318730f7e87daa708a282 Mon Sep 17 00:00:00 2001
From: Christos Malliaridis <malliaridis@apache.org>
Date: Mon, 6 Jan 2025 11:15:19 +0200
Subject: [PATCH 02/16] Fix renovate.json to work with version catalogs (#2936)

---
 .github/renovate.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 5cf53a4c5fd..94220882331 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -4,9 +4,9 @@
   "enabled": true,
   "dependencyDashboard": false,
   "enabledManagers": ["gradle", "github-actions"],
-  "includePaths": ["versions.*", "build.gradle", ".github/workflows/*"],
+  "includePaths": ["gradle/libs.versions.toml", "versions.*", "build.gradle", ".github/workflows/*"],
   "postUpgradeTasks": {
-    "commands": ["./gradlew updateLicenses"],
+    "commands": ["./gradlew writeLocks", "./gradlew updateLicenses"],
     "fileFilters": ["solr/licenses/*.sha1"],
     "executionMode": "branch"
   },

From f844b7faf5f0046487f0f7d559b88a4b6e7d286a Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Mon, 6 Jan 2025 13:08:57 +0000
Subject: [PATCH 03/16] Update copyright year in NOTICE.txt file. (#2933)

---
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 49724175b40..ce7c667fc29 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,6 +1,6 @@
 ==============================================================
  Apache Solr
- Copyright 2006-2024 The Apache Software Foundation
+ Copyright 2006-2025 The Apache Software Foundation
 ==============================================================
 
 This product includes software developed at

From ee1e48dce697c5da4e6b0f54acc300354722ca86 Mon Sep 17 00:00:00 2001
From: Pierre Salagnac <psalagnac@apache.org>
Date: Mon, 6 Jan 2025 18:28:12 +0100
Subject: [PATCH 04/16] SOLR-17471: upgrade Lucene to version 9.12.1 (#2736)

---
 dev-docs/lucene-upgrade.md                    |  4 +-
 gradle/libs.versions.toml                     |  2 +-
 solr/CHANGES.txt                              |  2 +-
 .../apache/solr/core/SchemaCodecFactory.java  |  6 +--
 .../backup/repository/BackupRepository.java   | 10 ++--
 .../ClassicSimilarityFactory.java             | 12 ++---
 .../similarities/DFISimilarityFactory.java    |  7 +--
 .../similarities/DFRSimilarityFactory.java    |  6 +--
 .../similarities/IBSimilarityFactory.java     |  6 +--
 .../LMDirichletSimilarityFactory.java         | 15 ++++--
 .../LMJelinekMercerSimilarityFactory.java     |  9 ++--
 .../SweetSpotSimilarityFactory.java           | 50 +++++++++++------
 .../solr/collection1/conf/schema_codec.xml    |  2 +-
 .../apache/solr/core/TestCodecSupport.java    |  2 +-
 .../lucene-analysis-common-9.11.1.jar.sha1    |  1 -
 .../lucene-analysis-common-9.12.1.jar.sha1    |  1 +
 .../lucene-analysis-icu-9.11.1.jar.sha1       |  1 -
 .../lucene-analysis-icu-9.12.1.jar.sha1       |  1 +
 .../lucene-analysis-kuromoji-9.11.1.jar.sha1  |  1 -
 .../lucene-analysis-kuromoji-9.12.1.jar.sha1  |  1 +
 ...lucene-analysis-morfologik-9.11.1.jar.sha1 |  1 -
 ...lucene-analysis-morfologik-9.12.1.jar.sha1 |  1 +
 .../lucene-analysis-nori-9.11.1.jar.sha1      |  1 -
 .../lucene-analysis-nori-9.12.1.jar.sha1      |  1 +
 .../lucene-analysis-opennlp-9.11.1.jar.sha1   |  1 -
 .../lucene-analysis-opennlp-9.12.1.jar.sha1   |  1 +
 .../lucene-analysis-phonetic-9.11.1.jar.sha1  |  1 -
 .../lucene-analysis-phonetic-9.12.1.jar.sha1  |  1 +
 .../lucene-analysis-smartcn-9.11.1.jar.sha1   |  1 -
 .../lucene-analysis-smartcn-9.12.1.jar.sha1   |  1 +
 .../lucene-analysis-stempel-9.11.1.jar.sha1   |  1 -
 .../lucene-analysis-stempel-9.12.1.jar.sha1   |  1 +
 .../lucene-backward-codecs-9.11.1.jar.sha1    |  1 -
 .../lucene-backward-codecs-9.12.1.jar.sha1    |  1 +
 .../lucene-classification-9.11.1.jar.sha1     |  1 -
 .../lucene-classification-9.12.1.jar.sha1     |  1 +
 solr/licenses/lucene-codecs-9.11.1.jar.sha1   |  1 -
 solr/licenses/lucene-codecs-9.12.1.jar.sha1   |  1 +
 solr/licenses/lucene-core-9.11.1.jar.sha1     |  1 -
 solr/licenses/lucene-core-9.12.1.jar.sha1     |  1 +
 .../lucene-expressions-9.11.1.jar.sha1        |  1 -
 .../lucene-expressions-9.12.1.jar.sha1        |  1 +
 solr/licenses/lucene-facet-9.12.1.jar.sha1    |  1 +
 solr/licenses/lucene-grouping-9.11.1.jar.sha1 |  1 -
 solr/licenses/lucene-grouping-9.12.1.jar.sha1 |  1 +
 .../lucene-highlighter-9.11.1.jar.sha1        |  1 -
 .../lucene-highlighter-9.12.1.jar.sha1        |  1 +
 solr/licenses/lucene-join-9.11.1.jar.sha1     |  1 -
 solr/licenses/lucene-join-9.12.1.jar.sha1     |  1 +
 solr/licenses/lucene-memory-9.11.1.jar.sha1   |  1 -
 solr/licenses/lucene-memory-9.12.1.jar.sha1   |  1 +
 solr/licenses/lucene-misc-9.11.1.jar.sha1     |  1 -
 solr/licenses/lucene-misc-9.12.1.jar.sha1     |  1 +
 solr/licenses/lucene-queries-9.11.1.jar.sha1  |  1 -
 solr/licenses/lucene-queries-9.12.1.jar.sha1  |  1 +
 .../lucene-queryparser-9.11.1.jar.sha1        |  1 -
 .../lucene-queryparser-9.12.1.jar.sha1        |  1 +
 solr/licenses/lucene-sandbox-9.11.1.jar.sha1  |  1 -
 solr/licenses/lucene-sandbox-9.12.1.jar.sha1  |  1 +
 .../lucene-spatial-extras-9.11.1.jar.sha1     |  1 -
 .../lucene-spatial-extras-9.12.1.jar.sha1     |  1 +
 .../licenses/lucene-spatial3d-9.11.1.jar.sha1 |  1 -
 .../licenses/lucene-spatial3d-9.12.1.jar.sha1 |  1 +
 solr/licenses/lucene-suggest-9.11.1.jar.sha1  |  1 -
 solr/licenses/lucene-suggest-9.12.1.jar.sha1  |  1 +
 .../lucene-test-framework-9.11.1.jar.sha1     |  1 -
 .../lucene-test-framework-9.12.1.jar.sha1     |  1 +
 .../apache/solr/gcs/GCSBackupRepository.java  |  4 +-
 .../apache/solr/s3/S3BackupRepository.java    |  5 +-
 .../solr/s3/S3BackupRepositoryTest.java       | 11 ++--
 .../configsets/_default/conf/solrconfig.xml   |  2 +-
 .../conf/solrconfig.xml                       |  2 +-
 .../AbstractBackupRepositoryTest.java         |  7 ++-
 versions.lock                                 | 53 ++++++++++---------
 74 files changed, 141 insertions(+), 129 deletions(-)
 delete mode 100644 solr/licenses/lucene-analysis-common-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-common-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-classification-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-classification-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-codecs-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-codecs-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-core-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-core-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-expressions-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-expressions-9.12.1.jar.sha1
 create mode 100644 solr/licenses/lucene-facet-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-grouping-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-grouping-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-highlighter-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-highlighter-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-join-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-join-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-memory-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-memory-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-misc-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-misc-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-queries-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-queries-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-queryparser-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-queryparser-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-sandbox-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-sandbox-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial3d-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial3d-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-suggest-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-suggest-9.12.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-test-framework-9.11.1.jar.sha1
 create mode 100644 solr/licenses/lucene-test-framework-9.12.1.jar.sha1

diff --git a/dev-docs/lucene-upgrade.md b/dev-docs/lucene-upgrade.md
index c9ee1a27802..e5ab91e7c9f 100644
--- a/dev-docs/lucene-upgrade.md
+++ b/dev-docs/lucene-upgrade.md
@@ -27,7 +27,7 @@ Create a new branch locally e.g. `git checkout -b lucene940 -t origin/main` for
 
 ## Build
 
-### `versions.props` update
+### `gradle/libs.versions.toml` update
 
 ```
 - org.apache.lucene:*=9.3.0
@@ -37,7 +37,7 @@ Create a new branch locally e.g. `git checkout -b lucene940 -t origin/main` for
 ### `versions.lock` update
 
 ```
-gradlew --write-locks
+gradlew :writeLocks
 ```
 
 ### `solr/licenses` update
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd7a5dfff0f..685fe012216 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ apache-httpcomponents-httpcore = "4.4.16"
 apache-httpcomponents-httpmime = "4.5.14"
 apache-kafka = "3.7.1"
 apache-log4j = "2.21.0"
-apache-lucene = "9.11.1"
+apache-lucene = "9.12.1"
 apache-opennlp = "1.9.4"
 apache-poi = "5.2.2"
 apache-rat = "0.15"
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9ef3e302af9..b7291e9a23e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -170,7 +170,7 @@ Bug Fixes
 
 Dependency Upgrades
 ---------------------
-(No changes)
+* SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, 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 a7d9305b3c3..cf1c0f18d0a 100644
--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
@@ -26,8 +26,8 @@
 import org.apache.lucene.codecs.KnnVectorsReader;
 import org.apache.lucene.codecs.KnnVectorsWriter;
 import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.lucene99.Lucene99Codec;
-import org.apache.lucene.codecs.lucene99.Lucene99Codec.Mode;
+import org.apache.lucene.codecs.lucene912.Lucene912Codec;
+import org.apache.lucene.codecs.lucene912.Lucene912Codec.Mode;
 import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.index.SegmentWriteState;
@@ -97,7 +97,7 @@ public void init(NamedList<?> args) {
       log.debug("Using default compressionMode: {}", compressionMode);
     }
     codec =
-        new Lucene99Codec(compressionMode) {
+        new Lucene912Codec(compressionMode) {
           @Override
           public PostingsFormat getPostingsFormatForField(String field) {
             final SchemaField schemaField = core.getLatestSchema().getFieldOrNull(field);
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java
index 68cf5636fdd..5e45e5ef206 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java
@@ -31,7 +31,6 @@
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.common.params.CoreAdminParams;
-import org.apache.solr.core.DirectoryFactory;
 import org.apache.solr.core.backup.Checksum;
 import org.apache.solr.util.plugin.NamedListInitializedPlugin;
 
@@ -217,9 +216,8 @@ default void copyIndexFileFrom(
       Directory sourceDir, String sourceFileName, Directory destDir, String destFileName)
       throws IOException {
     boolean success = false;
-    try (ChecksumIndexInput is =
-            sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE);
-        IndexOutput os = destDir.createOutput(destFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {
+    try (ChecksumIndexInput is = sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE);
+        IndexOutput os = destDir.createOutput(destFileName, IOContext.READONCE)) {
       os.copyBytes(is, is.length() - CodecUtil.footerLength());
 
       // ensure that index file is not corrupted
@@ -300,8 +298,8 @@ default void copyFileNoChecksum(
       Directory sourceDir, String sourceFileName, Directory destDir, String destFileName)
       throws IOException {
     boolean success = false;
-    try (IndexInput is = sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE);
-        IndexOutput os = destDir.createOutput(destFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {
+    try (IndexInput is = sourceDir.openInput(sourceFileName, IOContext.READONCE);
+        IndexOutput os = destDir.createOutput(destFileName, IOContext.READONCE)) {
       os.copyBytes(is, is.length());
       success = true;
     } finally {
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java
index 250ca045acf..ade8362ee88 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java
@@ -31,7 +31,7 @@
  * <p>Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link ClassicSimilarity#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {@link ClassicSimilarity#getDiscountOverlaps()}.
  * </ul>
  *
  * @see TFIDFSimilarity
@@ -41,13 +41,13 @@ public class ClassicSimilarityFactory extends SimilarityFactory {
 
   /**
    * Init param name for specifying the value to use in {@link
-   * ClassicSimilarity#setDiscountOverlaps(boolean)}
+   * ClassicSimilarity#getDiscountOverlaps()}.
    */
   public static final String DISCOUNT_OVERLAPS = "discountOverlaps";
 
   /**
-   * Controls the value of {@link ClassicSimilarity#setDiscountOverlaps(boolean)} on newly
-   * constructed instances of {@link ClassicSimilarity}
+   * Controls the value of {@link ClassicSimilarity#getDiscountOverlaps()} on newly constructed
+   * instances of {@link ClassicSimilarity}
    */
   protected boolean discountOverlaps = true;
 
@@ -59,8 +59,6 @@ public void init(SolrParams params) {
 
   @Override
   public Similarity getSimilarity() {
-    ClassicSimilarity sim = new ClassicSimilarity();
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    return new ClassicSimilarity(discountOverlaps);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java
index df5ea9f1182..7bdb9f8e518 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java
@@ -39,8 +39,7 @@
  * Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link
- *       org.apache.lucene.search.similarities.SimilarityBase#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}
  * </ul>
  *
  * @lucene.experimental
@@ -59,9 +58,7 @@ public void init(SolrParams params) {
 
   @Override
   public Similarity getSimilarity() {
-    DFISimilarity sim = new DFISimilarity(independenceMeasure);
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    return new DFISimilarity(independenceMeasure, discountOverlaps);
   }
 
   private Independence parseIndependenceMeasure(String expr) {
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java
index 61b972f604b..63cca3194f5 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java
@@ -86,7 +86,7 @@
  * <p>Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link DFRSimilarity#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {@link Similarity#getDiscountOverlaps()}
  * </ul>
  *
  * @lucene.experimental
@@ -160,8 +160,6 @@ static Normalization parseNormalization(String expr, String c, String mu, String
 
   @Override
   public Similarity getSimilarity() {
-    DFRSimilarity sim = new DFRSimilarity(basicModel, afterEffect, normalization);
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    return new DFRSimilarity(basicModel, afterEffect, normalization, discountOverlaps);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java
index 6c387fe93de..b397b9c655a 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java
@@ -56,7 +56,7 @@
  * <p>Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link IBSimilarity#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}
  * </ul>
  *
  * @lucene.experimental
@@ -100,8 +100,6 @@ private Lambda parseLambda(String expr) {
 
   @Override
   public Similarity getSimilarity() {
-    IBSimilarity sim = new IBSimilarity(distribution, lambda, normalization);
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    return new IBSimilarity(distribution, lambda, normalization, discountOverlaps);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java
index d23430d45ab..8792e5ff0d7 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java
@@ -17,6 +17,7 @@
 package org.apache.solr.search.similarities;
 
 import org.apache.lucene.search.similarities.LMDirichletSimilarity;
+import org.apache.lucene.search.similarities.LMSimilarity;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.schema.SimilarityFactory;
@@ -33,7 +34,7 @@
  * <p>Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link LMDirichletSimilarity#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}
  * </ul>
  *
  * @lucene.experimental
@@ -51,9 +52,13 @@ public void init(SolrParams params) {
 
   @Override
   public Similarity getSimilarity() {
-    LMDirichletSimilarity sim =
-        (mu != null) ? new LMDirichletSimilarity(mu) : new LMDirichletSimilarity();
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+
+    // Default μ is 2000 in Lucene. Unfortunately, there is no constant we can use
+    if (mu == null) {
+      mu = 2000f;
+    }
+
+    LMSimilarity.CollectionModel model = new LMSimilarity.DefaultCollectionModel();
+    return new LMDirichletSimilarity(model, discountOverlaps, mu);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java
index 1f5549b769f..384dc5d9c37 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java
@@ -17,6 +17,7 @@
 package org.apache.solr.search.similarities;
 
 import org.apache.lucene.search.similarities.LMJelinekMercerSimilarity;
+import org.apache.lucene.search.similarities.LMSimilarity;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.schema.SimilarityFactory;
@@ -33,8 +34,7 @@
  * <p>Optional settings:
  *
  * <ul>
- *   <li>discountOverlaps (bool): Sets {@link
- *       LMJelinekMercerSimilarity#setDiscountOverlaps(boolean)}
+ *   <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}
  * </ul>
  *
  * @lucene.experimental
@@ -52,8 +52,7 @@ public void init(SolrParams params) {
 
   @Override
   public Similarity getSimilarity() {
-    LMJelinekMercerSimilarity sim = new LMJelinekMercerSimilarity(lambda);
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    LMSimilarity.CollectionModel model = new LMSimilarity.DefaultCollectionModel();
+    return new LMJelinekMercerSimilarity(model, discountOverlaps, lambda);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
index 8dfc886dcc7..e312398bc48 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
@@ -104,33 +104,44 @@
  *     </code> for SVG diagrams showing how the each function behaves with various settings/inputs.
  */
 public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {
-  private SweetSpotSimilarity sim = null;
+
+  private Integer ln_min;
+  private Integer ln_max;
+  private Float ln_steep;
+
+  private Float hyper_min;
+  private Float hyper_max;
+  private Double hyper_base;
+  private Float hyper_offset;
+
+  private Float baseline_base;
+  private Float baseline_min;
 
   @Override
   public void init(SolrParams params) {
     super.init(params);
 
-    Integer ln_min = params.getInt("lengthNormMin");
-    Integer ln_max = params.getInt("lengthNormMax");
-    Float ln_steep = params.getFloat("lengthNormSteepness");
+    ln_min = params.getInt("lengthNormMin");
+    ln_max = params.getInt("lengthNormMax");
+    ln_steep = params.getFloat("lengthNormSteepness");
     if (!allOrNoneNull(ln_min, ln_max, ln_steep)) {
       throw new SolrException(
           SERVER_ERROR,
           "Overriding default lengthNorm settings requires all to be specified: lengthNormMin, lengthNormMax, lengthNormSteepness");
     }
 
-    Float hyper_min = params.getFloat("hyperbolicTfMin");
-    Float hyper_max = params.getFloat("hyperbolicTfMax");
-    Double hyper_base = params.getDouble("hyperbolicTfBase");
-    Float hyper_offset = params.getFloat("hyperbolicTfOffset");
+    hyper_min = params.getFloat("hyperbolicTfMin");
+    hyper_max = params.getFloat("hyperbolicTfMax");
+    hyper_base = params.getDouble("hyperbolicTfBase");
+    hyper_offset = params.getFloat("hyperbolicTfOffset");
     if (!allOrNoneNull(hyper_min, hyper_max, hyper_base, hyper_offset)) {
       throw new SolrException(
           SERVER_ERROR,
           "Overriding default hyperbolicTf settings requires all to be specified: hyperbolicTfMin, hyperbolicTfMax, hyperbolicTfBase, hyperbolicTfOffset");
     }
 
-    Float baseline_base = params.getFloat("baselineTfBase");
-    Float baseline_min = params.getFloat("baselineTfMin");
+    baseline_base = params.getFloat("baselineTfBase");
+    baseline_min = params.getFloat("baselineTfMin");
     if (!allOrNoneNull(baseline_min, baseline_base)) {
       throw new SolrException(
           SERVER_ERROR,
@@ -142,13 +153,19 @@ public void init(SolrParams params) {
       throw new SolrException(
           SERVER_ERROR, "Can not mix hyperbolicTf settings with baselineTf settings");
     }
+  }
 
+  @Override
+  public Similarity getSimilarity() {
     // pick Similarity impl based on whether hyper tf settings are set
-    sim = (null != hyper_min) ? new HyperbolicSweetSpotSimilarity() : new SweetSpotSimilarity();
+    SweetSpotSimilarity sim =
+        (null != hyper_min)
+            ? new HyperbolicSweetSpotSimilarity(discountOverlaps)
+            : new SweetSpotSimilarity(discountOverlaps);
 
     if (null != ln_min) {
       // overlaps already handled by super factory
-      sim.setLengthNormFactors(ln_min, ln_max, ln_steep, this.discountOverlaps);
+      sim.setLengthNormFactors(ln_min, ln_max, ln_steep);
     }
 
     if (null != hyper_min) {
@@ -158,11 +175,7 @@ public void init(SolrParams params) {
     if (null != baseline_min) {
       sim.setBaselineTfFactors(baseline_base, baseline_min);
     }
-  }
 
-  @Override
-  public Similarity getSimilarity() {
-    assert sim != null : "SweetSpotSimilarityFactory was not initialized";
     return sim;
   }
 
@@ -181,6 +194,11 @@ private static boolean allOrNoneNull(Object... args) {
   }
 
   private static final class HyperbolicSweetSpotSimilarity extends SweetSpotSimilarity {
+
+    private HyperbolicSweetSpotSimilarity(boolean discountOverlaps) {
+      super(discountOverlaps);
+    }
+
     @Override
     public float tf(float freq) {
       return hyperbolicTf(freq);
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
index 29e62e3c88c..5095c0c01ac 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
@@ -20,7 +20,7 @@
        as a way to vet that the configuration actually matters.
   -->
   <fieldType name="string_direct" class="solr.StrField" postingsFormat="Direct" docValuesFormat="Asserting" />
-  <fieldType name="string_standard" class="solr.StrField" postingsFormat="Lucene99"/>
+  <fieldType name="string_standard" class="solr.StrField" postingsFormat="Lucene912"/>
 
   <fieldType name="string_disk" class="solr.StrField" />
 
diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
index 54f7406635d..f5f084da8ab 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.lucene99.Lucene99Codec.Mode;
+import org.apache.lucene.codecs.lucene912.Lucene912Codec.Mode;
 import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
 import org.apache.lucene.index.SegmentInfo;
diff --git a/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1
deleted file mode 100644
index 2b71b2f9ebf..00000000000
--- a/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51286aca019db66311f71496191b4bd7adaf3dcf
diff --git a/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1
new file mode 100644
index 00000000000..805ece8fb95
--- /dev/null
+++ b/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1
@@ -0,0 +1 @@
+86836497e35c1ab33259d9864ceb280c0016075e
diff --git a/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1
deleted file mode 100644
index 95765d43eab..00000000000
--- a/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-028beadfa152c159d21d880461c06f895052bd33
diff --git a/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1
new file mode 100644
index 00000000000..d938191bbfd
--- /dev/null
+++ b/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1
@@ -0,0 +1 @@
+abaef4767ad64289e62abdd4606bf6ed2ddea0fd
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1
deleted file mode 100644
index d51f9c1b6ea..00000000000
--- a/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-701c1366189c4410d3cb1f8607df2e50621bfd22
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1
new file mode 100644
index 00000000000..af4a809392a
--- /dev/null
+++ b/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1
@@ -0,0 +1 @@
+635c41143b896f402589d29e33695dcfabae9cc5
diff --git a/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1
deleted file mode 100644
index 8421387ddb6..00000000000
--- a/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20fe70fa74097c35c9aaaa5c0e19ca5f7ac93141
diff --git a/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1
new file mode 100644
index 00000000000..0df56116cac
--- /dev/null
+++ b/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1
@@ -0,0 +1 @@
+d8e4716dab6d829e7b37a8b185cbd242650aeb9e
diff --git a/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1
deleted file mode 100644
index 3cd3de6f22d..00000000000
--- a/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-46e8f4f3f2f540307fe7d9f500ddc56c1e74d400
diff --git a/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1
new file mode 100644
index 00000000000..2ebf1d07eed
--- /dev/null
+++ b/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1
@@ -0,0 +1 @@
+e265410a6a4d9cd23b2e9c73321e6bd307bc1422
diff --git a/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1
deleted file mode 100644
index 3d521c374c6..00000000000
--- a/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8acc70958b0549705c45587bf315b2884a8eb169
diff --git a/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1
new file mode 100644
index 00000000000..77cf5acafe1
--- /dev/null
+++ b/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1
@@ -0,0 +1 @@
+021d892f1946bc238c6e9a651f9446813b715c5a
diff --git a/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1
deleted file mode 100644
index 144a5724a1a..00000000000
--- a/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d8eca81f0d1e5671bf1f1692225f7d8cc7977e8
diff --git a/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1
new file mode 100644
index 00000000000..09dd0aa365c
--- /dev/null
+++ b/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1
@@ -0,0 +1 @@
+3787b8edc0cfad21998abc6aeb9d2cbf152b4b26
diff --git a/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1
deleted file mode 100644
index 4cfb7e94652..00000000000
--- a/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e900ea081428c3fdc7ec7a48f9c392871304476e
diff --git a/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1
new file mode 100644
index 00000000000..eed0ea08e27
--- /dev/null
+++ b/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1
@@ -0,0 +1 @@
+e935f600bf153c46f5725198ca9352c32025f274
diff --git a/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1
deleted file mode 100644
index 59120fa4610..00000000000
--- a/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50f4d2400fa6264bf682028d8c7b6bbdd588b496
diff --git a/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1
new file mode 100644
index 00000000000..12e57532ee6
--- /dev/null
+++ b/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1
@@ -0,0 +1 @@
+c4e1c94b1adbd1cb9dbdc0d3c2d2c33beabfc777
diff --git a/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1
deleted file mode 100644
index d8e756dd606..00000000000
--- a/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-948fda53ceeb0fa1b835af5376abec771b2c3fb1
diff --git a/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1
new file mode 100644
index 00000000000..c8871fa4179
--- /dev/null
+++ b/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1
@@ -0,0 +1 @@
+d0e79d06a0ed021663737e4df777ab7b80cd28c4
diff --git a/solr/licenses/lucene-classification-9.11.1.jar.sha1 b/solr/licenses/lucene-classification-9.11.1.jar.sha1
deleted file mode 100644
index 3d17b3b3af8..00000000000
--- a/solr/licenses/lucene-classification-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a157f57964e1b8b9106b8c70083387f5a212362
diff --git a/solr/licenses/lucene-classification-9.12.1.jar.sha1 b/solr/licenses/lucene-classification-9.12.1.jar.sha1
new file mode 100644
index 00000000000..81a3850dc0d
--- /dev/null
+++ b/solr/licenses/lucene-classification-9.12.1.jar.sha1
@@ -0,0 +1 @@
+a64da0d06bedcf7a7a6ca5b13d0b49918717d576
diff --git a/solr/licenses/lucene-codecs-9.11.1.jar.sha1 b/solr/licenses/lucene-codecs-9.11.1.jar.sha1
deleted file mode 100644
index 87712934448..00000000000
--- a/solr/licenses/lucene-codecs-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1f1f273e1a2a956528dbf2abf4f7300b18648b2
diff --git a/solr/licenses/lucene-codecs-9.12.1.jar.sha1 b/solr/licenses/lucene-codecs-9.12.1.jar.sha1
new file mode 100644
index 00000000000..e65e95728d0
--- /dev/null
+++ b/solr/licenses/lucene-codecs-9.12.1.jar.sha1
@@ -0,0 +1 @@
+cf88c401660f80fd7a3c0896c180581126880697
diff --git a/solr/licenses/lucene-core-9.11.1.jar.sha1 b/solr/licenses/lucene-core-9.11.1.jar.sha1
deleted file mode 100644
index d6f1be77240..00000000000
--- a/solr/licenses/lucene-core-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f52ba14b21774f41ce33cf5ca111cbdefeed7f9
diff --git a/solr/licenses/lucene-core-9.12.1.jar.sha1 b/solr/licenses/lucene-core-9.12.1.jar.sha1
new file mode 100644
index 00000000000..2000314c74c
--- /dev/null
+++ b/solr/licenses/lucene-core-9.12.1.jar.sha1
@@ -0,0 +1 @@
+91447c90c1180122142773b5baddaf8547124794
diff --git a/solr/licenses/lucene-expressions-9.11.1.jar.sha1 b/solr/licenses/lucene-expressions-9.11.1.jar.sha1
deleted file mode 100644
index cb9f8b66836..00000000000
--- a/solr/licenses/lucene-expressions-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e46fbc4fd325ca00ed5a7cacde7ffafa01d7973e
diff --git a/solr/licenses/lucene-expressions-9.12.1.jar.sha1 b/solr/licenses/lucene-expressions-9.12.1.jar.sha1
new file mode 100644
index 00000000000..870d6a91d7e
--- /dev/null
+++ b/solr/licenses/lucene-expressions-9.12.1.jar.sha1
@@ -0,0 +1 @@
+667ee99f31c8e42eac70b0adcf8deb4232935430
diff --git a/solr/licenses/lucene-facet-9.12.1.jar.sha1 b/solr/licenses/lucene-facet-9.12.1.jar.sha1
new file mode 100644
index 00000000000..469a8a45fac
--- /dev/null
+++ b/solr/licenses/lucene-facet-9.12.1.jar.sha1
@@ -0,0 +1 @@
+265df739cf97862931606395a10a0d0b97ff7f97
diff --git a/solr/licenses/lucene-grouping-9.11.1.jar.sha1 b/solr/licenses/lucene-grouping-9.11.1.jar.sha1
deleted file mode 100644
index 8290e22d3c4..00000000000
--- a/solr/licenses/lucene-grouping-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0bdf9db0134523d2a41123dca1018f4c771c7b23
diff --git a/solr/licenses/lucene-grouping-9.12.1.jar.sha1 b/solr/licenses/lucene-grouping-9.12.1.jar.sha1
new file mode 100644
index 00000000000..7fa34405470
--- /dev/null
+++ b/solr/licenses/lucene-grouping-9.12.1.jar.sha1
@@ -0,0 +1 @@
+e4bc3d0aa7eec4f41b4f350de0263a8d5625d2b3
diff --git a/solr/licenses/lucene-highlighter-9.11.1.jar.sha1 b/solr/licenses/lucene-highlighter-9.11.1.jar.sha1
deleted file mode 100644
index 5fd7ac44ddc..00000000000
--- a/solr/licenses/lucene-highlighter-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e16cc9c531998a76eb5528147b5f07596f95fad8
diff --git a/solr/licenses/lucene-highlighter-9.12.1.jar.sha1 b/solr/licenses/lucene-highlighter-9.12.1.jar.sha1
new file mode 100644
index 00000000000..ddd10ca6e1c
--- /dev/null
+++ b/solr/licenses/lucene-highlighter-9.12.1.jar.sha1
@@ -0,0 +1 @@
+2eeedfcec47dd65969f36e88931ed452291dd43e
diff --git a/solr/licenses/lucene-join-9.11.1.jar.sha1 b/solr/licenses/lucene-join-9.11.1.jar.sha1
deleted file mode 100644
index db5c2e0ad13..00000000000
--- a/solr/licenses/lucene-join-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7d63c04f3cc2ec8d7df73178db20de34cf60667
diff --git a/solr/licenses/lucene-join-9.12.1.jar.sha1 b/solr/licenses/lucene-join-9.12.1.jar.sha1
new file mode 100644
index 00000000000..b03ee165abc
--- /dev/null
+++ b/solr/licenses/lucene-join-9.12.1.jar.sha1
@@ -0,0 +1 @@
+3c5e9ff2925a8373ae0d35c1d0a7b2465cebec9f
diff --git a/solr/licenses/lucene-memory-9.11.1.jar.sha1 b/solr/licenses/lucene-memory-9.11.1.jar.sha1
deleted file mode 100644
index bdd68d82720..00000000000
--- a/solr/licenses/lucene-memory-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4221baad5c40849f641f0f5c1b8e2f2dfcf1e73a
diff --git a/solr/licenses/lucene-memory-9.12.1.jar.sha1 b/solr/licenses/lucene-memory-9.12.1.jar.sha1
new file mode 100644
index 00000000000..e0541f0f417
--- /dev/null
+++ b/solr/licenses/lucene-memory-9.12.1.jar.sha1
@@ -0,0 +1 @@
+e80eecfb1dcc324140387c8357c81e12c2a01937
diff --git a/solr/licenses/lucene-misc-9.11.1.jar.sha1 b/solr/licenses/lucene-misc-9.11.1.jar.sha1
deleted file mode 100644
index 53bc1cb906b..00000000000
--- a/solr/licenses/lucene-misc-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a3ecdb999c3d3435ead88771ce215834bd8be7b8
diff --git a/solr/licenses/lucene-misc-9.12.1.jar.sha1 b/solr/licenses/lucene-misc-9.12.1.jar.sha1
new file mode 100644
index 00000000000..bed6c11b854
--- /dev/null
+++ b/solr/licenses/lucene-misc-9.12.1.jar.sha1
@@ -0,0 +1 @@
+4e65d01d1c23f3f49dc325d552701bbefafee7ee
diff --git a/solr/licenses/lucene-queries-9.11.1.jar.sha1 b/solr/licenses/lucene-queries-9.11.1.jar.sha1
deleted file mode 100644
index d8e030fc1f2..00000000000
--- a/solr/licenses/lucene-queries-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-027fc885a0442a0442f426f7fea9743f6fcf3c43
diff --git a/solr/licenses/lucene-queries-9.12.1.jar.sha1 b/solr/licenses/lucene-queries-9.12.1.jar.sha1
new file mode 100644
index 00000000000..1cda38477b3
--- /dev/null
+++ b/solr/licenses/lucene-queries-9.12.1.jar.sha1
@@ -0,0 +1 @@
+14f24315041b686683dba4bc679ca7dc6a505906
diff --git a/solr/licenses/lucene-queryparser-9.11.1.jar.sha1 b/solr/licenses/lucene-queryparser-9.11.1.jar.sha1
deleted file mode 100644
index 1f69eb506fd..00000000000
--- a/solr/licenses/lucene-queryparser-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad6e5b135e1e284d4462d717086ce13a3ce01b4a
diff --git a/solr/licenses/lucene-queryparser-9.12.1.jar.sha1 b/solr/licenses/lucene-queryparser-9.12.1.jar.sha1
new file mode 100644
index 00000000000..9baf9838b20
--- /dev/null
+++ b/solr/licenses/lucene-queryparser-9.12.1.jar.sha1
@@ -0,0 +1 @@
+aa6df09a99f8881d843e9863aa1713dc9f3ed24f
diff --git a/solr/licenses/lucene-sandbox-9.11.1.jar.sha1 b/solr/licenses/lucene-sandbox-9.11.1.jar.sha1
deleted file mode 100644
index 6613da2336a..00000000000
--- a/solr/licenses/lucene-sandbox-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9d6a88d9cb7f206c12d13c4fe48f8c7a973ebdb5
diff --git a/solr/licenses/lucene-sandbox-9.12.1.jar.sha1 b/solr/licenses/lucene-sandbox-9.12.1.jar.sha1
new file mode 100644
index 00000000000..87836cb52c9
--- /dev/null
+++ b/solr/licenses/lucene-sandbox-9.12.1.jar.sha1
@@ -0,0 +1 @@
+1a66485629d60779f039fc26360f4374ef1496e7
diff --git a/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1
deleted file mode 100644
index ed1128ece9b..00000000000
--- a/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3938d4f63a29a6e8396416ec6e6e835826e7734
diff --git a/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1
new file mode 100644
index 00000000000..3495009b5a5
--- /dev/null
+++ b/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1
@@ -0,0 +1 @@
+0a7379410eff21676472adc8ea76a57891ec83c2
diff --git a/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1 b/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1
deleted file mode 100644
index f6dc1cf4979..00000000000
--- a/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d9c48cf29e8736e6ce6cd81c614367b10210523c
diff --git a/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1 b/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1
new file mode 100644
index 00000000000..4dea89bd83e
--- /dev/null
+++ b/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1
@@ -0,0 +1 @@
+d2fdea4edabb1f616f494999651c43abfd0aa124
diff --git a/solr/licenses/lucene-suggest-9.11.1.jar.sha1 b/solr/licenses/lucene-suggest-9.11.1.jar.sha1
deleted file mode 100644
index 2d79215b57e..00000000000
--- a/solr/licenses/lucene-suggest-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9cceafd67d032d2a507e81f797e05eb284849987
diff --git a/solr/licenses/lucene-suggest-9.12.1.jar.sha1 b/solr/licenses/lucene-suggest-9.12.1.jar.sha1
new file mode 100644
index 00000000000..7cceda02bf6
--- /dev/null
+++ b/solr/licenses/lucene-suggest-9.12.1.jar.sha1
@@ -0,0 +1 @@
+0660e0996ec7653fe0c13c608137e264645eecac
diff --git a/solr/licenses/lucene-test-framework-9.11.1.jar.sha1 b/solr/licenses/lucene-test-framework-9.11.1.jar.sha1
deleted file mode 100644
index bce92787396..00000000000
--- a/solr/licenses/lucene-test-framework-9.11.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9a3c349131233d2b5c258dff0cac77627525c14a
diff --git a/solr/licenses/lucene-test-framework-9.12.1.jar.sha1 b/solr/licenses/lucene-test-framework-9.12.1.jar.sha1
new file mode 100644
index 00000000000..f7a37882d52
--- /dev/null
+++ b/solr/licenses/lucene-test-framework-9.12.1.jar.sha1
@@ -0,0 +1 @@
+d348aac4eff0371888f45b2aaa9034922b96b466
diff --git a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
index 13f9f78bcd5..f2b8867b1b8 100644
--- a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
+++ b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
@@ -344,8 +344,8 @@ public void copyIndexFileFrom(
     final BlobInfo blobInfo = BlobInfo.newBuilder(bucketName, blobName).build();
     try (IndexInput input =
         shouldVerifyChecksum
-            ? sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)
-            : sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {
+            ? sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE)
+            : sourceDir.openInput(sourceFileName, IOContext.READONCE)) {
       if (input.length() <= CodecUtil.footerLength()) {
         throw new CorruptIndexException("file is too small:" + input.length(), input);
       }
diff --git a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java
index 122dcc11918..29b6daffb55 100644
--- a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java
+++ b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java
@@ -38,7 +38,6 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.DirectoryFactory;
 import org.apache.solr.core.backup.repository.AbstractBackupRepository;
 import org.apache.solr.core.backup.repository.BackupRepository;
 import org.slf4j.Logger;
@@ -280,8 +279,8 @@ public void copyIndexFileFrom(
 
     try (IndexInput indexInput =
         shouldVerifyChecksum
-            ? sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)
-            : sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {
+            ? sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE)
+            : sourceDir.openInput(sourceFileName, IOContext.READONCE)) {
       if (indexInput.length() <= CodecUtil.footerLength()) {
         throw new CorruptIndexException("file is too small:" + indexInput.length(), indexInput);
       }
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
index 71617a1f028..498b0788ab0 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
@@ -33,7 +33,6 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.store.OutputStreamIndexOutput;
 import org.apache.solr.cloud.api.collections.AbstractBackupRepositoryTest;
 import org.apache.solr.common.util.NamedList;
@@ -187,8 +186,9 @@ private void doTestCopyFileFrom(String content) throws Exception {
         CodecUtil.writeFooter(indexOutput);
       }
 
-      Directory sourceDir = new NIOFSDirectory(tmp.toPath());
-      repo.copyIndexFileFrom(sourceDir, "from-file", new URI("s3://to-folder"), "to-file");
+      try (Directory sourceDir = newFSDirectory(tmp.toPath())) {
+        repo.copyIndexFileFrom(sourceDir, "from-file", new URI("s3://to-folder"), "to-file");
+      }
 
       // Sanity check: we do have different files
       File actualSource = new File(tmp, "from-file");
@@ -208,12 +208,13 @@ private void doTestCopyFileTo(String content) throws Exception {
 
       // Local folder for destination
       File tmp = temporaryFolder.newFolder();
-      Directory destDir = new NIOFSDirectory(tmp.toPath());
 
       // Directly create a file on S3
       pushObject("from-file", content);
 
-      repo.copyIndexFileTo(new URI("s3:///"), "from-file", destDir, "to-file");
+      try (Directory destDir = newFSDirectory(tmp.toPath())) {
+        repo.copyIndexFileTo(new URI("s3:///"), "from-file", destDir, "to-file");
+      }
 
       // Sanity check: we do have different files
       File actualSource = pullObject("from-file");
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 3cec6a4e578..4ca8a8db187 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.11</luceneMatchVersion>
+  <luceneMatchVersion>9.12</luceneMatchVersion>
 
   <!-- Data Directory
 
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 0cf3a85a63c..194d7e5dfe5 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.11</luceneMatchVersion>
+  <luceneMatchVersion>9.12</luceneMatchVersion>
 
   <!-- Data Directory
 
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
index 34b0d4a2b77..56db52cc9cb 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
@@ -40,7 +40,6 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.store.OutputStreamIndexOutput;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.CoreAdminParams;
@@ -337,7 +336,7 @@ private void copyFileToRepo(
       SolrResourceLoader resourceLoader)
       throws IOException, URISyntaxException {
     try (BackupRepository repo = repoFactory.newInstance(resourceLoader, repoName);
-        Directory directory = new NIOFSDirectory(dir.toPath())) {
+        Directory directory = newFSDirectory(dir.toPath())) {
       URI destinationDir = repo.resolve(getBaseUri(), "destination-folder");
       repo.copyIndexFileFrom(directory, fileName, destinationDir, fileName);
     }
@@ -352,8 +351,8 @@ private void copyFileToDir(
       SolrResourceLoader resourceLoader)
       throws IOException {
     try (BackupRepository repo = repoFactory.newInstance(resourceLoader, repoName);
-        Directory sourceDirectory = new NIOFSDirectory(sourceDir.toPath());
-        Directory destinationDirectory = new NIOFSDirectory(destinationDir.toPath())) {
+        Directory sourceDirectory = newFSDirectory(sourceDir.toPath());
+        Directory destinationDirectory = newFSDirectory(destinationDir.toPath())) {
       repo.copyIndexFileFrom(sourceDirectory, fileName, destinationDirectory, fileName);
     }
   }
diff --git a/versions.lock b/versions.lock
index b380f0a30ec..0bec5572d1d 100644
--- a/versions.lock
+++ b/versions.lock
@@ -280,32 +280,33 @@
       "org.apache.logging.log4j:log4j-layout-template-json:2.21.0" : "e20caca6,refs=19",
       "org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0" : "ad222d06,refs=81",
       "org.apache.logging.log4j:log4j-web:2.21.0" : "e20caca6,refs=19",
-      "org.apache.lucene:lucene-analysis-common:9.11.1" : "e60c688a,refs=119",
-      "org.apache.lucene:lucene-analysis-icu:9.11.1" : "07070cdb,refs=8",
-      "org.apache.lucene:lucene-analysis-kuromoji:9.11.1" : "90067a87,refs=77",
-      "org.apache.lucene:lucene-analysis-morfologik:9.11.1" : "e3ddf06b,refs=6",
-      "org.apache.lucene:lucene-analysis-nori:9.11.1" : "90067a87,refs=77",
-      "org.apache.lucene:lucene-analysis-opennlp:9.11.1" : "07070cdb,refs=8",
-      "org.apache.lucene:lucene-analysis-phonetic:9.11.1" : "90067a87,refs=77",
-      "org.apache.lucene:lucene-analysis-smartcn:9.11.1" : "e3ddf06b,refs=6",
-      "org.apache.lucene:lucene-analysis-stempel:9.11.1" : "e3ddf06b,refs=6",
-      "org.apache.lucene:lucene-backward-codecs:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-classification:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-codecs:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-core:9.11.1" : "e60c688a,refs=119",
-      "org.apache.lucene:lucene-expressions:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-grouping:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-highlighter:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-join:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-memory:9.11.1" : "90067a87,refs=77",
-      "org.apache.lucene:lucene-misc:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-queries:9.11.1" : "e60c688a,refs=119",
-      "org.apache.lucene:lucene-queryparser:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-sandbox:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-spatial-extras:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-spatial3d:9.11.1" : "51c1a817,refs=79",
-      "org.apache.lucene:lucene-suggest:9.11.1" : "57e9f35b,refs=81",
-      "org.apache.lucene:lucene-test-framework:9.11.1" : "64a0cd23,refs=52",
+      "org.apache.lucene:lucene-analysis-common:9.12.1" : "e60c688a,refs=119",
+      "org.apache.lucene:lucene-analysis-icu:9.12.1" : "07070cdb,refs=8",
+      "org.apache.lucene:lucene-analysis-kuromoji:9.12.1" : "90067a87,refs=77",
+      "org.apache.lucene:lucene-analysis-morfologik:9.12.1" : "e3ddf06b,refs=6",
+      "org.apache.lucene:lucene-analysis-nori:9.12.1" : "90067a87,refs=77",
+      "org.apache.lucene:lucene-analysis-opennlp:9.12.1" : "07070cdb,refs=8",
+      "org.apache.lucene:lucene-analysis-phonetic:9.12.1" : "90067a87,refs=77",
+      "org.apache.lucene:lucene-analysis-smartcn:9.12.1" : "e3ddf06b,refs=6",
+      "org.apache.lucene:lucene-analysis-stempel:9.12.1" : "e3ddf06b,refs=6",
+      "org.apache.lucene:lucene-backward-codecs:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-classification:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-codecs:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-core:9.12.1" : "e60c688a,refs=119",
+      "org.apache.lucene:lucene-expressions:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-facet:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-grouping:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-highlighter:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-join:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-memory:9.12.1" : "90067a87,refs=77",
+      "org.apache.lucene:lucene-misc:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-queries:9.12.1" : "e60c688a,refs=119",
+      "org.apache.lucene:lucene-queryparser:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-sandbox:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-spatial-extras:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-spatial3d:9.12.1" : "51c1a817,refs=79",
+      "org.apache.lucene:lucene-suggest:9.12.1" : "57e9f35b,refs=81",
+      "org.apache.lucene:lucene-test-framework:9.12.1" : "64a0cd23,refs=52",
       "org.apache.opennlp:opennlp-tools:1.9.4" : "fbf7fa7b,refs=18",
       "org.apache.pdfbox:fontbox:2.0.26" : "50a667d1,refs=5",
       "org.apache.pdfbox:jbig2-imageio:3.0.4" : "50a667d1,refs=5",

From 4f60afede0f705c95a536fc6a371437724e7b68d Mon Sep 17 00:00:00 2001
From: Alessandro Benedetti <a.benedetti@sease.io>
Date: Mon, 6 Jan 2025 18:40:23 +0000
Subject: [PATCH 05/16] SOLR-17525: wrong model store in documentation

---
 .../modules/query-guide/pages/text-to-vector.adoc         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/solr-ref-guide/modules/query-guide/pages/text-to-vector.adoc b/solr/solr-ref-guide/modules/query-guide/pages/text-to-vector.adoc
index 89d7d4a743e..9457f8005c4 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/text-to-vector.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/text-to-vector.adoc
@@ -218,27 +218,27 @@ To upload the model in a `/path/myModel.json` file, please run:
 
 [source,bash]
 ----
-curl -XPUT 'http://localhost:8983/solr/techproducts/schema/vectorisation-model-store' --data-binary "@/path/myModel.json" -H 'Content-type:application/json'
+curl -XPUT 'http://localhost:8983/solr/techproducts/schema/text-to-vector-model-store' --data-binary "@/path/myModel.json" -H 'Content-type:application/json'
 ----
 
 
 To view all models:
 
 [source,text]
-http://localhost:8983/solr/techproducts/schema/vectorisation-model-store
+http://localhost:8983/solr/techproducts/schema/text-to-vector-model-store
 
 To delete the `currentModel` model:
 
 [source,bash]
 ----
-curl -XDELETE 'http://localhost:8983/solr/techproducts/schema/vectorisation-model-store/currentModel'
+curl -XDELETE 'http://localhost:8983/solr/techproducts/schema/text-to-vector-model-store/currentModel'
 ----
 
 
 To view the model you just uploaded please open the following URL in a browser:
 
 [source,text]
-http://localhost:8983/solr/techproducts/schema/vectorisation-model-store
+http://localhost:8983/solr/techproducts/schema/text-to-vector-model-store
 
 .Example: /path/myModel.json
 [source,json]

From 2728f7a4077f6aa4118dc81b4beacecc53ea2e18 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Mon, 6 Jan 2025 12:21:35 -0600
Subject: [PATCH 06/16] SOLR-17525: Add test permissions and fix docs

---
 solr/licenses/langchain4j-0.35.0.jar.sha1 | 1 -
 solr/modules/llm/build.gradle             | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 solr/licenses/langchain4j-0.35.0.jar.sha1

diff --git a/solr/licenses/langchain4j-0.35.0.jar.sha1 b/solr/licenses/langchain4j-0.35.0.jar.sha1
deleted file mode 100644
index 2199fe110d3..00000000000
--- a/solr/licenses/langchain4j-0.35.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f739eae706dcfd090c56c2a470e1b6bd8d60e175
diff --git a/solr/modules/llm/build.gradle b/solr/modules/llm/build.gradle
index b6c3d57eb15..d8f02056b50 100644
--- a/solr/modules/llm/build.gradle
+++ b/solr/modules/llm/build.gradle
@@ -39,3 +39,9 @@ dependencies {
   testImplementation libs.commonsio.commonsio
   
 }
+
+// langchain4j has reflection issues, and requires the following permissions
+// https://docs.gradle.org/current/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
+tasks.withType(Test).configureEach {
+  jvmArgs(["--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"])
+}

From af2c0b3815836a13f0447ce501c067a3c15fc2c0 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 7 Jan 2025 07:56:46 -0500
Subject: [PATCH 07/16] IDE suggested cleanups (#2934)

Remove unused parameters and constants.
---
 .../DefaultSampleDocumentsLoader.java         | 15 ++++++--------
 .../designer/DefaultSchemaSuggester.java      | 11 +++-------
 .../handler/designer/SampleDocuments.java     | 13 +-----------
 .../handler/designer/SchemaDesignerAPI.java   | 20 ++++++++-----------
 .../SchemaDesignerConfigSetHelper.java        |  2 +-
 .../designer/TestSchemaDesignerAPI.java       |  2 +-
 .../TestSchemaDesignerConfigSetHelper.java    |  2 +-
 7 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
index d35a76a75c6..611cea3d58f 100644
--- a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
@@ -117,14 +117,14 @@ public SampleDocuments parseDocsFromStream(
     List<SolrInputDocument> docs = null;
     if (stream.getSize() > 0) {
       if (contentType.contains(JSON_MIME)) {
-        docs = loadJsonDocs(params, byteStream, maxDocsToLoad);
+        docs = loadJsonDocs(byteStream, maxDocsToLoad);
       } else if (contentType.contains("text/xml") || contentType.contains("application/xml")) {
-        docs = loadXmlDocs(params, byteStream, maxDocsToLoad);
+        docs = loadXmlDocs(byteStream, maxDocsToLoad);
       } else if (contentType.contains("text/csv") || contentType.contains("application/csv")) {
         docs = loadCsvDocs(params, fileSource, uploadedBytes, charset, maxDocsToLoad);
       } else if (contentType.contains("text/plain")
           || contentType.contains("application/octet-stream")) {
-        docs = loadJsonLines(params, byteStream, maxDocsToLoad);
+        docs = loadJsonLines(byteStream, maxDocsToLoad);
       } else {
         throw new SolrException(
             SolrException.ErrorCode.BAD_REQUEST, contentType + " not supported yet!");
@@ -157,8 +157,7 @@ protected List<SolrInputDocument> loadCsvDocs(
 
   @SuppressWarnings("unchecked")
   protected List<SolrInputDocument> loadJsonLines(
-      SolrParams params, ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad)
-      throws IOException {
+      ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad) throws IOException {
     List<Map<String, Object>> docs = new ArrayList<>();
     try (Reader r = stream.getReader()) {
       BufferedReader br = new BufferedReader(r);
@@ -182,8 +181,7 @@ protected List<SolrInputDocument> loadJsonLines(
 
   @SuppressWarnings("unchecked")
   protected List<SolrInputDocument> loadJsonDocs(
-      SolrParams params, ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad)
-      throws IOException {
+      ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad) throws IOException {
     Object json;
     try (Reader r = stream.getReader()) {
       json = ObjectBuilder.getVal(new JSONParser(r));
@@ -231,8 +229,7 @@ protected List<SolrInputDocument> loadJsonDocs(
   }
 
   protected List<SolrInputDocument> loadXmlDocs(
-      SolrParams params, ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad)
-      throws IOException {
+      ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad) throws IOException {
     String xmlString = new String(readAllBytes(stream), StandardCharsets.UTF_8).trim();
     List<SolrInputDocument> docs;
     if (xmlString.contains("<add>") && xmlString.contains("<doc>")) {
diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java
index d3dc4acaf5b..543b7a77af1 100644
--- a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java
+++ b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java
@@ -163,7 +163,7 @@ public Optional<SchemaField> suggestField(
     Locale locale = Locale.ROOT;
 
     boolean isMV = isMultiValued(sampleValues);
-    String fieldTypeName = guessFieldType(fieldName, sampleValues, schema, isMV, locale);
+    String fieldTypeName = guessFieldType(sampleValues, isMV, locale);
     FieldType fieldType = schema.getFieldTypeByName(fieldTypeName);
     if (fieldType == null) {
       // TODO: construct this field type on-the-fly ...
@@ -222,12 +222,7 @@ public Map<String, List<Object>> transposeDocs(List<SolrInputDocument> docs) {
     return mapByField;
   }
 
-  protected String guessFieldType(
-      String fieldName,
-      final List<Object> sampleValues,
-      IndexSchema schema,
-      boolean isMV,
-      Locale locale) {
+  protected String guessFieldType(final List<Object> sampleValues, boolean isMV, Locale locale) {
     String type = null;
 
     // flatten values to a single stream for easier analysis; also remove nulls
@@ -361,7 +356,7 @@ protected String isIntOrLong(List<Object> values, Locale locale) {
     }
 
     // if all values are less than some smallish threshold, then it's likely this field holds small
-    // numbers but be very conservative here as it's simply an optimization and we can always fall
+    // numbers but be very conservative here as it's simply an optimization, and we can always fall
     // back to long
     return maxLong < 10000 ? "pint" : "plong";
   }
diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java
index e1794913beb..b98c5995db2 100644
--- a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java
+++ b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java
@@ -17,8 +17,6 @@
 
 package org.apache.solr.handler.designer;
 
-import static org.apache.solr.common.params.CommonParams.JSON_MIME;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -42,15 +40,6 @@ public String getSource() {
     return fileSource != null ? fileSource : "paste";
   }
 
-  private boolean isTextContentType() {
-    if (contentType == null) {
-      return false;
-    }
-    return contentType.contains(JSON_MIME)
-        || contentType.startsWith("text/")
-        || contentType.contains("application/xml");
-  }
-
   public List<SolrInputDocument> appendDocs(
       String idFieldName, List<SolrInputDocument> add, int maxDocsToLoad) {
     if (add != null && !add.isEmpty()) {
@@ -65,7 +54,7 @@ public List<SolrInputDocument> appendDocs(
                   doc -> {
                     Object id = doc.getFieldValue(idFieldName);
                     return id != null
-                        && !ids.contains(id); // doc has ID and it's not already in the set
+                        && !ids.contains(id); // doc has ID, and it's not already in the set
                   })
               .collect(Collectors.toList());
       parsed.addAll(toAdd);
diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java
index 1370c775540..e1589c192c0 100644
--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java
@@ -22,7 +22,6 @@
 import static org.apache.solr.client.solrj.SolrRequest.METHOD.PUT;
 import static org.apache.solr.common.params.CommonParams.JSON_MIME;
 import static org.apache.solr.handler.admin.ConfigSetsHandler.DEFAULT_CONFIGSET_NAME;
-import static org.apache.solr.schema.ManagedIndexSchemaFactory.DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME;
 import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_EDIT_PERM;
 import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM;
 
@@ -85,7 +84,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** All V2 APIs that have a prefix of /api/schema-designer/ */
+/** All V2 APIs have a prefix of /api/schema-designer/ */
 public class SchemaDesignerAPI implements SchemaDesignerConstants {
 
   private static final Set<String> excludeConfigSetNames =
@@ -103,8 +102,8 @@ public class SchemaDesignerAPI implements SchemaDesignerConstants {
   public SchemaDesignerAPI(CoreContainer coreContainer) {
     this(
         coreContainer,
-        SchemaDesignerAPI.newSchemaSuggester(coreContainer),
-        SchemaDesignerAPI.newSampleDocumentsLoader(coreContainer));
+        SchemaDesignerAPI.newSchemaSuggester(),
+        SchemaDesignerAPI.newSampleDocumentsLoader());
   }
 
   SchemaDesignerAPI(
@@ -119,13 +118,13 @@ public SchemaDesignerAPI(CoreContainer coreContainer) {
     this.settingsDAO = new SchemaDesignerSettingsDAO(coreContainer, configSetHelper);
   }
 
-  public static SchemaSuggester newSchemaSuggester(CoreContainer coreContainer) {
+  public static SchemaSuggester newSchemaSuggester() {
     DefaultSchemaSuggester suggester = new DefaultSchemaSuggester();
     suggester.init(new NamedList<>());
     return suggester;
   }
 
-  public static SampleDocumentsLoader newSampleDocumentsLoader(CoreContainer coreContainer) {
+  public static SampleDocumentsLoader newSampleDocumentsLoader() {
     SampleDocumentsLoader loader = new DefaultSampleDocumentsLoader();
     loader.init(new NamedList<>());
     return loader;
@@ -520,7 +519,8 @@ public void publish(SolrQueryRequest req, SolrQueryResponse rsp)
     final String configSet = getRequiredParam(CONFIG_SET_PARAM, req);
     final String mutableId = checkMutable(configSet, req);
 
-    // verify the configSet we're going to apply changes to has not changed since being loaded for
+    // verify the configSet we're going to apply changes to hasn't been changed since being loaded
+    // for
     // editing by the schema designer
     SchemaDesignerSettings settings = settingsDAO.getSettings(mutableId);
     final Optional<Integer> publishedVersion = settings.getPublishedVersion();
@@ -845,7 +845,7 @@ protected SampleDocuments loadSampleDocuments(SolrQueryRequest req, String confi
                   latestSchema.getUniqueKeyField().getName(), stored, MAX_SAMPLE_DOCS);
         }
 
-        // store in the blob store so we always have access to these docs
+        // store in the blob store so that we always have access to these docs
         configSetHelper.storeSampleDocs(configSet, docs);
       }
     }
@@ -892,10 +892,6 @@ protected ManagedIndexSchema analyzeInputDocs(
     return schema;
   }
 
-  protected String getManagedSchemaZkPath(final String configSet) {
-    return getConfigSetZkPath(configSet, DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME);
-  }
-
   protected SchemaDesignerSettings getMutableSchemaForConfigSet(
       final String configSet, final int schemaVersion, String copyFrom) throws IOException {
     // The designer works with mutable config sets stored in a "temp" znode in ZK instead of the
diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java
index 955aa1d98a9..b6afd8a4f11 100644
--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java
+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java
@@ -1052,7 +1052,7 @@ private boolean isMatchingLangOrNonLangFile(final String path, final Set<String>
       }
     }
 
-    // if we fall thru to here, then the file should be excluded
+    // if we fall through to here, then the file should be excluded
     return false;
   }
 
diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
index 983d0fa3ab1..2e50d6abc82 100644
--- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
+++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
@@ -740,7 +740,7 @@ public void testFieldUpdates() throws Exception {
 
     String mutableId = getMutableId(configSet);
     SchemaDesignerConfigSetHelper configSetHelper =
-        new SchemaDesignerConfigSetHelper(cc, SchemaDesignerAPI.newSchemaSuggester(cc));
+        new SchemaDesignerConfigSetHelper(cc, SchemaDesignerAPI.newSchemaSuggester());
     ManagedIndexSchema schema = schemaDesignerAPI.loadLatestSchema(mutableId);
 
     // make it required
diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java
index af6412da947..7d94f185e44 100644
--- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java
+++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java
@@ -78,7 +78,7 @@ public void setupTest() {
     assertNotNull(cluster);
     cc = cluster.getJettySolrRunner(0).getCoreContainer();
     assertNotNull(cc);
-    helper = new SchemaDesignerConfigSetHelper(cc, SchemaDesignerAPI.newSchemaSuggester(cc));
+    helper = new SchemaDesignerConfigSetHelper(cc, SchemaDesignerAPI.newSchemaSuggester());
   }
 
   @Test

From 9bfae53db358354f014339498faae7957bee1e27 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 7 Jan 2025 17:38:41 -0500
Subject: [PATCH 08/16] SolrTestCase now supports @LogLevel (#2869)

Refactored the functionality into a TestRule, and moved from STCJ4 up to SolrTestCase.
Move reinstatement of the root log level to shutdown()
---
 solr/CHANGES.txt                              |  3 +
 .../apache/solr/util/StartupLoggingUtils.java |  7 ++
 .../java/org/apache/solr/SolrTestCase.java    | 50 ++++++++------
 .../java/org/apache/solr/SolrTestCaseJ4.java  | 47 -------------
 .../java/org/apache/solr/util/LogLevel.java   |  2 +
 .../apache/solr/util/LogLevelTestRule.java    | 69 +++++++++++++++++++
 .../{ => util}/TestLogLevelAnnotations.java   | 27 ++++----
 7 files changed, 126 insertions(+), 79 deletions(-)
 create mode 100644 solr/test-framework/src/java/org/apache/solr/util/LogLevelTestRule.java
 rename solr/test-framework/src/test/org/apache/solr/{ => util}/TestLogLevelAnnotations.java (89%)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b7291e9a23e..2f20701968b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -177,6 +177,9 @@ Other Changes
 * SOLR-17579: Remove unused code and other refactorings in ReplicationHandler and tests.  Removed unused public 
   LOCAL_ACTIVITY_DURING_REPLICATION variable. (Eric Pugh)
 
+* GITHUB#2869: SolrTestCase now supports @LogLevel annotations (as SolrTestCaseJ4 has).  Added LogLevelTestRule
+  for encapsulation and reuse. (David Smiley)
+
 ==================  9.8.0 ==================
 New Features
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
index aeda7757593..79047a502e3 100644
--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
@@ -43,6 +43,8 @@ public final class StartupLoggingUtils {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
 
+  private static final String INITIAL_ROOT_LOG_LEVEL = getLogLevelString();
+
   /** Checks whether mandatory log dir is given */
   public static void checkLogDir() {
     if (EnvUtils.getProperty("solr.log.dir") == null) {
@@ -151,6 +153,11 @@ public static void shutdown() {
     }
     flushAllLoggers();
     LogManager.shutdown(true);
+
+    // re-instate original log level.
+    if (!INITIAL_ROOT_LOG_LEVEL.equals(getLogLevelString())) {
+      changeLogLevel(INITIAL_ROOT_LOG_LEVEL);
+    }
   }
 
   /**
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 98a0634ca5e..909a38479ad 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -22,8 +22,8 @@
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import com.carrotsearch.randomizedtesting.rules.StatementAdapter;
 import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter;
 import java.io.File;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
@@ -37,14 +37,17 @@
 import org.apache.solr.common.util.ObjectReleaseTracker;
 import org.apache.solr.servlet.SolrDispatchFilter;
 import org.apache.solr.util.ExternalPaths;
+import org.apache.solr.util.LogLevelTestRule;
 import org.apache.solr.util.RevertDefaultThreadHandlerRule;
 import org.apache.solr.util.StartupLoggingUtils;
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.ComparisonFailure;
+import org.junit.Rule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.slf4j.Logger;
@@ -90,24 +93,23 @@ public class SolrTestCase extends LuceneTestCase {
               new VerifyTestClassNamingConvention(
                   "org.apache.solr.ltr", NAMING_CONVENTION_TEST_PREFIX))
           .around(new RevertDefaultThreadHandlerRule())
+          .around(new LogLevelTestRule())
           .around(
-              (base, description) ->
-                  new StatementAdapter(base) {
-                    @Override
-                    protected void afterIfSuccessful() {
-                      // if the tests passed, make sure everything was closed / released
-                      String orr = ObjectReleaseTracker.clearObjectTrackerAndCheckEmpty();
-                      assertNull(orr, orr);
-                    }
-
-                    @Override
-                    protected void afterAlways(List<Throwable> errors) {
-                      if (!errors.isEmpty()) {
-                        ObjectReleaseTracker.tryClose();
-                      }
-                      StartupLoggingUtils.shutdown();
-                    }
-                  });
+              new TestRuleAdapter() {
+                @Override
+                protected void afterIfSuccessful() {
+                  // if the tests passed, make sure everything was closed / released
+                  String orr = ObjectReleaseTracker.clearObjectTrackerAndCheckEmpty();
+                  assertNull(orr, orr);
+                }
+
+                @Override
+                protected void afterAlways(List<Throwable> errors) {
+                  if (!errors.isEmpty()) {
+                    ObjectReleaseTracker.tryClose();
+                  }
+                }
+              });
 
   /**
    * Sets the <code>solr.default.confdir</code> system property to the value of {@link
@@ -174,19 +176,27 @@ public static void checkSyspropForceBeforeClassAssumptionFailure() {
     assumeFalse(PROP + " == true", systemPropertyAsBoolean(PROP, false));
   }
 
+  @AfterClass
+  public static void afterClassShutdownLogging() {
+    StartupLoggingUtils.shutdown();
+  }
+
+  @Rule public TestRule methodRules = new LogLevelTestRule();
+
   /**
    * Special hook for sanity checking if any tests trigger failures when an Assumption failure
-   * occures in a {@link Before} method
+   * occurs in a {@link Before} method
    *
    * @lucene.internal
    */
   @Before
   public void checkSyspropForceBeforeAssumptionFailure() {
-    // ant test -Dargs="-Dtests.force.assumption.failure.before=true"
     final String PROP = "tests.force.assumption.failure.before";
     assumeFalse(PROP + " == true", systemPropertyAsBoolean(PROP, false));
   }
 
+  //              UTILITY METHODS FOLLOW
+
   public static void assertJSONEquals(String expected, String actual) {
     Object json1 = fromJSONString(expected);
     Object json2 = fromJSONString(actual);
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 d5d630333a4..a5e256d2fac 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -41,7 +41,6 @@
 import java.lang.annotation.Target;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -75,7 +74,6 @@
 import java.util.stream.Collectors;
 import javax.xml.xpath.XPathExpressionException;
 import org.apache.http.client.HttpClient;
-import org.apache.logging.log4j.Level;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.tests.analysis.MockAnalyzer;
 import org.apache.lucene.tests.analysis.MockTokenizer;
@@ -109,7 +107,6 @@
 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.common.util.SuppressForbidden;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.common.util.XML;
 import org.apache.solr.core.CoreContainer;
@@ -138,18 +135,14 @@
 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;
 import org.apache.solr.util.RefCounted;
 import org.apache.solr.util.SSLTestConfig;
-import org.apache.solr.util.StartupLoggingUtils;
 import org.apache.solr.util.TestHarness;
 import org.apache.solr.util.TestInjection;
 import org.apache.zookeeper.KeeperException;
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.rules.RuleChain;
@@ -187,8 +180,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
 
   public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms
 
-  private static String initialRootLogLevel;
-
   protected static volatile ExecutorService testExecutor;
 
   protected void writeCoreProperties(Path coreDirectory, String coreName) throws IOException {
@@ -257,8 +248,6 @@ protected void assertExceptionThrownWithMessageContaining(
 
   @BeforeClass
   public static void setupTestCases() {
-    initialRootLogLevel = StartupLoggingUtils.getLogLevelString();
-    initClassLogLevels();
     resetExceptionIgnores();
 
     testExecutor =
@@ -348,10 +337,6 @@ public static void teardownTestCases() throws Exception {
       testSolrHome = null;
 
       IpTables.unblockAllPorts();
-
-      LogLevel.Configurer.restoreLogLevels(savedClassLogLevels);
-      savedClassLogLevels.clear();
-      StartupLoggingUtils.changeLogLevel(initialRootLogLevel);
     }
   }
 
@@ -391,38 +376,6 @@ public static void assumeWorkingMockito() {
     }
   }
 
-  @SuppressForbidden(reason = "Using the Level class from log4j2 directly")
-  private static Map<String, Level> savedClassLogLevels = new HashMap<>();
-
-  public static void initClassLogLevels() {
-    Class<?> currentClass = RandomizedContext.current().getTargetClass();
-    LogLevel annotation = currentClass.getAnnotation(LogLevel.class);
-    if (annotation == null) {
-      return;
-    }
-    Map<String, Level> previousLevels = LogLevel.Configurer.setLevels(annotation.value());
-    savedClassLogLevels.putAll(previousLevels);
-  }
-
-  private Map<String, Level> savedMethodLogLevels = new HashMap<>();
-
-  @Before
-  public void initMethodLogLevels() {
-    Method method = RandomizedContext.current().getTargetMethod();
-    LogLevel annotation = method.getAnnotation(LogLevel.class);
-    if (annotation == null) {
-      return;
-    }
-    Map<String, Level> previousLevels = LogLevel.Configurer.setLevels(annotation.value());
-    savedMethodLogLevels.putAll(previousLevels);
-  }
-
-  @After
-  public void restoreMethodLogLevels() {
-    LogLevel.Configurer.restoreLogLevels(savedMethodLogLevels);
-    savedMethodLogLevels.clear();
-  }
-
   protected static boolean isSSLMode() {
     return sslConfig != null && sslConfig.isSSLMode();
   }
diff --git a/solr/test-framework/src/java/org/apache/solr/util/LogLevel.java b/solr/test-framework/src/java/org/apache/solr/util/LogLevel.java
index af7451944e9..4d4d0387df6 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/LogLevel.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/LogLevel.java
@@ -38,6 +38,8 @@
  * like this: <code>
  *   {@literal @}LogLevel("org.apache.solr=DEBUG;org.apache.solr.core=INFO")
  * </code>
+ *
+ * @see LogLevelTestRule
  */
 @Documented
 @Inherited
diff --git a/solr/test-framework/src/java/org/apache/solr/util/LogLevelTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/LogLevelTestRule.java
new file mode 100644
index 00000000000..99ce3d02665
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/util/LogLevelTestRule.java
@@ -0,0 +1,69 @@
+/*
+ * 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.annotation.Annotation;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.logging.log4j.Level;
+import org.apache.solr.common.util.SuppressForbidden;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * A JUnit {@link TestRule} that sets (and resets) the Log4j2 log level based on the {@code
+ * LogLevel} annotation.
+ */
+public class LogLevelTestRule implements TestRule {
+
+  @Override
+  public Statement apply(Statement base, Description description) {
+    // loop over the annotations to find LogLevel
+    final Optional<Annotation> annotationOpt =
+        description.getAnnotations().stream()
+            .filter(a -> a.annotationType().equals(LogLevel.class))
+            .findAny();
+    if (annotationOpt.isEmpty()) {
+      return base;
+    }
+    final var annotation = (LogLevel) annotationOpt.get();
+    return new LogLevelStatement(base, annotation);
+  }
+
+  static class LogLevelStatement extends Statement {
+    private final Statement delegate;
+    private final LogLevel annotation;
+
+    protected LogLevelStatement(Statement delegate, LogLevel annotation) {
+      this.delegate = delegate;
+      this.annotation = annotation;
+    }
+
+    @SuppressForbidden(reason = "Using the Level class from log4j2 directly")
+    @Override
+    public void evaluate() throws Throwable {
+      Map<String, Level> savedLogLevels = LogLevel.Configurer.setLevels(annotation.value());
+      try {
+        delegate.evaluate();
+      } finally {
+        LogLevel.Configurer.restoreLogLevels(savedLogLevels);
+      }
+    }
+  }
+}
diff --git a/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java b/solr/test-framework/src/test/org/apache/solr/util/TestLogLevelAnnotations.java
similarity index 89%
rename from solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java
rename to solr/test-framework/src/test/org/apache/solr/util/TestLogLevelAnnotations.java
index 83b2888910e..ebfad4ea63c 100644
--- a/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java
+++ b/solr/test-framework/src/test/org/apache/solr/util/TestLogLevelAnnotations.java
@@ -15,22 +15,26 @@
  * limitations under the License.
  */
 
-package org.apache.solr;
+package org.apache.solr.util;
 
 import java.util.Map;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.solr.SolrTestCase;
 import org.apache.solr.common.util.SuppressForbidden;
-import org.apache.solr.util.LogLevel;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
+/**
+ * @see LogLevel
+ * @see LogLevelTestRule
+ */
 @SuppressForbidden(reason = "We need to use log4J2 classes to access the log levels")
 @LogLevel(
     "org.apache.solr.bogus_logger.ClassLogLevel=error;org.apache.solr.bogus_logger.MethodLogLevel=warn")
-public class TestLogLevelAnnotations extends SolrTestCaseJ4 {
+public class TestLogLevelAnnotations extends SolrTestCase {
 
   private static final String bogus_logger_prefix = "org.apache.solr.bogus_logger";
 
@@ -42,12 +46,12 @@ public class TestLogLevelAnnotations extends SolrTestCaseJ4 {
    * the test.
    *
    * <p>We also don't want to initialize this in a <code>@BeforeClass</code> method because that
-   * will run <em>after</em> the <code>@BeforeClass</code> logic of our super class {@link
-   * SolrTestCaseJ4} where the <code>@LogLevel</code> annotation on this class will be parsed and
-   * evaluated -- modifying the log4j run time configuration. The <code>@LogLevel</code>
-   * configuration of this class <em>should</em> not affect the "root" Logger, but setting this in
-   * static class initialization protect us (as best we can) against the possibility that it
-   * <em>might</em> due to an unforseen (future) bug.
+   * will run <em>after</em> the <code>@BeforeClass</code> or {@code @ClassRule} logic of our super
+   * class where the <code>@LogLevel</code> annotation on this class will be parsed and evaluated --
+   * modifying the log4j run time configuration. The <code>@LogLevel</code> configuration of this
+   * class <em>should</em> not affect the "root" Logger, but setting this in static class
+   * initialization protect us (as best we can) against the possibility that it <em>might</em> due
+   * to an unforseen (future) bug.
    *
    * @see #checkLogLevelsBeforeClass
    */
@@ -93,9 +97,8 @@ public static void checkLogLevelsBeforeClass() {
    * Check that the expected log level <em>configurations</em> have been reset after the test
    *
    * <p><b>NOTE:</b> We only validate <code>@LogLevel</code> modifications made at the {@link
-   * #testMethodLogLevels} level, not at the 'class' level, because of the lifecycle of junit
-   * methods: This <code>@AfterClass</code> will run before the <code>SolrTestCaseJ4#@AfterClass
-   * </code> method where the 'class' <code>@LogLevel</code> modifications will be reset.
+   * #testMethodLogLevels} level, not at the 'class' level, because the lifecycle of junit methods
+   * that activate this logic prevent us from doing so.
    *
    * @see #checkLogLevelsBeforeClass
    * @see #testWhiteBoxMethods

From 388101fc84140c0bdc50706637bcc5df11908ca6 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <121591679+tylerbertrand@users.noreply.github.com>
Date: Wed, 8 Jan 2025 07:28:43 -0600
Subject: [PATCH 09/16] Use separate nodeProjectDir for each subproject (#2680)

Using a shared nodeProjectDir caused multiple nodeSetup tasks to step on each others' toes. The com.github.node-gradle.node plugin doesn't fully support reusing nodeProjectDir, and each nodeSetup task will clean up the existing nodeProjectDir before unpacking the node installation into it. This can result in tasks seeing issues when trying to use npm/node while a nodeSetup task from another project is cleaning it up.

use nodeProjectDir instead of rootNodeDir

---------

Co-authored-by: Eric Pugh <epugh@opensourceconnections.com>
---
 gradle/node.gradle | 7 +++----
 solr/CHANGES.txt   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gradle/node.gradle b/gradle/node.gradle
index d585ab5f871..fe128ea1f4a 100644
--- a/gradle/node.gradle
+++ b/gradle/node.gradle
@@ -35,8 +35,7 @@ configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(
     }
 
     project.ext {
-        rootNodeDir = "$rootDir/.gradle/node"
-        nodeProjectDir = file("$rootNodeDir/$project.name")
+        nodeProjectDir = layout.projectDirectory.dir(".gradle/node")
     }
 
     node {
@@ -49,10 +48,10 @@ configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(
         }
 
         // The directory where Node.js is unpacked (when download is true)
-        workDir = file("${project.ext.rootNodeDir}/nodejs")
+        workDir = file("${project.ext.nodeProjectDir.getAsFile().path}/nodejs")
 
         // The directory where npm is installed (when a specific version is defined)
-        npmWorkDir = file("${project.ext.rootNodeDir}/npm")
+        npmWorkDir = file("${project.ext.nodeProjectDir.getAsFile().path}/npm")
 
         // The Node.js project directory location
         // This is where the package.json file and node_modules directory are located
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2f20701968b..8d7a10668be 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -166,7 +166,7 @@ Optimizations
 
 Bug Fixes
 ---------------------
-(No changes)
+* PR#2680: Improve reliablity of NpmTasks finding needed files/commands.  (Tyler Bertrand via Eric Pugh)
 
 Dependency Upgrades
 ---------------------

From 35b27d3642797df345233b0c1f1a5cda9855b120 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Wed, 8 Jan 2025 17:02:23 -0500
Subject: [PATCH 10/16] New dev-tools/scripts/parseContributorsFromChanges.py
 (#2424)

Parses a CHANGES.txt section passed in, in order to identify all contributors.

Future: integrate with the release wizard, to include providing only the versioned section of CHANGES.txt to the script.
---
 .../scripts/parseContributorsFromChanges.py   | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 dev-tools/scripts/parseContributorsFromChanges.py

diff --git a/dev-tools/scripts/parseContributorsFromChanges.py b/dev-tools/scripts/parseContributorsFromChanges.py
new file mode 100644
index 00000000000..9ce1a5e19ae
--- /dev/null
+++ b/dev-tools/scripts/parseContributorsFromChanges.py
@@ -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.
+
+import sys
+import re
+from collections import defaultdict
+
+# Read data from standard input
+data = sys.stdin.read()
+
+# Replace all carriage return line feed (Windows) with line feed
+data = data.replace('\r\n', '\n')
+
+# Replace all carriage return (Mac OS before X) with line feed
+data = data.replace('\r', '\n')
+
+# Split data at blank lines
+paras = data.split('\n\n')
+
+# Initialize a default dictionary to store contributors and their counts
+contributors = defaultdict(int)
+
+# Regular expression to find the attribution in parentheses at the end of a line
+pattern = re.compile(r"\(([^()]*)\)$")
+
+for para in paras:
+  # Normalize whitespace (replace all whitespace with a single space)
+  para = re.sub('\s+', ' ', para).strip()
+  #print(f'> {para}')
+
+  # Find all contributors in the line
+  match = pattern.search(para.strip())
+  if match:
+    attribution = match.group(1)
+    # might have a "via" committer; we only want the author here
+    attribution = attribution.split(" via ")[0] # keep left side
+    # Split the contributors by comma and strip whitespace
+    for contributor in attribution.split(','):
+      contributor = contributor.strip()
+      contributors[contributor] += 1
+
+del contributors['solrbot']
+
+sorted_contributors = sorted(contributors.items(), key=lambda item: item[1], reverse=True)
+
+# Print the contributors and their counts
+for contributor, count in sorted_contributors:
+  print(f'{contributor}: {count}')
+
+print('\n\nThanks to all contributors!: ')
+print(', '.join([contributor for contributor, count in sorted_contributors]))
\ No newline at end of file

From 796b788ce8567cd21a89d1d58f715b65fda6ecc5 Mon Sep 17 00:00:00 2001
From: Matthew Biscocho <54160956+mlbiscoc@users.noreply.github.com>
Date: Wed, 8 Jan 2025 23:59:05 -0500
Subject: [PATCH 11/16] SOLR-17587: wt=prometheus fix duplicate TYPE
 information (#2902)

Metrics: Prometheus response writer fix for non-compliant exposition format containing duplicate TYPE lines
---
 solr/CHANGES.txt                              |  5 ++-
 .../solr/handler/admin/MetricsHandler.java    | 31 ++++++++++++++
 .../core/PrometheusCoreFormatterInfo.java     |  4 --
 .../prometheus/core/SolrCoreCacheMetric.java  |  5 +--
 .../core/SolrCoreHandlerMetric.java           |  5 +--
 .../core/SolrCoreHighlighterMetric.java       |  5 +--
 .../prometheus/core/SolrCoreIndexMetric.java  |  5 +--
 .../prometheus/core/SolrCoreMetric.java       | 42 ++++++++++---------
 .../core/SolrCoreSearcherMetric.java          |  5 +--
 .../prometheus/core/SolrCoreTlogMetric.java   |  5 +--
 .../core/SolrPrometheusCoreFormatter.java     | 20 ++++-----
 .../response/PrometheusResponseWriter.java    | 21 +++-------
 .../handler/admin/MetricsHandlerTest.java     |  6 +--
 .../solr/metrics/SolrCoreMetricTest.java      | 25 +++++------
 .../metrics/SolrPrometheusFormatterTest.java  | 41 +++++++++++-------
 .../TestPrometheusResponseWriter.java         | 19 ++++++++-
 16 files changed, 143 insertions(+), 101 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8d7a10668be..6e36e4ca99c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -166,7 +166,8 @@ Optimizations
 
 Bug Fixes
 ---------------------
-* PR#2680: Improve reliablity of NpmTasks finding needed files/commands.  (Tyler Bertrand via Eric Pugh)
+* SOLR-17587: Metrics: wt=prometheus fix for non-compliant exposition format containing duplicate TYPE lines.
+  (Matthew Biscocho via David Smiley)
 
 Dependency Upgrades
 ---------------------
@@ -180,6 +181,8 @@ Other Changes
 * GITHUB#2869: SolrTestCase now supports @LogLevel annotations (as SolrTestCaseJ4 has).  Added LogLevelTestRule
   for encapsulation and reuse. (David Smiley)
 
+* GITHUB#2680: Improve reliablity of NpmTasks finding needed files/commands.  (Tyler Bertrand via Eric Pugh)
+
 ==================  9.8.0 ==================
 New Features
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
index 73da8a818e4..4bba3414be9 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
@@ -186,10 +186,20 @@ private NamedList<Object> handlePrometheusExport(SolrParams params) {
     List<MetricType> metricTypes = parseMetricTypes(params);
     List<MetricFilter> metricFilters =
         metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
+
     Set<String> requestedRegistries = parseRegistries(params);
+    MetricRegistry mergedCoreRegistries = new MetricRegistry();
 
     for (String registryName : requestedRegistries) {
       MetricRegistry dropwizardRegistry = metricManager.registry(registryName);
+
+      // Merge all core registries into a single registry and
+      // append the core name to the metric to avoid duplicate metrics name
+      if (registryName.startsWith("solr.core")) {
+        mergedCoreRegistries.registerAll(getCoreNameFromRegistry(registryName), dropwizardRegistry);
+        continue;
+      }
+
       PrometheusResponseWriter.toPrometheus(
           dropwizardRegistry,
           registryName,
@@ -203,6 +213,22 @@ private NamedList<Object> handlePrometheusExport(SolrParams params) {
             response.add(registryName, registry);
           });
     }
+
+    if (!mergedCoreRegistries.getMetrics().isEmpty()) {
+      PrometheusResponseWriter.toPrometheus(
+          mergedCoreRegistries,
+          "solr.core",
+          metricFilters,
+          mustMatchFilter,
+          propertyFilter,
+          false,
+          false,
+          true,
+          (registry) -> {
+            response.add("solr.core", registry);
+          });
+    }
+
     return response;
   }
 
@@ -523,6 +549,11 @@ private List<MetricType> parseMetricTypes(SolrParams params) {
     return metricTypes;
   }
 
+  private String getCoreNameFromRegistry(String registryName) {
+    String coreName = registryName.substring(registryName.indexOf('.') + 1);
+    return coreName.replace(".", "_");
+  }
+
   @Override
   public String getDescription() {
     return "A handler to return all the metrics gathered by Solr";
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java
index baa7be5898b..b80b406d356 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java
@@ -16,8 +16,6 @@
  */
 package org.apache.solr.metrics.prometheus.core;
 
-import java.util.regex.Pattern;
-
 public interface PrometheusCoreFormatterInfo {
   /** Category of prefix Solr Core dropwizard handler metric names */
   enum CoreCategory {
@@ -32,6 +30,4 @@ enum CoreCategory {
     INDEX,
     CORE
   }
-
-  Pattern CLOUD_CORE_PATTERN = Pattern.compile("^core_(.*)_(shard[0-9]+)_(replica_.[0-9]+)$");
 }
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java
index e8352d3575c..d4d9627c222 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java
@@ -24,9 +24,8 @@
 public class SolrCoreCacheMetric extends SolrCoreMetric {
   public static final String CORE_CACHE_SEARCHER_METRICS = "solr_metrics_core_cache";
 
-  public SolrCoreCacheMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreCacheMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java
index af9641729a9..9273e825759 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java
@@ -30,9 +30,8 @@ public class SolrCoreHandlerMetric extends SolrCoreMetric {
   public static final String CORE_REQUESTS_TOTAL_TIME = "solr_metrics_core_requests_time";
   public static final String CORE_REQUEST_TIMES = "solr_metrics_core_average_request_time";
 
-  public SolrCoreHandlerMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreHandlerMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java
index 52bc1292c25..d3da3d3426f 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java
@@ -24,9 +24,8 @@
 public class SolrCoreHighlighterMetric extends SolrCoreMetric {
   public static final String CORE_HIGHLIGHER_METRICS = "solr_metrics_core_highlighter_requests";
 
-  public SolrCoreHighlighterMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreHighlighterMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java
index 048fc8d2ca2..e45e1e955bd 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java
@@ -24,9 +24,8 @@
 public class SolrCoreIndexMetric extends SolrCoreMetric {
   public static final String CORE_INDEX_METRICS = "solr_metrics_core_index_size_bytes";
 
-  public SolrCoreIndexMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreIndexMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java
index 5010425a023..59236b18629 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java
@@ -16,37 +16,41 @@
  */
 package org.apache.solr.metrics.prometheus.core;
 
-import static org.apache.solr.metrics.prometheus.core.PrometheusCoreFormatterInfo.CLOUD_CORE_PATTERN;
-
 import com.codahale.metrics.Metric;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.metrics.prometheus.SolrMetric;
 
 /** Base class is a wrapper to export a solr.core {@link com.codahale.metrics.Metric} */
 public abstract class SolrCoreMetric extends SolrMetric {
-  public String coreName;
 
-  public SolrCoreMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, metricName);
-    this.coreName = coreName;
-    labels.put("core", coreName);
-    if (cloudMode) {
-      appendCloudModeLabels();
-    }
-  }
+  public static Pattern CLOUD_CORE_PATTERN =
+      Pattern.compile(
+          "(?<core>^core_(?<collection>.*)_(?<shard>shard[0-9]+)_(?<replica>replica_.[0-9]+)).(.*)$");
+  public static Pattern STANDALONE_CORE_PATTERN = Pattern.compile("^core_(?<core>.*?)\\.(.*)$");
+
+  public String coreName;
 
-  private void appendCloudModeLabels() {
-    Matcher m = CLOUD_CORE_PATTERN.matcher(coreName);
-    if (m.find()) {
-      labels.put("collection", m.group(1));
-      labels.put("shard", m.group(2));
-      labels.put("replica", m.group(3));
+  public SolrCoreMetric(Metric dropwizardMetric, String metricName) {
+    // Remove Core Name prefix from metric as it is no longer needed for tag parsing from this point
+    super(dropwizardMetric, metricName.substring(metricName.indexOf(".") + 1));
+    Matcher cloudPattern = CLOUD_CORE_PATTERN.matcher(metricName);
+    Matcher standalonePattern = STANDALONE_CORE_PATTERN.matcher(metricName);
+    if (cloudPattern.find()) {
+      coreName = cloudPattern.group("core");
+      cloudPattern
+          .namedGroups()
+          .forEach((key, value) -> labels.put(key, cloudPattern.group(value)));
+    } else if (standalonePattern.find()) {
+      coreName = standalonePattern.group("core");
+      standalonePattern
+          .namedGroups()
+          .forEach((key, value) -> labels.put(key, standalonePattern.group(value)));
     } else {
       throw new SolrException(
           SolrException.ErrorCode.SERVER_ERROR,
-          "Core name does not match pattern for parsing " + coreName);
+          "Core name does not match pattern for parsing in metric " + metricName);
     }
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java
index 93071f9b8ad..7ca694d311d 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java
@@ -29,9 +29,8 @@ public class SolrCoreSearcherMetric extends SolrCoreMetric {
   public static final String CORE_SEARCHER_METRICS = "solr_metrics_core_searcher_documents";
   public static final String CORE_SEARCHER_TIMES = "solr_metrics_core_average_searcher_warmup_time";
 
-  public SolrCoreSearcherMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreSearcherMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java
index 29b13e1caee..7286c99d986 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java
@@ -24,9 +24,8 @@
 public class SolrCoreTlogMetric extends SolrCoreMetric {
   public static final String CORE_TLOG_METRICS = "solr_metrics_core_tlog";
 
-  public SolrCoreTlogMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreTlogMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java
index 6b2a49154f3..dd3ed025ddf 100644
--- a/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java
@@ -28,13 +28,9 @@
  */
 public class SolrPrometheusCoreFormatter extends SolrPrometheusFormatter
     implements PrometheusCoreFormatterInfo {
-  public final String coreName;
-  public final boolean cloudMode;
 
-  public SolrPrometheusCoreFormatter(String coreName, boolean cloudMode) {
+  public SolrPrometheusCoreFormatter() {
     super();
-    this.coreName = coreName;
-    this.cloudMode = cloudMode;
   }
 
   @Override
@@ -45,7 +41,7 @@ public void exportDropwizardMetric(Metric dropwizardMetric, String metricName) {
 
   @Override
   public SolrMetric categorizeMetric(Metric dropwizardMetric, String metricName) {
-    String metricCategory = metricName.split("\\.", 2)[0];
+    String metricCategory = metricName.split("\\.", 3)[1];
     if (!Enums.getIfPresent(PrometheusCoreFormatterInfo.CoreCategory.class, metricCategory)
         .isPresent()) {
       return new SolrNoOpMetric();
@@ -55,17 +51,17 @@ public SolrMetric categorizeMetric(Metric dropwizardMetric, String metricName) {
       case QUERY:
       case UPDATE:
       case REPLICATION:
-        return new SolrCoreHandlerMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreHandlerMetric(dropwizardMetric, metricName);
       case TLOG:
-        return new SolrCoreTlogMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreTlogMetric(dropwizardMetric, metricName);
       case CACHE:
-        return new SolrCoreCacheMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreCacheMetric(dropwizardMetric, metricName);
       case SEARCHER:
-        return new SolrCoreSearcherMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreSearcherMetric(dropwizardMetric, metricName);
       case HIGHLIGHTER:
-        return new SolrCoreHighlighterMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreHighlighterMetric(dropwizardMetric, metricName);
       case INDEX:
-        return new SolrCoreIndexMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreIndexMetric(dropwizardMetric, metricName);
       case CORE:
       default:
         return new SolrNoOpMetric();
diff --git a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
index 5c6210603da..8689751a514 100644
--- a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
@@ -25,12 +25,11 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.metrics.AggregateMetric;
 import org.apache.solr.metrics.prometheus.SolrPrometheusFormatter;
@@ -115,8 +114,10 @@ public static void toPrometheus(
             Metric dropwizardMetric = dropwizardMetrics.get(metricName);
             formatter.exportDropwizardMetric(dropwizardMetric, metricName);
           } catch (Exception e) {
-            // Do not fail entirely for metrics exporting. Log and try to export next metric
-            log.warn("Error occurred exporting Dropwizard Metric to Prometheus", e);
+            throw new SolrException(
+                SolrException.ErrorCode.SERVER_ERROR,
+                "Error occurred exporting Dropwizard Metric to Prometheus",
+                e);
           }
         });
 
@@ -124,21 +125,11 @@ public static void toPrometheus(
   }
 
   public static SolrPrometheusFormatter getFormatterType(String registryName) {
-    String coreName;
-    boolean cloudMode = false;
     String[] parsedRegistry = registryName.split("\\.");
 
     switch (parsedRegistry[1]) {
       case "core":
-        if (parsedRegistry.length == 3) {
-          coreName = parsedRegistry[2];
-        } else if (parsedRegistry.length == 5) {
-          coreName = Arrays.stream(parsedRegistry).skip(1).collect(Collectors.joining("_"));
-          cloudMode = true;
-        } else {
-          coreName = registryName;
-        }
-        return new SolrPrometheusCoreFormatter(coreName, cloudMode);
+        return new SolrPrometheusCoreFormatter();
       case "jvm":
         return new SolrPrometheusJvmFormatter();
       case "jetty":
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index a90e059e03f..4c3709f5ae5 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -725,8 +725,7 @@ public void testPrometheusMetricsCore() throws Exception {
     NamedList<?> values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList<?>) values.get("metrics");
-    SolrPrometheusFormatter formatter =
-        (SolrPrometheusFormatter) values.get("solr.core.collection1");
+    SolrPrometheusFormatter formatter = (SolrPrometheusFormatter) values.get("solr.core");
     assertNotNull(formatter);
     MetricSnapshots actualSnapshots = formatter.collect();
     assertNotNull(actualSnapshots);
@@ -1009,8 +1008,7 @@ public void testPrometheusMetricsFilter() throws Exception {
     NamedList<?> values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList<?>) values.get("metrics");
-    SolrPrometheusFormatter formatter =
-        (SolrPrometheusFormatter) values.get("solr.core.collection1");
+    SolrPrometheusFormatter formatter = (SolrPrometheusFormatter) values.get("solr.core");
     assertNotNull(formatter);
     MetricSnapshots actualSnapshots = formatter.collect();
     assertNotNull(actualSnapshots);
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java
index 19a9fce2cbe..9ee34056e5e 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java
@@ -26,12 +26,13 @@
 public class SolrCoreMetricTest extends SolrTestCaseJ4 {
 
   @Test
-  public void testStandaloneDefaultLabels() throws InterruptedException {
-    String expectedCoreName = "test_core";
+  public void testStandaloneDefaultLabels() {
+    String dropwizardMetricName = "core_Core_Name.test_core_metric";
+
+    String expectedCoreName = "Core_Name";
     String expectedMetricName = "test_core_metric";
     Labels expectedLabels = Labels.of("core", expectedCoreName);
-    TestSolrCoreMetric testSolrCoreMetric =
-        new TestSolrCoreMetric(null, expectedCoreName, expectedMetricName, false);
+    TestSolrCoreMetric testSolrCoreMetric = new TestSolrCoreMetric(null, dropwizardMetricName);
 
     assertEquals(expectedCoreName, testSolrCoreMetric.coreName);
     assertEquals(expectedMetricName, testSolrCoreMetric.metricName);
@@ -39,10 +40,12 @@ public void testStandaloneDefaultLabels() throws InterruptedException {
   }
 
   @Test
-  public void testCloudDefaultLabels() throws InterruptedException {
-    String expectedCoreName = "core_test_core_shard1_replica_n1";
+  public void testCloudDefaultLabels() {
+    String dropwizardMetricName = "core_Collection_Name_shard1_replica_n1.test_core_metric";
+
+    String expectedCoreName = "core_Collection_Name_shard1_replica_n1";
     String expectedMetricName = "test_core_metric";
-    String expectedCollectionName = "test_core";
+    String expectedCollectionName = "Collection_Name";
     String expectedShardName = "shard1";
     String expectedReplicaName = "replica_n1";
 
@@ -56,8 +59,7 @@ public void testCloudDefaultLabels() throws InterruptedException {
             expectedShardName,
             "replica",
             expectedReplicaName);
-    TestSolrCoreMetric testSolrCoreMetric =
-        new TestSolrCoreMetric(null, expectedCoreName, expectedMetricName, true);
+    TestSolrCoreMetric testSolrCoreMetric = new TestSolrCoreMetric(null, dropwizardMetricName);
 
     assertEquals(expectedCoreName, testSolrCoreMetric.coreName);
     assertEquals(expectedMetricName, testSolrCoreMetric.metricName);
@@ -65,9 +67,8 @@ public void testCloudDefaultLabels() throws InterruptedException {
   }
 
   static class TestSolrCoreMetric extends SolrCoreMetric {
-    public TestSolrCoreMetric(
-        Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-      super(dropwizardMetric, coreName, metricName, cloudMode);
+    public TestSolrCoreMetric(Metric dropwizardMetric, String metricName) {
+      super(dropwizardMetric, metricName);
     }
 
     @Override
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java
index 5c62910b43f..76077385800 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java
@@ -16,7 +16,8 @@
  */
 package org.apache.solr.metrics;
 
-import static org.apache.solr.metrics.prometheus.core.PrometheusCoreFormatterInfo.CLOUD_CORE_PATTERN;
+import static org.apache.solr.metrics.prometheus.core.SolrCoreMetric.CLOUD_CORE_PATTERN;
+import static org.apache.solr.metrics.prometheus.core.SolrCoreMetric.STANDALONE_CORE_PATTERN;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
@@ -146,32 +147,42 @@ public Map<String, Number> getValue() {
 
   @Test
   public void testCloudCorePattern() {
-    String coreName = "core_test-core_shard2_replica_t123";
-    Matcher m = CLOUD_CORE_PATTERN.matcher(coreName);
+    String metricName = "core_test-core_shard2_replica_t123.TEST./foobar/endpoint";
+    Matcher m = CLOUD_CORE_PATTERN.matcher(metricName);
     assertTrue(m.find());
-    assertEquals("test-core", m.group(1));
-    assertEquals("shard2", m.group(2));
-    assertEquals("replica_t123", m.group(3));
+    assertEquals("core_test-core_shard2_replica_t123", m.group("core"));
+    assertEquals("test-core", m.group("collection"));
+    assertEquals("shard2", m.group("shard"));
+    assertEquals("replica_t123", m.group("replica"));
 
-    coreName = "core_foo_bar_shard24_replica_p8";
-    m = CLOUD_CORE_PATTERN.matcher(coreName);
+    metricName = "core_foo_bar_shard24_replica_p8.QUERY.random.metric-name";
+    m = CLOUD_CORE_PATTERN.matcher(metricName);
     assertTrue(m.matches());
-    assertEquals("foo_bar", m.group(1));
-    assertEquals("shard24", m.group(2));
-    assertEquals("replica_p8", m.group(3));
+    assertEquals("core_foo_bar_shard24_replica_p8", m.group("core"));
+    assertEquals("foo_bar", m.group("collection"));
+    assertEquals("shard24", m.group("shard"));
+    assertEquals("replica_p8", m.group("replica"));
   }
 
   @Test
   public void testBadCloudCorePattern() {
-    String badCoreName = "core_solrtest_shard100_replica_xyz23";
-    Matcher m = CLOUD_CORE_PATTERN.matcher(badCoreName);
+    String badMetricName = "core_solrtest_shard100_replica_xyz23.TEST./foobar/endpoint";
+    Matcher m = CLOUD_CORE_PATTERN.matcher(badMetricName);
     assertFalse(m.matches());
 
-    badCoreName = "core_solrtest_shards100_replica_x23";
-    m = CLOUD_CORE_PATTERN.matcher(badCoreName);
+    badMetricName = "core_solrtest_shards100_replica_x23.QUERY.random.metric-name";
+    m = CLOUD_CORE_PATTERN.matcher(badMetricName);
     assertFalse(m.matches());
   }
 
+  @Test
+  public void testStandaloneCorePattern() {
+    String metricName = "core_test-core.TEST./foobar/endpoint";
+    Matcher m = STANDALONE_CORE_PATTERN.matcher(metricName);
+    assertTrue(m.find());
+    assertEquals("test-core", m.group(1));
+  }
+
   static class TestSolrPrometheusFormatter extends SolrPrometheusFormatter {
     @Override
     public void exportDropwizardMetric(Metric dropwizardMetric, String metricName) {}
diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
index 0e25201cce0..7f15a6ae894 100644
--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
@@ -23,7 +23,9 @@
 import com.codahale.metrics.SharedMetricRegistries;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
@@ -83,8 +85,23 @@ public void testPrometheusStructureOutput() throws Exception {
       NamedList<Object> res = adminClient.request(req);
       assertNotNull("null response from server", res);
       String output = (String) res.get("response");
+
+      Set<String> seenTypeInfo = new HashSet<>();
+
       List<String> filteredResponse =
-          output.lines().filter(line -> !line.startsWith("#")).collect(Collectors.toList());
+          output
+              .lines()
+              .filter(
+                  line -> {
+                    if (!line.startsWith("#")) {
+                      return true;
+                    }
+                    assertTrue(
+                        "Prometheus exposition format cannot have duplicate TYPE information",
+                        seenTypeInfo.add(line));
+                    return false;
+                  })
+              .collect(Collectors.toList());
       filteredResponse.forEach(
           (actualMetric) -> {
             String actualValue;

From 80dfe11fe4c8f123f56ec2f85870d12b7e086e9e Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Thu, 9 Jan 2025 11:46:26 -0600
Subject: [PATCH 12/16] SOLR-17556: Fix smokeTest to use films as example for
 slim distribution

---
 dev-tools/scripts/smokeTestRelease.py         | 22 ++++++++-------
 .../org/apache/solr/cli/RunExampleTool.java   | 27 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index acfa109f2fc..4deb80f8bf4 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -690,7 +690,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
     shutil.copytree(unpackPath, java11UnpackPath)
     os.chdir(java11UnpackPath)
     print('    test solr example w/ Java 11...')
-    testSolrExample(java11UnpackPath, java.java11_home)
+    testSolrExample(java11UnpackPath, java.java11_home, isSlim)
 
     if java.run_java17:
       print('    copying unpacked distribution for Java 17 ...')
@@ -700,7 +700,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
       shutil.copytree(unpackPath, java17UnpackPath)
       os.chdir(java17UnpackPath)
       print('    test solr example w/ Java 17...')
-      testSolrExample(java17UnpackPath, java.java17_home)
+      testSolrExample(java17UnpackPath, java.java17_home, isSlim)
 
     os.chdir(unpackPath)
 
@@ -742,7 +742,7 @@ def is_port_in_use(port):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         return s.connect_ex(('localhost', port)) == 0
 
-def testSolrExample(binaryDistPath, javaPath):
+def testSolrExample(binaryDistPath, javaPath, isSlim):
   # test solr using some examples it comes with
   logFile = '%s/solr-example.log' % binaryDistPath
   old_cwd = os.getcwd() # So we can back-track
@@ -754,6 +754,10 @@ def testSolrExample(binaryDistPath, javaPath):
   env['JAVA_HOME'] = javaPath
   env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
 
+  example = "techproducts"
+  if isSlim:
+    example = "films"
+
   # Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
   try:
       if not cygwin:
@@ -763,20 +767,20 @@ def testSolrExample(binaryDistPath, javaPath):
   except:
      print('      Stop failed due to: '+sys.exc_info()[0])
 
-  print('      Running techproducts example on port 8983 from %s' % binaryDistPath)
+  print('      Running %s example on port 8983 from %s' % (example, binaryDistPath))
   try:
     if not cygwin:
-      runExampleStatus = subprocess.call(['bin/solr','start','-e','techproducts'])
+      runExampleStatus = subprocess.call(['bin/solr','start','-e',example])
     else:
-      runExampleStatus = subprocess.call('env "PATH=`cygpath -S -w`:$PATH" bin/solr.cmd -e techproducts', shell=True)
+      runExampleStatus = subprocess.call('env "PATH=`cygpath -S -w`:$PATH" bin/solr.cmd -e ' + example, shell=True)
 
     if runExampleStatus != 0:
-      raise RuntimeError('Failed to run the techproducts example, check log for previous errors.')
+      raise RuntimeError('Failed to run the %s example, check log for previous errors.' % example)
 
     os.chdir('example')
     print('      run query...')
-    s = load('http://localhost:8983/solr/techproducts/select/?q=video')
-    if s.find('"numFound":3,') == -1:
+    s = load('http://localhost:8983/solr/%s/select/?q=video' % example)
+    if s.find('"numFound":%d,' % (8 if isSlim else 3)) == -1:
       print('FAILED: response is:\n%s' % s)
       raise RuntimeError('query on solr example instance failed')
     s = load('http://localhost:8983/api/cores')
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 a3e1cc39f71..b0d02b9f997 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -382,7 +382,8 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
                 + "        }\n"
                 + "      }");
 
-        echo("Adding name, initial_release_date, and film_vector fields to films schema");
+        echo(
+            "Adding name, genre, directed_by, initial_release_date, and film_vector fields to films schema");
         SolrCLI.postJsonToSolr(
             solrClient,
             "/" + collectionName + "/schema",
@@ -394,6 +395,18 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
                 + "          \"stored\":true\n"
                 + "        },\n"
                 + "        \"add-field\" : {\n"
+                + "          \"name\":\"genre\",\n"
+                + "          \"type\":\"text_general\",\n"
+                + "          \"multiValued\":true,\n"
+                + "          \"stored\":true\n"
+                + "        },\n"
+                + "        \"add-field\" : {\n"
+                + "          \"name\":\"directed_by\",\n"
+                + "          \"type\":\"text_general\",\n"
+                + "          \"multiValued\":true,\n"
+                + "          \"stored\":true\n"
+                + "        },\n"
+                + "        \"add-field\" : {\n"
                 + "          \"name\":\"initial_release_date\",\n"
                 + "          \"type\":\"pdate\",\n"
                 + "          \"stored\":true\n"
@@ -403,6 +416,18 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
                 + "          \"type\":\"knn_vector_10\",\n"
                 + "          \"indexed\":true\n"
                 + "          \"stored\":true\n"
+                + "        },\n"
+                + "        \"add-copy-field\" : {\n"
+                + "          \"source\":\"genre\",\n"
+                + "          \"dest\":\"_text_\"\n"
+                + "        },\n"
+                + "        \"add-copy-field\" : {\n"
+                + "          \"source\":\"name\",\n"
+                + "          \"dest\":\"_text_\"\n"
+                + "        },\n"
+                + "        \"add-copy-field\" : {\n"
+                + "          \"source\":\"directed_by\",\n"
+                + "          \"dest\":\"_text_\"\n"
                 + "        }\n"
                 + "      }");
 

From 1c2b64990aac592a343c1bfbb8bd6a4ead847f9f Mon Sep 17 00:00:00 2001
From: Pierre Salagnac <psalagnac@apache.org>
Date: Thu, 9 Jan 2025 22:47:30 +0100
Subject: [PATCH 13/16] Fix rarely flaky DeleteInactiveReplicaTest. (#3012)

The test was retrieving a replica from cluster state using core name
instead of correct replica name.
---
 .../test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
index 8d3749b7eba..33bab69aeae 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
@@ -83,7 +83,7 @@ public void deleteInactiveReplicaTest() throws Exception {
         "Expected replica " + replica.getName() + " on down node to be removed from cluster state",
         collectionName,
         (n, c) -> {
-          Replica r = c.getReplica(replica.getCoreName());
+          Replica r = c.getReplica(replica.getName());
           return r == null || r.getState() != Replica.State.ACTIVE;
         });
 
@@ -96,7 +96,7 @@ public void deleteInactiveReplicaTest() throws Exception {
         "Expected deleted replica " + replica.getName() + " to be removed from cluster state",
         collectionName,
         (n, c) -> {
-          return c.getReplica(replica.getCoreName()) == null;
+          return c.getReplica(replica.getName()) == null;
         });
 
     cluster.startJettySolrRunner(jetty);

From 1425e0e7c1890fb9c5b57d89b7a17e417e3df897 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbergja@users.noreply.github.com>
Date: Fri, 10 Jan 2025 04:17:15 -0800
Subject: [PATCH 14/16] Note how to view the requested and applied facet.method
 (#2974)

---
 solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc b/solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc
index bad04b6123b..9196ad4f6f7 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc
@@ -212,6 +212,8 @@ This parameter allows faceting to be faster in the presence of rapid index chang
 
 +
 The default value is `fc` (except for fields using the `BoolField` field type and when `facet.exists=true` is requested) since it tends to use less memory and is faster when a field has many unique terms in the index.
+[NOTE]
+If you request a method that is not compatible with the field you are faceting, Solr will automatically choose a different method that is compatible.  You can see the method you requested (`requestedMethod`) and the method Solr used (`appliedMethod`) by running a query with `debug=timing` or `debug=all`.
 
 `facet.enum.cache.minDf`::
 +

From 4b6e545d3a019183265c4ccbbbd465a8f7894e0f Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 10 Jan 2025 11:02:10 -0600
Subject: [PATCH 15/16] SOLR-17556: Add solr-home option for examples

This is important for testing, but is much better than modifying the server directory in solr.
Also remove test_utf8 from the smoke test, and the data for the test.

forward-ported from 9x commit: 9d67ad63ce182ca9bf463023b3ae16c35a65516f
---
 solr/bin/solr                                 |  9 +++
 .../org/apache/solr/cli/RunExampleTool.java   | 56 +++++++++++++++----
 .../solr/cli/TestSolrCLIRunExample.java       | 30 +++++-----
 .../solr/cloud/SolrCloudExampleTest.java      |  2 +-
 .../designer/TestSchemaDesignerAPI.java       |  2 +-
 .../solr/schema/TestUseDocValuesAsStored.java |  2 +-
 solr/example/exampledocs/utf8-example.xml     | 41 --------------
 solr/packaging/test/test_post.bats            |  8 +--
 .../pages/tutorial-techproducts.adoc          |  3 +-
 9 files changed, 76 insertions(+), 77 deletions(-)
 delete mode 100644 solr/example/exampledocs/utf8-example.xml

diff --git a/solr/bin/solr b/solr/bin/solr
index 0c0dc007e48..28217b29940 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -718,6 +718,7 @@ if [ $# -gt 0 ]; then
             fi
 
             SOLR_HOME="$2"
+            PASS_TO_RUN_EXAMPLE+=("--solr-home" "$SOLR_HOME")
             shift 2
         ;;
         --data-home)
@@ -736,6 +737,14 @@ if [ $# -gt 0 ]; then
             EXAMPLE="$2"
             shift 2
         ;;
+        --example-dir)
+            if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
+              print_usage "$SCRIPT_CMD" "Example directory is required when using the $1 option!"
+              exit 1
+            fi
+            PASS_TO_RUN_EXAMPLE+=("--example-dir" "$2")
+            shift 2
+        ;;
         -f|--foreground)
             FG="true"
             shift
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 b0d02b9f997..dde7da22761 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -48,6 +48,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.EnvUtils;
 import org.noggit.CharArr;
 import org.noggit.JSONWriter;
 
@@ -116,6 +117,16 @@ public class RunExampleTool extends ToolBase {
               "Path to the Solr example directory; if not provided, ${serverDir}/../example is expected to exist.")
           .build();
 
+  private static final Option SOLR_HOME_OPTION =
+      Option.builder()
+          .longOpt("solr-home")
+          .hasArg()
+          .argName("SOLR_HOME_DIR")
+          .required(false)
+          .desc(
+              "Path to the Solr home directory; if not provided, ${serverDir}/solr is expected to exist.")
+          .build();
+
   private static final Option URL_SCHEME_OPTION =
       Option.builder()
           .longOpt("url-scheme")
@@ -165,6 +176,7 @@ public class RunExampleTool extends ToolBase {
   protected String script;
   protected Path serverDir;
   protected Path exampleDir;
+  protected Path solrHomeDir;
   protected String urlScheme;
 
   /** Default constructor used by the framework when running as a command-line application. */
@@ -190,6 +202,7 @@ public Options getOptions() {
         .addOption(EXAMPLE_OPTION)
         .addOption(SCRIPT_OPTION)
         .addOption(SERVER_DIR_OPTION)
+        .addOption(SOLR_HOME_OPTION)
         .addOption(FORCE_OPTION)
         .addOption(EXAMPLE_DIR_OPTION)
         .addOption(URL_SCHEME_OPTION)
@@ -204,6 +217,7 @@ public Options getOptions() {
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     this.urlScheme = cli.getOptionValue(URL_SCHEME_OPTION, "http");
+    String exampleType = cli.getOptionValue(EXAMPLE_OPTION);
 
     serverDir = Path.of(cli.getOptionValue(SERVER_DIR_OPTION));
     if (!Files.isDirectory(serverDir))
@@ -242,15 +256,35 @@ public void runImpl(CommandLine cli) throws Exception {
               + exampleDir.toAbsolutePath()
               + " is not a directory!");
 
+    if (cli.hasOption(SOLR_HOME_OPTION)) {
+      solrHomeDir = Path.of(cli.getOptionValue(SOLR_HOME_OPTION));
+    } else {
+      String solrHomeProp = EnvUtils.getProperty("solr.home");
+      if (solrHomeProp != null && !solrHomeProp.isEmpty()) {
+        solrHomeDir = Path.of(solrHomeProp);
+      } else if ("cloud".equals(exampleType)) {
+        solrHomeDir = exampleDir.resolve("cloud");
+        if (!Files.isDirectory(solrHomeDir)) Files.createDirectory(solrHomeDir);
+      } else {
+        solrHomeDir = serverDir.resolve("solr");
+      }
+    }
+    if (!Files.isDirectory(solrHomeDir))
+      throw new IllegalArgumentException(
+          "Value of --solr-home option is invalid! "
+              + solrHomeDir.toAbsolutePath()
+              + " is not a directory!");
+
     echoIfVerbose(
         "Running with\nserverDir="
             + serverDir.toAbsolutePath()
             + ",\nexampleDir="
             + exampleDir.toAbsolutePath()
+            + ",\nsolrHomeDir="
+            + solrHomeDir.toAbsolutePath()
             + "\nscript="
             + script);
 
-    String exampleType = cli.getOptionValue(EXAMPLE_OPTION);
     if ("cloud".equals(exampleType)) {
       runCloudExample(cli);
     } else if ("techproducts".equals(exampleType)
@@ -275,8 +309,7 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
     int port =
         Integer.parseInt(
             cli.getOptionValue(PORT_OPTION, System.getenv().getOrDefault("SOLR_PORT", "8983")));
-    Map<String, Object> nodeStatus =
-        startSolr(serverDir.resolve("solr"), isCloudMode, cli, port, zkHost, 30);
+    Map<String, Object> nodeStatus = startSolr(solrHomeDir, isCloudMode, cli, port, zkHost, 30);
 
     String solrUrl = CLIUtils.normalizeSolrUrl((String) nodeStatus.get("baseUrl"));
 
@@ -494,8 +527,6 @@ protected void runCloudExample(CommandLine cli) throws Exception {
       // 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};
     }
-    Path cloudDir = exampleDir.resolve("cloud");
-    if (!Files.isDirectory(cloudDir)) Files.createDirectory(cloudDir);
 
     echo("\nWelcome to the SolrCloud example!\n");
 
@@ -541,9 +572,9 @@ protected void runCloudExample(CommandLine cli) throws Exception {
     }
 
     // setup a unique solr.solr.home directory for each node
-    Path node1Dir = setupExampleDir(serverDir, cloudDir, "node1");
+    Path node1Dir = setupSolrHomeDir(serverDir, solrHomeDir, "node1");
     for (int n = 2; n <= numNodes; n++) {
-      Path nodeNDir = cloudDir.resolve("node" + n);
+      Path nodeNDir = solrHomeDir.resolve("node" + n);
       if (!Files.isDirectory(nodeNDir)) {
         echo("Cloning " + node1Dir.toAbsolutePath() + " into\n   " + nodeNDir.toAbsolutePath());
         PathUtils.copyDirectory(node1Dir, nodeNDir, StandardCopyOption.REPLACE_EXISTING);
@@ -574,7 +605,7 @@ protected void runCloudExample(CommandLine cli) throws Exception {
       // start the other nodes
       for (int n = 1; n < numNodes; n++)
         startSolr(
-            cloudDir.resolve("node" + (n + 1)).resolve("solr"),
+            solrHomeDir.resolve("node" + (n + 1)).resolve("solr"),
             true,
             cli,
             cloudPorts[n],
@@ -668,7 +699,7 @@ protected Map<String, Object> startSolr(
     String callScript = (!isWindows && cwd.equals(binDir.getParent())) ? "bin/solr" : script;
 
     String cwdPath = cwd.toAbsolutePath().toString();
-    String solrHome = solrHomeDir.toAbsolutePath().toString();
+    String solrHome = solrHomeDir.toAbsolutePath().toRealPath().toString();
 
     // don't display a huge path for solr home if it is relative to the cwd
     if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath))
@@ -682,11 +713,12 @@ protected Map<String, Object> startSolr(
     String startCmd =
         String.format(
             Locale.ROOT,
-            "\"%s\" start %s -p %d --solr-home \"%s\" %s %s %s %s %s %s %s %s",
+            "\"%s\" start %s -p %d --solr-home \"%s\" --server-dir \"%s\" %s %s %s %s %s %s %s %s",
             callScript,
             cloudModeArg,
             port,
             solrHome,
+            serverDir.toAbsolutePath(),
             hostArg,
             zkHostArg,
             memArg,
@@ -952,7 +984,7 @@ protected Map<String, Object> getNodeStatus(String solrUrl, String credentials,
     return nodeStatus;
   }
 
-  protected Path setupExampleDir(Path serverDir, Path exampleParentDir, String dirName)
+  protected Path setupSolrHomeDir(Path serverDir, Path solrHomeParentDir, String dirName)
       throws IOException {
     Path solrXml = serverDir.resolve("solr").resolve("solr.xml");
     if (!Files.isRegularFile(solrXml))
@@ -964,7 +996,7 @@ protected Path setupExampleDir(Path serverDir, Path exampleParentDir, String dir
       throw new IllegalArgumentException(
           "Value of --server-dir option is invalid! " + zooCfg.toAbsolutePath() + " not found!");
 
-    Path solrHomeDir = exampleParentDir.resolve(dirName).resolve("solr");
+    Path solrHomeDir = solrHomeParentDir.resolve(dirName).resolve("solr");
     if (!Files.isDirectory(solrHomeDir)) {
       echo("Creating Solr home directory " + solrHomeDir);
       Files.createDirectories(solrHomeDir);
diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
index 6da81edaa29..c98662a6100 100644
--- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
@@ -121,9 +121,12 @@ public int execute(org.apache.commons.exec.CommandLine cmd) throws IOException {
 
           String solrHomeDir = getArg("--solr-home", args);
           int port = Integer.parseInt(getArg("-p", args));
-          String solrxml =
-              Files.readString(
-                  Paths.get(solrHomeDir).resolve("solr.xml"), Charset.defaultCharset());
+          Path solrXmlPath = Paths.get(solrHomeDir).resolve("solr.xml");
+          if (!Files.exists(solrXmlPath)) {
+            String solrServerDir = getArg("--server-dir", args);
+            solrXmlPath = Paths.get(solrServerDir).resolve("solr").resolve("solr.xml");
+          }
+          String solrxml = Files.readString(solrXmlPath, Charset.defaultCharset());
 
           JettyConfig jettyConfig = JettyConfig.builder().setPort(port).build();
           try {
@@ -318,19 +321,16 @@ public void tearDown() throws Exception {
   }
 
   @Test
-  @LuceneTestCase.Nightly
   public void testTechproductsExample() throws Exception {
     testExample("techproducts");
   }
 
   @Test
-  @LuceneTestCase.Nightly
   public void testSchemalessExample() throws Exception {
     testExample("schemaless");
   }
 
   @Test
-  @LuceneTestCase.Nightly
   public void testFilmsExample() throws Exception {
     testExample("films");
   }
@@ -338,14 +338,14 @@ public void testFilmsExample() throws Exception {
   protected void testExample(String exampleName) throws Exception {
     // Occasionally we want to test in User Managed mode, not the default SolrCloud mode.
     String testStandaloneMode = LuceneTestCase.rarely() ? "--user-managed" : "";
-    File solrHomeDir = new File(ExternalPaths.SERVER_HOME);
-    if (!solrHomeDir.isDirectory()) {
-      fail(solrHomeDir.getAbsolutePath() + " not found and is required to run this test!");
+    File defaultSolrHomeDir = new File(ExternalPaths.SERVER_HOME);
+    if (!defaultSolrHomeDir.isDirectory()) {
+      fail(defaultSolrHomeDir.getAbsolutePath() + " not found and is required to run this test!");
     }
 
     Path tmpDir = createTempDir();
-    File solrExampleDir = tmpDir.toFile();
-    File solrServerDir = solrHomeDir.getParentFile();
+    File testSolrHomeDir = tmpDir.toFile();
+    File solrServerDir = defaultSolrHomeDir.getParentFile();
 
     for (int pass = 0; pass < 2; pass++) {
       // need a port to start the example server on
@@ -362,8 +362,8 @@ protected void testExample(String exampleName) throws Exception {
             exampleName,
             "--server-dir",
             solrServerDir.getAbsolutePath(),
-            "--example-dir",
-            solrExampleDir.getAbsolutePath(),
+            "--solr-home",
+            testSolrHomeDir.getAbsolutePath(),
             "-p",
             String.valueOf(bindPort),
             testStandaloneMode
@@ -421,13 +421,13 @@ protected void testExample(String exampleName) throws Exception {
             numFound = solrClient.query(query).getResults().getNumFound();
           }
           assertEquals(
-              "expected 32 docs in the "
+              "expected 31 docs in the "
                   + exampleName
                   + " example but found "
                   + numFound
                   + ", output: "
                   + toolOutput,
-              32,
+              31,
               numFound);
         }
       }
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
index 8e2e728944f..36ce7aa7930 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
@@ -129,7 +129,7 @@ public void testLoadDocsIntoGettingStartedCollection() throws Exception {
     CommandLine postCli = SolrCLI.processCommandLineArgs(postTool, argsForPost);
     postTool.runTool(postCli);
 
-    int expectedXmlDocCount = 32;
+    int expectedXmlDocCount = 31;
 
     int numFound = 0;
 
diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
index 2e50d6abc82..83b589466fa 100644
--- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
+++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java
@@ -239,7 +239,7 @@ public void testAddTechproductsProgressively() throws Exception {
     schemaDesignerAPI.query(req, rsp);
     assertNotNull(rsp.getResponseHeader());
     SolrDocumentList results = (SolrDocumentList) rsp.getResponse();
-    assertEquals(48, results.getNumFound());
+    assertEquals(47, results.getNumFound());
 
     // publish schema to a config set that can be used by real collections
     reqParams.clear();
diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
index 51cab8a55a7..b6b2e98eab8 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
@@ -323,7 +323,7 @@ public void testMultipleSearchResults() throws Exception {
     assertU(commit());
 
     assertJQ(
-        req("q", "id:myid*", "fl", "*"),
+        req("q", "id:myid*", "fl", "*", "sort", "id asc"),
         "/response/docs==["
             + "{'id':'myid1','test_is_dvo':[101,102,103]},"
             + "{'id':'myid2','test_is_dvo':[201,202]},"
diff --git a/solr/example/exampledocs/utf8-example.xml b/solr/example/exampledocs/utf8-example.xml
deleted file mode 100644
index e785b38199b..00000000000
--- a/solr/example/exampledocs/utf8-example.xml
+++ /dev/null
@@ -1,41 +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.
--->
-
-<!-- 
-  After posting this to Solr with bin/solr post, searching for "êâîôû" from
-  the solr/admin/ search page must return this document.
- -->
-
-<add>
-  <doc>
-    <field name="id">UTF8TEST</field>
-    <field name="name">Test with some UTF-8 encoded characters</field>
-    <field name="manu">Apache Software Foundation</field>
-    <field name="cat">software</field>
-    <field name="cat">search</field>
-    <field name="features">No accents here</field>
-    <field name="features">This is an e acute: é</field>
-    <field name="features">eaiou with circumflexes: êâîôû</field>
-    <field name="features">eaiou with umlauts: ëäïöü</field>
-    <field name="features">tag with escaped chars: &lt;nicetag/&gt;</field>
-    <field name="features">escaped ampersand: Bonnie &amp; Clyde</field>
-    <field name="features">Outside the BMP:𐌈 codepoint=10308, a circle with an x inside. UTF8=f0908c88 UTF16=d800 df08</field>
-    <field name="price">0.0</field>
-    <field name="inStock">true</field>
-  </doc>
-</add>
diff --git a/solr/packaging/test/test_post.bats b/solr/packaging/test/test_post.bats
index 277631297f9..fa60a76afb0 100644
--- a/solr/packaging/test/test_post.bats
+++ b/solr/packaging/test/test_post.bats
@@ -120,8 +120,8 @@ teardown() {
   # We filter to xml,json,and csv as we don't want to invoke the Extract handler, and are running it as a dry run
   run solr post --dry-run --filetypes xml,json,csv --solr-url http://localhost:${SOLR_PORT} -c foobar --skip-commit ${SOLR_TIP}/example/exampledocs
 
-  assert_output --partial 'Dry run complete. 16 would have been indexed.'
-  refute_output --partial '16 files indexed.'
+  assert_output --partial 'Dry run complete. 15 would have been indexed.'
+  refute_output --partial '15 files indexed.'
   refute_output --partial 'ERROR'
 }
 
@@ -132,10 +132,10 @@ teardown() {
   # We filter to xml,json,and csv as we don't want to invoke the Extract handler.
   run solr post --filetypes xml,json,csv --solr-url http://localhost:${SOLR_PORT} -c mixed_content ${SOLR_TIP}/example/exampledocs
 
-  assert_output --partial '16 files indexed.'
+  assert_output --partial '15 files indexed.'
   refute_output --partial 'ERROR'
   run curl "http://localhost:${SOLR_PORT}/solr/mixed_content/select?q=*:*"
-  assert_output --partial '"numFound":46'
+  assert_output --partial '"numFound":45'
 }
 
 # this test doesn't complete due to issues in posting to the /extract handler
diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adoc
index bfd05668588..8456d17dce2 100644
--- a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adoc
+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adoc
@@ -195,9 +195,8 @@ POSTing file sample.html (text/html) to [base]/extract
 POSTing file sd500.xml (application/xml) to [base]
 POSTing file solr-word.pdf (application/pdf) to [base]/extract
 POSTing file solr.xml (application/xml) to [base]
-POSTing file utf8-example.xml (application/xml) to [base]
 POSTing file vidcard.xml (application/xml) to [base]
-20 files indexed.
+19 files indexed.
 COMMITting Solr index changes to http://localhost:8983/solr/techproducts/update...
 Time spent: 0:00:00.822
 ----

From 440e70d2decaddb4907fef354a9ab13962796609 Mon Sep 17 00:00:00 2001
From: Houston Putman <houston@apache.org>
Date: Fri, 10 Jan 2025 15:57:10 -0600
Subject: [PATCH 16/16] SOLR-17556: Small smokeTest fix

---
 dev-tools/scripts/smokeTestRelease.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 4deb80f8bf4..6358a152dd8 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -668,7 +668,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
     java.run_java11('./gradlew --no-daemon integrationTest -Dversion.release=%s' % version, '%s/itest.log' % unpackPath)
     print("    build binary release w/ Java 11")
     java.run_java11('./gradlew --no-daemon dev -Dversion.release=%s' % version, '%s/assemble.log' % unpackPath)
-    testSolrExample("%s/solr/packaging/build/dev" % unpackPath, java.java11_home)
+    testSolrExample("%s/solr/packaging/build/dev" % unpackPath, java.java11_home, False)
 
     if java.run_java17:
       print("    run tests w/ Java 17 and testArgs='%s'..." % testArgs)
@@ -677,7 +677,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
       java.run_java17('./gradlew --no-daemon integrationTest -Dversion.release=%s' % version, '%s/itest-java17.log' % unpackPath)
       print("    build binary release w/ Java 17")
       java.run_java17('./gradlew --no-daemon dev -Dversion.release=%s' % version, '%s/assemble-java17.log' % unpackPath)
-      testSolrExample("%s/solr/packaging/build/dev" % unpackPath, java.java17_home)
+      testSolrExample("%s/solr/packaging/build/dev" % unpackPath, java.java17_home, False)
 
   else:
     # Binary tarball