You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/10/08 08:54:24 UTC

[lucene-solr] branch jira/solr-14749 updated (a8658ce -> ceb0d87)

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

ab pushed a change to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from a8658ce  SOLR-14749: Fix the race between plugin loading and registration and Overseer leader election. Make events implement MapWriter-s. Add more unit tests.
     add 1dba76c  SOLR-14333: Implement toString in Collapse filter  (#1371)
     add 63f0b6b  SOLR-14767 : Fix NumberFormatException when int/long field value is floating num (#1775)
     add b9c7f50  LUCENE-9401: include field in the complex pharse query's toString
     add 3dcb19f  SOLR-14897: limit no of forwarding for given request
     add 8c7502d  SOLR-14898: Stop returning duplicate HTTP response headers when requests are forward to another node
     add 52183df  SOLR-14889: improve templated variable escaping in ref-guide _config.yml
     add 274a3d6  Revert "SOLR-14767 : Fix NumberFormatException when int/long field value is floating num"
     add 9bfaca0  LUCENE-9549: add command-line quotes for 'reproduce with'.
     add f8b7a60  LUCENE-9550: Upgrade to Gradle 6.6.1. (#1933)
     add 2e2161b  LUCENE-9444: Improve test coverage for TaxonomyFacetLabels (#1928)
     add 167c305  SOLR-14905: Upgrade commons-io version to 2.8.0. Closes #1934
     add 9cadbf0  SOLR-12987: Deprecated plugins are logged once and with log category org.apache.solr.DEPRECATED (#1927)
     add 1af17a5  SOLR-14792: add removal message to major changes section of ref guide
     add 45dc261  SOLR-14792: Remove /browse references from example and docs
     add 6c3b1aa  SOLR-12987: Fix precommit
     add 8f2f80b  SOLR-14663: Copy ConfigSet root data from base ConfigSet when using CREATE command
     add 0303063  LUCENE-9458: WDGF should tie-break by endOffset (#1740)
     add 2aa51fe  LUCENE-9032: BaseTokenStreamTestCase minor... * make checkResetException() public * one assertAnalyzesTo variant should be calling checkAnalysisConsistency (only used by OpenNLP tests now)
     add 7e04e4d  LUCENE-9554: Expose IndexWriter#pendingNumDocs (#1941)
     add f6c4f8a  SOLR-14910: Use in-line tags for logger declarations in Gradle ValidateLogCalls that are non-standard, change //logok to //nowarn
     add 7eee4fd  LUCENE-9557: regeneration should use python3, not python2
     add 4728a71  LUCENE-9559: "gradle eclipse" do not work if .java files are not in proper package
     add d9a4109  LUCENE-9548: Apache repository publishing (#1929)
     add e879a52  SOLR-14659: Remove restlet as dependency for the ManagedResource API (#1938)
     add 34776ed  LUCENE-9561: workaround for POMs that have superfluous dependencyManagement section.
     add 1038fe8  Fix rare test failure.
     add 0864b39  make sure we don't build circles with zero radius in ShapeTestUtil
     add b70eaee  LUCENE-9558: Clean up package name conflicts for analyzers-icu. (#1946)
     add 5f34acf  LUCENE-9541 ConjunctionDISI sub-iterators check (#1937)
     add e325f66  Revert "LUCENE-9541 ConjunctionDISI sub-iterators check (#1937)"
     add 5bf487f  Ref Guide: monospace parameter names for overall consistency
     add b45c43f  SOLR-13438: update ref guide for new default delete behavior
     add 6ac94a6  LUCENE-9555: Advance conjunction Iterator for two phase iteration (#1943)
     add 874c446  LUCENE-9565 Fix competitive iteration (#1952)
     add 6b82884  LUCENE-9541 ConjunctionDISI sub-iterators check (#1937)
     add 5039e71  Mute TestApproximationSearchEquivalence.testExclusion
     add 247cea1  SOLR-14829: Improve documentation for Request Handlers in RefGuide and solrconfig.xml (#1921)
     add 2a8136b  SOLR-14151: refactor to avoid code duplicate
     add 0b08943  LUCENE-9566 TestApproximationSearchEquivalence.testExclusion fix (#1955)
     add 2d4a51b  SOLR-10370: ReplicationHandler should fetch index at fixed delay instead of fixed rate
     add 43b1a2f  SOLR-14691: Metrics reporting should avoid creating objects.
     add 969f9c1  SOLR-14691: Fix a minor back-compat formatting issue.
     add 01e1a7b  Fix changes to indicate SOLR-14659 fixed in 8.7 vs. 9
     add 7a5219c  Revert "Fix changes to indicate SOLR-14659 fixed in 8.7 vs. 9"
     add 2813b12  SOLR-14659: Fix changes to indicate SOLR-14659 fixed in 8.7 vs. 9
     add ba9fc74  Fix changes to indicate SOLR-14659 fixed in 8.7 vs. 9
     add 7a13e81  Merge remote-tracking branch 'asf/master'
     new ceb0d87  Merge branch 'master' into jira/solr-14749

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:
 gradle/defaults.gradle                             |   3 -
 gradle/documentation/render-javadoc.gradle         |  10 -
 gradle/generation/jflex.gradle                     |   2 +-
 gradle/maven/defaults-maven.gradle                 | 175 ++++++++--
 gradle/maven/maven-local.gradle                    |  15 +-
 gradle/testing/randomization.gradle                |   3 +-
 gradle/validation/check-environment.gradle         |   2 +-
 .../owasp-dependency-check/exclusions.xml          |  30 --
 gradle/validation/validate-log-calls.gradle        |  22 +-
 gradle/wrapper/gradle-wrapper.jar                  | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.jar.sha256           |   2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 help/validateLogCalls.txt                          |   2 +-
 lucene/CHANGES.txt                                 |  11 +-
 lucene/MIGRATE.md                                  |   5 +
 .../miscellaneous/WordDelimiterGraphFilter.java    |  24 +-
 .../miscellaneous/WordDelimiterIterator.java       |  14 +-
 .../TestWordDelimiterGraphFilter.java              |  56 ++-
 .../icu}/ICUCollationAttributeFactory.java         |   5 +-
 .../icu}/ICUCollationDocValuesField.java           |   2 +-
 .../icu}/ICUCollationKeyAnalyzer.java              |   3 +-
 .../ICUCollatedTermAttributeImpl.java              |   2 +-
 .../java/org/apache/lucene/collation/package.html  |  23 --
 .../lucene/collation/tokenattributes/package.html  |  23 --
 .../icu}/TestICUCollationDocValuesField.java       |   2 +-
 .../icu}/TestICUCollationKeyAnalyzer.java          |   3 +-
 .../byTask/tasks/NewCollationAnalyzerTask.java     |   2 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |   8 +
 .../org/apache/lucene/search/ConjunctionDISI.java  |  36 ++
 .../src/java/org/apache/lucene/search/Weight.java  |  58 +++-
 .../lucene/search/comparators/DocComparator.java   |   8 +-
 .../search/comparators/NumericComparator.java      |   8 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |  20 ++
 .../lucene/index/TestSizeBoundedForceMerge.java    |   2 +-
 .../apache/lucene/search/TestConjunctionDISI.java  |  19 +-
 .../org/apache/lucene/facet/FacetTestCase.java     |  43 ++-
 .../facet/taxonomy/TestTaxonomyFacetCounts.java    |  24 +-
 .../complexPhrase/ComplexPhraseQueryParser.java    |  13 +-
 .../complexPhrase/TestComplexPhraseQuery.java      |   6 +-
 .../apache/lucene/spatial/StrategyTestCase.java    |   2 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java    |   2 +-
 .../prefix/RandomSpatialOpFuzzyPrefixTreeTest.java |   2 +-
 .../lucene/analysis/BaseTokenStreamTestCase.java   |   3 +-
 .../java/org/apache/lucene/geo/ShapeTestUtil.java  |   6 +-
 solr/CHANGES.txt                                   |  26 ++
 solr/NOTICE.txt                                    |  12 -
 .../org/apache/solr/schema/ICUCollationField.java  |   2 +-
 .../clustering/carrot2/CarrotClusteringEngine.java |   2 +-
 .../extraction/ExtractingDocumentLoader.java       |   2 +-
 solr/contrib/ltr/build.gradle                      |   1 -
 .../test/org/apache/solr/ltr/TestRerankBase.java   |  14 +-
 .../collector/SchedulerMetricsCollector.java       |   2 +-
 solr/core/build.gradle                             |   2 -
 .../apache/solr/cloud/ActiveReplicaWatcher.java    |   4 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |   2 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   6 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   4 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  26 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |   4 +-
 .../apache/solr/handler/ReplicationHandler.java    |  11 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   4 +-
 .../org/apache/solr/handler/SchemaHandler.java     |  39 +++
 .../solr/handler/admin/CollectionsHandler.java     |   2 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |  50 ++-
 .../apache/solr/handler/admin/MetricsHandler.java  |  24 +-
 .../apache/solr/handler/admin/PrepRecoveryOp.java  |   2 +-
 .../solr/handler/component/SuggestComponent.java   |   4 +-
 .../org/apache/solr/logging/DeprecationLog.java}   |  50 ++-
 .../java/org/apache/solr/metrics/MetricsMap.java   |  69 +++-
 .../solr/metrics/reporters/solr/SolrReporter.java  |   2 +-
 .../org/apache/solr/rest/BaseSolrResource.java     | 133 ++------
 .../src/java/org/apache/solr/rest/DELETEable.java  |  26 --
 .../src/java/org/apache/solr/rest/GETable.java     |  26 --
 .../java/org/apache/solr/rest/ManagedResource.java |  23 +-
 .../apache/solr/rest/ManagedResourceStorage.java   |   4 +-
 .../src/java/org/apache/solr/rest/POSTable.java    |  26 --
 .../src/java/org/apache/solr/rest/PUTable.java     |  26 --
 .../src/java/org/apache/solr/rest/RestManager.java | 323 ++++++------------
 .../org/apache/solr/rest/SolrSchemaRestApi.java    |  78 -----
 .../java/org/apache/solr/rest/package-info.java    |   2 +-
 .../analysis/ManagedSynonymFilterFactory.java      |   6 +-
 .../analysis/ManagedSynonymGraphFilterFactory.java |   6 +-
 .../solr/rest/schema/analysis/package-info.java    |   3 +-
 .../org/apache/solr/rest/schema/package-info.java  |   2 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |  11 +-
 .../java/org/apache/solr/search/CaffeineCache.java |   2 +-
 .../solr/search/CollapsingQParserPlugin.java       | 147 +++++---
 .../org/apache/solr/search/SolrFieldCacheBean.java |   4 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   4 +-
 .../org/apache/solr/security/HadoopAuthPlugin.java |   2 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |  69 ++--
 .../apache/solr/servlet/SolrDispatchFilter.java    |   8 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |  11 +-
 .../apache/solr/spelling/SpellCheckCollator.java   |   2 +-
 .../org/apache/solr/store/blockcache/Metrics.java  |   2 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java      |   2 +-
 .../org/apache/solr/update/SolrIndexSplitter.java  |   2 +-
 .../org/apache/solr/util/StartupLoggingUtils.java  |   2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    | 380 +++++++++++++++------
 ... => MyPatternReplaceCharFilterFactory.java.txt} |   0
 .../{MyPlugin.java => MyPlugin.java.txt}           |   0
 .../{MyTextField.java => MyTextField.java.txt}     |   0
 ....java => MyWhitespaceTokenizerFactory.java.txt} |   0
 ...qHandler.java => RuntimeLibReqHandler.java.txt} |   0
 ...iter.java => RuntimeLibResponseWriter.java.txt} |   0
 ...ent.java => RuntimeLibSearchComponent.java.txt} |   0
 .../runtimecode/{TestURP.java => TestURP.java.txt} |   0
 ...VersionedURP.java => TestVersionedURP.java.txt} |   0
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |  10 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java    |   3 +-
 .../test/org/apache/hadoop/http/HttpServer2.java   |   3 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |   2 +-
 .../org/apache/solr/cloud/OverseerRolesTest.java   |   2 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  16 +-
 .../org/apache/solr/cloud/RollingRestartTest.java  |   2 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   | 146 +++++---
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |   3 +
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |   1 +
 .../test/org/apache/solr/core/MockInfoBean.java    |   2 +-
 .../apache/solr/core/TestSolrConfigHandler.java    |   4 -
 .../solr/handler/TestReplicationHandler.java       |   2 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |  63 ++--
 .../apache/solr/handler/admin/TestConfigsApi.java  |   4 -
 .../org/apache/solr/request/TestStreamBody.java    |   4 -
 .../org/apache/solr/rest/SolrRestletTestBase.java  |   9 +-
 .../test/org/apache/solr/rest/TestRestManager.java | 147 +-------
 .../schema/TestSerializedLuceneMatchVersion.java   |   4 -
 .../analysis/TestManagedStopFilterFactory.java     |   4 -
 .../analysis/TestManagedSynonymFilterFactory.java  |   4 -
 .../TestManagedSynonymGraphFilterFactory.java      |   4 -
 .../apache/solr/schema/TestCloudSchemaless.java    |   4 -
 .../search/TestRandomCollapseQParserPlugin.java    |  53 ++-
 .../solr/security/BasicAuthIntegrationTest.java    |   2 +-
 .../apache/solr/servlet/SecurityHeadersTest.java   |  93 +++++
 .../solr/update/TestInPlaceUpdatesDistrib.java     |   6 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    |   2 +-
 .../DimensionalRoutedAliasUpdateProcessorTest.java |   2 +-
 .../TimeRoutedAliasUpdateProcessorTest.java        |   2 +-
 .../apache/solr/util/TestSolrCLIRunExample.java    |   2 +-
 .../apache/solr/util/stats/MetricUtilsTest.java    |  75 ++--
 solr/example/films/README.md                       |  46 ---
 solr/licenses/commons-io-2.6.jar.sha1              |   1 -
 solr/licenses/commons-io-2.8.0.jar.sha1            |   1 +
 solr/licenses/org.restlet-2.4.3.jar.sha1           |   1 -
 solr/licenses/org.restlet-LICENSE-ASL.txt          | 201 -----------
 solr/licenses/org.restlet-NOTICE.txt               |   2 -
 .../org.restlet.ext.servlet-2.4.3.jar.sha1         |   1 -
 .../org.restlet.ext.servlet-LICENSE-ASL.txt        | 201 -----------
 solr/licenses/org.restlet.ext.servlet-NOTICE.txt   |   2 -
 .../solr/configsets/_default/conf/solrconfig.xml   | 154 ++-------
 .../conf/solrconfig.xml                            | 166 ++-------
 solr/solr-ref-guide/build.gradle                   |  79 ++---
 solr/solr-ref-guide/src/_config.yml.template       |  32 +-
 solr/solr-ref-guide/src/analytics.adoc             |   2 +-
 solr/solr-ref-guide/src/collection-management.adoc |   5 +-
 .../src/common-query-parameters.adoc               |   8 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |  14 +-
 solr/solr-ref-guide/src/faceting.adoc              |   2 +
 solr/solr-ref-guide/src/highlighting.adoc          |   2 +-
 solr/solr-ref-guide/src/index-replication.adoc     |   2 +-
 .../src/initparams-in-solrconfig.adoc              |   2 +-
 .../src/major-changes-in-solr-9.adoc               |   4 +
 ...andlers-and-searchcomponents-in-solrconfig.adoc | 286 ++++++++++++----
 .../src/rule-based-authorization-plugin.adoc       |   4 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |  13 +-
 solr/solr-ref-guide/src/the-terms-component.adoc   |   2 +-
 .../src/uploading-data-with-index-handlers.adoc    |   5 +
 solr/solrj/build.gradle                            |   1 -
 .../java/org/apache/solr/common/MapWriterMap.java  |   5 +
 .../org/apache/solr/common/NavigableObject.java    |   6 +
 .../solr/common/cloud/NodesSysPropsCacher.java     |   4 +-
 .../apache/solr/common/cloud/ZkConfigManager.java  |  23 +-
 .../org/apache/solr/common/util/NamedList.java     |   5 +
 .../java/org/apache/solr/common/util/Utils.java    |  60 +++-
 .../solr/client/solrj/request/SchemaTest.java      |   4 -
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |   6 +-
 solr/webapp/web/WEB-INF/web.xml                    |  14 -
 versions.lock                                      |   4 +-
 versions.props                                     |   3 +-
 180 files changed, 2083 insertions(+), 2373 deletions(-)
 rename lucene/analysis/icu/src/java/org/apache/lucene/{collation => analysis/icu}/ICUCollationAttributeFactory.java (94%)
 rename lucene/analysis/icu/src/java/org/apache/lucene/{collation => analysis/icu}/ICUCollationDocValuesField.java (98%)
 rename lucene/analysis/icu/src/java/org/apache/lucene/{collation => analysis/icu}/ICUCollationKeyAnalyzer.java (97%)
 rename lucene/analysis/icu/src/java/org/apache/lucene/{collation => analysis/icu}/tokenattributes/ICUCollatedTermAttributeImpl.java (97%)
 delete mode 100644 lucene/analysis/icu/src/java/org/apache/lucene/collation/package.html
 delete mode 100644 lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/package.html
 rename lucene/analysis/icu/src/test/org/apache/lucene/{collation => analysis/icu}/TestICUCollationDocValuesField.java (99%)
 rename lucene/analysis/icu/src/test/org/apache/lucene/{collation => analysis/icu}/TestICUCollationKeyAnalyzer.java (98%)
 copy solr/core/src/{test/org/apache/solr/security/MockAuditLoggerPlugin.java => java/org/apache/solr/logging/DeprecationLog.java} (52%)
 delete mode 100644 solr/core/src/java/org/apache/solr/rest/DELETEable.java
 delete mode 100644 solr/core/src/java/org/apache/solr/rest/GETable.java
 delete mode 100644 solr/core/src/java/org/apache/solr/rest/POSTable.java
 delete mode 100644 solr/core/src/java/org/apache/solr/rest/PUTable.java
 delete mode 100644 solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
 rename solr/core/src/test-files/runtimecode/{MyPatternReplaceCharFilterFactory.java => MyPatternReplaceCharFilterFactory.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{MyPlugin.java => MyPlugin.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{MyTextField.java => MyTextField.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{MyWhitespaceTokenizerFactory.java => MyWhitespaceTokenizerFactory.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{RuntimeLibReqHandler.java => RuntimeLibReqHandler.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{RuntimeLibResponseWriter.java => RuntimeLibResponseWriter.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{RuntimeLibSearchComponent.java => RuntimeLibSearchComponent.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{TestURP.java => TestURP.java.txt} (100%)
 rename solr/core/src/test-files/runtimecode/{TestVersionedURP.java => TestVersionedURP.java.txt} (100%)
 create mode 100644 solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java
 delete mode 100644 solr/licenses/commons-io-2.6.jar.sha1
 create mode 100644 solr/licenses/commons-io-2.8.0.jar.sha1
 delete mode 100644 solr/licenses/org.restlet-2.4.3.jar.sha1
 delete mode 100644 solr/licenses/org.restlet-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/org.restlet-NOTICE.txt
 delete mode 100644 solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1
 delete mode 100644 solr/licenses/org.restlet.ext.servlet-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/org.restlet.ext.servlet-NOTICE.txt


[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14749

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit ceb0d870bbb16380f22367c4fbc2eaf9cfbccbcc
Merge: a8658ce 7a13e81
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Oct 8 10:53:52 2020 +0200

    Merge branch 'master' into jira/solr-14749

 gradle/defaults.gradle                             |   3 -
 gradle/documentation/render-javadoc.gradle         |  10 -
 gradle/generation/jflex.gradle                     |   2 +-
 gradle/maven/defaults-maven.gradle                 | 175 ++++++++--
 gradle/maven/maven-local.gradle                    |  15 +-
 gradle/testing/randomization.gradle                |   3 +-
 gradle/validation/check-environment.gradle         |   2 +-
 .../owasp-dependency-check/exclusions.xml          |  30 --
 gradle/validation/validate-log-calls.gradle        |  22 +-
 gradle/wrapper/gradle-wrapper.jar                  | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.jar.sha256           |   2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 help/validateLogCalls.txt                          |   2 +-
 lucene/CHANGES.txt                                 |  11 +-
 lucene/MIGRATE.md                                  |   5 +
 .../miscellaneous/WordDelimiterGraphFilter.java    |  24 +-
 .../miscellaneous/WordDelimiterIterator.java       |  14 +-
 .../TestWordDelimiterGraphFilter.java              |  56 ++-
 .../icu}/ICUCollationAttributeFactory.java         |   5 +-
 .../icu}/ICUCollationDocValuesField.java           |   2 +-
 .../icu}/ICUCollationKeyAnalyzer.java              |   3 +-
 .../ICUCollatedTermAttributeImpl.java              |   2 +-
 .../java/org/apache/lucene/collation/package.html  |  23 --
 .../lucene/collation/tokenattributes/package.html  |  23 --
 .../icu}/TestICUCollationDocValuesField.java       |   2 +-
 .../icu}/TestICUCollationKeyAnalyzer.java          |   3 +-
 .../byTask/tasks/NewCollationAnalyzerTask.java     |   2 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |   8 +
 .../org/apache/lucene/search/ConjunctionDISI.java  |  36 ++
 .../src/java/org/apache/lucene/search/Weight.java  |  58 +++-
 .../lucene/search/comparators/DocComparator.java   |   8 +-
 .../search/comparators/NumericComparator.java      |   8 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |  20 ++
 .../lucene/index/TestSizeBoundedForceMerge.java    |   2 +-
 .../apache/lucene/search/TestConjunctionDISI.java  |  19 +-
 .../org/apache/lucene/facet/FacetTestCase.java     |  43 ++-
 .../facet/taxonomy/TestTaxonomyFacetCounts.java    |  24 +-
 .../complexPhrase/ComplexPhraseQueryParser.java    |  13 +-
 .../complexPhrase/TestComplexPhraseQuery.java      |   6 +-
 .../apache/lucene/spatial/StrategyTestCase.java    |   2 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java    |   2 +-
 .../prefix/RandomSpatialOpFuzzyPrefixTreeTest.java |   2 +-
 .../lucene/analysis/BaseTokenStreamTestCase.java   |   3 +-
 .../java/org/apache/lucene/geo/ShapeTestUtil.java  |   6 +-
 solr/CHANGES.txt                                   |  26 ++
 solr/NOTICE.txt                                    |  12 -
 .../org/apache/solr/schema/ICUCollationField.java  |   2 +-
 .../clustering/carrot2/CarrotClusteringEngine.java |   2 +-
 .../extraction/ExtractingDocumentLoader.java       |   2 +-
 solr/contrib/ltr/build.gradle                      |   1 -
 .../test/org/apache/solr/ltr/TestRerankBase.java   |  14 +-
 .../collector/SchedulerMetricsCollector.java       |   2 +-
 solr/core/build.gradle                             |   2 -
 .../apache/solr/cloud/ActiveReplicaWatcher.java    |   4 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |   2 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   6 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   4 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  26 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |   4 +-
 .../apache/solr/handler/ReplicationHandler.java    |  11 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   4 +-
 .../org/apache/solr/handler/SchemaHandler.java     |  39 +++
 .../solr/handler/admin/CollectionsHandler.java     |   2 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |  50 ++-
 .../apache/solr/handler/admin/MetricsHandler.java  |  24 +-
 .../apache/solr/handler/admin/PrepRecoveryOp.java  |   2 +-
 .../solr/handler/component/SuggestComponent.java   |   4 +-
 .../org/apache/solr/logging/DeprecationLog.java    |  53 +++
 .../java/org/apache/solr/metrics/MetricsMap.java   |  69 +++-
 .../solr/metrics/reporters/solr/SolrReporter.java  |   2 +-
 .../org/apache/solr/rest/BaseSolrResource.java     | 133 ++------
 .../src/java/org/apache/solr/rest/DELETEable.java  |  26 --
 .../src/java/org/apache/solr/rest/GETable.java     |  26 --
 .../java/org/apache/solr/rest/ManagedResource.java |  23 +-
 .../apache/solr/rest/ManagedResourceStorage.java   |   4 +-
 .../src/java/org/apache/solr/rest/POSTable.java    |  26 --
 .../src/java/org/apache/solr/rest/PUTable.java     |  26 --
 .../src/java/org/apache/solr/rest/RestManager.java | 323 ++++++------------
 .../org/apache/solr/rest/SolrSchemaRestApi.java    |  78 -----
 .../java/org/apache/solr/rest/package-info.java    |   2 +-
 .../analysis/ManagedSynonymFilterFactory.java      |   6 +-
 .../analysis/ManagedSynonymGraphFilterFactory.java |   6 +-
 .../solr/rest/schema/analysis/package-info.java    |   3 +-
 .../org/apache/solr/rest/schema/package-info.java  |   2 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |  11 +-
 .../java/org/apache/solr/search/CaffeineCache.java |   2 +-
 .../solr/search/CollapsingQParserPlugin.java       | 147 +++++---
 .../org/apache/solr/search/SolrFieldCacheBean.java |   4 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   4 +-
 .../org/apache/solr/security/HadoopAuthPlugin.java |   2 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |  69 ++--
 .../apache/solr/servlet/SolrDispatchFilter.java    |   8 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |  11 +-
 .../apache/solr/spelling/SpellCheckCollator.java   |   2 +-
 .../org/apache/solr/store/blockcache/Metrics.java  |   2 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java      |   2 +-
 .../org/apache/solr/update/SolrIndexSplitter.java  |   2 +-
 .../org/apache/solr/util/StartupLoggingUtils.java  |   2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    | 380 +++++++++++++++------
 ... => MyPatternReplaceCharFilterFactory.java.txt} |   0
 .../{MyPlugin.java => MyPlugin.java.txt}           |   0
 .../{MyTextField.java => MyTextField.java.txt}     |   0
 ....java => MyWhitespaceTokenizerFactory.java.txt} |   0
 ...qHandler.java => RuntimeLibReqHandler.java.txt} |   0
 ...iter.java => RuntimeLibResponseWriter.java.txt} |   0
 ...ent.java => RuntimeLibSearchComponent.java.txt} |   0
 .../runtimecode/{TestURP.java => TestURP.java.txt} |   0
 ...VersionedURP.java => TestVersionedURP.java.txt} |   0
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |  10 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java    |   3 +-
 .../test/org/apache/hadoop/http/HttpServer2.java   |   3 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |   2 +-
 .../org/apache/solr/cloud/OverseerRolesTest.java   |   2 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  16 +-
 .../org/apache/solr/cloud/RollingRestartTest.java  |   2 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   | 146 +++++---
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |   3 +
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |   1 +
 .../test/org/apache/solr/core/MockInfoBean.java    |   2 +-
 .../apache/solr/core/TestSolrConfigHandler.java    |   4 -
 .../solr/handler/TestReplicationHandler.java       |   2 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |  63 ++--
 .../apache/solr/handler/admin/TestConfigsApi.java  |   4 -
 .../org/apache/solr/request/TestStreamBody.java    |   4 -
 .../org/apache/solr/rest/SolrRestletTestBase.java  |   9 +-
 .../test/org/apache/solr/rest/TestRestManager.java | 147 +-------
 .../schema/TestSerializedLuceneMatchVersion.java   |   4 -
 .../analysis/TestManagedStopFilterFactory.java     |   4 -
 .../analysis/TestManagedSynonymFilterFactory.java  |   4 -
 .../TestManagedSynonymGraphFilterFactory.java      |   4 -
 .../apache/solr/schema/TestCloudSchemaless.java    |   4 -
 .../search/TestRandomCollapseQParserPlugin.java    |  53 ++-
 .../solr/security/BasicAuthIntegrationTest.java    |   2 +-
 .../apache/solr/servlet/SecurityHeadersTest.java   |  93 +++++
 .../solr/update/TestInPlaceUpdatesDistrib.java     |   6 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    |   2 +-
 .../DimensionalRoutedAliasUpdateProcessorTest.java |   2 +-
 .../TimeRoutedAliasUpdateProcessorTest.java        |   2 +-
 .../apache/solr/util/TestSolrCLIRunExample.java    |   2 +-
 .../apache/solr/util/stats/MetricUtilsTest.java    |  75 ++--
 solr/example/films/README.md                       |  46 ---
 solr/licenses/commons-io-2.6.jar.sha1              |   1 -
 solr/licenses/commons-io-2.8.0.jar.sha1            |   1 +
 solr/licenses/org.restlet-2.4.3.jar.sha1           |   1 -
 solr/licenses/org.restlet-LICENSE-ASL.txt          | 201 -----------
 solr/licenses/org.restlet-NOTICE.txt               |   2 -
 .../org.restlet.ext.servlet-2.4.3.jar.sha1         |   1 -
 .../org.restlet.ext.servlet-LICENSE-ASL.txt        | 201 -----------
 solr/licenses/org.restlet.ext.servlet-NOTICE.txt   |   2 -
 .../solr/configsets/_default/conf/solrconfig.xml   | 154 ++-------
 .../conf/solrconfig.xml                            | 166 ++-------
 solr/solr-ref-guide/build.gradle                   |  79 ++---
 solr/solr-ref-guide/src/_config.yml.template       |  32 +-
 solr/solr-ref-guide/src/analytics.adoc             |   2 +-
 solr/solr-ref-guide/src/collection-management.adoc |   5 +-
 .../src/common-query-parameters.adoc               |   8 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |  14 +-
 solr/solr-ref-guide/src/faceting.adoc              |   2 +
 solr/solr-ref-guide/src/highlighting.adoc          |   2 +-
 solr/solr-ref-guide/src/index-replication.adoc     |   2 +-
 .../src/initparams-in-solrconfig.adoc              |   2 +-
 .../src/major-changes-in-solr-9.adoc               |   4 +
 ...andlers-and-searchcomponents-in-solrconfig.adoc | 286 ++++++++++++----
 .../src/rule-based-authorization-plugin.adoc       |   4 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |  13 +-
 solr/solr-ref-guide/src/the-terms-component.adoc   |   2 +-
 .../src/uploading-data-with-index-handlers.adoc    |   5 +
 solr/solrj/build.gradle                            |   1 -
 .../java/org/apache/solr/common/MapWriterMap.java  |   5 +
 .../org/apache/solr/common/NavigableObject.java    |   6 +
 .../solr/common/cloud/NodesSysPropsCacher.java     |   4 +-
 .../apache/solr/common/cloud/ZkConfigManager.java  |  23 +-
 .../org/apache/solr/common/util/NamedList.java     |   5 +
 .../java/org/apache/solr/common/util/Utils.java    |  60 +++-
 .../solr/client/solrj/request/SchemaTest.java      |   4 -
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |   6 +-
 solr/webapp/web/WEB-INF/web.xml                    |  14 -
 versions.lock                                      |   4 +-
 versions.props                                     |   3 +-
 180 files changed, 2113 insertions(+), 2346 deletions(-)