This is an automated email from the ASF dual-hosted git repository.

houston pushed a change to branch SOLR-17065-cross-dc
in repository https://gitbox.apache.org/repos/asf/solr.git


    from b7cf17e2f7e Merge remote-tracking branch 'apache/main' into 
SOLR-17065-cross-dc
     add 390c30ff56a SOLR-17349: SolrDocumentFetcher should always skip lazy 
field loading overhead if documentCache==null (#2535)
     add 0df3e63ffbd SOLR-16824: Adopt Linux Command line tool pattern of -- 
for long option commands (#1768)
     add 08d0fc18a0a SOLR-17325: Upgrade Lucene to 9.11.1
     add c25e4a103d0 Run more workflows for branch_9x (#2543)
     add e36a6de63f0 Github workflows run on branch pattern 'branch_*'
     add d0aad69c0ff SOLR-17302: Convert remaining filestore APIs to JAX-RS 
(#2532)
     add aec6e8f7500 Refactor: QueryResult: don't provide to SolrIndexSearcher 
(#2524)
     add c421288aece SOLR-17358: Escape + symbol to render documentation 
correctly (#2547)
     add 07ff1338525 SOLR-17347: Remove ENV storage/retrieval in EnvUtils 
(#2534)
     add 011d713a884 Stalebot: increase to 100 operations per run (#2549)
     new 869701a5d77 Merge remote-tracking branch 'apache/main' into 
SOLR-17065-cross-dc

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/bin-solr-test.yml                |   1 +
 .github/workflows/docker-test.yml                  |   1 +
 .github/workflows/gradle-precommit.yml             |   3 +-
 .github/workflows/solrj-test.yml                   |   1 +
 .github/workflows/stale.yml                        |   9 +-
 .github/workflows/tests-via-crave.yml              |   1 +
 dev-docs/FAQ.adoc                                  |   3 +-
 dev-tools/scripts/cloud.sh                         |   2 +-
 solr/CHANGES.txt                                   |  13 +
 .../client/api/endpoint/ClusterFileStoreApis.java  |   7 +-
 .../client/api/endpoint/NodeFileStoreApis.java     |  67 +++++
 .../FileStoreDirectoryListingResponse.java}        |  23 +-
 .../client/api/model/FileStoreEntryMetadata.java   |  44 +++
 .../FileStoreJsonFileResponse.java}                |  25 +-
 .../org/apache/solr/client/api/util/Constants.java |   1 +
 solr/bin/solr                                      | 213 +++++++--------
 solr/bin/solr.cmd                                  | 119 +++++----
 solr/core/build.gradle                             |   2 -
 .../core/src/java/org/apache/solr/cli/ApiTool.java |  20 +-
 .../src/java/org/apache/solr/cli/AssertTool.java   |  15 +-
 .../src/java/org/apache/solr/cli/AuthTool.java     |  71 ++---
 .../src/java/org/apache/solr/cli/ClusterTool.java  |   7 +-
 .../org/apache/solr/cli/ConfigSetDownloadTool.java |  22 +-
 .../org/apache/solr/cli/ConfigSetUploadTool.java   |  32 +--
 .../src/java/org/apache/solr/cli/ConfigTool.java   |  11 +-
 .../src/java/org/apache/solr/cli/CreateTool.java   | 100 +++++--
 .../src/java/org/apache/solr/cli/DeleteTool.java   |  53 +++-
 .../src/java/org/apache/solr/cli/ExportTool.java   |  16 +-
 .../java/org/apache/solr/cli/HealthcheckTool.java  |  11 +-
 .../java/org/apache/solr/cli/LinkConfigTool.java   |   7 +-
 .../src/java/org/apache/solr/cli/PackageTool.java  |  57 ++--
 .../src/java/org/apache/solr/cli/PostLogsTool.java |   6 +-
 .../src/java/org/apache/solr/cli/PostTool.java     | 106 +++++---
 .../java/org/apache/solr/cli/RunExampleTool.java   | 103 +++----
 .../core/src/java/org/apache/solr/cli/SolrCLI.java |  95 +++++--
 .../src/java/org/apache/solr/cli/StatusTool.java   |  13 +-
 .../java/org/apache/solr/cli/UpdateACLTool.java    |   3 +-
 .../src/java/org/apache/solr/cli/ZkCpTool.java     |  20 +-
 .../src/java/org/apache/solr/cli/ZkLsTool.java     |  10 +-
 .../src/java/org/apache/solr/cli/ZkMkrootTool.java |   8 +-
 .../src/java/org/apache/solr/cli/ZkMvTool.java     |  20 +-
 .../src/java/org/apache/solr/cli/ZkRmTool.java     |  10 +-
 .../cloud/api/collections/CreateCollectionCmd.java |   2 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   7 +-
 .../apache/solr/filestore/ClusterFileStore.java    |  51 ++--
 .../apache/solr/filestore/DistribFileStore.java    |  17 +-
 .../java/org/apache/solr/filestore/FileStore.java  |   3 +-
 .../org/apache/solr/filestore/FileStoreAPI.java    | 241 -----------------
 .../org/apache/solr/filestore/NodeFileStore.java   | 210 +++++++++++++++
 .../apache/solr/handler/MoreLikeThisHandler.java   |  16 +-
 .../org/apache/solr/handler/api/V2ApiUtils.java    |   4 +
 .../solr/handler/component/QueryComponent.java     |  39 ++-
 .../apache/solr/jersey/SolrRequestAuthorizer.java  |  16 +-
 .../apache/solr/response/RawResponseWriter.java    |   6 +
 .../java/org/apache/solr/search/QueryCommand.java  |   6 +
 .../apache/solr/search/SolrDocumentFetcher.java    |  12 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  | 116 ++++----
 .../apache/solr/uninverting/FieldCacheImpl.java    |   2 +-
 .../java/org/apache/solr/util/SolrPluginUtils.java |  14 +-
 .../src/test/org/apache/solr/cli/AuthToolTest.java |   8 +-
 .../test/org/apache/solr/cli/CreateToolTest.java   |   2 +-
 .../test/org/apache/solr/cli/DeleteToolTest.java   |   6 +-
 .../org/apache/solr/cli/HealthcheckToolTest.java   |   8 +-
 .../test/org/apache/solr/cli/PackageToolTest.java  |  74 ++---
 .../src/test/org/apache/solr/cli/PostToolTest.java |   4 +-
 .../SolrCLIZkToolsTest.java}                       | 297 ++++++++++-----------
 .../org/apache/solr/cli/TestSolrCLIRunExample.java |  22 +-
 .../org/apache/solr/cli/ZkSubcommandsTest.java     |  64 ++---
 .../apache/solr/cloud/SolrCloudExampleTest.java    |  26 +-
 .../apache/solr/handler/api/V2ApiUtilsTest.java    |   5 +
 .../org/apache/solr/search/TestSearchPerf.java     |   9 +-
 .../solr/security/BasicAuthIntegrationTest.java    |   2 +-
 solr/example/README.md                             |   2 +-
 solr/licenses/icu4j-70.1.jar.sha1                  |   1 -
 solr/licenses/icu4j-74.2.jar.sha1                  |   1 +
 .../lucene-analysis-common-9.10.0.jar.sha1         |   1 -
 .../lucene-analysis-common-9.11.1.jar.sha1         |   1 +
 solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1  |   1 -
 solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1  |   1 +
 .../lucene-analysis-kuromoji-9.10.0.jar.sha1       |   1 -
 .../lucene-analysis-kuromoji-9.11.1.jar.sha1       |   1 +
 .../lucene-analysis-morfologik-9.10.0.jar.sha1     |   1 -
 .../lucene-analysis-morfologik-9.11.1.jar.sha1     |   1 +
 solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1 |   1 -
 solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1 |   1 +
 .../lucene-analysis-opennlp-9.10.0.jar.sha1        |   1 -
 .../lucene-analysis-opennlp-9.11.1.jar.sha1        |   1 +
 .../lucene-analysis-phonetic-9.10.0.jar.sha1       |   1 -
 .../lucene-analysis-phonetic-9.11.1.jar.sha1       |   1 +
 .../lucene-analysis-smartcn-9.10.0.jar.sha1        |   1 -
 .../lucene-analysis-smartcn-9.11.1.jar.sha1        |   1 +
 .../lucene-analysis-stempel-9.10.0.jar.sha1        |   1 -
 .../lucene-analysis-stempel-9.11.1.jar.sha1        |   1 +
 .../lucene-backward-codecs-9.10.0.jar.sha1         |   1 -
 .../lucene-backward-codecs-9.11.1.jar.sha1         |   1 +
 .../licenses/lucene-classification-9.10.0.jar.sha1 |   1 -
 .../licenses/lucene-classification-9.11.1.jar.sha1 |   1 +
 solr/licenses/lucene-codecs-9.10.0.jar.sha1        |   1 -
 solr/licenses/lucene-codecs-9.11.1.jar.sha1        |   1 +
 solr/licenses/lucene-core-9.10.0.jar.sha1          |   1 -
 solr/licenses/lucene-core-9.11.1.jar.sha1          |   1 +
 solr/licenses/lucene-expressions-9.10.0.jar.sha1   |   1 -
 solr/licenses/lucene-expressions-9.11.1.jar.sha1   |   1 +
 solr/licenses/lucene-grouping-9.10.0.jar.sha1      |   1 -
 solr/licenses/lucene-grouping-9.11.1.jar.sha1      |   1 +
 solr/licenses/lucene-highlighter-9.10.0.jar.sha1   |   1 -
 solr/licenses/lucene-highlighter-9.11.1.jar.sha1   |   1 +
 solr/licenses/lucene-join-9.10.0.jar.sha1          |   1 -
 solr/licenses/lucene-join-9.11.1.jar.sha1          |   1 +
 solr/licenses/lucene-memory-9.10.0.jar.sha1        |   1 -
 solr/licenses/lucene-memory-9.11.1.jar.sha1        |   1 +
 solr/licenses/lucene-misc-9.10.0.jar.sha1          |   1 -
 solr/licenses/lucene-misc-9.11.1.jar.sha1          |   1 +
 solr/licenses/lucene-queries-9.10.0.jar.sha1       |   1 -
 solr/licenses/lucene-queries-9.11.1.jar.sha1       |   1 +
 solr/licenses/lucene-queryparser-9.10.0.jar.sha1   |   1 -
 solr/licenses/lucene-queryparser-9.11.1.jar.sha1   |   1 +
 solr/licenses/lucene-sandbox-9.10.0.jar.sha1       |   1 -
 solr/licenses/lucene-sandbox-9.11.1.jar.sha1       |   1 +
 .../licenses/lucene-spatial-extras-9.10.0.jar.sha1 |   1 -
 .../licenses/lucene-spatial-extras-9.11.1.jar.sha1 |   1 +
 solr/licenses/lucene-spatial3d-9.10.0.jar.sha1     |   1 -
 solr/licenses/lucene-spatial3d-9.11.1.jar.sha1     |   1 +
 solr/licenses/lucene-suggest-9.10.0.jar.sha1       |   1 -
 solr/licenses/lucene-suggest-9.11.1.jar.sha1       |   1 +
 .../licenses/lucene-test-framework-9.10.0.jar.sha1 |   1 -
 .../licenses/lucene-test-framework-9.11.1.jar.sha1 |   1 +
 .../solr/opentelemetry/OtelTracerConfigurator.java |   2 +-
 solr/packaging/README.txt                          |   4 +-
 solr/packaging/test/bats_helper.bash               |   2 +-
 solr/packaging/test/test_assert.bats               |   2 +-
 solr/packaging/test/test_auth.bats                 |  18 +-
 solr/packaging/test/test_basic_auth.bats           |  22 +-
 solr/packaging/test/test_bats.bats                 |   4 +-
 solr/packaging/test/test_config.bats               |  31 ++-
 solr/packaging/test/test_create.bats               |   2 +-
 solr/packaging/test/test_create_collection.bats    |  28 +-
 solr/packaging/test/test_delete_collection.bats    |  10 +-
 solr/packaging/test/test_example_noprompt.bats     |   6 +-
 solr/packaging/test/test_export.bats               |   4 +-
 solr/packaging/test/test_extraction.bats           |   2 +-
 solr/packaging/test/test_healthcheck.bats          |   2 +-
 solr/packaging/test/test_help.bats                 |  30 ++-
 solr/packaging/test/test_modules.bats              |   4 +-
 solr/packaging/test/test_packages.bats             |   4 +-
 solr/packaging/test/test_placement_plugin.bats     |   2 +-
 solr/packaging/test/test_post.bats                 |  94 +++----
 solr/packaging/test/test_postlogs.bats             |   2 +-
 solr/packaging/test/test_security_manager.bats     |   6 +-
 solr/packaging/test/test_ssl.bats                  |  60 ++---
 solr/packaging/test/test_start_solr.bats           |   6 +-
 solr/packaging/test/test_status.bats               |  11 +-
 solr/packaging/test/test_zk.bats                   |  36 ++-
 solr/packaging/test/test_zz_cleanup.bats           |   4 +-
 .../solr/prometheus/exporter/SolrExporter.java     |   2 +-
 .../solr/configsets/_default/conf/solrconfig.xml   |   2 +-
 .../conf/solrconfig.xml                            |   2 +-
 solr/server/solr/zoo.cfg                           |   2 +-
 .../pages/configuring-solr-xml.adoc                |   2 +-
 .../configuration-guide/pages/package-manager.adoc |   2 +-
 .../deployment-guide/pages/enabling-ssl.adoc       |   8 +-
 .../deployment-guide/pages/installing-solr.adoc    |   2 +-
 .../monitoring-with-prometheus-and-grafana.adoc    |   2 +-
 .../deployment-guide/pages/security-ui.adoc        |   2 +-
 .../pages/solr-control-script-reference.adoc       | 196 +++++++-------
 .../deployment-guide/pages/solr-in-docker.adoc     |   2 +-
 .../pages/zookeeper-file-management.adoc           |   2 +-
 .../pages/zookeeper-utilities.adoc                 |   2 +-
 .../getting-started/pages/solr-tutorial.adoc       |   2 +-
 .../getting-started/pages/tutorial-films.adoc      |   2 +-
 .../pages/tutorial-five-minutes.adoc               |   2 +-
 .../getting-started/pages/tutorial-solrcloud.adoc  |  12 +-
 .../pages/tutorial-techproducts.adoc               |   8 +-
 .../modules/indexing-guide/pages/post-tool.adoc    |  95 ++++---
 .../indexing-guide/pages/schemaless-mode.adoc      |   2 +-
 .../modules/query-guide/pages/logs.adoc            |   2 +-
 .../query-guide/pages/standard-query-parser.adoc   |   2 +-
 .../pages/major-changes-in-solr-10.adoc            |   5 +
 .../upgrade-notes/pages/solr-upgrade-notes.adoc    |   1 -
 .../java/org/apache/solr/common/util/EnvUtils.java |  87 +-----
 .../solrj/src/resources/java-template/api.mustache |   4 +-
 .../src/test-files/solrj/solr/multicore/zoo.cfg    |   2 +-
 .../org/apache/solr/common/util/EnvUtilsTest.java  |  63 ++---
 .../solr/cloud/AbstractDistribZkTestBase.java      |  11 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |   4 +-
 solr/webapp/web/partials/security.html             |   2 +-
 versions.lock                                      |  54 ++--
 versions.props                                     |   2 +-
 188 files changed, 2034 insertions(+), 1650 deletions(-)
 create mode 100644 
solr/api/src/java/org/apache/solr/client/api/endpoint/NodeFileStoreApis.java
 copy solr/api/src/java/org/apache/solr/client/api/{util/Constants.java => 
model/FileStoreDirectoryListingResponse.java} (57%)
 create mode 100644 
solr/api/src/java/org/apache/solr/client/api/model/FileStoreEntryMetadata.java
 copy solr/api/src/java/org/apache/solr/client/api/{util/Constants.java => 
model/FileStoreJsonFileResponse.java} (57%)
 create mode 100644 
solr/core/src/java/org/apache/solr/filestore/NodeFileStore.java
 rename solr/core/src/test/org/apache/solr/{cloud/SolrCLIZkUtilsTest.java => 
cli/SolrCLIZkToolsTest.java} (86%)
 delete mode 100644 solr/licenses/icu4j-70.1.jar.sha1
 create mode 100644 solr/licenses/icu4j-74.2.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-common-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-common-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-classification-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-classification-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-codecs-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-codecs-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-core-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-core-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-expressions-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-expressions-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-grouping-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-grouping-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-highlighter-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-highlighter-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-join-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-join-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-memory-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-memory-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-misc-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-misc-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-queries-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-queries-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-queryparser-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-queryparser-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-sandbox-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-sandbox-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-spatial3d-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-spatial3d-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-suggest-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-suggest-9.11.1.jar.sha1
 delete mode 100644 solr/licenses/lucene-test-framework-9.10.0.jar.sha1
 create mode 100644 solr/licenses/lucene-test-framework-9.11.1.jar.sha1

Reply via email to