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 07a895f866c3dbc7f33ab8040098403db979961d Merge: 7bd97d66276 949b28e2cb2 Author: Chris Hostetter <[email protected]> AuthorDate: Tue Feb 3 13:10:27 2026 -0700 Merge remote-tracking branch 'origin/main' into jira/SOLR-17975 .github/renovate.json | 13 +- CHANGELOG.md | 18 +- .../SOLR-12224-add-collprop-read-apis.yml | 8 + .../SOLR-17437-shard-split-disk-space-check.yml | 9 + ...OLR-17955-SplitShardCmd.checkDiskSpace-otel.yml | 9 + ...SOLR-17999-fix-llm-managed-model-store-init.yml | 9 + ...002-add-unresponsive-servers-to-zombie-list.yml | 8 + .../SOLR-18008-simulate_solr_core_remnants.yml | 9 + changelog/unreleased/SOLR-18046.yml | 8 + .../SOLR-18051-fix-double-registration-bug.yml | 8 + changelog/unreleased/SOLR-18065.yml | 7 + ...R-18071-support-stored-fields-export-writer.yml | 8 + changelog/unreleased/SOLR-18074.yml | 8 + ...-CoreAdmin-API-to-upgrade-an-index-in-place.yml | 9 + .../admin-response-writers-minimal-set.yml | 9 + changelog/unreleased/solr-18063.yml | 9 + .../solr-18072-refactor-admin-cmd-apis.yml | 11 + ...lr-18081-shard-request-tracker-replica-name.yml | 9 + .../solr-18083-fix-read-only-behavior.yml | 9 + .../unreleased/solr-18090-shard-term-deletes.yml | 9 + changelog/v10.0.0/version-summary.md | 6 +- changelog/v9.10.0/version-summary.md | 4 +- ...R-17947-cloudsolrclient async state refresh.yml | 0 changelog/v9.10.1/release-date.txt | 2 +- changelog/v9.10.1/version-summary.md | 6 +- dev-docs/gradle-help/dependencies.txt | 25 + dev-tools/doap/solr.rdf | 7 + .../documentation/changes-to-html/changes2html.py | 1 + .../randomization/policies/solr-tests.policy | 8 + gradle/validation/validate-source-patterns.gradle | 2 +- settings.gradle | 4 +- .../client/api/endpoint/AliasPropertyApis.java | 3 +- .../client/api/endpoint/BalanceReplicasApi.java | 4 +- .../client/api/endpoint/CollectionPropertyApi.java | 23 +- .../solr/client/api/endpoint/CreateAliasApi.java | 4 +- .../solr/client/api/endpoint/DeleteAliasApi.java | 4 +- .../solr/client/api/endpoint/DeleteNodeApi.java | 4 +- .../client/api/endpoint/InstallShardDataApi.java | 4 +- .../client/api/endpoint/MigrateReplicasApi.java | 4 +- .../solr/client/api/endpoint/ReplaceNodeApi.java | 4 +- .../model/CreateCollectionSnapshotResponse.java | 2 +- .../model/DeleteCollectionSnapshotResponse.java | 2 +- ...nse.java => GetCollectionPropertyResponse.java} | 14 +- ....java => ListCollectionPropertiesResponse.java} | 15 +- ...ponse.java => UpgradeCoreIndexRequestBody.java} | 17 +- ...Response.java => UpgradeCoreIndexResponse.java} | 22 +- .../solr/bench/search/QueryResponseWriters.java | 2 - solr/bin/solr.cmd | 1 + solr/core/build.gradle | 11 +- solr/core/gradle.lockfile | 69 ++- .../org/apache/solr/cloud/RecoveryStrategy.java | 22 +- .../solr/cloud/ShardLeaderElectionContext.java | 2 +- .../org/apache/solr/cloud/ZkCollectionTerms.java | 11 +- .../java/org/apache/solr/cloud/ZkShardTerms.java | 16 +- .../solr/cloud/api/collections/AddReplicaCmd.java | 22 +- .../cloud/api/collections/AdminCmdContext.java | 63 +++ .../solr/cloud/api/collections/AliasCmd.java | 10 +- .../solr/cloud/api/collections/BackupCmd.java | 32 +- .../cloud/api/collections/BalanceReplicasCmd.java | 8 +- .../solr/cloud/api/collections/CollApiCmds.java | 89 ++-- .../api/collections/CollectionApiLockFactory.java | 7 +- .../api/collections/CollectionCommandContext.java | 7 +- .../api/collections/CollectionHandlingUtils.java | 232 ++++++--- .../solr/cloud/api/collections/CreateAliasCmd.java | 20 +- .../cloud/api/collections/CreateCollectionCmd.java | 37 +- .../solr/cloud/api/collections/CreateShardCmd.java | 31 +- .../cloud/api/collections/CreateSnapshotCmd.java | 9 +- .../solr/cloud/api/collections/DeleteAliasCmd.java | 3 +- .../cloud/api/collections/DeleteBackupCmd.java | 3 +- .../cloud/api/collections/DeleteCollectionCmd.java | 10 +- .../solr/cloud/api/collections/DeleteNodeCmd.java | 13 +- .../cloud/api/collections/DeleteReplicaCmd.java | 28 +- .../solr/cloud/api/collections/DeleteShardCmd.java | 14 +- .../cloud/api/collections/DeleteSnapshotCmd.java | 9 +- ...istributedCollectionConfigSetCommandRunner.java | 96 ++-- .../cloud/api/collections/InstallShardDataCmd.java | 5 +- .../api/collections/MaintainRoutedAliasCmd.java | 33 +- .../solr/cloud/api/collections/MigrateCmd.java | 98 ++-- .../cloud/api/collections/MigrateReplicasCmd.java | 7 +- .../solr/cloud/api/collections/MoveReplicaCmd.java | 89 ++-- .../OverseerCollectionMessageHandler.java | 5 +- .../cloud/api/collections/OverseerRoleCmd.java | 3 +- .../cloud/api/collections/OverseerStatusCmd.java | 3 +- .../api/collections/ReindexCollectionCmd.java | 111 ++-- .../solr/cloud/api/collections/RenameCmd.java | 5 +- .../solr/cloud/api/collections/ReplaceNodeCmd.java | 7 +- .../api/collections/ReplicaMigrationUtils.java | 31 +- .../solr/cloud/api/collections/RestoreCmd.java | 109 ++-- .../cloud/api/collections/SetAliasPropCmd.java | 3 +- .../solr/cloud/api/collections/SplitShardCmd.java | 155 ++++-- .../java/org/apache/solr/core/CoreContainer.java | 9 +- .../apache/solr/core/CorePropertiesLocator.java | 21 + .../org/apache/solr/core/RateLimiterConfig.java | 6 +- .../src/java/org/apache/solr/core/SolrCore.java | 148 +++--- .../java/org/apache/solr/handler/IndexFetcher.java | 6 +- .../apache/solr/handler/ReplicationHandler.java | 2 +- .../apache/solr/handler/RequestHandlerUtils.java | 1 + .../solr/handler/admin/CollectionsHandler.java | 39 +- .../solr/handler/admin/CoreAdminOperation.java | 4 +- .../solr/handler/admin/RebalanceLeaders.java | 12 +- .../solr/handler/admin/SystemInfoHandler.java | 7 +- .../solr/handler/admin/UpgradeCoreIndexOp.java | 82 +++ .../solr/handler/admin/api/AddReplicaProperty.java | 18 +- .../solr/handler/admin/api/AdminAPIBase.java | 67 ++- .../solr/handler/admin/api/AliasProperty.java | 79 ++- .../solr/handler/admin/api/BalanceReplicas.java | 34 +- .../solr/handler/admin/api/BalanceShardUnique.java | 7 +- .../solr/handler/admin/api/CollectionProperty.java | 57 ++- .../apache/solr/handler/admin/api/CreateAlias.java | 31 +- .../solr/handler/admin/api/CreateCollection.java | 32 +- .../handler/admin/api/CreateCollectionBackup.java | 21 +- .../admin/api/CreateCollectionSnapshot.java | 30 +- .../solr/handler/admin/api/CreateReplica.java | 10 +- .../apache/solr/handler/admin/api/CreateShard.java | 9 +- .../apache/solr/handler/admin/api/DeleteAlias.java | 44 +- .../solr/handler/admin/api/DeleteCollection.java | 39 +- .../handler/admin/api/DeleteCollectionBackup.java | 19 +- .../admin/api/DeleteCollectionSnapshot.java | 29 +- .../apache/solr/handler/admin/api/DeleteNode.java | 43 +- .../solr/handler/admin/api/DeleteReplica.java | 15 +- .../handler/admin/api/DeleteReplicaProperty.java | 23 +- .../apache/solr/handler/admin/api/DeleteShard.java | 9 +- .../solr/handler/admin/api/InstallShardData.java | 30 +- .../solr/handler/admin/api/MigrateReplicas.java | 34 +- .../handler/admin/api/ReloadCollectionAPI.java | 17 +- .../solr/handler/admin/api/RenameCollection.java | 8 +- .../apache/solr/handler/admin/api/ReplaceNode.java | 35 +- .../solr/handler/admin/api/RestoreCollection.java | 32 +- .../solr/handler/admin/api/UpgradeCoreIndex.java | 434 ++++++++++++++++ .../solr/handler/component/ShardRequest.java | 7 + .../solr/handler/export/DoubleFieldWriter.java | 8 +- .../apache/solr/handler/export/ExportWriter.java | 87 +++- .../apache/solr/handler/export/FieldWriter.java | 12 +- .../solr/handler/export/FloatFieldWriter.java | 8 +- .../apache/solr/handler/export/IntFieldWriter.java | 8 +- .../solr/handler/export/LongFieldWriter.java | 8 +- .../solr/handler/export/MultiFieldWriter.java | 9 +- .../solr/handler/export/StoredFieldsWriter.java | 143 ++++++ .../solr/handler/export/StringFieldWriter.java | 8 +- .../org/apache/solr/request/SolrQueryRequest.java | 16 +- .../solr/response/FileStreamResponseWriter.java | 67 +++ .../solr/response/ResponseWritersRegistry.java | 93 ++++ .../apache/solr/response/SolrQueryResponse.java | 4 +- .../response/transform/ChildDocTransformer.java | 120 ++++- .../org/apache/solr/schema/DenseVectorField.java | 5 - .../java/org/apache/solr/schema/IndexSchema.java | 1 + .../solr/servlet/CoreContainerAwareHttpFilter.java | 10 - .../apache/solr/servlet/CoreContainerProvider.java | 30 -- .../java/org/apache/solr/servlet/HttpSolrCall.java | 4 +- .../apache/solr/servlet/LoadAdminUiServlet.java | 2 +- .../org/apache/solr/servlet/RateLimitFilter.java | 76 +++ .../org/apache/solr/servlet/RateLimitManager.java | 23 +- ...tFilter.java => RequiredSolrRequestFilter.java} | 23 +- .../java/org/apache/solr/servlet/ServletUtils.java | 36 +- .../apache/solr/servlet/SolrDispatchFilter.java | 42 +- .../apache/solr/update/CommitUpdateCommand.java | 4 + .../apache/solr/update/DefaultSolrCoreState.java | 5 +- .../org/apache/solr/update/DocumentBuilder.java | 30 ++ .../java/org/apache/solr/update/SolrCoreState.java | 14 +- .../processor/DistributedUpdateProcessor.java | 2 +- .../processor/DistributedZkUpdateProcessor.java | 10 +- .../processor/NestedUpdateProcessorFactory.java | 123 +++-- .../src/java/org/apache/solr/util/TimeOut.java | 9 + .../org/apache/solr/util/tracing/TraceUtils.java | 12 +- solr/core/src/resources/ImplicitPlugins.json | 20 + .../solr/collection1/conf/schema-densevector.xml | 13 +- .../collection1/conf/schema-sortingresponse.xml | 20 +- .../apache/solr/AnalysisAfterCoreReloadTest.java | 4 - .../test/org/apache/solr/SolrTestCaseJ4Test.java | 4 - .../test/org/apache/solr/TestGroupingSearch.java | 6 - .../apache/solr/TestHighlightDedupGrouping.java | 8 +- .../test/org/apache/solr/cli/PackageToolTest.java | 9 +- .../apache/solr/cli/SolrProcessManagerTest.java | 2 - .../org/apache/solr/cli/TestSolrCLIRunExample.java | 9 - .../org/apache/solr/cli/ZkSubcommandsTest.java | 55 +- .../embedded/TestEmbeddedSolrServerSchemaAPI.java | 1 - .../solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 1 - ...aosMonkeyNothingIsSafeWithPullReplicasTest.java | 1 - .../solr/cloud/ChaosMonkeySafeLeaderTest.java | 1 - .../ChaosMonkeySafeLeaderWithPullReplicasTest.java | 1 - .../apache/solr/cloud/ClusterStateUpdateTest.java | 7 - .../apache/solr/cloud/CollectionsAPISolrJTest.java | 38 +- .../solr/cloud/DeleteCoreRemnantsOnCreateTest.java | 320 ++++++++++++ .../solr/cloud/LeaderElectionIntegrationTest.java | 6 - .../cloud/LeaderFailureAfterFreshStartTest.java | 122 +++-- .../solr/cloud/LeaderVoteWaitTimeoutTest.java | 5 - .../solr/cloud/MissingSegmentRecoveryTest.java | 1 - .../OutOfBoxZkACLAndCredentialsProvidersTest.java | 6 - ...OverriddenZkACLAndCredentialsProvidersTest.java | 6 - .../OverseerCollectionConfigSetProcessorTest.java | 27 +- .../test/org/apache/solr/cloud/OverseerTest.java | 2 - .../apache/solr/cloud/PeerSyncReplicationTest.java | 182 ++++--- .../solr/cloud/RecoveryAfterSoftCommitTest.java | 3 - .../solr/cloud/RestartWhileUpdatingTest.java | 8 - .../solr/cloud/TestAuthenticationFramework.java | 1 - .../apache/solr/cloud/TestBaseStatsCacheCloud.java | 7 - .../apache/solr/cloud/TestCloudConsistency.java | 5 +- .../org/apache/solr/cloud/TestConfigSetsAPI.java | 27 +- .../solr/cloud/TestConfigSetsAPIShareSchema.java | 6 - .../org/apache/solr/cloud/TestPrepRecovery.java | 6 - .../org/apache/solr/cloud/TestPullReplica.java | 2 - .../org/apache/solr/cloud/TestSegmentSorting.java | 2 - .../solr/cloud/TestTlogReplayVsRecovery.java | 3 - .../cloud/TlogReplayBufferedWhileIndexingTest.java | 10 +- .../VMParamsZkACLAndCredentialsProvidersTest.java | 6 - .../AsyncCallRequestStatusResponseTest.java | 5 +- .../BackupRestoreApiErrorConditionsTest.java | 6 - .../api/collections/CollectionApiLockingTest.java | 40 +- .../solr/cloud/overseer/ZkStateWriterTest.java | 7 - .../cluster/events/ClusterEventProducerTest.java | 1 - .../org/apache/solr/core/DirectoryFactoryTest.java | 2 - .../test/org/apache/solr/core/TestBadConfig.java | 7 +- .../org/apache/solr/core/TestCodecSupport.java | 9 +- .../src/test/org/apache/solr/core/TestConfig.java | 6 - .../org/apache/solr/core/TestCoreContainer.java | 19 - .../org/apache/solr/core/TestCoreDiscovery.java | 10 +- .../org/apache/solr/core/TestImplicitPlugins.java | 78 +++ .../src/test/org/apache/solr/core/TestNRTOpen.java | 9 - .../apache/solr/core/TestReloadAndDeleteDocs.java | 1 - .../apache/solr/core/TestSolrDeletionPolicy2.java | 3 - .../apache/solr/core/TestTracerConfigurator.java | 15 +- .../core/snapshots/TestSolrCloudSnapshots.java | 8 - .../solr/core/snapshots/TestSolrCoreSnapshots.java | 8 - .../solr/filestore/TestDistribFileStore.java | 6 - .../apache/solr/handler/ReplicationTestHelper.java | 7 + .../solr/handler/RequestHandlerMetricsTest.java | 6 - .../apache/solr/handler/TestContainerPlugin.java | 1 - .../solr/handler/TestReplicationHandler.java | 8 +- .../TestReplicationHandlerDiskOverFlow.java | 2 - .../solr/handler/TestStressIncrementalBackup.java | 2 - .../solr/handler/TestStressThreadBackup.java | 6 - .../admin/SegmentsInfoRequestHandlerTest.java | 3 - .../handler/admin/UpgradeCoreIndexActionTest.java | 380 ++++++++++++++ .../admin/api/AddReplicaPropertyAPITest.java | 81 +-- .../solr/handler/admin/api/BackupCoreAPITest.java | 25 +- .../admin/api/BalanceShardUniqueAPITest.java | 64 +-- .../handler/admin/api/CoreSnapshotAPITest.java | 30 +- .../solr/handler/admin/api/CreateAliasAPITest.java | 141 +++--- .../handler/admin/api/CreateCollectionAPITest.java | 112 +++-- .../admin/api/CreateCollectionSnapshotAPITest.java | 90 ++-- .../handler/admin/api/CreateReplicaAPITest.java | 94 ++-- .../solr/handler/admin/api/CreateShardAPITest.java | 95 ++-- .../solr/handler/admin/api/DeleteAliasAPITest.java | 117 ++++- .../handler/admin/api/DeleteCollectionAPITest.java | 69 +-- .../admin/api/DeleteCollectionBackupAPITest.java | 148 +++--- .../admin/api/DeleteCollectionSnapshotAPITest.java | 84 ++-- .../solr/handler/admin/api/DeleteNodeAPITest.java | 194 +++++-- .../handler/admin/api/DeleteReplicaAPITest.java | 175 ++++--- .../admin/api/DeleteReplicaPropertyAPITest.java | 71 ++- .../solr/handler/admin/api/DeleteShardAPITest.java | 79 +-- .../solr/handler/admin/api/ForceLeaderAPITest.java | 32 +- .../handler/admin/api/MigrateReplicasAPITest.java | 88 +--- .../solr/handler/admin/api/MockV2APITest.java | 123 +++++ .../handler/admin/api/ReloadCollectionAPITest.java | 43 +- .../solr/handler/admin/api/ReloadCoreAPITest.java | 11 +- .../solr/handler/admin/api/ReplaceNodeAPITest.java | 110 ++-- .../admin/api/RestoreCollectionAPITest.java | 146 +++--- .../solr/handler/admin/api/SyncShardAPITest.java | 32 +- .../solr/handler/admin/api/UnloadCoreAPITest.java | 11 +- .../admin/api/V2CollectionBackupApiTest.java | 98 ++-- .../solr/handler/component/BadComponentTest.java | 1 - .../component/DistributedMLTComponentTest.java | 6 - .../handler/component/ShardsAllowListTest.java | 8 +- .../TermVectorComponentDistributedTest.java | 6 - .../handler/component/TestShardHandlerFactory.java | 1 - .../solr/handler/export/TestExportWriter.java | 304 ++++++++++- .../highlight/HighlighterWithoutStoredIdTest.java | 7 - .../solr/highlight/TestUnifiedSolrHighlighter.java | 10 - .../TestUnifiedSolrHighlighterWithoutStoredId.java | 7 - .../solr/pkg/PackageStoreSchemaPluginsTest.java | 1 - .../src/test/org/apache/solr/pkg/TestPackages.java | 1 - .../response/TestFileStreamResponseWriter.java | 149 ++++++ .../solr/response/TestResponseWritersRegistry.java | 64 +++ .../analysis/TestManagedStopFilterFactory.java | 2 - .../TestManagedSynonymGraphFilterFactory.java | 2 - .../apache/solr/schema/DenseVectorFieldTest.java | 14 +- .../schema/ManagedSchemaRoundRobinCloudTest.java | 6 - .../schema/SchemaVersionSpecificBehaviorTest.java | 17 +- .../solr/schema/SpatialRPTFieldTypeTest.java | 2 - .../org/apache/solr/schema/TestManagedSchema.java | 2 - .../apache/solr/schema/TestManagedSchemaAPI.java | 6 - .../schema/TestManagedSchemaWithMultipleAdd.java | 7 - .../solr/schema/TestUseDocValuesAsStored.java | 2 - .../solr/search/ComponentStageLimitsTest.java | 1 - .../org/apache/solr/search/LargeFieldTest.java | 7 - .../apache/solr/search/TestCpuAllowedLimit.java | 1 - .../solr/search/TestDocValuesIteratorCache.java | 6 - .../org/apache/solr/search/TestIndexSearcher.java | 6 - .../apache/solr/search/TestMainQueryCaching.java | 2 - .../apache/solr/search/TestMemAllowedLimit.java | 1 - .../test/org/apache/solr/search/TestRecovery.java | 9 - .../join/BlockJoinMultiValuedVectorsTest.java | 330 ++++++++++++ .../BlockJoinNestedVectorsParentQParserTest.java | 556 +++++++++++++++++++++ .../search/join/BlockJoinNestedVectorsTest.java | 254 ++++++++++ .../solr/search/stats/TestBaseStatsCache.java | 1 - .../solr/search/stats/TestDefaultStatsCache.java | 1 - .../apache/solr/search/stats/TestDistribIDF.java | 1 - .../apache/solr/servlet/HideStackTraceTest.java | 9 +- .../solr/servlet/TestRequestRateLimiter.java | 25 +- .../solr/spelling/suggest/SuggesterTest.java | 13 - .../solr/update/DirectUpdateHandlerTest.java | 14 - .../apache/solr/update/MaxSizeAutoCommitTest.java | 1 - .../apache/solr/update/SolrCmdDistributorTest.java | 7 - .../apache/solr/update/SolrIndexConfigTest.java | 22 +- .../solr/update/TestAtomicUpdateErrorCases.java | 1 - .../solr/update/TestIndexingPerformance.java | 12 - .../processor/DistributedUpdateProcessorTest.java | 1 - .../org/apache/solr/util/TestCborDataFormat.java | 1 - .../org/apache/solr/util/TestCircuitBreakers.java | 64 ++- .../apache/solr/util/TestGlobalCircuitBreaker.java | 1 - .../org/apache/solr/util/TestSystemIdResolver.java | 6 - .../manager/consumer/KafkaCrossDcConsumer.java | 38 +- .../messageprocessor/SolrMessageProcessor.java | 29 +- .../manager/consumer/KafkaCrossDcConsumerTest.java | 8 +- .../messageprocessor/SolrMessageProcessorTest.java | 6 +- .../apache/solr/crossdc/common/IQueueHandler.java | 12 +- .../handler/MirroringCollectionsHandlerTest.java | 10 - solr/modules/cuvs/build.gradle | 4 - solr/modules/cuvs/gradle.lockfile | 6 +- solr/modules/extraction/build.gradle | 6 +- solr/modules/extraction/gradle.lockfile | 10 +- .../ExtractingRequestHandlerTikaServerTest.java | 3 - .../TextToVectorUpdateProcessorFactory.java | 26 +- .../solrconfig-language-models-no-components.xml | 53 ++ ...olrconfig-language-models-query-parser-only.xml | 57 +++ ...nguage-models-update-request-processor-only.xml | 62 +++ .../solr/languagemodels/TestLanguageModelBase.java | 1 - .../rest/TestManagedModelStoreInitialization.java | 67 +++ .../org/apache/solr/ltr/TestLTROnSolrCloud.java | 1 - .../test/org/apache/solr/ltr/TestRerankBase.java | 7 - .../CustomTestOtelTracerConfigurator.java | 1 - .../opentelemetry/OtelTracerConfiguratorTest.java | 12 - solr/modules/sql/build.gradle | 3 - solr/modules/sql/gradle.lockfile | 24 +- .../pages/configuring-solr-xml.adoc | 5 +- .../configuration-guide/pages/core-discovery.adoc | 2 + .../configuration-guide/pages/coreadmin-api.adoc | 88 ++++ .../configuration-guide/pages/solr-properties.adoc | 2 + .../pages/system-info-handler.adoc | 4 +- .../pages/collection-management.adoc | 69 ++- .../modules/deployment-guide/pages/solrj.adoc | 1 + .../query-guide/pages/common-query-parameters.adoc | 3 +- .../query-guide/pages/dense-vector-search.adoc | 131 ++++- .../query-guide/pages/exporting-result-sets.adoc | 73 ++- .../modules/query-guide/pages/text-to-vector.adoc | 35 +- solr/solrj-jetty/build.gradle | 2 - .../client/solrj/jetty/HttpJettySolrClient.java | 86 ++-- .../jetty/ConcurrentUpdateJettySolrClientTest.java | 405 ++------------- .../solrj/jetty/HttpJettySolrClientTest.java | 10 - solr/solrj-streaming/build.gradle | 8 +- solr/solrj-streaming/gradle.lockfile | 64 +-- solr/solrj-zookeeper/build.gradle | 6 +- solr/solrj-zookeeper/gradle.lockfile | 89 ++-- solr/solrj/build.gradle | 10 - solr/solrj/gradle.lockfile | 55 +- .../solrj/impl/ConcurrentUpdateBaseSolrClient.java | 4 +- .../solrj/impl/ConcurrentUpdateJdkSolrClient.java | 102 ++++ .../solr/client/solrj/impl/HttpJdkSolrClient.java | 18 +- .../solr/client/solrj/impl/LBAsyncSolrClient.java | 16 +- .../solr/client/solrj/impl/LBSolrClient.java | 16 +- .../client/solrj/response/RequestStatusState.java | 19 +- .../apache/solr/common/params/CoreAdminParams.java | 3 +- .../apache/solr/common/params/UpdateParams.java | 3 + .../org/apache/solr/common/util/RetryUtil.java | 45 ++ .../client/solrj/MergeIndexesExampleTestBase.java | 8 +- .../solr/client/solrj/TestLBHttpSolrClient.java | 14 - .../AbstractEmbeddedSolrServerTestCase.java | 4 - .../client/solrj/embedded/JettyWebappTest.java | 3 - .../solrj/embedded/MergeIndexesEmbeddedTest.java | 7 - .../solrj/impl/ClusterStateProviderTest.java | 4 +- .../impl/ConcurrentUpdateJdkSolrClientTest.java | 122 +++++ .../impl/ConcurrentUpdateSolrClientTestBase.java} | 178 +++---- .../client/solrj/impl/HttpSolrClientTestBase.java | 3 - .../solr/client/solrj/impl/LB2SolrClientTest.java | 201 +++++++- .../solr/client/solrj/request/SchemaTest.java | 11 +- solr/test-framework/build.gradle | 10 +- solr/test-framework/gradle.lockfile | 12 +- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 41 +- .../solr/cloud/AbstractFullDistribZkTestBase.java | 16 - .../org/apache/solr/cloud/AbstractZkTestCase.java | 5 - .../apache/solr/cloud/SolrCloudAuthTestCase.java | 6 - .../org/apache/solr/cloud/SolrCloudTestCase.java | 7 + .../AbstractCloudBackupRestoreTestCase.java | 7 - .../org/apache/solr/embedded/JettySolrRunner.java | 26 +- .../solr/cloud/MiniSolrCloudClusterTest.java | 71 ++- solr/webapp/build.gradle | 1 - solr/webapp/gradle.lockfile | 246 ++++----- solr/webapp/web/WEB-INF/web.xml | 12 +- 388 files changed, 8916 insertions(+), 4399 deletions(-)
