Merge remote-tracking branch 'upstream/main' into copilot/fix-7df2ce69-bc8a-4146-b0e1-f2e206772f13

Author: epugh

.github/renovate.json

@@ -4,6 +4,7 @@
   "enabled": true,
   "dependencyDashboard": false,
   "enabledManagers": ["gradle", "github-actions"],
+  "labels": ["exempt-stale"],
   "includePaths": ["gradle/libs.versions.toml", "versions.*", "build.gradle", ".github/workflows/*"],
   "postUpgradeTasks": {
     "commands": [

gradle/libs.versions.toml

@@ -16,11 +16,11 @@
 adobe-testing-s3mock = "3.9.1"
 amazon-awssdk = "2.31.77"
 # @keep Antora version used in ref-guide
-antora = "3.1.4"
-# @keep Most recent commit as of 2022-06-24, this repo does not have tags
-antora-default-ui = "51ad811622394027afb4e182c2fdabc235ae04dd"
+antora = "3.1.12"
+# @keep Most recent commit as of 2025-08-03, this repo does not have tags
+antora-default-ui = "782311344b54aaa734d4c86629b8cd75e4da36d6"
 # @keep Antora Lunr extensions version used in ref-guide
-antora-lunr-extension = "1.0.0-alpha.8"
+antora-lunr-extension = "1.0.0-alpha.10"
 apache-calcite = "1.37.0"
 apache-calcite-avatica = "1.25.0"
 apache-commons-collections4 = "4.4"
@@ -70,7 +70,7 @@ carrotsearch-randomizedtesting = "2.8.1"
 # @keep for version alignment
 checkerframework = "3.44.0"
 codehaus-woodstox = "4.2.2"
-commons-cli = "1.9.0"
+commons-cli = "1.10.0"
 commons-codec = "1.17.2"
 commons-io = "2.15.1"
 compose = "1.8.2"
@@ -113,7 +113,7 @@ google-protobuf = "3.25.8"
 gradle = "8.10"
 grpc = "1.65.1"
 # @keep Gulp version used in ref-guide
-gulp-cli = "2.3.0"
+gulp-cli = "3.1.0"
 hamcrest = "3.0"
 hk2 = "3.1.1"
 hsqldb = "2.7.4"
@@ -168,9 +168,9 @@ netty = "4.2.4.Final"
 netty-tcnative = "2.0.66.Final"
 nimbusds-josejwt = "9.48"
 nlopez-compose = "0.4.26"
-nodegradle-node = "7.0.1"
+nodegradle-node = "7.1.0"
 # @keep Node JS version used in node.gradle (LTS)
-nodejs = "16.20.2"
+nodejs = "22.18.0"
 openapi = "7.6.0"
 openjdk-jmh = "1.37"
 opentelemetry = "1.46.0"

solr/CHANGES.txt

@@ -211,6 +211,10 @@ Other Changes
 
 * SOLR-17703: SolrJ - Rename BinaryResponseParser and BinaryRequestWriter including StreamingBinaryResponseParser to "JavaBin.." equivalent. (Abhishek Umarjikar)
 
+* SOLR-17286: When proxying requests to another node, use Jetty HttpClient not Apache HttpClient. (David Smiley)
+
+* SOLR-17874: Switch remaining usages of Apache HttpClient to use the internally managed Jetty HttpClient instance. (David Smiley)
+
 ==================  9.10.0 ==================
 New Features
 ---------------------
@@ -245,8 +249,7 @@ Dependency Upgrades
 
 Other Changes
 ---------------------
-* SOLR-17286: When proxying requests to another node, use Jetty HttpClient not Apache HttpClient.
-  (David Smiley)
+* SOLR-17620: SolrCloud "live_node" now has metadata: version of Solr, roles (Yuntong Qu, David Smiley)
 
 ==================  9.9.1 ==================
 Bug Fixes
@@ -258,6 +261,8 @@ Bug Fixes
 
 * SOLR-17830: v1 Restore API no longer conflates backup-name and collection-name during validation. (Abhishek Umarjikar via Jason Gerlowski)
 
+* SOLR-17871: Http2SolrClient wasn't honoring idle timeout configuration above 30 seconds -- a regression. (Thomas Wöckinger, David Smiley)
+
 Dependency Upgrades
 ---------------------
 (No changes)

solr/api/gradle.lockfile

@@ -44,7 +44,7 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath
 com.sun.activation:jakarta.activation:2.0.1=swaggerBuild
 com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath
-commons-cli:commons-cli:1.9.0=jarValidation,testRuntimeClasspath
+commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.17.2=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath

solr/benchmark/build.gradle

@@ -46,7 +46,6 @@ dependencies {
   implementation project(':solr:solrj-streaming')
 
   implementation libs.apache.lucene.core
-  implementation libs.apache.httpcomponents.httpclient
   implementation libs.commonsio.commonsio
   implementation libs.dropwizard.metrics.core
   implementation libs.apache.commons.math3

solr/benchmark/gradle.lockfile

@@ -31,8 +31,8 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntime
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath
-commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.17.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+commons-codec:commons-codec:1.17.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

solr/benchmark/src/java/org/apache/solr/bench/search/StreamingSearch.java

@@ -28,7 +28,6 @@
 import org.apache.solr.bench.MiniClusterState.MiniClusterBenchState;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.stream.CloudSolrStream;
@@ -98,13 +97,9 @@ public void setup(MiniClusterBenchState miniClusterState) throws Exception {
     public void setupIteration(MiniClusterState.MiniClusterBenchState miniClusterState)
         throws SolrServerException, IOException {
       SolrClientCache solrClientCache;
-      if (useHttp1) {
-        var httpClient = HttpClientUtil.createClient(null); // TODO tune params?
-        solrClientCache = new SolrClientCache(httpClient);
-      } else {
-        http2SolrClient = newHttp2SolrClient();
-        solrClientCache = new SolrClientCache(http2SolrClient);
-      }
+      // TODO tune params?
+      var client = new Http2SolrClient.Builder().useHttp1_1(useHttp1).build();
+      solrClientCache = new SolrClientCache(client);
 
       streamContext = new StreamContext();
       streamContext.setSolrClientCache(solrClientCache);
@@ -145,10 +140,4 @@ private static List<Tuple> getTuples(TupleStream tupleStream) throws IOException
       tupleStream.close();
     }
   }
-
-  public static Http2SolrClient newHttp2SolrClient() {
-    // TODO tune params?
-    var builder = new Http2SolrClient.Builder();
-    return builder.build();
-  }
 }

solr/bin/solr.in.cmd

@@ -175,7 +175,7 @@ REM Settings for authentication
 REM Please configure only one of SOLR_AUTHENTICATION_CLIENT_BUILDER or SOLR_AUTH_TYPE parameters
 REM set SOLR_AUTHENTICATION_CLIENT_BUILDER=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory
 REM set SOLR_AUTH_TYPE=basic
-REM set SOLR_AUTHENTICATION_OPTS=-Dbasicauth=solr:SolrRocks
+REM set SOLR_AUTHENTICATION_OPTS=-Dsolr.security.auth.basicauth.credentials=solr:SolrRocks
 
 REM Settings for ZK ACL
 REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.DigestZkACLProvider ^

solr/bin/solr.in.sh

@@ -191,7 +191,7 @@
 # Please configure only one of SOLR_AUTHENTICATION_CLIENT_BUILDER or SOLR_AUTH_TYPE parameters
 #SOLR_AUTHENTICATION_CLIENT_BUILDER="org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory"
 #SOLR_AUTH_TYPE="basic"
-#SOLR_AUTHENTICATION_OPTS="-Dbasicauth=solr:SolrRocks"
+#SOLR_AUTHENTICATION_OPTS="-Dsolr.security.auth.basicauth.credentials=solr:SolrRocks"
 
 # Settings for ZK ACL
 #SOLR_ZK_CREDS_AND_ACLS="-DzkACLProvider=org.apache.solr.common.cloud.DigestZkACLProvider \

solr/core/gradle.lockfile

@@ -39,7 +39,7 @@ com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-commons-cli:commons-cli:1.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.17.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath