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 1d99b86bacee81d0800b15195e270d97ffef70e3 Merge: c355f114205 2bac9034aec Author: Chris Hostetter <[email protected]> AuthorDate: Wed Jan 7 14:25:05 2026 -0700 Merge remote-tracking branch 'origin/main' into jira/SOLR-17975 .github/scripts/validate-changelog-yaml.py | 32 ++ .github/workflows/bin-solr-test.yml | 2 +- .github/workflows/docker-nightly.yml | 176 ++++++ .github/workflows/renovate-changelog.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- CHANGELOG.md | 304 +++++++++- changelog/unreleased/.gitkeep | 0 ...R#3085-update-com-github-ben-manes-versions.yml | 7 + ...-update-jakarta-servlet-jakarta-servlet-api.yml | 7 + .../PR#3601-update-org-openapi-generator.yml | 7 + changelog/unreleased/PR#3764-update-bytebuddy.yml | 7 + .../PR#3781-update-net-java-dev-jna-jna.yml | 7 + ...95-update-org-testcontainers-testcontainers.yml | 7 + .../PR#3870-update-actions-setup-python-action.yml | 7 + ...#3959-update-actions-upload-artifact-action.yml | 7 + .../PR#4000-update-actions-cache-action.yml | 7 + ...> PR#4001-update-actions-setup-java-action.yml} | 4 +- ...ml => PR#4002-update-gradle-actions-action.yml} | 4 +- .../SOLR-17136-replace-GenericSolrRequest.yml | 8 + .../SOLR-17319-added_combined_query_RRF.yml | 8 + changelog/unreleased/SOLR-17736.yml | 8 + ... => SOLR-17933-remove-directsolrconnection.yml} | 6 +- ...SOLR-18000-update langchain4j and fasterxml.yml | 9 + .../unreleased/SOLR-18003_jackson-bom_import.yml | 10 + changelog/unreleased/SOLR-18041.yml | 8 + changelog/unreleased/SOLR-18044.yml | 8 + .../deprecation_removal_char_SOLR-17934.yml | 10 + ...removing redundant check if field exists in.yml | 0 .../{unreleased => v10.0.0}/GPU-info-admin-ui.yml | 4 +- ...PR#1382-update com-lmax-disruptor to v3-4-4.yml | 0 ...87-update net-thisptr-jackson-jq to v0-0-13.yml | 0 .../PR#1393-update org-apache-httpcomponents.yml | 0 ...ate com-fasterxml-woodstox-woodstox-core to.yml | 0 ...PR#1401-update com-google-re2j-re2j to v1-7.yml | 0 ...R#1405-remove explicit net-arnx-jsonic from.yml | 0 ...te net-sourceforge-argparse4j-argparse4j to.yml | 0 ...pdate no-nav-security-mock-oauth2-server to.yml | 0 ...#1611-update org-mockito-mockito-core to v5.yml | 0 ...e biz-aqute-bnd-biz-aqute-bnd-annotation to.yml | 0 ... com-adobe-testing-s3mock-junit4 to v2-17-0.yml | 0 ...e org-semver4j-semver4j dependency from 4-3.yml | 0 ...38-update org-openjdk-jmh-jmh-core to v1-37.yml | 0 ...e org-codehaus-woodstox-stax2-api to v4-2-2.yml | 0 ...e io-swagger-core-v3-swagger-annotations to.yml | 0 ...35-update com-google-errorprone-error-prone.yml | 0 ...update com-google-cloud-google-cloud-bom to.yml | 0 ...-update software-amazon-awssdk- to v2-26-19.yml | 0 ...1-update org-jctools-jctools-core to v4-0-5.yml | 0 ...R#2136-update com-tdunning-t-digest to v3-3.yml | 0 ...PR#2140-update org-apache-calcite to 1-37-0.yml | 0 ...R#2182-update org-apache-curator- to v5-7-0.yml | 0 ...ate com-jayway-jsonpath-json-path to v2-9-0.yml | 0 ... org-apache-hadoop-thirdparty-hadoop-shaded.yml | 0 ...org-immutables-value-annotations to v2-10-1.yml | 0 .../PR#2314-update io-grpc-grpc- to v1-65-1.yml | 0 ...2341-update org-apache-zookeeper- to v3-9-2.yml | 0 ...2-update org-bitbucket-b-c-jose4j to v0-9-6.yml | 0 ...pdate io-opentelemetry-opentelemetry-bom to.yml | 0 ...date io-swagger-core-v3-swagger-annotations.yml | 0 ...PR#2380-update org-apache-hadoop- to v3-4-0.yml | 0 .../PR#2406-update org-slf4j- to v2-0-13.yml | 0 ... org-bouncycastle-bcpkix-jdk18on to v1-78-1.yml | 0 ...#2468-update org-eclipse-jetty- to v10-0-22.yml | 0 ...2490-update org-mockito-mockito- to v5-12-0.yml | 0 ...512-update com-carrotsearch-hppc to v0-10-0.yml | 0 ...20-update io-dropwizard-metrics- to v4-2-26.yml | 0 .../PR#2561-update actions-cache action to v4.yml | 0 ...update actions-upload-artifact action to v4.yml | 0 ... gradle-wrapper-validation-action action to.yml | 0 .../PR#2617-update org-hamcrest- to v3 -major.yml | 0 .../PR#2702-update io-netty- to v4-1-114-final.yml | 0 ...update com-fasterxml-jackson-jackson-bom to.yml | 0 ...2-update com-carrotsearch-randomizedtesting.yml | 0 ...date commons-codec-commons-codec to v1-19-0.yml | 0 ...3064-update io-morethan-jmhreport to v0-9-6.yml | 0 ...pdate net-java-dev-javacc-javacc to v7-0-13.yml | 0 ...e nl-littlerobots-version-catalog-update to.yml | 0 ...e org-glassfish-jaxb-jaxb-runtime to v2-3-9.yml | 0 .../PR#3068-update org-hsqldb-hsqldb to v2-7-4.yml | 0 ... org-xerial-snappy-snappy-java to v1-1-10-8.yml | 0 .../PR#3072-update google-protobuf to v3-25-8.yml | 0 .../PR#3073-update jersey to v3-1-11.yml | 0 .../PR#3081-update bouncycastle to v1-81.yml | 0 ...e com-github-ben-manes-caffeine-caffeine to.yml | 0 ...ate com-google-api-grpc-proto-google-common.yml | 0 ...R#3089-update com-google-api-gax to v2-70-0.yml | 0 ...090-update com-google-auto-value-auto-value.yml | 0 ...pdate com-google-guava-guava to v33-4-8-jre.yml | 0 ...pdate com-squareup-okhttp3-mockwebserver to.yml | 0 ...094-update commons-io-commons-io to v2-20-0.yml | 0 ...096-update de-undercouch-download to v5-6-0.yml | 0 ...#3097-update joda-time-joda-time to v2-14-0.yml | 0 ...date org-apache-commons-commons-compress to.yml | 0 ... org-apache-commons-commons-text to v1-14-0.yml | 0 ...109-update org-openapi-generator to v7-14-0.yml | 0 .../PR#3110-update org-ow2-asm-asm to v9-7-1.yml | 0 ...PR#3116-update google-errorprone to v2-41-0.yml | 0 ...ate org-eclipse-jgit-org-eclipse-jgit to v7.yml | 0 ...138-update org-owasp-dependencycheck to v12.yml | 0 ...update com-google-code-gson-gson to v2-13-1.yml | 0 .../PR#3165-update opentelemetry to v1-53-0.yml | 0 ... org-junit-jupiter-junit-jupiter to v5-13-4.yml | 0 ...e io-github-oshai-kotlin-logging to v7-0-13.yml | 0 ... owasp dependency-check to 12-1-3 -fix cvss.yml | 0 .../PR#3219-update slf4j to v2-0-17.yml | 0 .../PR#3220-update decompose to v3-3-0.yml | 0 .../PR#3227-update fasterxml.yml | 0 ...PR#3231-update google-cloud-core to v2-60-1.yml | 0 .../PR#3294-update ow2-asm to v9-8.yml | 0 .../PR#3297-update bytebuddy to v1-17-7.yml | 0 ...3302-update kotlinx-serialization to v1-9-0.yml | 0 .../PR#3309-update mockito to v5-19-0.yml | 0 ... org-apache-commons-commons-collections4 to.yml | 0 .../PR#3364-update apache-kafka to v3-9-1.yml | 0 ...3365-update adobe-testing-s3mock to v3-12-0.yml | 0 ...e org-apache-commons-commons-configuration2.yml | 0 ...e org-apache-commons-commons-exec to v1-5-0.yml | 0 ...9-update org-carrot2-carrot2-core to v4-8-1.yml | 0 ...e org-jetbrains-kotlinx-atomicfu to v0-29-0.yml | 0 .../PR#3455-update apache-opennlp to v2-5-6.yml | 0 .../PR#3456-update apache-curator to v5-9-0.yml | 0 ...7-update commons-cli-commons-cli to v1-10-0.yml | 0 .../PR#3474-update org-semver4j-semver4j to v6.yml | 0 ...e io-nlopez-compose-rules-ktlint to v0-4-27.yml | 0 ...ate com-google-j2objc-j2objc-annotations to.yml | 0 .../PR#3523-update apache-zookeeper to v3-9-4.yml | 0 .../PR#3596-update amazon-awssdk to v2-32-31.yml | 0 changelog/v10.0.0/PR#3603-update-log4j.yml | 9 + ...R#3605-update actions-checkout action to v5.yml | 0 ...3606-update actions-setup-java action to v5.yml | 0 .../PR#3612-update netty to v4-2-6-final.yml | 0 .../PR#3637-update actions-stale action to v10.yml | 0 ...PR#3642-update actions-labeler action to v6.yml | 0 ...pdate com-nimbusds-nimbus-jose-jwt to v10-5.yml | 0 ...factoring of the texttovectorqparserplugin.yml} | 4 +- ...te com-github-spotbugs-spotbugs-annotations.yml | 0 ...org-apache-commons-commons-lang3 to v3-19-0.yml | 0 ...te com-microsoft-onnxruntime-onnxruntime to.yml | 0 .../PR#3736-update gradle-actions action to v5.yml | 0 ...3-update de-thetaphi-forbiddenapis to v3-10.yml | 0 ...- removed webapp-solr and also removed from.yml | 0 ...ove-LowerCaseTokenizer-deprecated-tokenizer.yml | 0 .../PR#3864-Remove-ManagedSynonymFilterFactory.yml | 0 ...PR#3865-Remove deprecated Jaspell suggester.yml | 0 ...873-update-org-apache-commons-commons-lang3.yml | 0 .../PR#3879-update-dev-logchange.yml | 0 .../PR#3926-tika-server-idle-timeout-fix.yml | 0 ...3933-update-org-apache-commons-commons-text.yml | 0 changelog/{unreleased => v10.0.0}/SOLR-11373.yml | 0 ...emove deprecated -breaksugestiontiebreaker-.yml | 0 ...deprecate cloudsolrclient-s zookeeper hosts.yml | 0 ...remove deprecated zkcli script in favour of.yml | 0 ...ch from sysv init script to systemd service.yml | 0 ...oduce a new- experimental admin ui that can.yml | 0 ...r cli commands now can interact with a solr.yml | 0 ...-solr cli now has bin-solr stream tool that.yml | 0 ...ove deprecated asynchronous request methods.yml | 0 changelog/{unreleased => v10.0.0}/SOLR-15349.yml | 0 changelog/{unreleased => v10.0.0}/SOLR-15442.yml | 0 ...emoved deprecated solrexception-log methods.yml | 0 ...modules like solrj-zookeeper are now opt-in.yml | 0 ...deprecated feature to load solr-xml from zk.yml | 0 ...ache curator is now used to manage all solr.yml | 0 .../v10.0.0/SOLR-16116-remove-retryOnConnLoss.yml | 8 + ...5-the -jaegertracer-configurator- module is.yml | 0 ...36-replace opentracing instrumentation with.yml | 0 ...2-solr-16578- upgrade caffeine to 3-1-4 and.yml | 0 ...oved deprecated methods on the various solr.yml | 0 ...61-removed deprecated -analytics- component.yml | 0 ...-ltr add feature vector caching for ranking.yml | 0 ...support for -lt-lib-gt- directives -used in.yml | 0 ...remove the bin-solr -f pattern in favour of.yml | 0 ...li commands that use -solrurl now work with.yml | 0 ...e meaning of -h from shorthand for -host to.yml | 0 ...23-remove backcompatiblity of -upconfig and.yml | 0 ...te arg parsing and help usage from bin-solr.yml | 0 ...tify a user if they run healthcheck against.yml | 0 ...olr create command supports both standalone.yml | 0 ... bin-solr create-core and create-collection.yml | 0 ...LR-16903-replace all java-io-file usages to.yml | 0 ...11-establish -solr as the only host context.yml | 0 ...SOLR-16961-the legacy circuit breaker named.yml | 0 ...raded jetty to 12 -jakarta ee 10 namespace-.yml | 0 ...5-add a replicacount class to keep track of.yml | 0 ... modern nlp models from apache opennlp with.yml | 0 ...42-remove deprecated -v2requestsupport- and.yml | 0 ...d -cloud- clients no longer use brittle url.yml | 0 ...rclient- implementations that rely on -base.yml | 0 ...when a shard rejoins leader election- leave.yml | 0 ...remove deprecated bin-post and bin-postlogs.yml | 0 ... -solr-useexitabledirectoryreader- property.yml | 0 ...82-remove -solr-useexitabledirectoryreader-.yml | 0 ...ple solrj required java version from server.yml | 0 ...previously deprecated -solrrequest- methods.yml | 0 ...79-introduce securityjson-java file to test.yml | 0 ...move deprecated blobrepository in favour of.yml | 0 ...lrj remotesolrexception moved to solrclient.yml | 0 ...roxying requests to another node- use jetty.yml | 0 ...oncurrentupdatesolrclient no longer detects.yml | 0 ...13-remove deprecated class solrlogposttool-.yml | 0 ...mum java version for apache solr is now 21-.yml | 0 ...e deprecated solr cli options- run bin-solr.yml | 0 ... deprecated script snapshotcli-sh- bin-solr.yml | 0 ...he base docker image has been upgraded from.yml | 0 ...458-switch-from-dropwizard-to-opentelemetry.yml | 0 ...li bin-solr start defaults to starting solr.yml | 0 ...ove language specific writer types -i-e wt-.yml | 0 ...hange solr cli delete command to not delete.yml | 0 .../{unreleased => v10.0.0}/SOLR-17503-noJavax.yml | 0 ...2solrclient- is now generic- adding support.yml | 0 ...518-removed deprecated methods -getxml- and.yml | 0 ...d the hadoop auth module- and thus kerberos.yml | 0 ...lbhttp2solrclient- now maintains a separate.yml | 0 ...cli will now stop when you combine mutually.yml | 0 ...64-remove code in assign used for backwards.yml | 0 ...solrcloud no longer reroutes-proxies a core.yml | 0 ...e cli bin-solr export tool now contacts the.yml | 0 ...ove deprecated master-slave option language.yml | 0 ... is no longer a distinction between trusted.yml | 0 ...d the hdfs module and therefore support for.yml | 0 .../SOLR-17631-upgrade to lucene 10-3-1.yml | 0 ...oved the -version- parameter that the solrj.yml | 0 ...ved deprecated externalfilefield field type.yml | 0 .../SOLR-17675-remove dircontext param from.yml | 0 ...esponsewriter- refactor the hierarchy- base.yml | 0 ...removed deprecated currencyfield field type.yml | 0 ...7685-simplify bin-solr scripts by no longer.yml | 0 ...698-removed deprecated enumfield field type.yml | 0 ...lify bin-solr scripts by removing auth-port.yml | 0 ...703-solrj - rename binaryresponseparser and.yml | 0 ...j-s solrrequest now allows any type for its.yml | 0 ...-solrj documentobjectbinder is now a global.yml | 0 ...-for-compatibility-with-future-Solr-version.yml | 2 +- ...R-17738-removed deprecated -transform- from.yml | 0 ...ing a config sets with forbidden file types.yml | 0 ...LR-17742-removed the handleselect option of.yml | 0 ...dhttp2solrclient-builder- now also can work.yml | 0 .../SOLR-17771-remove -cloudsolrclient-builder.yml | 0 ...ts for cli examples were failing on windows.yml | 0 ...LR-17778-removed no-op core admin operation.yml | 0 ...moved obsolete -roles- and -numshards- core.yml | 0 ... support for scalar quantized dense vectors.yml | 0 ... support for binary quantized dense vectors.yml | 0 ...-17813-add support for seededknnvectorquery.yml | 0 ...7814-add support for patienceknnvectorquery.yml | 0 ...5-add parameter to regulate for acorn-based.yml | 0 .../SOLR-17839-removed preanalyzedfields.yml | 0 ...ToVectorUpdateProcessor for partial updates.yml | 0 ... blobhandler and -system collection support.yml | 0 ...igrate schema designer to use filestore api.yml | 0 ...darized patterns for system property naming.yml | 0 ...export tool should properly output exported.yml | 0 ...7872-solr no longer uses apache httpclient-.yml | 0 ...ch remaining usages of apache httpclient to.yml | 0 ...solrcloud overseer is disable-able- in lieu.yml | 0 ...upport for cuvs-lucene as a pluggable codec.yml | 0 ... obsolete querycommand-timeallowed replaced.yml | 0 ...6-improve tracking of time already spent to.yml | 0 .../SOLR-17928_added_efSearch_parameter.yml | 0 ...move obsolete overseer internal work queue-.yml | 0 ...ltiauthplugin now looks up for auth plugins.yml | 0 .../SOLR-17931-remove-clusterstate-methods.yml | 2 +- .../SOLR-17931_remove_hostContext.yml | 0 ...7932-remove transient solr cores capability.yml | 0 ...-17935-remove deprecated noopresponseparser.yml | 0 ...delegatingcollector to prevent the delegate.yml | 0 .../SOLR-17942-raising-ramPerThreadHardLimit.yml | 8 + ...lusterstateprovider- now also can work with.yml | 0 ...R-17947-cloudsolrclient async state refresh.yml | 0 ...upport indexing primitive float- values for.yml | 0 ...R-17957-xlsxresponsewriter has been removed.yml | 0 ...oved tikalanguageidentifierupdateprocessor-.yml | 0 ...OLR-17961-remove LocalTikaExtractionBackend.yml | 0 .../SOLR-17962-MoveDeprecatedToTestFramework.yml | 0 ...e solrcloud commands no longer aquire locks.yml | 0 .../SOLR-17984-merge-on-flush-policy.yml | 0 .../SOLR-17985-fix-slow-no-rows-queries.yml | 0 .../SOLR-17994-SolrClientCustomizer.yml | 0 .../SOLR-17996-requestWithBaseUrl.yml | 0 .../SOLR-17998-better-error-info.yml | 0 .../SOLR-18004-frontend-parse-prometheus.yml | 0 .../SOLR-18005-ConcurrentUpdateJettySolrClient.yml | 0 .../SOLR-18005-LBAsyncSolrClient.yml | 0 .../SOLR-18005-MoveToJettyPackageAndRename.yml | 0 ...rse dist sorting on LatLonPointSpatialField.yml | 0 .../SOLR-18028-remove_stream_file_stream_url.yml | 0 .../v10.0.0/SOLR-18029-properties-bulk-read.yml | 8 + .../SOLR-18035-remove-election-pause-parameter.yml | 7 + .../SOLR-18036-auto-migrate-log4j2.xml-docker.yml | 8 + changelog/{unreleased => v10.0.0}/SOLR-6953.yml | 0 .../SOLR_17864_part_trece.yml | 0 changelog/v10.0.0/release-date.txt | 1 + ...llel-http-shard-handler-failure-propagation.yml | 0 .../{unreleased => v10.0.0}/solr_17927_new.yml | 6 +- .../{unreleased => v10.0.0}/solrj-class-moves.yml | 0 .../{unreleased => v10.0.0}/update-jetty-xmls.yml | 0 .../upgrade-lucene-1032.yml | 0 changelog/v10.0.0/version-summary.md | 301 ++++++++++ changelog/v9.10.0/version-summary.md | 2 +- changelog/v9.9.0/version-summary.md | 2 +- dev-docs/gradle-help/docker.txt | 37 +- gradle/libs.versions.toml | 33 +- solr/api/gradle.lockfile | 28 +- .../solr/client/api/model/NodeSystemResponse.java | 126 +++++ solr/benchmark/gradle.lockfile | 20 +- solr/core/build.gradle | 3 - solr/core/gradle.lockfile | 31 +- .../apache/solr/api/ZkClusterPluginsSource.java | 2 +- .../src/java/org/apache/solr/cli/AuthTool.java | 8 +- .../src/java/org/apache/solr/cli/CLIUtils.java | 18 +- .../src/java/org/apache/solr/cli/CreateTool.java | 20 +- .../java/org/apache/solr/cli/HealthcheckTool.java | 21 +- .../src/java/org/apache/solr/cli/StatusTool.java | 47 +- .../src/java/org/apache/solr/cli/ZkMkrootTool.java | 2 +- .../src/java/org/apache/solr/cli/ZkRmTool.java | 2 +- .../client/solrj/embedded/EmbeddedSolrServer.java | 4 +- .../src/java/org/apache/solr/cloud/CloudUtil.java | 4 +- .../solr/cloud/DistributedApiAsyncTracker.java | 16 +- .../solr/cloud/DistributedClusterStateUpdater.java | 10 +- .../java/org/apache/solr/cloud/DistributedMap.java | 20 +- .../org/apache/solr/cloud/ElectionContext.java | 4 +- .../java/org/apache/solr/cloud/LeaderElector.java | 25 +- .../src/java/org/apache/solr/cloud/Overseer.java | 8 +- .../apache/solr/cloud/OverseerElectionContext.java | 14 +- .../apache/solr/cloud/OverseerNodePrioritizer.java | 5 +- .../apache/solr/cloud/OverseerTaskProcessor.java | 8 +- .../org/apache/solr/cloud/OverseerTaskQueue.java | 22 +- .../solr/cloud/RefreshCollectionMessage.java | 2 +- .../solr/cloud/ShardLeaderElectionContext.java | 7 +- .../solr/cloud/ShardLeaderElectionContextBase.java | 3 +- .../solr/cloud/SizeLimitedDistributedMap.java | 4 +- .../org/apache/solr/cloud/ZkConfigSetService.java | 21 +- .../java/org/apache/solr/cloud/ZkController.java | 59 +- .../org/apache/solr/cloud/ZkDistributedLock.java | 9 +- .../solr/cloud/ZkDistributedLockFactory.java | 4 +- .../org/apache/solr/cloud/ZkDistributedQueue.java | 20 +- .../java/org/apache/solr/cloud/ZkShardTerms.java | 8 +- .../apache/solr/cloud/ZkSolrResourceLoader.java | 4 +- .../cloud/api/collections/CreateCollectionCmd.java | 6 +- .../cloud/api/collections/DeleteCollectionCmd.java | 4 +- .../cloud/api/collections/OverseerRoleCmd.java | 8 +- .../cloud/api/collections/OverseerStatusCmd.java | 4 +- .../solr/cloud/api/collections/SplitShardCmd.java | 17 +- .../apache/solr/cloud/overseer/ZkStateWriter.java | 6 +- .../src/java/org/apache/solr/core/NodeConfig.java | 2 +- .../java/org/apache/solr/core/RequestParams.java | 3 +- .../src/java/org/apache/solr/core/SolrCore.java | 8 +- .../org/apache/solr/core/backup/BackupManager.java | 6 +- .../apache/solr/core/backup/BackupProperties.java | 4 +- .../solr/core/backup/ShardBackupMetadata.java | 4 +- .../solr/core/snapshots/SolrSnapshotManager.java | 18 +- .../apache/solr/filestore/ClusterFileStore.java | 8 +- .../apache/solr/filestore/DistribFileStore.java | 11 +- .../apache/solr/handler/ReplicationHandler.java | 4 +- .../org/apache/solr/handler/SchemaHandler.java | 65 ++- .../org/apache/solr/handler/SolrConfigHandler.java | 41 +- .../apache/solr/handler/admin/ClusterStatus.java | 7 +- .../solr/handler/admin/SecurityConfHandler.java | 7 +- .../solr/handler/admin/SecurityConfHandlerZk.java | 3 +- .../solr/handler/admin/ShowFileRequestHandler.java | 9 +- .../solr/handler/admin/ZookeeperInfoHandler.java | 8 +- .../apache/solr/handler/admin/ZookeeperRead.java | 10 +- .../handler/component/CombinedQueryComponent.java | 614 +++++++++++++++++++++ .../component/CombinedQueryResponseBuilder.java | 55 ++ .../component/CombinedQuerySearchHandler.java | 63 +++ .../solr/handler/component/DebugComponent.java | 8 +- .../handler/component/HttpShardHandlerFactory.java | 3 +- .../solr/handler/component/QueryComponent.java | 144 +++-- .../solr/handler/component/ResponseBuilder.java | 3 + .../solr/handler/component/SearchHandler.java | 82 --- .../combine/QueryAndResponseCombiner.java | 130 +++++ .../component/combine/ReciprocalRankFusion.java | 166 ++++++ .../component/combine/package-info.java} | 12 +- .../solr/handler/designer/SchemaDesignerAPI.java | 10 +- .../designer/SchemaDesignerConfigSetHelper.java | 10 +- .../designer/SchemaDesignerSettingsDAO.java | 2 +- ...gePolicy.java => LatestVersionMergePolicy.java} | 4 +- .../index/LatestVersionMergePolicyFactory.java | 8 +- .../apache/solr/packagemanager/PackageManager.java | 8 +- .../solr/packagemanager/RepositoryManager.java | 30 +- .../src/java/org/apache/solr/pkg/PackageAPI.java | 11 +- .../org/apache/solr/request/SolrQueryRequest.java | 3 +- .../apache/solr/rest/ManagedResourceStorage.java | 24 +- .../org/apache/solr/schema/ManagedIndexSchema.java | 4 +- .../solr/schema/ManagedIndexSchemaFactory.java | 18 +- .../java/org/apache/solr/schema/SchemaManager.java | 4 +- .../apache/solr/schema/ZkIndexSchemaReader.java | 4 +- .../org/apache/solr/search/vector/KnnQParser.java | 81 +++ .../solr/servlet/CoreContainerAwareHttpFilter.java | 59 ++ .../apache/solr/servlet/CoreContainerProvider.java | 20 +- .../apache/solr/servlet/DirectSolrConnection.java | 133 ----- .../solr/servlet/EssentialSolrRequestFilter.java | 97 ++++ .../java/org/apache/solr/servlet/HttpSolrCall.java | 7 +- .../apache/solr/servlet/LoadAdminUiServlet.java | 4 +- .../apache/solr/servlet/PathExclusionFilter.java | 80 +++ .../org/apache/solr/servlet/QueryRateLimiter.java | 2 +- .../java/org/apache/solr/servlet/ServletUtils.java | 44 -- .../apache/solr/servlet/SolrDispatchFilter.java | 100 +--- .../apache/solr/servlet/SolrRequestParsers.java | 8 +- .../org/apache/solr/update/SolrIndexConfig.java | 37 +- ...InputStream.java => IndexInputInputStream.java} | 22 +- .../apache/solr/util/MockSearchableSolrClient.java | 136 ----- .../solr/collection1/conf/schema-densevector.xml | 7 +- .../conf/solrconfig-analytics-query.xml | 4 - .../conf/solrconfig-collapseqparser.xml | 4 - .../collection1/conf/solrconfig-combined-query.xml | 168 ++++++ .../solr/collection1/conf/solrconfig-elevate.xml | 4 - .../solr/collection1/conf/solrconfig-minhash.xml | 4 - .../collection1/conf/solrconfig-plugcollector.xml | 4 - .../solr/collection1/conf/solrconfig-test-misc.xml | 6 - ...est-misc.xml => solrconfig-test-properties.xml} | 22 +- .../solr/collection1/conf/solrconfig.xml | 4 - .../test/org/apache/solr/SolrTestCaseJ4Test.java | 2 - .../test/org/apache/solr/TestCrossCoreJoin.java | 96 ++-- .../org/apache/solr/TestCustomCoreProperties.java | 22 +- .../test/org/apache/solr/TestTolerantSearch.java | 62 ++- .../org/apache/solr/cli/SolrCLIZkToolsTest.java | 46 +- .../org/apache/solr/cli/ZkSubcommandsTest.java | 33 +- .../TestEmbeddedSolrServerAdminHandler.java | 28 +- .../apache/solr/cloud/AliasIntegrationTest.java | 2 +- .../apache/solr/cloud/BasicDistributedZk2Test.java | 2 +- .../apache/solr/cloud/BasicDistributedZkTest.java | 15 +- .../org/apache/solr/cloud/CollectionPropsTest.java | 5 +- .../solr/cloud/CollectionStateZnodeTest.java | 6 +- .../org/apache/solr/cloud/DeleteShardTest.java | 6 +- .../apache/solr/cloud/DistributedQueueTest.java | 6 +- .../solr/cloud/LeaderElectionContextKeyTest.java | 3 +- .../org/apache/solr/cloud/LeaderElectionTest.java | 40 +- .../solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 +- .../OutOfBoxZkACLAndCredentialsProvidersTest.java | 20 +- ...OverriddenZkACLAndCredentialsProvidersTest.java | 22 +- .../OverseerCollectionConfigSetProcessorTest.java | 10 +- .../test/org/apache/solr/cloud/OverseerTest.java | 8 +- .../test/org/apache/solr/cloud/SplitShardTest.java | 22 +- .../apache/solr/cloud/TestBaseStatsCacheCloud.java | 11 +- .../org/apache/solr/cloud/TestConfigSetsAPI.java | 48 +- .../solr/cloud/TestConfigSetsAPIZkFailure.java | 3 +- .../org/apache/solr/cloud/TestDistributedMap.java | 21 +- .../org/apache/solr/cloud/TestPullReplica.java | 4 +- .../solr/cloud/TestQueryingOnDownCollection.java | 5 +- .../apache/solr/cloud/TestRebalanceLeaders.java | 3 +- .../apache/solr/cloud/TestRequestForwarding.java | 5 - .../org/apache/solr/cloud/TestStressLiveNodes.java | 4 +- .../org/apache/solr/cloud/TestTlogReplica.java | 4 +- .../VMParamsZkACLAndCredentialsProvidersTest.java | 43 +- .../org/apache/solr/cloud/ZkControllerTest.java | 35 +- .../org/apache/solr/cloud/ZkSolrClientTest.java | 34 +- .../solr/cloud/api/collections/ShardSplitTest.java | 6 +- .../SimpleCollectionCreateDeleteTest.java | 35 +- .../cloud/api/collections/TestCollectionAPI.java | 4 +- .../collections/TestLocalFSCloudBackupRestore.java | 4 +- .../solr/cloud/overseer/ZkStateReaderTest.java | 37 +- .../solr/cloud/overseer/ZkStateWriterTest.java | 12 +- .../src/test/org/apache/solr/core/TestConfig.java | 26 - .../solr/core/TestConfigPropertySubstitution.java | 66 +++ .../apache/solr/core/TestConfigSetImmutable.java | 2 +- .../apache/solr/core/TestCorePropertiesReload.java | 2 - .../test/org/apache/solr/core/TestLazyCores.java | 1 - .../apache/solr/core/TestSolrConfigHandler.java | 2 +- .../solr/handler/MoreLikeThisHandlerTest.java | 15 +- .../apache/solr/handler/ReplicationTestHelper.java | 13 +- .../org/apache/solr/handler/TestConfigReload.java | 8 +- .../org/apache/solr/handler/TestHttpRequestId.java | 12 +- .../solr/handler/TestReplicationHandlerBackup.java | 19 +- .../TestReplicationHandlerDiskOverFlow.java | 3 + .../org/apache/solr/handler/TestRequestId.java | 91 --- .../org/apache/solr/handler/TestRestoreCore.java | 12 +- .../solr/handler/TestStressIncrementalBackup.java | 3 +- .../solr/handler/TestStressThreadBackup.java | 3 +- .../org/apache/solr/handler/V2StandaloneTest.java | 2 - .../solr/handler/admin/AdminHandlersProxyTest.java | 46 +- .../solr/handler/admin/MetricsHandlerTest.java | 16 +- .../handler/admin/SecurityConfHandlerTest.java | 17 +- .../handler/admin/ShowFileRequestHandlerTest.java | 32 +- .../solr/handler/admin/ZookeeperReadAPITest.java | 6 +- .../component/CombinedQueryComponentTest.java | 250 +++++++++ .../component/CombinedQuerySearchHandlerTest.java | 76 +++ .../component/CombinedQuerySolrCloudTest.java | 284 ++++++++++ .../solr/handler/component/DebugComponentTest.java | 28 +- .../DistributedCombinedQueryComponentTest.java | 293 ++++++++++ .../component/DistributedDebugComponentTest.java | 65 +-- .../component/DistributedFacetPivotLargeTest.java | 2 +- .../combine/QueryAndResponseCombinerTest.java | 61 ++ .../combine/ReciprocalRankFusionTest.java | 109 ++++ .../handler/component/combine/TestCombiner.java | 64 +++ .../handler/designer/TestSchemaDesignerAPI.java | 4 +- .../TestSchemaDesignerConfigSetHelper.java | 6 +- .../solr/jersey/JerseyApplicationSharingTest.java | 3 - .../org/apache/solr/metrics/JvmMetricsTest.java | 16 +- .../solr/metrics/SolrMetricsIntegrationTest.java | 3 - .../src/test/org/apache/solr/pkg/TestPackages.java | 9 +- .../solr/response/TestErrorResponseStackTrace.java | 11 +- .../response/TestPrometheusResponseWriter.java | 56 +- .../TestPrometheusResponseWriterCloud.java | 12 +- .../apache/solr/response/TestRawTransformer.java | 6 +- .../TestSubQueryTransformerCrossCore.java | 102 ++-- .../org/apache/solr/rest/SolrRestletTestBase.java | 3 - .../apache/solr/rest/schema/TestBulkSchemaAPI.java | 4 +- .../analysis/TestManagedStopFilterFactory.java | 2 +- .../TestManagedSynonymGraphFilterFactory.java | 2 +- .../test/org/apache/solr/schema/DateFieldTest.java | 3 - .../apache/solr/schema/PrimitiveFieldTypeTest.java | 2 - .../org/apache/solr/schema/TestBinaryField.java | 48 +- .../apache/solr/schema/TestCloudManagedSchema.java | 6 +- .../solr/schema/TestManagedSchemaThreadSafety.java | 6 +- .../solr/schema/TestUseDocValuesAsStored2.java | 2 +- .../solr/search/TestDocValuesIteratorCache.java | 6 +- .../org/apache/solr/search/TestIndexSearcher.java | 25 +- .../test/org/apache/solr/search/TestThinCache.java | 13 +- .../join/BlockJoinNestedVectorsQParserTest.java | 437 +++++++++++++++ .../solr/search/join/ShardToShardJoinAbstract.java | 19 +- .../json/TestJsonRequestWithEdismaxDefType.java | 9 +- .../apache/solr/search/stats/TestDistribIDF.java | 5 - .../solr/search/vector/KnnQParserChildTest.java | 199 +++++++ .../solr/security/BasicAuthIntegrationTest.java | 2 +- .../solr/security/BasicAuthOnSingleNodeTest.java | 2 +- .../solr/security/BasicAuthStandaloneTest.java | 32 +- .../apache/solr/security/MultiAuthPluginTest.java | 9 +- .../solr/security/TestAuthorizationFramework.java | 3 +- .../org/apache/solr/servlet/CacheHeaderTest.java | 52 +- .../apache/solr/servlet/CacheHeaderTestBase.java | 40 +- .../solr/servlet/DirectSolrConnectionTest.java | 70 --- .../apache/solr/servlet/HideStackTraceTest.java | 9 +- .../org/apache/solr/servlet/NoCacheHeaderTest.java | 17 +- .../apache/solr/servlet/ResponseHeaderTest.java | 55 +- .../apache/solr/servlet/SolrRequestParserTest.java | 22 + .../org/apache/solr/update/CustomTLogDirTest.java | 22 +- .../test/org/apache/solr/update/RootFieldTest.java | 12 +- .../AbstractAtomicUpdatesMultivalueTestBase.java | 6 +- .../TimeRoutedAliasUpdateProcessorTest.java | 10 +- .../processor/TolerantUpdateProcessorTest.java | 31 +- .../UniqFieldsUpdateProcessorFactoryTest.java | 7 +- solr/cross-dc-manager/gradle.lockfile | 36 +- solr/docker/README.md | 28 + solr/docker/build.gradle | 88 ++- solr/docker/scripts/init-var-solr | 3 +- .../tests/cases/log4j2_migration/log4j2_old.xml | 86 +++ solr/docker/tests/cases/log4j2_migration/test.sh | 82 +++ .../biz.aQute.bnd.annotation-6.4.1.jar.sha1 | 1 - .../biz.aQute.bnd.annotation-7.1.0.jar.sha1 | 1 + solr/licenses/byte-buddy-1.17.7.jar.sha1 | 1 - solr/licenses/byte-buddy-1.18.3.jar.sha1 | 1 + solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 | 1 - solr/licenses/byte-buddy-agent-1.18.3.jar.sha1 | 1 + solr/licenses/docker-java-api-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-api-3.7.0.jar.sha1 | 1 + solr/licenses/docker-java-transport-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-transport-3.7.0.jar.sha1 | 1 + .../docker-java-transport-zerodep-3.4.0.jar.sha1 | 1 - .../docker-java-transport-zerodep-3.7.0.jar.sha1 | 1 + solr/licenses/jackson-core-2.20.0.jar.sha1 | 1 - solr/licenses/jackson-core-2.20.1.jar.sha1 | 1 + solr/licenses/jackson-databind-2.20.0.jar.sha1 | 1 - solr/licenses/jackson-databind-2.20.1.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.20.0.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.20.1.jar.sha1 | 1 + .../jackson-dataformat-csv-2.20.0.jar.sha1 | 1 - .../jackson-dataformat-csv-2.20.1.jar.sha1 | 1 + .../jackson-dataformat-smile-2.20.0.jar.sha1 | 1 - .../jackson-dataformat-smile-2.20.1.jar.sha1 | 1 + .../jackson-dataformat-xml-2.20.0.jar.sha1 | 1 - .../jackson-dataformat-xml-2.20.1.jar.sha1 | 1 + .../licenses/jackson-datatype-jdk8-2.20.0.jar.sha1 | 1 - .../licenses/jackson-datatype-jdk8-2.20.1.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.20.0.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.20.1.jar.sha1 | 1 + ...ule-jakarta-xmlbind-annotations-2.20.0.jar.sha1 | 1 - ...ule-jakarta-xmlbind-annotations-2.20.1.jar.sha1 | 1 + .../licenses/jackson-module-kotlin-2.20.0.jar.sha1 | 1 - .../licenses/jackson-module-kotlin-2.20.1.jar.sha1 | 1 + .../jackson-module-parameter-names-2.20.0.jar.sha1 | 1 - .../jackson-module-parameter-names-2.20.1.jar.sha1 | 1 + .../jackson-module-scala_2.13-2.20.0.jar.sha1 | 1 - .../jackson-module-scala_2.13-2.20.1.jar.sha1 | 1 + solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 | 1 - solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 | 1 + solr/licenses/jna-5.13.0.jar.sha1 | 1 - solr/licenses/jna-5.18.1.jar.sha1 | 1 + solr/licenses/langchain4j-cohere-0.35.0.jar.sha1 | 1 - .../langchain4j-cohere-1.9.1-beta17.jar.sha1 | 1 + solr/licenses/langchain4j-core-0.35.0.jar.sha1 | 1 - solr/licenses/langchain4j-core-1.9.1.jar.sha1 | 1 + .../langchain4j-http-client-1.9.1.jar.sha1 | 1 + .../langchain4j-http-client-jdk-1.9.1.jar.sha1 | 1 + .../langchain4j-hugging-face-0.35.0.jar.sha1 | 1 - .../langchain4j-hugging-face-1.9.1-beta17.jar.sha1 | 1 + .../langchain4j-mistral-ai-0.35.0.jar.sha1 | 1 - .../licenses/langchain4j-mistral-ai-1.9.1.jar.sha1 | 1 + solr/licenses/langchain4j-open-ai-0.35.0.jar.sha1 | 1 - solr/licenses/langchain4j-open-ai-1.9.1.jar.sha1 | 1 + solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-1.2-api-2.25.3.jar.sha1 | 1 + solr/licenses/log4j-api-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-api-2.25.3.jar.sha1 | 1 + solr/licenses/log4j-core-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-core-2.25.3.jar.sha1 | 1 + .../log4j-layout-template-json-2.21.0.jar.sha1 | 1 - .../log4j-layout-template-json-2.25.3.jar.sha1 | 1 + solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 | 1 + solr/licenses/log4j-web-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-web-2.25.3.jar.sha1 | 1 + solr/licenses/okhttp-sse-4.12.0.jar.sha1 | 1 - solr/licenses/openai4j-0.22.0.jar.sha1 | 1 - solr/licenses/openai4j-NOTICE.txt | 11 - .../org.osgi.annotation.bundle-2.0.0.jar.sha1 | 1 + ... => org.osgi.annotation.bundle-LICENSE-ASL.txt} | 1 + ...E.txt => org.osgi.annotation.bundle-NOTICE.txt} | 2 +- .../org.osgi.annotation.versioning-1.1.2.jar.sha1 | 1 + ...org.osgi.annotation.versioning-LICENSE-ASL.txt} | 7 +- ...t => org.osgi.annotation.versioning-NOTICE.txt} | 2 +- solr/licenses/osgi.annotation-8.1.0.jar.sha1 | 1 - solr/licenses/testcontainers-1.20.4.jar.sha1 | 1 - solr/licenses/testcontainers-2.0.3.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 28 +- solr/modules/clustering/gradle.lockfile | 26 +- solr/modules/cross-dc/gradle.lockfile | 30 +- .../org/apache/solr/crossdc/common/ConfUtil.java | 7 +- .../handler/MirroringCollectionsHandlerTest.java | 2 +- .../handler/MirroringConfigSetsHandlerTest.java | 4 +- solr/modules/cuvs/gradle.lockfile | 26 +- solr/modules/extraction/gradle.lockfile | 36 +- .../solr/collection1/conf/solrconfig.xml | 3 - solr/modules/gcs-repository/gradle.lockfile | 26 +- solr/modules/jwt-auth/gradle.lockfile | 30 +- .../security/jwt/JWTAuthPluginIntegrationTest.java | 13 +- solr/modules/langid/gradle.lockfile | 26 +- solr/modules/language-models/build.gradle | 3 +- solr/modules/language-models/gradle.lockfile | 42 +- .../solr/languagemodels/TestLanguageModelBase.java | 2 +- .../TextToVectorUpdateProcessorFactoryTest.java | 2 +- .../processor/TextToVectorUpdateProcessorTest.java | 2 +- solr/modules/ltr/gradle.lockfile | 28 +- .../apache/solr/ltr/TestFeatureVectorCache.java | 2 +- .../test/org/apache/solr/ltr/TestRerankBase.java | 6 +- solr/modules/opentelemetry/gradle.lockfile | 26 +- .../solr/opentelemetry/TestDistributedTracing.java | 6 +- .../solr/opentelemetry/TestMetricExemplars.java | 10 +- solr/modules/s3-repository/gradle.lockfile | 36 +- solr/modules/scripting/gradle.lockfile | 26 +- .../xslt/XSLTUpdateRequestHandlerTest.java | 7 +- solr/modules/sql/gradle.lockfile | 26 +- .../solr/handler/sql/TestSQLHandlerNonCloud.java | 19 +- solr/server/gradle.lockfile | 26 +- solr/solr-ref-guide/build.gradle | 2 + solr/solr-ref-guide/gradle.lockfile | 37 +- solr/solr-ref-guide/increase-request-timeout.js | 42 +- .../pages/index-segments-merging.adoc | 4 +- .../pages/solr-control-script-reference.adoc | 2 +- .../examples/IndexingNestedDocuments.java | 3 +- .../examples/SolrCellRefGuideExamplesTest.java | 91 +++ .../indexing-guide/pages/indexing-with-tika.adoc | 11 +- .../examples/ExpectedOutputVerifier.java | 57 ++ .../examples/PaginationRefGuideExamplesTest.java | 129 +++++ .../examples/ParallelSqlRefGuideExamplesTest.java | 121 ++++ .../TermComponentRefGuideExamplesTest.java | 128 +++++ .../query-guide/pages/dense-vector-search.adoc | 46 +- .../query-guide/pages/json-combined-query-dsl.adoc | 107 ++++ .../modules/query-guide/pages/morelikethis.adoc | 27 +- .../query-guide/pages/pagination-of-results.adoc | 14 +- .../pages/searching-nested-documents.adoc | 40 ++ .../modules/query-guide/pages/sql-query.adoc | 16 +- .../modules/query-guide/pages/terms-component.adoc | 12 +- .../modules/query-guide/querying-nav.adoc | 1 + solr/solrj-streaming/gradle.lockfile | 20 +- .../client/solrj/io/sql/DatabaseMetaDataImpl.java | 14 +- solr/solrj-zookeeper/gradle.lockfile | 20 +- .../solr/client/solrj/impl/NodeValueFetcher.java | 6 +- .../solrj/impl/SolrClientNodeStateProvider.java | 5 +- .../solrj/impl/ZkClientClusterStateProvider.java | 2 +- .../client/solrj/impl/ZkDistribStateManager.java | 14 +- .../solr/common/cloud/ClusterProperties.java | 14 +- .../solr/common/cloud/CollectionProperties.java | 13 +- .../cloud/CollectionPropertiesZkStateReader.java | 4 +- .../solr/common/cloud/PerReplicaStatesOps.java | 6 +- .../solr/common/cloud/SecurityNodeWatcher.java | 13 +- .../org/apache/solr/common/cloud/SolrZkClient.java | 125 ++--- .../solr/common/cloud/ZkMaintenanceUtils.java | 51 +- .../apache/solr/common/cloud/ZkStateReader.java | 31 +- .../apache/solr/common/cloud/SolrZkClientTest.java | 28 +- .../solr/common/cloud/TestPerReplicaStates.java | 6 +- .../solr/common/cloud/TestZkMaintenanceUtils.java | 19 +- solr/solrj/build.gradle | 1 + solr/solrj/gradle.lockfile | 22 +- .../org/apache/solr/client/solrj/SolrRequest.java | 18 +- .../solr/client/solrj/request/MetricsRequest.java | 57 ++ .../client/solrj/request/SystemInfoRequest.java | 83 +++ .../client/solrj/response/SystemInfoResponse.java | 261 +++++++++ .../apache/solr/client/solrj/util/ClientUtils.java | 6 +- .../apache/solr/common/params/CombinerParams.java} | 26 +- .../apache/solr/common/params/CommonParams.java | 21 +- .../src/resources/EnvToSyspropMappings.properties | 1 - .../org/apache/solr/client/solrj/GetByIdTest.java | 9 +- .../client/solrj/SolrExampleBinaryHttp2Test.java | 2 +- .../solr/client/solrj/SolrExampleBinaryTest.java | 2 +- .../solr/client/solrj/SolrExampleCborTest.java | 2 +- .../apache/solr/client/solrj/SolrExampleTests.java | 36 +- .../solr/client/solrj/SolrExampleTestsBase.java | 33 +- .../solr/client/solrj/SolrExampleXMLTest.java | 2 +- .../client/solrj/SolrSchemalessExampleTest.java | 24 +- .../apache/solr/client/solrj/TestBatchUpdate.java | 21 +- .../solr/client/solrj/TestLBHttpSolrClient.java | 14 - .../solr/client/solrj/TestSolrJErrorHandling.java | 23 +- .../AbstractEmbeddedSolrServerTestCase.java | 8 +- .../solrj/embedded/LargeVolumeBinaryJettyTest.java | 7 +- .../solrj/embedded/LargeVolumeEmbeddedTest.java | 7 +- .../solrj/embedded/LargeVolumeJettyTest.java | 7 +- .../solrj/embedded/SolrExampleEmbeddedTest.java | 2 +- .../solrj/embedded/SolrExampleJettyTest.java | 17 +- .../embedded/SolrExampleStreamingHttp2Test.java | 2 +- .../solrj/embedded/SolrExampleStreamingTest.java | 2 +- .../solrj/embedded/SolrExampleXMLHttp2Test.java | 2 +- .../client/solrj/impl/HttpClusterStateSSLTest.java | 4 +- .../client/solrj/impl/HttpJdkSolrClientTest.java | 94 ++-- .../solrj/impl/HttpSolrClientBadInputTest.java | 20 +- .../client/solrj/impl/HttpSolrClientTestBase.java | 52 +- .../solr/client/solrj/impl/LB2SolrClientTest.java | 14 - .../solrj/impl/LBHttpSolrClientBadInputTest.java | 20 +- .../solrj/impl/TestCloudSolrClientConnections.java | 2 +- ...oncurrentUpdateJettySolrClientBadInputTest.java | 16 +- .../jetty/ConcurrentUpdateJettySolrClientTest.java | 21 +- .../HttpJettySolrClientCompatibilityTest.java | 31 +- .../solrj/jetty/HttpJettySolrClientProxyTest.java | 15 +- .../solrj/jetty/HttpJettySolrClientTest.java | 142 ++--- .../solr/client/solrj/request/SchemaTest.java | 2 +- .../solr/client/solrj/request/SolrPingTest.java | 6 +- ...DirectJsonQueryRequestFacetingEmbeddedTest.java | 8 +- .../response/InputStreamResponseParserTest.java | 14 +- .../solrj/response/SystemInfoResponseTest.java | 80 +++ .../client/solrj/response/TermsResponseTest.java | 9 +- .../solrj/response/TestClusteringResponse.java | 4 +- .../solrj/response/TestSpellCheckResponse.java | 7 +- .../solrj/response/TestSuggesterResponse.java | 30 +- .../cloud/PerReplicaStatesIntegrationTest.java | 17 +- .../cloud/SolrZkClientCompressedDataTest.java | 4 +- solr/test-framework/gradle.lockfile | 25 +- .../apache/solr/BaseDistributedSearchTestCase.java | 45 +- .../apache/solr/EmbeddedSolrServerTestBase.java | 4 +- .../src/java/org/apache/solr/JSONTestUtil.java | 2 +- .../org/apache/solr/SolrIgnoredThreadsFilter.java | 4 +- .../java/org/apache/solr/SolrJettyTestBase.java | 148 ----- .../src/java/org/apache/solr/SolrTestCase.java | 7 +- .../src/java/org/apache/solr/SolrTestCaseHS.java | 15 +- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 130 ++--- .../solr/cloud/AbstractFullDistribZkTestBase.java | 75 +-- .../org/apache/solr/cloud/AbstractZkTestCase.java | 6 +- .../java/org/apache/solr/cloud/ChaosMonkey.java | 15 +- .../org/apache/solr/cloud/CloudInspectUtil.java | 4 +- .../cloud/FullThrottleStoppableIndexingThread.java | 2 +- .../src/java/org/apache/solr/cloud/IpTables.java | 9 - .../apache/solr/cloud/MiniSolrCloudCluster.java | 54 +- .../org/apache/solr/cloud/MockSolrZkClient.java | 6 +- .../org/apache/solr/cloud/MockZkStateReader.java | 2 +- .../apache/solr/cloud/MultiSolrCloudTestCase.java | 3 +- .../apache/solr/cloud/SolrCloudAuthTestCase.java | 13 +- .../org/apache/solr/cloud/SolrCloudTestCase.java | 15 +- .../apache/solr/cloud/StoppableIndexingThread.java | 8 - .../java/org/apache/solr/cloud/ZkTestServer.java | 150 +---- .../collections/AbstractBackupRepositoryTest.java | 2 +- .../AbstractCloudBackupRestoreTestCase.java | 14 +- ...bstractCollectionsAPIDistributedZkTestBase.java | 14 +- .../collections/AbstractIncrementalBackupTest.java | 5 +- .../api/collections/AbstractInstallShardTest.java | 7 +- .../apache/solr/cluster/placement/Builders.java | 8 +- .../org/apache/solr/core/MockDirectoryFactory.java | 2 +- .../apache/solr/core/MockFSDirectoryFactory.java | 2 +- .../org/apache/solr/embedded/JettySolrRunner.java | 56 +- .../apache/solr/handler/BackupStatusChecker.java | 34 +- .../component/TrackingShardHandlerFactory.java | 1 - .../solr/search/CallerSpecificQueryLimit.java | 5 - .../org/apache/solr/search/facet/DebugAgg.java | 18 +- .../processor/RecordingUpdateProcessorFactory.java | 1 - .../processor/TrackingUpdateProcessorFactory.java | 1 - .../update/processor/UpdateProcessorTestBase.java | 2 +- .../solr/util/BadZookeeperThreadsFilter.java | 36 -- .../java/org/apache/solr/util/BaseTestHarness.java | 6 +- .../java/org/apache/solr/util/CallerMatcher.java | 2 +- .../java/org/apache/solr/util/DirectoryUtil.java | 2 +- .../java/org/apache/solr/util/ErrorLogMuter.java | 20 +- .../src/java/org/apache/solr/util/LogListener.java | 30 +- .../org/apache/solr/util/MockCoreContainer.java | 39 -- .../apache/solr/util/NotSecurePseudoRandomSpi.java | 35 +- .../java/org/apache/solr/util/QueryMatchers.java | 2 +- .../java/org/apache/solr/util/RandomizeSSL.java | 22 +- .../java/org/apache/solr/util/RestTestBase.java | 85 ++- .../java/org/apache/solr/util/RestTestHarness.java | 30 - .../java/org/apache/solr/util/SSLTestConfig.java | 8 +- .../java/org/apache/solr/util/ServletFixtures.java | 1 - .../src/java/org/apache/solr/util/SocketProxy.java | 3 +- .../org/apache/solr/util/SolrClientTestRule.java | 9 +- .../org/apache/solr/util/SolrJMetricTestUtils.java | 24 +- .../org/apache/solr/util/SolrMetricTestUtils.java | 15 +- .../solr/util/SolrTestNonSecureRandomProvider.java | 2 +- .../src/java/org/apache/solr/util/TestHarness.java | 50 +- .../solr/collection1/conf/solrconfig.xml | 4 - .../solrj/apache/BasicHttpSolrClientTest.java | 65 ++- .../ConcurrentUpdateSolrClientBadInputTest.java | 16 +- .../apache/ConcurrentUpdateSolrClientTest.java | 21 +- .../solrj/apache/HttpSolrClientConPoolTest.java | 13 +- .../apache/HttpSolrClientSSLAuthConPoolTest.java | 5 +- .../solrj/apache/SolrPortAwareCookieSpecTest.java | 8 +- .../solr/cloud/MiniSolrCloudClusterTest.java | 5 +- .../org/apache/solr/util/TestErrorLogMuter.java | 10 +- .../apache/solr/util/TestLogLevelAnnotations.java | 2 +- solr/webapp/gradle.lockfile | 26 +- solr/webapp/web/WEB-INF/web.xml | 28 +- 806 files changed, 8912 insertions(+), 4460 deletions(-)
