This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-16858 in repository https://gitbox.apache.org/repos/asf/solr.git
commit cf26b6c1f451677efde2cee877722b0332610a0e Merge: 68d2c743f30 b5db1791649 Author: Chris Hostetter <[email protected]> AuthorDate: Tue Jan 16 16:14:07 2024 -0700 Merge branch 'main' into jira/SOLR-16858 .asf.yaml | 19 ++ .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/labeler.yml | 172 +++++++++++++ .github/workflows/labeler.yml | 13 + NOTICE.txt | 2 +- dev-docs/FAQ.adoc | 7 + dev-tools/scripts/githubPRs.py | 6 +- dev-tools/scripts/releaseWizard.yaml | 13 +- dev-tools/scripts/requirements.txt | 2 +- gradle/globals.gradle | 2 +- gradle/validation/git-status.gradle | 14 +- solr/CHANGES.txt | 22 ++ .../solr/client/api/endpoint/MergeIndexesApi.java | 52 ++++ .../client/api/model/MergeIndexesRequestBody.java} | 42 ++-- solr/bin/solr | 42 +--- solr/bin/solr.cmd | 10 +- solr/bin/solr.in.cmd | 5 +- solr/bin/solr.in.sh | 5 +- .../core/src/java/org/apache/solr/cli/SolrCLI.java | 16 +- .../org/apache/solr/cloud/RecoveryStrategy.java | 34 ++- .../api/collections/CollectionHandlingUtils.java | 9 +- .../api/collections/ReindexCollectionCmd.java | 44 ++-- .../java/org/apache/solr/core/CoreContainer.java | 7 +- .../solr/core/FileSystemConfigSetService.java | 5 +- .../src/java/org/apache/solr/core/SolrCore.java | 17 +- .../org/apache/solr/core/TracerConfigurator.java | 5 +- .../java/org/apache/solr/handler/IndexFetcher.java | 54 ++-- .../apache/solr/handler/ReplicationHandler.java | 4 +- .../org/apache/solr/handler/SolrConfigHandler.java | 33 +-- .../solr/handler/admin/CoreAdminHandler.java | 6 +- .../apache/solr/handler/admin/MergeIndexesOp.java | 128 ++-------- .../solr/handler/admin/api/MergeIndexes.java | 211 ++++++++++++++++ .../solr/handler/admin/api/MergeIndexesAPI.java | 88 ------- .../handler/component/IterativeMergeStrategy.java | 10 +- .../apache/solr/handler/export/ExportWriter.java | 77 +++--- .../src/java/org/apache/solr/pkg/PackageAPI.java | 4 +- .../java/org/apache/solr/schema/IndexSchema.java | 77 +++++- .../org/apache/solr/schema/ManagedIndexSchema.java | 124 ++-------- .../org/apache/solr/search/SolrReturnFields.java | 5 +- .../solr/search/function/FileFloatSource.java | 3 +- .../org/apache/solr/update/PeerSyncWithLeader.java | 10 +- .../apache/solr/update/StreamingSolrClients.java | 7 +- .../org/apache/solr/util/FileTypeMagicUtil.java | 93 ++++--- .../src/java/org/apache/solr/util/ModuleUtils.java | 14 +- .../org/apache/solr/util/StartupLoggingUtils.java | 3 +- .../circuitbreaker/CircuitBreakerRegistry.java | 5 +- .../src/resources/EnvToSyspropMappings.properties | 97 ++++++++ .../solr/core/ConfigureRecoveryStrategyTest.java | 4 +- .../test/org/apache/solr/core/SolrCoreTest.java | 60 +++++ .../solr/handler/admin/MetricsHandlerTest.java | 4 + .../solr/handler/admin/api/MergeIndexesTest.java | 115 +++++++++ .../handler/admin/api/V2CoreAPIMappingTest.java | 27 -- .../solr/handler/export/TestExportWriter.java | 37 +++ .../solr/schema/ResolveAnalyzerByNameTest.java | 10 + .../apache/solr/update/SolrCmdDistributorTest.java | 27 +- .../apache/solr/util/FileTypeMagicUtilTest.java | 58 ++--- solr/licenses/byte-buddy-1.14.10.jar.sha1 | 1 + solr/licenses/byte-buddy-1.14.6.jar.sha1 | 1 - solr/licenses/commons-cli-1.5.0.jar.sha1 | 1 - solr/licenses/commons-cli-1.6.0.jar.sha1 | 1 + solr/licenses/http2-client-10.0.18.jar.sha1 | 1 - solr/licenses/http2-client-10.0.19.jar.sha1 | 1 + solr/licenses/http2-common-10.0.18.jar.sha1 | 1 - solr/licenses/http2-common-10.0.19.jar.sha1 | 1 + solr/licenses/http2-hpack-10.0.18.jar.sha1 | 1 - solr/licenses/http2-hpack-10.0.19.jar.sha1 | 1 + .../http2-http-client-transport-10.0.18.jar.sha1 | 1 - .../http2-http-client-transport-10.0.19.jar.sha1 | 1 + solr/licenses/http2-server-10.0.18.jar.sha1 | 1 - solr/licenses/http2-server-10.0.19.jar.sha1 | 1 + solr/licenses/jackson-annotations-2.15.3.jar.sha1 | 1 - solr/licenses/jackson-annotations-2.16.1.jar.sha1 | 1 + solr/licenses/jackson-core-2.15.3.jar.sha1 | 1 - solr/licenses/jackson-core-2.16.1.jar.sha1 | 1 + solr/licenses/jackson-databind-2.15.3.jar.sha1 | 1 - solr/licenses/jackson-databind-2.16.1.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.15.3.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.16.1.jar.sha1 | 1 + .../jackson-dataformat-smile-2.15.3.jar.sha1 | 1 - .../jackson-dataformat-smile-2.16.1.jar.sha1 | 1 + .../jackson-dataformat-xml-2.15.3.jar.sha1 | 1 - .../jackson-dataformat-xml-2.16.1.jar.sha1 | 1 + .../licenses/jackson-datatype-jdk8-2.15.3.jar.sha1 | 1 - .../licenses/jackson-datatype-jdk8-2.16.1.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.15.3.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.16.1.jar.sha1 | 1 + ...jackson-module-jaxb-annotations-2.15.3.jar.sha1 | 1 - ...jackson-module-jaxb-annotations-2.16.1.jar.sha1 | 1 + .../licenses/jackson-module-kotlin-2.15.3.jar.sha1 | 1 - .../licenses/jackson-module-kotlin-2.16.1.jar.sha1 | 1 + .../jackson-module-parameter-names-2.15.3.jar.sha1 | 1 - .../jackson-module-parameter-names-2.16.1.jar.sha1 | 1 + solr/licenses/jcl-over-slf4j-2.0.10.jar.sha1 | 1 + solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1 | 1 - solr/licenses/jetty-alpn-client-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-alpn-client-10.0.19.jar.sha1 | 1 + .../jetty-alpn-java-client-10.0.18.jar.sha1 | 1 - .../jetty-alpn-java-client-10.0.19.jar.sha1 | 1 + .../jetty-alpn-java-server-10.0.18.jar.sha1 | 1 - .../jetty-alpn-java-server-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-alpn-server-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-alpn-server-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-client-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-client-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-deploy-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-deploy-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-http-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-http-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-io-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-io-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-jmx-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-jmx-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-rewrite-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-rewrite-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-security-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-security-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-server-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-server-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-servlet-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-servlet-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-servlets-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-servlets-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-start-10.0.18-shaded.jar.sha1 | 1 - solr/licenses/jetty-start-10.0.19-shaded.jar.sha1 | 1 + solr/licenses/jetty-util-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-util-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-webapp-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-webapp-10.0.19.jar.sha1 | 1 + solr/licenses/jetty-xml-10.0.18.jar.sha1 | 1 - solr/licenses/jetty-xml-10.0.19.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.10.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.9.jar.sha1 | 1 - solr/licenses/mockito-core-5.5.0.jar.sha1 | 1 - solr/licenses/mockito-core-5.8.0.jar.sha1 | 1 + ....0.jar.sha1 => mockito-subclass-5.8.0.jar.sha1} | 0 solr/licenses/netty-buffer-4.1.101.Final.jar.sha1 | 1 - solr/licenses/netty-buffer-4.1.104.Final.jar.sha1 | 1 + solr/licenses/netty-codec-4.1.101.Final.jar.sha1 | 1 - solr/licenses/netty-codec-4.1.104.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.101.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.104.Final.jar.sha1 | 1 + .../netty-codec-http2-4.1.101.Final.jar.sha1 | 1 - .../netty-codec-http2-4.1.104.Final.jar.sha1 | 1 + .../netty-codec-socks-4.1.101.Final.jar.sha1 | 1 - .../netty-codec-socks-4.1.104.Final.jar.sha1 | 1 + solr/licenses/netty-common-4.1.101.Final.jar.sha1 | 1 - solr/licenses/netty-common-4.1.104.Final.jar.sha1 | 1 + solr/licenses/netty-handler-4.1.101.Final.jar.sha1 | 1 - solr/licenses/netty-handler-4.1.104.Final.jar.sha1 | 1 + .../netty-handler-proxy-4.1.101.Final.jar.sha1 | 1 - .../netty-handler-proxy-4.1.104.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.101.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.104.Final.jar.sha1 | 1 + .../netty-transport-4.1.101.Final.jar.sha1 | 1 - .../netty-transport-4.1.104.Final.jar.sha1 | 1 + ...-transport-classes-epoll-4.1.101.Final.jar.sha1 | 1 - ...-transport-classes-epoll-4.1.104.Final.jar.sha1 | 1 + ...ative-epoll-4.1.101.Final-linux-x86_64.jar.sha1 | 1 - ...ative-epoll-4.1.104.Final-linux-x86_64.jar.sha1 | 1 + ...sport-native-unix-common-4.1.101.Final.jar.sha1 | 1 - ...sport-native-unix-common-4.1.104.Final.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.10.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.9.jar.sha1 | 1 - solr/packaging/test/test_auth.bats | 14 ++ .../solr/prometheus/scraper/SolrScraper.java | 10 +- .../configuration-guide/pages/coreadmin-api.adoc | 53 +++- .../pages/property-substitution.adoc | 6 +- .../deployment-guide/pages/docker-networking.adoc | 2 +- .../pages/jwt-authentication-plugin.adoc | 2 +- .../pages/solr-control-script-reference.adoc | 8 +- .../query-guide/pages/exporting-result-sets.adoc | 5 +- .../pages/stream-decorator-reference.adoc | 3 +- .../query-guide/pages/stream-source-reference.adoc | 3 + .../pages/major-changes-in-solr-9.adoc | 3 + .../solr/client/solrj/io/SolrClientCache.java | 45 +++- .../solr/client/solrj/io/stream/SelectStream.java | 30 ++- solr/solrj-streaming/src/test-files/log4j2.xml | 42 ++++ .../solr/client/solrj/io/SolrClientCacheTest.java | 77 ++++++ .../io/stream/StreamExpressionToExpessionTest.java | 3 +- .../solrj/impl/ZkClientClusterStateProvider.java | 11 +- .../org/apache/solr/common/cloud/SolrZkClient.java | 24 +- .../apache/solr/common/cloud/ZkStateReader.java | 15 +- .../org/apache/solr/client/solrj/SolrClient.java | 10 + .../org/apache/solr/client/solrj/SolrRequest.java | 13 + .../solrj/impl/BaseHttpClusterStateProvider.java | 1 + .../client/solrj/impl/CloudHttp2SolrClient.java | 14 +- .../client/solrj/impl/CloudLegacySolrClient.java | 29 ++- .../solr/client/solrj/impl/CloudSolrClient.java | 6 - .../client/solrj/impl/ClusterStateProvider.java | 6 +- .../impl/ConcurrentUpdateHttp2SolrClient.java | 11 + .../solrj/impl/ConcurrentUpdateSolrClient.java | 3 + .../solr/client/solrj/impl/Http2SolrClient.java | 11 +- .../solr/client/solrj/impl/HttpSolrClient.java | 6 +- .../solr/client/solrj/impl/LBHttp2SolrClient.java | 21 +- .../solr/client/solrj/impl/LBHttpSolrClient.java | 4 + .../solr/client/solrj/impl/LBSolrClient.java | 3 + .../solr/client/solrj/impl/SolrClientBuilder.java | 7 + .../solrj/request/AbstractUpdateRequest.java | 3 +- ...chemaRequest.java => DataStoreSolrRequest.java} | 23 +- .../client/solrj/request/DirectXmlRequest.java | 4 +- .../solrj/request/DocumentAnalysisRequest.java | 3 +- .../client/solrj/request/FieldAnalysisRequest.java | 3 +- .../solr/client/solrj/request/LukeRequest.java | 3 +- .../solr/client/solrj/request/QueryRequest.java | 3 +- .../apache/solr/client/solrj/request/SolrPing.java | 3 +- .../request/schema/AbstractSchemaRequest.java | 5 +- .../apache/solr/client/solrj/util/ClientUtils.java | 14 ++ .../java/org/apache/solr/common/util/EnvUtils.java | 275 +++++++++++++++++++++ .../util/{URLUtil.java => GlobPatternUtil.java} | 45 ++-- .../apache/solr/common/util/PropertiesUtil.java | 2 +- .../java/org/apache/solr/common/util/URLUtil.java | 37 +++ solr/solrj/src/test-files/solrj/solr/solr.xml | 3 + .../impl/CloudHttp2SolrClientBuilderTest.java | 11 + .../solrj/impl/CloudSolrClientBuilderTest.java | 10 + .../ConcurrentUpdateSolrClientBuilderTest.java | 11 + .../solrj/impl/HttpSolrClientBuilderTest.java | 9 + .../solrj/impl/LBHttpSolrClientBuilderTest.java | 11 + .../solrj/response/TestSuggesterResponse.java | 3 +- .../solr/client/solrj/util/ClientUtilsTest.java | 19 ++ .../org/apache/solr/common/util/EnvUtilsTest.java | 119 +++++++++ .../{URLUtilTest.java => TestGlobPatternUtil.java} | 22 +- .../org/apache/solr/common/util/URLUtilTest.java | 63 +++++ .../apache/solr/BaseDistributedSearchTestCase.java | 11 +- .../src/java/org/apache/solr/SolrTestCase.java | 3 +- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 + .../java/org/apache/solr/cloud/ConfigRequest.java | 3 +- .../apache/solr/cloud/MiniSolrCloudCluster.java | 1 + versions.lock | 110 ++++----- versions.props | 12 +- 229 files changed, 2516 insertions(+), 905 deletions(-)
