This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/solr-17917-lucene-10.3-upgrade in repository https://gitbox.apache.org/repos/asf/solr.git
commit f3e2784856fd5d0b816a49b5e1b3c35a506499cf Merge: d57c4a8bea6 5782bdc0b65 Author: Chris Hostetter <[email protected]> AuthorDate: Wed Oct 1 17:17:38 2025 -0700 Merge branch 'main' into jira/solr-17917-lucene-10.3-upgrade dev-docs/dependency-upgrades.adoc | 8 +- dev-docs/gradle-help/README.md | 24 + {help => dev-docs/gradle-help}/ant.txt | 0 {help => dev-docs/gradle-help}/dependencies.txt | 0 .../gradle-help/docker.txt | 0 {help => dev-docs/gradle-help}/forbiddenApis.txt | 0 {help => dev-docs/gradle-help}/formatting.txt | 0 {help => dev-docs/gradle-help}/git.txt | 0 {help => dev-docs/gradle-help}/localSettings.txt | 0 {help => dev-docs/gradle-help}/publishing.txt | 0 {help => dev-docs/gradle-help}/tests.txt | 0 .../gradle-help}/validateLogCalls.txt | 0 {help => dev-docs/gradle-help}/workflow.txt | 0 dev-docs/lucene-upgrade.md | 2 +- dev-tools/scripts/releaseWizard.yaml | 4 +- gradle/globals.gradle | 5 + gradle/help.gradle | 22 +- gradle/libs.versions.toml | 2 + .../randomization/policies/solr-tests.policy | 2 + gradle/validation/spotless.gradle | 2 +- settings.gradle | 1 + solr/CHANGES.txt | 19 + .../solr/client/api/model/CreateCoreParams.java | 5 - solr/bin/solr | 2 +- solr/bin/solr.cmd | 8 +- .../java/org/apache/solr/core/CoreContainer.java | 116 +---- .../java/org/apache/solr/core/CoreDescriptor.java | 8 - .../src/java/org/apache/solr/core/NodeConfig.java | 18 - .../src/java/org/apache/solr/core/SolrCores.java | 112 +---- .../java/org/apache/solr/core/SolrXmlConfig.java | 4 - .../apache/solr/core/TransientSolrCoreCache.java | 119 ----- .../solr/core/TransientSolrCoreCacheDefault.java | 184 -------- .../org/apache/solr/core/TransientSolrCores.java | 173 -------- .../solr/handler/admin/CoreAdminHandler.java | 1 - .../handler/component/HttpShardHandlerFactory.java | 7 - .../solr/handler/component/QueryComponent.java | 11 +- .../solr/handler/component/ResponseBuilder.java | 19 + .../solr/handler/component/SearchHandler.java | 17 +- .../apache/solr/search/DelegatingCollector.java | 18 +- .../java/org/apache/solr/search/QueryLimit.java | 14 + .../java/org/apache/solr/search/QueryLimits.java | 84 +++- .../org/apache/solr/search/TimeAllowedLimit.java | 67 ++- .../TopGroupsShardRequestFactory.java | 22 +- .../apache/solr/security/AllowListUrlChecker.java | 25 +- .../org/apache/solr/security/MultiAuthPlugin.java | 14 +- .../conf/solrconfig-implicitproperties.xml | 1 - ...auth_plugin_with_basic_and_xbasic_security.json | 26 ++ ...multi_auth_plugin_with_basic_only_security.json | 17 + ...i_auth_plugin_with_mock_and_basic_security.json | 22 + .../multi_auth_plugin_with_xbasic_security.json | 22 + solr/core/src/test-files/solr/solr-50-all.xml | 1 - .../src/test-files/solr/solr-transientCores.xml | 20 - .../test/org/apache/solr/TestCpuTimeSearch.java | 2 - .../org/apache/solr/TestDistributedGrouping.java | 109 ++++- .../test/org/apache/solr/TestTolerantSearch.java | 4 +- .../org/apache/solr/core/TestCoreDiscovery.java | 139 ++---- .../solr/core/TestImplicitCoreProperties.java | 6 +- .../test/org/apache/solr/core/TestLazyCores.java | 487 +-------------------- .../src/test/org/apache/solr/core/TestSolrXml.java | 1 - .../handler/TestHealthCheckHandlerLegacyMode.java | 2 +- .../solr/handler/TestReplicationHandler.java | 6 +- .../TestUserManagedReplicationWithAuth.java | 2 +- .../solr/handler/admin/MetricsHandlerTest.java | 10 +- .../solr/handler/admin/V2CoresAPIMappingTest.java | 2 - .../component/DistributedDebugComponentTest.java | 4 +- .../solr/metrics/SolrMetricsIntegrationTest.java | 1 - .../org/apache/solr/search/TestQueryLimits.java | 59 ++- .../org/apache/solr/search/TestSmileRequest.java | 4 +- .../solr/search/facet/TestJsonFacetErrors.java | 14 +- .../solr/search/facet/TestJsonFacetRefinement.java | 16 +- .../apache/solr/search/facet/TestJsonFacets.java | 28 +- .../facet/TestJsonFacetsWithNestedObjects.java | 2 +- .../solr/search/facet/TestJsonRangeFacets.java | 12 +- .../apache/solr/search/json/TestJsonRequest.java | 6 +- .../apache/solr/security/MultiAuthPluginTest.java | 235 ++++++++++ solr/docker/build.gradle | 2 +- solr/licenses/cuvs-java-25.10.0.jar.sha1 | 1 + solr/licenses/cuvs-java-LICENSE-ASL.txt | 201 +++++++++ solr/licenses/cuvs-java-NOTICE.txt | 0 solr/licenses/cuvs-lucene-25.10.0.jar.sha1 | 1 + solr/licenses/cuvs-lucene-LICENSE-ASL.txt | 201 +++++++++ solr/licenses/cuvs-lucene-NOTICE.txt | 0 solr/modules/cuvs/README.md | 26 ++ .../QueryLimit.java => modules/cuvs/build.gradle} | 27 +- solr/modules/cuvs/gradle.lockfile | 162 +++++++ .../src/java/org/apache/solr/cuvs/CuVSCodec.java | 124 ++++++ .../org/apache/solr/cuvs/CuVSCodecFactory.java | 59 +++ .../java/org/apache/solr/cuvs/package-info.java} | 18 +- solr/modules/cuvs/src/java/overview.html | 21 + solr/modules/cuvs/src/test-files/log4j2.xml | 40 ++ .../test-files/solr/collection1/conf/schema.xml | 34 ++ .../solr/collection1/conf/solrconfig.xml | 41 ++ solr/modules/cuvs/src/test-files/solr/solr.xml | 41 ++ .../apache/solr/cuvs/TestCuVSCodecSupportIT.java | 164 +++++++ solr/server/etc/security.policy | 3 + .../pages/configuring-solr-xml.adoc | 10 - .../configuration-guide/pages/core-discovery.adoc | 11 - .../modules/configuration-guide/pages/libs.adoc | 31 +- .../pages/property-substitution.adoc | 1 - .../pages/basic-authentication-plugin.adoc | 31 +- .../deployment-guide/pages/metrics-reporting.adoc | 3 +- .../query-guide/pages/common-query-parameters.adoc | 4 + .../query-guide/pages/dense-vector-search.adoc | 279 +++++++++++- .../pages/major-changes-in-solr-10.adoc | 2 + .../pages/major-changes-in-solr-8.adoc | 2 +- .../solr/client/solrj/impl/NodeValueFetcher.java | 2 +- .../solr/client/solrj/impl/LBSolrClient.java | 8 + .../client/solrj/request/CoreAdminRequest.java | 13 - .../apache/solr/common/params/CoreAdminParams.java | 2 - .../DeprecatedSystemPropertyMappings.properties | 5 +- .../solr/client/solrj/request/TestCoreAdmin.java | 4 - .../apache/solr/BaseDistributedSearchTestCase.java | 9 +- .../src/java/org/apache/solr/SolrTestCaseHS.java | 80 +--- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 +- .../commonMain/composeResources/values/strings.xml | 1 + .../solr/ui/components/auth/BasicAuthComponent.kt | 2 +- .../integration/DefaultAuthenticationComponent.kt | 13 +- .../start/integration/HttpStartStoreClient.kt | 41 +- .../kotlin/org/apache/solr/ui/domain/AuthMethod.kt | 4 +- .../kotlin/org/apache/solr/ui/domain/AuthOption.kt | 4 +- .../org/apache/solr/ui/utils/HttpClientUtils.kt | 8 +- .../apache/solr/ui/views/auth/BasicAuthContent.kt | 5 +- solr/webapp/web/WEB-INF/web.xml | 2 +- 123 files changed, 2468 insertions(+), 1682 deletions(-) diff --cc solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc index 98efce79f94,9df9dc71a7a..78927356d2c --- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc +++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc @@@ -166,10 -166,10 +166,12 @@@ Nowadays, the HTTP request is availabl * The ConcurrentMergeScheduler's autoIOThrottle default changed to `false` but `true` may be configured to retain prior behaviour. (SOLR-17631). +* The TieredMergePolicy's segmentsPerTier default changed to `8` but `10` may be configured to retain prior behaviour. (SOLR-17917). + * BlobHandler and the `.system` collection have been removed in favour of FileStore API. (SOLR-17851). + * The deprecated transient Solr cores capability has been removed. (SOLR-17932) + === Security
