apache · epugh · Aug 28, 2026 · Aug 15, 2026 · Aug 15, 2026 · Aug 15, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -85,6 +85,16 @@ Solr issues are tracked at https://issues.apache.org/jira (project key `SOLR`).
 - Search: `curl "https://issues.apache.org/jira/rest/api/2/search?jql=<url-encoded JQL>&fields=summary,status,resolution&maxResults=10"` with JQL like `project=SOLR AND text~"some phrase" ORDER BY updated DESC`
 - Single issue (with comments): `curl "https://issues.apache.org/jira/rest/api/2/issue/SOLR-12345?fields=summary,description,comment"`
 
+## Git Branches and Repository History
+
+- This repo's history predates the Lucene/Solr split: before Solr 9.0, Solr was released jointly with Lucene from a combined `lucene-solr` repository. Commits and tags from that era are still present here.
+- Release tags come in two families — check both when doing any git-blame/version archaeology (e.g. figuring out which Solr version something was added or deprecated in), or you will silently get a too-recent answer for anything before the split:
+    - `releases/lucene-solr/X.Y.Z` — joint releases, pre-9.0 (Solr versions up to 8.x)
+    - `releases/solr/X.Y.Z` — standalone Solr releases, 9.0 onward
+- Exclude `releases/lucene/*` (pure Lucene releases, not Solr), and `grafts/*` / `history/branches/*` refs (historical/graft markers, not real releases) from any version lookup.
+- Example pattern to find the earliest release containing a commit: `git tag --contains <hash> | grep -E '^releases/(solr|lucene-solr)/[0-9]+\.[0-9]+(\.[0-9]+)?$' | sed -E 's#^releases/(solr|lucene-solr)/##' | sort -V | head -1`
+- The active development branch is `main`; its in-progress version is the `baseVersion` string in the root `build.gradle`. Maintenance branches for prior lines follow the `branch_9x`, `branch_10x`, etc. naming pattern.
+
 ## Security
 
 For security findings, follow the project's threat model:

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/BalanceReplicasRequestBody.java
@@ -36,6 +36,11 @@ public BalanceReplicasRequestBody(Set<String> nodes, Boolean waitForFinalState,
   @JsonProperty(value = "nodes")
   public Set<String> nodes;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @Schema(
       description =
           "If true, the request will complete only when all affected replicas become active. "

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateCollectionRequestBody.java
@@ -38,6 +38,11 @@ public class CreateCollectionRequestBody {
 
   @JsonProperty public Integer nrtReplicas;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @JsonProperty
   @Deprecated(since = "9.10")
   public Boolean waitForFinalState;

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateReplicaRequestBody.java
@@ -31,6 +31,11 @@ public class CreateReplicaRequestBody {
   @JsonProperty public Integer tlogReplicas;
   @JsonProperty public Integer pullReplicas;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @JsonProperty
   @Deprecated(since = "9.10")
   public Boolean waitForFinalState;

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateShardRequestBody.java
@@ -40,6 +40,11 @@ public class CreateShardRequestBody {
   @JsonProperty("nodeSet")
   public List<String> nodeSet;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @JsonProperty
   @Deprecated(since = "9.10")
   public Boolean waitForFinalState;

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/MigrateReplicasRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/MigrateReplicasRequestBody.java
@@ -42,6 +42,11 @@ public MigrateReplicasRequestBody(
   @JsonProperty
   public Set<String> targetNodes;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @Schema(
       description =
           "If true, the request will complete only when all affected replicas become active. "

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java b/solr/api/src/java/org/apache/solr/client/api/model/ReplaceNodeRequestBody.java
@@ -36,6 +36,11 @@ public ReplaceNodeRequestBody(String targetNodeName, Boolean waitForFinalState,
   @JsonProperty("targetNodeName")
   public String targetNodeName;
 
+  /**
+   * @deprecated Solr is moving toward always waiting for final state, with no option to opt out;
+   *     once that happens, this parameter will have no effect and will likely be removed. See
+   *     SOLR-17712.
+   */
   @Schema(
       description =
           "If true, the request will complete only when all affected replicas become active. "

diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -707,7 +707,7 @@ public FileStore getFileStore() {
    * @see HttpSolrClient#requestWithBaseUrl(String, SolrRequest, String)
    * @deprecated likely to simply be moved to the ObjectCache so as to not be used
    */
-  @Deprecated
+  @Deprecated(since = "10.0")
   public SolrClientCache getSolrClientCache() {
     // TODO put in the objectCache instead
     return solrClientCache;

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -865,7 +865,7 @@ private void initIndexReaderFactory() {
    * @deprecated Use of this method can only lead to race conditions. Try to actually obtain a lock
    *     instead.
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   private static boolean isWriterLocked(Directory directory) throws IOException {
     try {
       directory.obtainLock(IndexWriter.WRITE_LOCK_NAME).close();

diff --git a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java
@@ -257,6 +257,10 @@ private CoreContainer getCoreContainer() {
 
   @EndPoint(method = POST, path = "/cluster", permission = COLL_EDIT_PERM)
   public class Commands {
+    /**
+     * @deprecated This API will be removed in Solr 11. Use Node Roles ({@code -Dsolr.node.roles})
+     *     at startup instead.
+     */
     @Command(name = "add-role")
     @Deprecated(since = "10.1")
     public void addRole(PayloadObj<RoleInfo> obj) throws Exception {
@@ -266,6 +270,10 @@ public void addRole(PayloadObj<RoleInfo> obj) throws Exception {
       collectionsHandler.handleRequestBody(wrapParams(obj.getRequest(), m), obj.getResponse());
     }
 
+    /**
+     * @deprecated This API will be removed in Solr 11. Use Node Roles ({@code -Dsolr.node.roles})
+     *     at startup instead.
+     */
     @Command(name = "remove-role")
     @Deprecated(since = "10.1")
     public void removeRole(PayloadObj<RoleInfo> obj) throws Exception {

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
@@ -51,6 +51,10 @@ public class ClusterStatus {
   public static final String LIVENODES_PROP = "liveNodes";
   public static final String CLUSTER_PROP = "clusterProperties";
 
+  /**
+   * @deprecated This API will be removed in Solr 11. Use Node Roles ({@code -Dsolr.node.roles}) at
+   *     startup instead.
+   */
   @Deprecated(since = "10.1")
   public static final String ROLES_PROP = "roles";
 

diff --git a/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.java b/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.java
@@ -72,8 +72,11 @@
  * org.apache.lucene.index.LeafReader#getNumericDocValues}.
  *
  * @lucene.experimental
+ * @deprecated This class lives in the {@code org.apache.solr.legacy} package, which is being
+ *     removed; no replacement has been identified yet for {@link org.apache.solr.schema.BBoxField},
+ *     which uses this strategy.
  */
-@Deprecated
+@Deprecated(since = "9.0")
 public class BBoxStrategy extends SpatialStrategy {
 
   // note: we use a FieldType to articulate the options we want on the field.  We don't use it as-is
@@ -82,7 +85,11 @@ public class BBoxStrategy extends SpatialStrategy {
   /** pointValues, docValues, and nothing else. */
   public static FieldType DEFAULT_FIELDTYPE;
 
-  @Deprecated public static LegacyFieldType LEGACY_FIELDTYPE;
+  /**
+   * @deprecated Use {@link #DEFAULT_FIELDTYPE} instead.
+   */
+  @Deprecated(since = "10.0")
+  public static LegacyFieldType LEGACY_FIELDTYPE;
 
   static {
     // Default: pointValues + docValues
@@ -142,9 +149,10 @@ public static BBoxStrategy newInstance(SpatialContext ctx, String fieldNamePrefi
    * Creates a new {@link BBoxStrategy} instance that uses {@link LegacyDoubleField} for backwards
    * compatibility
    *
-   * @deprecated LegacyNumerics will be removed
+   * @deprecated LegacyNumerics will be removed. Use {@link #newInstance(SpatialContext, String)}
+   *     instead.
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   public static BBoxStrategy newLegacyInstance(SpatialContext ctx, String fieldNamePrefix) {
     return new BBoxStrategy(ctx, fieldNamePrefix, LEGACY_FIELDTYPE);
   }

diff --git a/solr/core/src/java/org/apache/solr/legacy/BBoxValueSource.java b/solr/core/src/java/org/apache/solr/legacy/BBoxValueSource.java
@@ -31,8 +31,9 @@
  * org.apache.lucene.queries.function.FunctionValues#objectVal(int)}.
  *
  * @lucene.internal
+ * @deprecated Internal helper for {@link BBoxStrategy}, which is deprecated.
  */
-@Deprecated
+@Deprecated(since = "9.0")
 class BBoxValueSource extends ShapeValuesSource {
 
   private final BBoxStrategy strategy;

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyDoubleField.java b/solr/core/src/java/org/apache/solr/legacy/LegacyDoubleField.java
@@ -91,7 +91,7 @@
  * @deprecated Please use {@link DoublePoint} instead
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyDoubleField extends LegacyField {
 
   /**

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyField.java b/solr/core/src/java/org/apache/solr/legacy/LegacyField.java
@@ -26,7 +26,7 @@
  *
  * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public class LegacyField extends Field {
 
   /**

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyFieldType.java b/solr/core/src/java/org/apache/solr/legacy/LegacyFieldType.java
@@ -24,7 +24,7 @@
  *
  * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public final class LegacyFieldType extends FieldType {
   private LegacyNumericType numericType;
   private int numericPrecisionStep = LegacyNumericUtils.PRECISION_STEP_DEFAULT;
@@ -47,7 +47,7 @@ public LegacyFieldType() {}
    * @see #numericType()
    * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   public void setNumericType(LegacyNumericType type) {
     checkIfFrozen();
     numericType = type;
@@ -62,7 +62,7 @@ public void setNumericType(LegacyNumericType type) {
    * @see #setNumericType(LegacyNumericType)
    * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   public LegacyNumericType numericType() {
     return numericType;
   }
@@ -76,7 +76,7 @@ public LegacyNumericType numericType() {
    * @see #numericPrecisionStep()
    * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   public void setNumericPrecisionStep(int precisionStep) {
     checkIfFrozen();
     if (precisionStep < 1) {
@@ -95,7 +95,7 @@ public void setNumericPrecisionStep(int precisionStep) {
    * @see #setNumericPrecisionStep(int)
    * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
    */
-  @Deprecated
+  @Deprecated(since = "7.0")
   public int numericPrecisionStep() {
     return numericPrecisionStep;
   }

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyFloatField.java b/solr/core/src/java/org/apache/solr/legacy/LegacyFloatField.java
@@ -91,7 +91,7 @@
  * @deprecated Please use {@link FloatPoint} instead
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyFloatField extends LegacyField {
 
   /**

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyIntField.java b/solr/core/src/java/org/apache/solr/legacy/LegacyIntField.java
@@ -91,7 +91,7 @@
  * @deprecated Please use {@link IntPoint} instead
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyIntField extends LegacyField {
 
   /**

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyLongField.java b/solr/core/src/java/org/apache/solr/legacy/LegacyLongField.java
@@ -97,7 +97,7 @@
  * @deprecated Please use {@link LongPoint} instead
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyLongField extends LegacyField {
 
   /**

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java
@@ -177,7 +177,7 @@
  *     on Points.
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyNumericRangeQuery<T extends Number> extends MultiTermQuery {
 
   private LegacyNumericRangeQuery(

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericTokenStream.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericTokenStream.java
@@ -81,7 +81,7 @@
  * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
  * @since 2.9
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyNumericTokenStream extends TokenStream {
 
   /** The full precision token gets this token type assigned. */

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericType.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericType.java
@@ -22,7 +22,7 @@
  * @since 3.2
  * @deprecated Please switch to {@link org.apache.lucene.index.PointValues} instead
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public enum LegacyNumericType {
   /** 32-bit integer numeric type */
   INT,

diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericUtils.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericUtils.java
@@ -49,7 +49,7 @@
  * @deprecated Please use {@link org.apache.lucene.index.PointValues} instead.
  * @since 2.9, API changed non backwards-compliant in 4.0
  */
-@Deprecated
+@Deprecated(since = "6.0")
 public final class LegacyNumericUtils {
 
   private LegacyNumericUtils() {} // no instance!

diff --git a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
@@ -72,7 +72,8 @@ public class DocsStreamer implements Iterator<SolrDocument> {
    * @deprecated new field types should not be added to this list, instead use {@link
    *     ExternalizeStoredValuesAsObjects}
    */
-  @Deprecated public static final Set<Class<? extends FieldType>> KNOWN_TYPES = new HashSet<>();
+  @Deprecated(since = "10.1")
+  public static final Set<Class<? extends FieldType>> KNOWN_TYPES = new HashSet<>();
 
   private final ResultContext rctx;
   private final SolrDocumentFetcher docFetcher; // a collaborator of SolrIndexSearcher

diff --git a/solr/core/src/java/org/apache/solr/schema/TrieDateField.java b/solr/core/src/java/org/apache/solr/schema/TrieDateField.java
@@ -72,10 +72,9 @@
  * </blockquote>
  *
  * @see TrieField
- * @deprecated Trie fields are deprecated as of Solr 7.0
- * @see DatePointField
+ * @deprecated Trie fields are deprecated as of Solr 7.0. Use {@link DatePointField} instead.
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public class TrieDateField extends TrieField implements DateValueFieldType {
   {
     this.type = NumberType.DATE;

diff --git a/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java b/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java
@@ -47,10 +47,9 @@
  * @see Double
  * @see <a href="http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.2.3">Java
  *     Language Specification, s4.2.3</a>
- * @deprecated Trie fields are deprecated as of Solr 7.0
- * @see DoublePointField
+ * @deprecated Trie fields are deprecated as of Solr 7.0. Use {@link DoublePointField} instead.
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public class TrieDoubleField extends TrieField implements DoubleValueFieldType {
   {
     type = NumberType.DOUBLE;

diff --git a/solr/core/src/java/org/apache/solr/schema/TrieField.java b/solr/core/src/java/org/apache/solr/schema/TrieField.java
@@ -84,10 +84,9 @@
  *
  * @see org.apache.solr.legacy.LegacyNumericRangeQuery
  * @since solr 1.4
- * @deprecated Trie fields are deprecated as of Solr 7.0
- * @see PointField
+ * @deprecated Trie fields are deprecated as of Solr 7.0. Use {@link PointField} instead.
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public class TrieField extends NumericFieldType {
   public static final int DEFAULT_PRECISION_STEP = 8;
 
@@ -720,7 +719,11 @@ public static String getMainValuePrefix(FieldType ft) {
   }
 }
 
-@Deprecated
+/**
+ * @deprecated Internal helper for {@link TrieDateField}, which is deprecated. Use {@link
+ *     DatePointField} instead.
+ */
+@Deprecated(since = "7.0")
 class TrieDateFieldSource extends LongFieldSource {
 
   public TrieDateFieldSource(String field) {

diff --git a/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java b/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java
@@ -47,10 +47,9 @@
  * @see Float
  * @see <a href="http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.2.3">Java
  *     Language Specification, s4.2.3</a>
- * @deprecated Trie fields are deprecated as of Solr 7.0
- * @see FloatPointField
+ * @deprecated Trie fields are deprecated as of Solr 7.0. Use {@link FloatPointField} instead.
  */
-@Deprecated
+@Deprecated(since = "7.0")
 public class TrieFloatField extends TrieField implements FloatValueFieldType {
   {
     type = NumberType.FLOAT;