This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-17975 in repository https://gitbox.apache.org/repos/asf/solr.git
commit fea08263458d36790d6c2ded4256055f7f624742 Merge: 4d616b46cd0 90ef6ff725d Author: Chris Hostetter <[email protected]> AuthorDate: Tue Jan 13 12:36:14 2026 -0700 Merge remote-tracking branch 'origin/main' into jira/SOLR-17975 CHANGELOG.md | 30 +++-- ...d-fieldtype-external-representation-control.yml | 7 ++ .../v10.0.0/SOLR-17161-separate-jetty-solrj.yml | 9 ++ changelog/v10.0.0/release-date.txt | 1 - changelog/v10.0.0/version-summary.md | 10 +- changelog/v9.10.0/release-date.txt | 1 + .../PR#3926-tika-server-idle-timeout-fix.yml | 0 .../PR#3963-update-log4j.yml} | 2 +- ...17888-mitigate-tika-cve-disable-xfa-parsing.yml | 9 ++ .../v9.10.1/SOLR-17972-distributed-lock-lead.yml | 7 ++ .../SOLR-17985-fix-slow-no-rows-queries.yml | 0 ...rse dist sorting on LatLonPointSpatialField.yml | 0 changelog/v9.10.1/release-date.txt | 1 + ...llel-http-shard-handler-failure-propagation.yml | 0 changelog/v9.10.1/version-summary.md | 29 +++++ gradle/maven/defaults-maven.gradle | 33 +++++ settings.gradle | 1 + solr/benchmark/build.gradle | 1 + solr/core/build.gradle | 1 + .../java/org/apache/solr/core/CoreContainer.java | 8 +- .../solr/core/FileSystemConfigSetService.java | 13 ++ .../src/java/org/apache/solr/core/SolrPaths.java | 4 + .../org/apache/solr/response/DocsStreamer.java | 28 ++++- .../java/org/apache/solr/schema/BinaryField.java | 5 + .../src/java/org/apache/solr/schema/FieldType.java | 24 ++++ .../apache/solr/search/SolrDocumentFetcher.java | 2 +- .../apache/solr/update/StreamingSolrClients.java | 5 +- .../solr/collection1/conf/schema-binaryfield.xml | 10 +- .../conf/schema-non-stored-docvalues.xml | 15 +++ .../component/DistributedDebugComponentTest.java | 5 + .../solr/response/TestErrorResponseStackTrace.java | 5 + .../response/TestPrometheusResponseWriter.java | 4 + .../org/apache/solr/schema/StrBinaryField.java | 88 ++++++++++++++ .../apache/solr/schema/SwapBytesBinaryField.java | 88 ++++++++++++++ .../org/apache/solr/schema/TestBinaryField.java | 130 ++++++++++++-------- .../solr/schema/TestUseDocValuesAsStored.java | 134 ++++++++++++++++++++- .../test/org/apache/solr/search/TestThinCache.java | 7 +- .../apache/solr/servlet/HideStackTraceTest.java | 5 + solr/cross-dc-manager/build.gradle | 1 + solr/cross-dc-manager/gradle.lockfile | 8 +- solr/modules/analysis-extras/build.gradle | 2 +- solr/modules/analysis-extras/gradle.lockfile | 14 +-- solr/modules/clustering/gradle.lockfile | 14 +-- solr/modules/cross-dc/build.gradle | 1 + solr/modules/cuvs/gradle.lockfile | 14 +-- solr/modules/extraction/gradle.lockfile | 6 +- solr/modules/gcs-repository/gradle.lockfile | 14 +-- solr/modules/jwt-auth/build.gradle | 1 + solr/modules/langid/gradle.lockfile | 14 +-- solr/modules/language-models/gradle.lockfile | 14 +-- solr/modules/ltr/gradle.lockfile | 14 +-- solr/modules/opentelemetry/gradle.lockfile | 14 +-- solr/modules/s3-repository/gradle.lockfile | 14 +-- solr/modules/scripting/gradle.lockfile | 14 +-- solr/modules/sql/gradle.lockfile | 14 +-- solr/solr-ref-guide/build.gradle | 1 + .../pages/basic-authentication-plugin.adoc | 2 + .../modules/deployment-guide/pages/solrj.adoc | 30 ++++- .../pages/major-changes-in-solr-10.adoc | 2 +- solr/solrj-jetty/build.gradle | 67 +++++++++++ solr/{solrj => solrj-jetty}/gradle.lockfile | 50 ++------ .../solrj/jetty/AuthenticationStoreHolder.java | 0 .../client/solrj/jetty/CloudJettySolrClient.java | 0 .../jetty/ConcurrentUpdateJettySolrClient.java | 46 ++++++- .../client/solrj/jetty/HttpJettySolrClient.java | 0 .../client/solrj/jetty/HttpListenerFactory.java | 0 .../solr/client/solrj/jetty/LBJettySolrClient.java | 0 .../jetty/PreemptiveBasicAuthClientCustomizer.java | 0 .../apache/solr/client/solrj/jetty/SSLConfig.java | 0 .../solrj/jetty/SolrBasicAuthentication.java | 0 .../solr/client/solrj/jetty/package-info.java | 0 ...oncurrentUpdateJettySolrClientBadInputTest.java | 0 ...ntUpdateJettySolrClientMultiCollectionTest.java | 0 .../jetty/ConcurrentUpdateJettySolrClientTest.java | 3 +- .../HttpJettySolrClientCompatibilityTest.java | 0 .../solrj/jetty/HttpJettySolrClientProxyTest.java | 6 + .../solrj/jetty/HttpJettySolrClientTest.java | 0 solr/solrj-streaming/build.gradle | 1 + solr/solrj-zookeeper/build.gradle | 1 + solr/solrj/build.gradle | 43 +++++-- solr/solrj/gradle.lockfile | 39 +++--- .../solrj/impl/ConcurrentUpdateBaseSolrClient.java | 67 +++++++++-- .../client/solrj/impl/SolrClientCustomizer.java | 3 +- .../apache/solr/client/solrj/TestBatchUpdate.java | 6 + .../solr/client/solrj/TestSolrJErrorHandling.java | 6 + .../solrj/impl/HttpSolrClientBadInputTest.java | 6 + .../solrj/impl/LBHttpSolrClientBadInputTest.java | 6 + solr/test-framework/build.gradle | 1 + .../solr/util/EmbeddedSolrServerTestRule.java | 3 + 89 files changed, 1032 insertions(+), 252 deletions(-)
