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/06/25 10:34:05 UTC

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

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

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

commit da324a8da1c01a0301ecfbb50aa040340757e91b
Merge: 9ba27b0 db98608
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jun 24 17:47:02 2020 +0200

    Merge branch 'master' into jira/solr-12847

 .gitignore                                         |    1 +
 build.gradle                                       |   25 +-
 dev-tools/doap/lucene.rdf                          |   14 +
 dev-tools/doap/solr.rdf                            |   14 +
 dev-tools/maven/pom.xml.template                   |    2 +-
 dev-tools/scripts/poll-mirrors.py                  |   20 +-
 dev-tools/scripts/releaseWizard.py                 |  148 +-
 dev-tools/scripts/releaseWizard.yaml               |  395 +-
 dev-tools/scripts/reproduceJenkinsFailures.py      |    5 +-
 gradle/defaults-java.gradle                        |    1 +
 gradle/documentation/changes-to-html.gradle        |   94 +
 gradle/documentation/documentation.gradle          |   78 +
 gradle/documentation/markdown.gradle               |  204 +
 gradle/generate-defaults.gradle                    |    2 +-
 gradle/generation/snowball.gradle                  |    2 +-
 gradle/hacks/findbugs.gradle                       |   45 +
 gradle/jar-manifest.gradle                         |    9 +-
 gradle/render-javadoc.gradle                       |  550 +-
 gradle/validation/check-broken-links.gradle        |   71 +
 gradle/validation/check-environment.gradle         |    2 +-
 gradle/validation/jar-checks.gradle                |    4 +-
 gradle/validation/precommit.gradle                 |    3 +-
 gradle/validation/validate-log-calls.gradle        |  309 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 58702 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.jar.sha256           |    2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |    2 +-
 gradle/wrapper/gradle-wrapper.properties           |    2 +-
 gradlew                                            |    5 +-
 help/ant.txt                                       |    4 +-
 help/validateLogCalls.txt                          |   65 +-
 lucene/CHANGES.txt                                 |  109 +-
 lucene/MIGRATE.md                                  |   15 +
 lucene/analysis/common/build.gradle                |    2 +
 .../ConcatenateGraphFilterFactory.java             |    4 +-
 .../FixBrokenOffsetsFilterFactory.java             |    1 +
 .../miscellaneous/WordDelimiterFilterFactory.java  |   19 +-
 .../lucene/analysis/snowball/french_stop.txt       |   20 +-
 .../lucene/analysis/core/TestBugInSomething.java   |    1 +
 .../lucene/analysis/core/TestRandomChains.java     |    4 +-
 .../lucene/analysis/custom/TestCustomAnalyzer.java |   13 +-
 .../miscellaneous/TestConcatenateGraphFilter.java  |    3 +
 .../TestConcatenateGraphFilterFactory.java         |    3 +-
 .../miscellaneous/TestFixBrokenOffsetsFilter.java  |    1 +
 .../TestLimitTokenPositionFilter.java              |    1 +
 .../TestRemoveDuplicatesTokenFilter.java           |    4 +-
 .../miscellaneous/TestWordDelimiterFilter.java     |   26 +-
 .../analysis/ngram/EdgeNGramTokenizerTest.java     |    2 +-
 .../lucene/analysis/ngram/NGramTokenizerTest.java  |    2 +-
 .../analysis/synonym/TestSolrSynonymParser.java    |    1 +
 .../analysis/synonym/TestSynonymFilterFactory.java |    1 +
 .../analysis/synonym/TestSynonymMapFilter.java     |    1 +
 .../analysis/synonym/TestWordnetSynonymParser.java |    3 +-
 .../util/TestFilesystemResourceLoader.java         |    5 +-
 lucene/analysis/icu/build.gradle                   |    2 +
 .../lucene/analysis/icu/ICUTransformFilter.java    |    1 +
 lucene/analysis/kuromoji/build.gradle              |    2 +
 .../analysis/ja/dict/TokenInfoDictionary.java      |    4 +-
 lucene/analysis/morfologik/build.gradle            |    2 +
 lucene/analysis/nori/build.gradle                  |    2 +
 .../analysis/ko/dict/TokenInfoDictionary.java      |    4 +-
 lucene/analysis/opennlp/build.gradle               |    2 +
 lucene/analysis/phonetic/build.gradle              |    2 +
 lucene/analysis/smartcn/build.gradle               |    2 +
 lucene/analysis/stempel/build.gradle               |    2 +
 lucene/backward-codecs/build.gradle                |    2 +
 .../codecs/lucene60/Lucene60PointsFormat.java      |  110 +
 .../codecs/lucene60/Lucene60PointsReader.java      |  146 +
 .../org/apache/lucene/codecs/lucene60/package.html |   25 +
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |  281 +
 .../lucene/codecs/lucene70/package-info.java       |   22 +
 .../lucene/codecs/lucene84/Lucene84Codec.java      |  178 +
 .../org/apache/lucene/codecs/lucene84/package.html |   25 +
 .../services/org.apache.lucene.codecs.Codec        |    1 +
 .../codecs/lucene60/Lucene60PointsWriter.java      |  267 +
 .../codecs/lucene60/Lucene60RWPointsFormat.java    |   35 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |  354 ++
 .../lucene70/Lucene70RWSegmentInfoFormat.java      |  204 +
 .../lucene70/TestLucene70SegmentInfoFormat.java    |   42 +
 .../lucene/codecs/lucene84/Lucene84RWCodec.java    |   39 +
 .../lucene/index/TestBackwardsCompatibility.java   |   11 +-
 .../org/apache/lucene/index/index.8.5.2-cfs.zip    |  Bin 0 -> 15897 bytes
 .../org/apache/lucene/index/index.8.5.2-nocfs.zip  |  Bin 0 -> 15902 bytes
 .../test/org/apache/lucene/index/sorted.8.5.2.zip  |  Bin 0 -> 80768 bytes
 .../apache/lucene/index/unsupported.7.7.3-cfs.zip  |  Bin 0 -> 15646 bytes
 .../lucene/index/unsupported.7.7.3-nocfs.zip       |  Bin 0 -> 15643 bytes
 .../lucene/index/unsupported.sorted.7.7.3.zip      |  Bin 0 -> 86356 bytes
 lucene/benchmark/build.gradle                      |  121 +-
 lucene/benchmark/scripts/collation.bm2jira.pl      |   22 +-
 .../benchmark/byTask/tasks/CreateIndexTask.java    |    4 +-
 lucene/build.gradle                                |    2 +
 lucene/classification/build.gradle                 |    2 +
 .../document/DocumentClassificationTestBase.java   |    2 +-
 lucene/codecs/build.gradle                         |    2 +
 .../blockterms/VariableGapTermsIndexReader.java    |    2 +-
 .../blockterms/VariableGapTermsIndexWriter.java    |    2 +-
 .../blocktreeords/OrdsBlockTreeTermsWriter.java    |    2 +-
 .../codecs/blocktreeords/OrdsFieldReader.java      |    2 +-
 .../lucene/codecs/memory/FSTTermsReader.java       |    2 +-
 .../lucene/codecs/memory/FSTTermsWriter.java       |    2 +-
 .../simpletext/SimpleTextSegmentInfoFormat.java    |  306 +-
 .../lucene/codecs/uniformsplit/FSTDictionary.java  |    8 +-
 .../uniformsplit/UniformSplitPostingsFormat.java   |   12 +-
 .../uniformsplit/UniformSplitTermsReader.java      |   44 +-
 .../uniformsplit/UniformSplitTermsWriter.java      |   17 +-
 .../sharedterms/STUniformSplitPostingsFormat.java  |    2 +-
 .../sharedterms/STUniformSplitTermsReader.java     |    5 +-
 .../sharedterms/UnionFieldMetadataBuilder.java     |    6 -
 .../TestUniformSplitPostingFormat.java             |   19 +-
 .../sharedterms/STBlockReaderTest.java             |  360 --
 .../sharedterms/TestSTBlockReader.java             |  360 ++
 lucene/common-build.xml                            |    2 +-
 lucene/core/build.gradle                           |    3 +-
 .../src/java/org/apache/lucene/codecs/Codec.java   |    2 +-
 .../java/org/apache/lucene/codecs/CodecUtil.java   |   41 +-
 .../apache/lucene/codecs/DocValuesConsumer.java    |    2 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |  157 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java     |  134 +-
 .../lucene/codecs/blocktree/FieldReader.java       |   32 +-
 .../codecs/lucene60/Lucene60PointsFormat.java      |  110 -
 .../codecs/lucene60/Lucene60PointsReader.java      |  166 -
 .../codecs/lucene60/Lucene60PointsWriter.java      |  263 -
 .../lucene/codecs/lucene60/package-info.java       |    2 +-
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |  439 --
 .../lucene/codecs/lucene70/package-info.java       |   22 -
 .../lucene/codecs/lucene84/Lucene84Codec.java      |  178 -
 .../lucene/codecs/lucene84/package-info.java       |  396 +-
 .../lucene/codecs/lucene86/Lucene86Codec.java      |  178 +
 .../codecs/lucene86/Lucene86PointsFormat.java      |   80 +
 .../codecs/lucene86/Lucene86PointsReader.java      |  152 +
 .../codecs/lucene86/Lucene86PointsWriter.java      |  265 +
 .../codecs/lucene86/Lucene86SegmentInfoFormat.java |  217 +
 .../lucene/codecs/lucene86/package-info.java       |  416 ++
 .../java/org/apache/lucene/geo/Tessellator.java    |    7 +-
 .../apache/lucene/index/BinaryDocValuesWriter.java |   29 +-
 .../org/apache/lucene/index/ByteSliceWriter.java   |    1 -
 .../apache/lucene/index/DefaultIndexingChain.java  |  279 +-
 .../java/org/apache/lucene/index/DocConsumer.java  |    2 +-
 .../java/org/apache/lucene/index/DocValues.java    |    4 +-
 .../apache/lucene/index/DocValuesLeafReader.java   |   89 +
 .../org/apache/lucene/index/DocValuesWriter.java   |    8 +-
 .../org/apache/lucene/index/DocumentsWriter.java   |   10 +-
 .../lucene/index/DocumentsWriterFlushControl.java  |   27 +-
 .../lucene/index/DocumentsWriterPerThread.java     |   68 +-
 .../org/apache/lucene/index/FreqProxFields.java    |   19 +-
 .../apache/lucene/index/FreqProxTermsWriter.java   |    6 +-
 .../lucene/index/FreqProxTermsWriterPerField.java  |   57 +-
 .../org/apache/lucene/index/IndexFileDeleter.java  |    4 +-
 .../java/org/apache/lucene/index/IndexSorter.java  |  448 ++
 .../java/org/apache/lucene/index/IndexWriter.java  |  199 +-
 .../org/apache/lucene/index/IndexWriterConfig.java |   17 +-
 .../java/org/apache/lucene/index/MergePolicy.java  |   79 +-
 .../org/apache/lucene/index/MultiDocValues.java    |    2 +-
 .../java/org/apache/lucene/index/MultiSorter.java  |  144 +-
 .../lucene/index/NumericDocValuesWriter.java       |   33 +-
 .../apache/lucene/index/ParallelPostingsArray.java |   10 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |  236 +-
 .../org/apache/lucene/index/SortFieldProvider.java |  118 +
 .../apache/lucene/index/SortedDocValuesWriter.java |   50 +-
 .../lucene/index/SortedNumericDocValuesWriter.java |   33 +-
 .../lucene/index/SortedSetDocValuesWriter.java     |   45 +-
 .../src/java/org/apache/lucene/index/Sorter.java   |  238 +-
 .../apache/lucene/index/TermVectorsConsumer.java   |   10 +-
 .../lucene/index/TermVectorsConsumerPerField.java  |   58 +-
 .../java/org/apache/lucene/index/TermsHash.java    |   12 +-
 .../org/apache/lucene/index/TermsHashPerField.java |  243 +-
 .../apache/lucene/search/ConstantScoreQuery.java   |    2 +-
 .../org/apache/lucene/search/FieldComparator.java  |   16 +-
 .../apache/lucene/search/FieldValueHitQueue.java   |   29 +-
 .../lucene/search/FilteringFieldComparator.java    |   93 +
 .../search/FilteringLeafFieldComparator.java       |   39 +
 .../lucene/search/FilteringNumericComparator.java  |   52 +
 .../search/FilteringNumericLeafComparator.java     |  336 ++
 .../lucene/search/FuzzyAutomatonBuilder.java       |   88 +
 .../java/org/apache/lucene/search/FuzzyQuery.java  |   60 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |  151 +-
 .../org/apache/lucene/search/IndexSearcher.java    |   10 +
 .../org/apache/lucene/search/LeafCollector.java    |   12 +
 .../apache/lucene/search/MatchAllDocsQuery.java    |    2 +-
 .../org/apache/lucene/search/MultiCollector.java   |  111 +-
 .../org/apache/lucene/search/MultiTermQuery.java   |    6 +-
 .../org/apache/lucene/search/QueryVisitor.java     |    5 +-
 .../java/org/apache/lucene/search/ScoreMode.java   |   54 +-
 .../java/org/apache/lucene/search/SortField.java   |  139 +
 .../lucene/search/SortedNumericSortField.java      |  106 +
 .../apache/lucene/search/SortedSetSortField.java   |   69 +-
 .../org/apache/lucene/search/TermInSetQuery.java   |   22 +-
 .../apache/lucene/search/TopFieldCollector.java    |   69 +-
 .../src/java/org/apache/lucene/search/Weight.java  |   18 +-
 .../org/apache/lucene/store/BufferedChecksum.java  |    4 +-
 .../lucene/store/ByteBuffersIndexOutput.java       |   18 +-
 .../java/org/apache/lucene/util/IntBlockPool.java  |    2 +-
 .../src/java/org/apache/lucene/util/Version.java   |    7 +
 .../lucene/util/automaton/CompiledAutomaton.java   |    4 +-
 .../org/apache/lucene/util/automaton/RegExp.java   |  329 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |  252 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |  514 +-
 .../src/java/org/apache/lucene/util/fst/FST.java   |   47 +-
 .../apache/lucene/util/fst/PositiveIntOutputs.java |    1 +
 .../org/apache/lucene/util/fst/package-info.java   |   18 +-
 .../lucene/util/packed/Packed64SingleBlock.java    |    3 +
 .../services/org.apache.lucene.codecs.Codec        |    2 +-
 .../org.apache.lucene.index.SortFieldProvider      |   20 +
 .../apache/lucene/analysis/TestCharArraySet.java   |    8 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java    |   57 +-
 ...tLucene50StoredFieldsFormatHighCompression.java |   11 +-
 .../codecs/lucene60/TestLucene60PointsFormat.java  |  401 --
 .../lucene70/TestLucene70SegmentInfoFormat.java    |   35 -
 .../codecs/lucene80/TestLucene80NormsFormat.java   |    4 +-
 .../codecs/lucene86/TestLucene86PointsFormat.java  |  393 ++
 .../lucene86/TestLucene86SegmentInfoFormat.java    |   37 +
 .../org/apache/lucene/document/TestDocument.java   |   12 +-
 .../org/apache/lucene/geo/TestTessellator.java     |    8 +
 .../org/apache/lucene/index/TestAddIndexes.java    |    2 +-
 .../lucene/index/TestAllFilesDetectBitFlips.java   |  141 +
 .../lucene/index/TestAllFilesDetectTruncation.java |    4 +-
 .../lucene/index/TestConcurrentMergeScheduler.java |    8 +-
 .../lucene/index/TestDemoParallelLeafReader.java   |    2 +-
 .../lucene/index/TestFlushByRamOrCountsPolicy.java |    8 +-
 .../apache/lucene/index/TestForceMergeForever.java |    2 +-
 .../org/apache/lucene/index/TestIndexSorting.java  |    5 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |   40 +-
 .../apache/lucene/index/TestIndexWriterDelete.java |    6 +-
 .../lucene/index/TestIndexWriterExceptions.java    |    4 +-
 .../lucene/index/TestIndexWriterExceptions2.java   |    6 +-
 .../lucene/index/TestIndexWriterMaxDocs.java       |    2 +-
 .../lucene/index/TestIndexWriterOnDiskFull.java    |    2 +-
 .../apache/lucene/index/TestIndexWriterReader.java |   15 +-
 .../lucene/index/TestIndexWriterWithThreads.java   |    6 +-
 .../org/apache/lucene/index/TestMergePolicy.java   |  159 +
 .../lucene/index/TestNRTReaderWithThreads.java     |    4 +-
 .../apache/lucene/index/TestPerSegmentDeletes.java |   10 +-
 .../org/apache/lucene/index/TestPointValues.java   |    4 +-
 .../org/apache/lucene/index/TestSegmentInfos.java  |   65 +
 .../index/TestSoftDeletesRetentionMergePolicy.java |   14 +-
 .../apache/lucene/index/TestTermsHashPerField.java |  209 +
 .../apache/lucene/index/TestTieredMergePolicy.java |    6 +-
 .../index/TestTragicIndexWriterDeadlock.java       |    2 +-
 .../apache/lucene/search/MultiCollectorTest.java   |  172 +
 .../apache/lucene/search/TermInSetQueryTest.java   |   42 +
 .../org/apache/lucene/search/TestBoolean2.java     |    8 +-
 .../search/TestFieldSortOptimizationSkipping.java  |  294 ++
 .../org/apache/lucene/search/TestFuzzyQuery.java   |  130 +-
 .../apache/lucene/search/TestLRUQueryCache.java    |   17 +-
 .../lucene/search/TestMultiTermConstantScore.java  |    3 +-
 .../org/apache/lucene/search/TestPointQueries.java |    8 +-
 .../org/apache/lucene/search/TestRegexpQuery.java  |   37 +-
 .../lucene/search/TestSameScoresWithThreads.java   |    1 +
 .../org/apache/lucene/search/TestSearchAfter.java  |    2 +-
 .../apache/lucene/search/TestSearcherManager.java  |    5 +-
 .../org/apache/lucene/search/TestTermQuery.java    |    7 +-
 .../test/org/apache/lucene/util/TestCharsRef.java  |    2 +
 .../org/apache/lucene/util/TestOfflineSorter.java  |   17 +-
 .../test/org/apache/lucene/util/TestVersion.java   |    1 +
 .../apache/lucene/util/automaton/TestRegExp.java   |  148 +
 .../apache/lucene/util/bkd/Test2BBKDPoints.java    |   12 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   92 +-
 .../test/org/apache/lucene/util/fst/Test2BFST.java |   16 +-
 .../lucene/util/fst/TestFSTDirectAddressing.java   |    4 +-
 .../test/org/apache/lucene/util/fst/TestFSTs.java  |   26 +-
 .../apache/lucene/util/packed/TestPackedInts.java  |    4 +-
 lucene/demo/build.gradle                           |    2 +
 lucene/expressions/build.gradle                    |    2 +
 .../lucene/expressions/ExpressionValueSource.java  |    2 +-
 .../expressions/TestExpressionValueSource.java     |   58 +
 lucene/facet/build.gradle                          |    1 +
 .../org/apache/lucene/facet/DrillSideways.java     |    3 +-
 .../java/org/apache/lucene/facet/FacetsConfig.java |   11 +-
 lucene/grouping/build.gradle                       |    2 +
 .../search/grouping/BlockGroupingCollector.java    |    4 +
 .../apache/lucene/search/grouping/DoubleRange.java |   59 +
 .../lucene/search/grouping/DoubleRangeFactory.java |   67 +
 .../search/grouping/DoubleRangeGroupSelector.java  |  100 +
 .../grouping/FirstPassGroupingCollector.java       |    1 +
 .../lucene/search/grouping/GroupSelector.java      |   10 +-
 .../lucene/search/grouping/GroupingSearch.java     |   10 +-
 .../apache/lucene/search/grouping/LongRange.java   |   58 +
 .../lucene/search/grouping/LongRangeFactory.java   |   67 +
 .../search/grouping/LongRangeGroupSelector.java    |  101 +
 .../grouping/SecondPassGroupingCollector.java      |    1 +
 .../lucene/search/grouping/TermGroupSelector.java  |    4 +
 .../search/grouping/ValueSourceGroupSelector.java  |   10 +-
 .../lucene/search/grouping/package-info.java       |   23 +-
 .../search/grouping/AbstractGroupingTestCase.java  |   45 +
 .../search/grouping/BaseGroupSelectorTestCase.java |  365 ++
 .../lucene/search/grouping/BlockGroupingTest.java  |  225 +
 .../grouping/DoubleRangeGroupSelectorTest.java     |   59 +
 .../grouping/LongRangeGroupSelectorTest.java       |   59 +
 .../search/grouping/TermGroupSelectorTest.java     |   60 +
 .../search/grouping/TestDoubleRangeFactory.java    |   39 +
 .../lucene/search/grouping/TestGrouping.java       |    2 +
 .../search/grouping/TestLongRangeFactory.java      |   39 +
 .../grouping/ValueSourceGroupSelectorTest.java     |   51 +
 lucene/highlighter/build.gradle                    |    2 +
 .../search/uhighlight/MultiTermHighlighting.java   |    5 +-
 .../search/uhighlight/UnifiedHighlighter.java      |    2 +
 .../lucene/search/highlight/HighlighterTest.java   |   27 +-
 .../lucene/search/highlight/TokenSourcesTest.java  |    2 +
 .../highlight/custom/HighlightCustomQueryTest.java |   23 +-
 lucene/ivy-versions.properties                     |    9 +-
 lucene/join/build.gradle                           |    2 +
 .../search/join/ToParentBlockJoinSortField.java    |   12 +-
 .../lucene/search/join/TestBlockJoinSelector.java  |    9 +-
 lucene/licenses/hppc-0.8.1.jar.sha1                |    1 -
 lucene/licenses/hppc-0.8.2.jar.sha1                |    1 +
 lucene/licenses/log4j-api-2.11.2.jar.sha1          |    1 -
 lucene/licenses/log4j-api-2.13.2.jar.sha1          |    1 +
 lucene/licenses/log4j-core-2.11.2.jar.sha1         |    1 -
 lucene/licenses/log4j-core-2.13.2.jar.sha1         |    1 +
 lucene/luke/build.gradle                           |    2 +
 .../apache/lucene/luke/app/AbstractHandler.java    |    4 +-
 .../dialog/documents/AddDocumentDialogFactory.java |    2 +-
 .../dialog/menubar/ExportTermsDialogFactory.java   |    4 +-
 .../luke/models/documents/DocumentsImpl.java       |    4 +-
 .../apache/lucene/luke/models/util/IndexUtils.java |    8 +-
 .../util/twentynewsgroups/MessageFilesParser.java  |    2 +-
 .../luke/util/reflection/SubtypeCollector.java     |    2 +-
 lucene/memory/build.gradle                         |    2 +
 lucene/misc/build.gradle                           |    2 +
 .../lucene/util/fst/UpToTwoPositiveIntOutputs.java |    3 +-
 .../similarity/TestLegacyBM25Similarity.java       |    1 +
 lucene/monitor/build.gradle                        |    2 +
 .../org/apache/lucene/monitor/DocumentBatch.java   |   12 +-
 .../apache/lucene/monitor/TestDocumentBatch.java   |   58 +
 lucene/queries/build.gradle                        |    2 +
 .../lucene/queries/function/FunctionQuery.java     |    2 +-
 .../queries/function/FunctionRangeQuery.java       |    3 +-
 .../queries/function/FunctionScoreQuery.java       |    8 +-
 .../lucene/queries/function/ValueSource.java       |   28 +-
 .../function/valuesource/BytesRefFieldSource.java  |    2 +-
 .../valuesource/ComparisonBoolFunction.java        |    4 +-
 .../function/valuesource/ConstValueSource.java     |    2 +-
 .../queries/function/valuesource/DefFunction.java  |    2 +-
 .../function/valuesource/DocFreqValueSource.java   |  181 +-
 .../valuesource/DoubleConstValueSource.java        |    2 +-
 .../function/valuesource/DoubleFieldSource.java    |    4 +-
 .../function/valuesource/DualFloatFunction.java    |    4 +-
 .../function/valuesource/EnumFieldSource.java      |    2 +-
 .../function/valuesource/FloatFieldSource.java     |    4 +-
 .../function/valuesource/IDFValueSource.java       |    4 +-
 .../queries/function/valuesource/IfFunction.java   |    4 +-
 .../function/valuesource/IntFieldSource.java       |    4 +-
 .../valuesource/JoinDocFreqValueSource.java        |    2 +-
 .../function/valuesource/LinearFloatFunction.java  |    4 +-
 .../function/valuesource/LiteralValueSource.java   |    2 +-
 .../function/valuesource/LongFieldSource.java      |    4 +-
 .../function/valuesource/MaxDocValueSource.java    |    8 +-
 .../function/valuesource/MultiBoolFunction.java    |    4 +-
 .../function/valuesource/MultiFloatFunction.java   |    4 +-
 .../function/valuesource/MultiFunction.java        |    4 +-
 .../valuesource/MultiValuedDoubleFieldSource.java  |    2 +-
 .../valuesource/MultiValuedFloatFieldSource.java   |    2 +-
 .../valuesource/MultiValuedIntFieldSource.java     |    2 +-
 .../valuesource/MultiValuedLongFieldSource.java    |    2 +-
 .../function/valuesource/NormValueSource.java      |    4 +-
 .../function/valuesource/NumDocsValueSource.java   |    4 +-
 .../function/valuesource/QueryValueSource.java     |    8 +-
 .../valuesource/RangeMapFloatFunction.java         |    4 +-
 .../valuesource/ReciprocalFloatFunction.java       |    4 +-
 .../function/valuesource/ScaleFloatFunction.java   |    6 +-
 .../function/valuesource/SimpleBoolFunction.java   |    4 +-
 .../function/valuesource/SimpleFloatFunction.java  |    2 +-
 .../function/valuesource/SingleFunction.java       |    2 +-
 .../function/valuesource/SortedSetFieldSource.java |    2 +-
 .../valuesource/SumTotalTermFreqValueSource.java   |    4 +-
 .../function/valuesource/TFValueSource.java        |    2 +-
 .../function/valuesource/TermFreqValueSource.java  |    2 +-
 .../valuesource/TotalTermFreqValueSource.java      |    4 +-
 .../function/valuesource/VectorValueSource.java    |    4 +-
 .../lucene/queries/intervals/IntervalMatches.java  |    1 +
 .../queries/function/TestFunctionScoreQuery.java   |   32 +
 .../lucene/queries/function/TestValueSources.java  |   10 +-
 lucene/queryparser/build.gradle                    |    2 +
 lucene/replicator/build.gradle                     |    2 +
 .../lucene/replicator/ReplicatorTestCase.java      |    2 +
 .../apache/lucene/replicator/nrt/SimpleServer.java |    1 +
 .../lucene/replicator/nrt/TestNRTReplication.java  |   17 +-
 .../replicator/nrt/TestStressNRTReplication.java   |    6 +-
 lucene/sandbox/build.gradle                        |    2 +
 .../idversion/VersionBlockTreeTermsWriter.java     |    2 +-
 .../codecs/idversion/VersionFieldReader.java       |    2 +-
 .../lucene/search/LatLonPointPrototypeQueries.java |    4 +-
 .../apache/lucene/search/PhraseWildcardQuery.java  |    2 +-
 .../document/TestFloatPointNearestNeighbor.java    |    2 +-
 .../test/org/apache/lucene/search/TestNearest.java |    2 +-
 .../lucene/search/TestPhraseWildcardQuery.java     |    3 +-
 .../lucene/search/TestTermAutomatonQuery.java      |    3 +-
 lucene/site/xsl/index.template.md                  |   50 +
 lucene/site/xsl/index.xsl                          |    6 +-
 lucene/spatial-extras/build.gradle                 |    2 +
 .../org/apache/lucene/spatial/SpatialStrategy.java |    2 +-
 .../lucene/spatial/bbox/BBoxValueSource.java       |    2 +-
 .../lucene/spatial/prefix/HeatmapFacetCounter.java |    4 +-
 .../spatial/prefix/WithinPrefixTreeQuery.java      |    6 +-
 .../spatial/prefix/tree/PackedQuadPrefixTree.java  |    8 +-
 .../lucene/spatial/prefix/tree/QuadPrefixTree.java |   10 +-
 .../spatial/spatial4j/Geo3dShapeFactory.java       |    2 +
 .../lucene/spatial/DistanceStrategyTest.java       |   14 +-
 .../org/apache/lucene/spatial/PortedSolr3Test.java |   70 +-
 .../lucene/spatial/QueryEqualsHashCodeTest.java    |    4 +-
 .../org/apache/lucene/spatial/SpatialExample.java  |   10 +-
 .../org/apache/lucene/spatial/SpatialTestCase.java |    7 +-
 .../apache/lucene/spatial/StrategyTestCase.java    |    2 +-
 .../lucene/spatial/bbox/TestBBoxStrategy.java      |   32 +-
 .../lucene/spatial/prefix/DateNRStrategyTest.java  |    2 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java    |   34 +-
 .../lucene/spatial/prefix/JtsPolygonTest.java      |    6 +-
 .../spatial/prefix/NumberRangeFacetsTest.java      |   11 +-
 .../prefix/RandomSpatialOpFuzzyPrefixTreeTest.java |    2 +-
 .../prefix/RandomSpatialOpStrategyTestCase.java    |    3 +-
 .../prefix/TestRecursivePrefixTreeStrategy.java    |    6 +-
 .../Geo3dShapeSphereModelRectRelationTest.java     |    2 +-
 .../spatial/spatial4j/RandomizedShapeTestCase.java |  233 -
 lucene/spatial3d/build.gradle                      |    2 +
 .../apache/lucene/spatial3d/TestGeo3DPoint.java    |    8 +-
 lucene/suggest/build.gradle                        |    2 +
 .../search/spell/LuceneLevenshteinDistance.java    |   24 +-
 .../suggest/analyzing/AnalyzingSuggester.java      |    4 +-
 .../suggest/analyzing/FreeTextSuggester.java       |    4 +-
 .../search/suggest/document/NRTSuggester.java      |    4 +-
 .../suggest/document/NRTSuggesterBuilder.java      |    2 +-
 .../search/suggest/fst/FSTCompletionLookup.java    |    4 +-
 .../search/suggest/fst/WFSTCompletionLookup.java   |    4 +-
 .../search/suggest/jaspell/JaspellLookup.java      |    4 +-
 .../search/spell/TestWordBreakSpellChecker.java    |    3 +-
 .../lucene/search/suggest/LookupBenchmarkTest.java |    2 +-
 .../lucene/search/suggest/PersistenceTest.java     |    3 +-
 .../suggest/analyzing/TestFreeTextSuggester.java   |    1 +
 .../suggest/analyzing/TestSuggestStopFilter.java   |    9 -
 .../search/suggest/document/TestSuggestField.java  |   13 +-
 lucene/test-framework/build.gradle                 |    2 +
 .../UniformSplitRot13PostingsFormat.java           |   15 +
 .../STUniformSplitRot13PostingsFormat.java         |    7 +
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |   10 +-
 .../org/apache/lucene/geo/BaseXYPointTestCase.java |   10 +-
 .../lucene/index/BaseIndexFileFormatTestCase.java  |    4 +-
 .../java/org/apache/lucene/index/RandomCodec.java  |   16 +-
 .../org/apache/lucene/index/RandomIndexWriter.java |   54 +-
 .../ThreadedIndexingAndSearchingTestCase.java      |   24 +-
 .../lucene/search/AssertingLeafCollector.java      |    6 +-
 .../java/org/apache/lucene/search/CheckHits.java   |   75 +-
 .../java/org/apache/lucene/search/QueryUtils.java  |   26 +-
 .../lucene/search/ShardSearchingTestBase.java      |    3 +-
 .../search/similarities/AssertingSimilarity.java   |    2 +-
 .../java/org/apache/lucene/util/LineFileDocs.java  |   17 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |   26 +
 .../util/TestRuleSetupAndRestoreClassEnv.java      |   29 +-
 .../src/java/org/apache/lucene/util/TestUtil.java  |    4 +-
 .../java/org/apache/lucene/util/fst/FSTTester.java |    5 +-
 .../lucene/search/TestBaseExplanationTestCase.java |   12 +-
 .../util/TestExceptionInBeforeClassHooks.java      |    3 +-
 solr/CHANGES.txt                                   |  223 +-
 solr/NOTICE.txt                                    |   10 +-
 solr/bin/solr                                      |   36 +-
 solr/bin/solr.cmd                                  |   33 +-
 solr/bin/solr.in.cmd                               |   14 +-
 solr/bin/solr.in.sh                                |   15 +-
 solr/build.gradle                                  |    2 +
 solr/build.xml                                     |    2 +-
 solr/contrib/analysis-extras/build.gradle          |    2 +
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |   13 +-
 solr/contrib/analytics/build.gradle                |    2 +
 .../apache/solr/analytics/ExpressionFactory.java   |   78 +-
 .../apache/solr/analytics/facet/PivotFacet.java    |   77 +-
 .../function/mapping/ComparisonFunction.java       |  320 +-
 .../function/mapping/DateMathFunction.java         |  171 +-
 .../function/mapping/DateParseFunction.java        |  261 +-
 .../mapping/DecimalNumericConversionFunction.java  |  283 +-
 .../analytics/function/mapping/EqualFunction.java  |  301 +-
 .../analytics/function/mapping/ExistsFunction.java |  143 +-
 .../function/mapping/FillMissingFunction.java      | 1283 ++---
 .../analytics/function/mapping/FilterFunction.java | 1075 ++--
 .../analytics/function/mapping/IfFunction.java     | 1268 ++---
 .../analytics/function/mapping/LambdaFunction.java | 4044 +++++++--------
 .../analytics/function/mapping/RemoveFunction.java | 1187 ++---
 .../function/mapping/ReplaceFunction.java          | 1521 +++---
 .../analytics/function/reduction/MaxFunction.java  |  405 +-
 .../function/reduction/MedianFunction.java         |  237 +-
 .../analytics/function/reduction/MinFunction.java  |  405 +-
 .../function/reduction/OrdinalFunction.java        |  489 +-
 .../function/reduction/PercentileFunction.java     |  453 +-
 .../solr/analytics/util/FacetRangeGenerator.java   |  132 +-
 .../solr/analytics/util/MedianCalculator.java      |    6 +-
 .../solr/analytics/util/OrdinalCalculator.java     |   15 +-
 .../org/apache/solr/handler/AnalyticsHandler.java  |    6 -
 .../solr/handler/component/AnalyticsComponent.java |    2 +-
 .../response/AnalyticsShardResponseWriter.java     |    2 +-
 .../analytics/legacy/LegacyNoFacetCloudTest.java   |   32 +-
 .../solr/analytics/legacy/LegacyNoFacetTest.java   |   32 +-
 .../LegacyAbstractAnalyticsFacetCloudTest.java     |    2 +-
 .../facet/LegacyAbstractAnalyticsFacetTest.java    |    4 +-
 .../legacy/facet/LegacyFieldFacetTest.java         |    1 +
 solr/contrib/clustering/build.gradle               |    2 +
 .../handler/clustering/ClusteringComponent.java    |   20 +-
 .../clustering/carrot2/CarrotClusteringEngine.java |   20 +-
 .../carrot2/LuceneCarrot2StemmerFactory.java       |   10 +-
 .../clustering/carrot2/SolrResourceLocator.java    |    8 +-
 solr/contrib/dataimporthandler-extras/build.gradle |    2 +
 .../handler/dataimport/MailEntityProcessor.java    |  103 +-
 .../handler/dataimport/TikaEntityProcessor.java    |    1 +
 .../dataimport/TestMailEntityProcessor.java        |   13 +-
 solr/contrib/dataimporthandler/build.gradle        |    2 +
 .../solr/handler/dataimport/BinURLDataSource.java  |    6 +-
 .../solr/handler/dataimport/ClobTransformer.java   |    1 +
 .../apache/solr/handler/dataimport/Context.java    |    2 +
 .../solr/handler/dataimport/ContextImpl.java       |    6 +-
 .../solr/handler/dataimport/DataImportHandler.java |   10 +-
 .../solr/handler/dataimport/DataImporter.java      |   10 +-
 .../handler/dataimport/DateFormatTransformer.java  |    1 +
 .../solr/handler/dataimport/DebugLogger.java       |   12 +-
 .../apache/solr/handler/dataimport/DocBuilder.java |   42 +-
 .../handler/dataimport/EntityProcessorWrapper.java |   22 +-
 .../solr/handler/dataimport/FileDataSource.java    |   12 +-
 .../handler/dataimport/HTMLStripTransformer.java   |    1 +
 .../solr/handler/dataimport/JdbcDataSource.java    |   20 +-
 .../dataimport/NumberFormatTransformer.java        |    1 +
 .../dataimport/PlainTextEntityProcessor.java       |    1 +
 .../solr/handler/dataimport/RegexTransformer.java  |    6 +-
 .../handler/dataimport/SimplePropertiesWriter.java |    6 +-
 .../apache/solr/handler/dataimport/SolrWriter.java |   10 +-
 .../handler/dataimport/SqlEntityProcessor.java     |   10 +-
 .../handler/dataimport/TemplateTransformer.java    |    5 +-
 .../solr/handler/dataimport/URLDataSource.java     |    6 +-
 .../handler/dataimport/XPathEntityProcessor.java   |   20 +-
 .../solr/handler/dataimport/XPathRecordReader.java |    3 +-
 .../handler/dataimport/ZKPropertiesWriter.java     |    4 +-
 .../dataimport/config/DIHConfiguration.java        |    8 +-
 .../dataimporthandler/src/test-files/log4j2.xml    |   42 +
 .../src/test-files/solr/collection1/README         |    1 +
 .../solr/configsets/dihconfigset/conf/README       |    2 +
 .../solr/configsets/dihconfigset/conf/schema.xml   |   70 +
 .../configsets/dihconfigset/conf/solrconfig.xml    |  287 ++
 .../dataimporthandler/src/test-files/solr/solr.xml |   27 +
 .../dataimport/AbstractDIHCacheTestCase.java       |    2 +-
 .../AbstractDataImportHandlerTestCase.java         |    9 +-
 .../AbstractSqlEntityProcessorTestCase.java        |   23 +-
 .../dataimport/MockInitialContextFactory.java      |    2 +-
 .../handler/dataimport/TestClobTransformer.java    |    2 +
 .../solr/handler/dataimport/TestDataConfig.java    |    1 +
 .../solr/handler/dataimport/TestDocBuilder.java    |   10 +-
 .../solr/handler/dataimport/TestDocBuilder2.java   |   16 +-
 .../handler/dataimport/TestEphemeralCache.java     |    3 +
 .../solr/handler/dataimport/TestErrorHandling.java |    1 +
 .../solr/handler/dataimport/TestFieldReader.java   |    1 +
 .../dataimport/TestFileListEntityProcessor.java    |    8 +-
 .../dataimport/TestJdbcDataSourceConvertType.java  |    2 +-
 .../dataimport/TestLineEntityProcessor.java        |    8 +
 .../dataimport/TestPlainTextEntityProcessor.java   |    3 +
 .../handler/dataimport/TestRegexTransformer.java   |    5 +
 .../handler/dataimport/TestScriptTransformer.java  |    4 +-
 .../dataimport/TestSolrEntityProcessorUnit.java    |    3 +-
 .../dataimport/TestSortedMapBackedCache.java       |    6 +-
 .../dataimport/TestSqlEntityProcessorDelta.java    |   12 +-
 .../dataimport/TestTemplateTransformer.java        |    4 +
 .../handler/dataimport/TestVariableResolver.java   |    1 +
 .../solr/handler/dataimport/TestWriterImpl.java    |    2 +
 .../dataimport/TestXPathEntityProcessor.java       |   15 +
 .../handler/dataimport/TestXPathRecordReader.java  |    1 +
 .../handler/dataimport/TestZKPropertiesWriter.java |  208 +-
 solr/contrib/extraction/build.gradle               |    2 +
 .../extraction/ExtractingDocumentLoader.java       |    8 +-
 .../extraction/ExtractingRequestHandler.java       |    2 +-
 .../extraction/RegexRulesPasswordProvider.java     |    4 +-
 .../handler/extraction/XLSXResponseWriter.java     |    4 +-
 .../extraction/ExtractingRequestHandlerTest.java   |    3 +
 .../contrib/jaegertracer-configurator/build.gradle |    2 +
 .../solr/jaeger/JaegerTracerConfigurator.java      |    2 +-
 .../apache/solr/jaeger/TestJaegerConfigurator.java |    4 +
 solr/contrib/langid/build.gradle                   |    2 +
 .../LanguageIdentifierUpdateProcessor.java         |   48 +-
 .../OpenNLPLangDetectUpdateProcessorFactory.java   |    2 +-
 .../TikaLanguageIdentifierUpdateProcessor.java     |    5 +-
 solr/contrib/ltr/build.gradle                      |    2 +
 .../java/org/apache/solr/ltr/LTRThreadModule.java  |    7 +-
 .../java/org/apache/solr/ltr/feature/Feature.java  |    1 +
 .../org/apache/solr/ltr/model/LTRScoringModel.java |    1 +
 .../org/apache/solr/ltr/model/LinearModel.java     |    1 +
 .../solr/ltr/model/MultipleAdditiveTreesModel.java |    4 +
 .../apache/solr/ltr/model/NeuralNetworkModel.java  |    4 +
 .../LTRFeatureLoggerTransformerFactory.java        |    1 +
 .../apache/solr/ltr/search/LTRQParserPlugin.java   |    1 +
 .../solr/ltr/store/rest/ManagedModelStore.java     |    5 +-
 .../apache/solr/ltr/TestLTRReRankingPipeline.java  |    6 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |   10 +-
 .../TestFeatureExtractionFromMultipleSegments.java |    2 +
 .../solr/ltr/feature/TestNoMatchSolrFeature.java   |    4 +
 .../solr/ltr/feature/TestOriginalScoreFeature.java |    6 +
 .../solr/ltr/model/TestNeuralNetworkModel.java     |    1 +
 .../store/rest/TestModelManagerPersistence.java    |    4 +
 solr/contrib/prometheus-exporter/build.gradle      |    2 +
 .../collector/SchedulerMetricsCollector.java       |    3 +-
 .../solr/prometheus/exporter/MetricsQuery.java     |    1 +
 .../exporter/PrometheusExporterSettings.java       |    4 +-
 .../solr/prometheus/exporter/SolrExporter.java     |    2 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |    1 +
 .../solr/prometheus/scraper/SolrScraper.java       |    4 +-
 solr/contrib/velocity/build.gradle                 |    2 +
 .../solr/response/VelocityResponseWriter.java      |   12 +-
 solr/core/build.gradle                             |    3 +-
 solr/core/ivy.xml                                  |    1 -
 .../src/java/org/apache/solr/api/AnnotatedApi.java |   93 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |   25 +-
 .../src/java/org/apache/solr/api/EndPoint.java     |    2 +-
 .../src/java/org/apache/solr/api/V2HttpCall.java   |    2 +
 .../client/solrj/embedded/EmbeddedSolrServer.java  |   13 +-
 .../client/solrj/embedded/JettySolrRunner.java     |    6 +-
 .../apache/solr/cloud/ActiveReplicaWatcher.java    |   19 +-
 .../apache/solr/cloud/CloudConfigSetService.java   |    3 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |   15 +-
 .../org/apache/solr/cloud/ElectionContext.java     |  707 ---
 .../apache/solr/cloud/ExclusiveSliceProperty.java  |   10 +-
 .../java/org/apache/solr/cloud/LeaderElector.java  |    2 +-
 .../src/java/org/apache/solr/cloud/LockTree.java   |   56 +-
 .../src/java/org/apache/solr/cloud/Overseer.java   |  114 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |   20 +-
 .../apache/solr/cloud/OverseerElectionContext.java |  110 +
 .../apache/solr/cloud/OverseerMessageHandler.java  |    7 +-
 .../apache/solr/cloud/OverseerNodePrioritizer.java |    6 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |    4 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |  226 +-
 .../org/apache/solr/cloud/OverseerTaskQueue.java   |   13 +-
 .../solr/cloud/RecoveringCoreTermWatcher.java      |    4 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |  101 +-
 .../solr/cloud/ShardLeaderElectionContext.java     |  493 ++
 .../solr/cloud/ShardLeaderElectionContextBase.java |  194 +
 .../java/org/apache/solr/cloud/SolrZkServer.java   |   10 +-
 .../java/org/apache/solr/cloud/SyncStrategy.java   |   29 +-
 .../core/src/java/org/apache/solr/cloud/ZkCLI.java |   16 +-
 .../java/org/apache/solr/cloud/ZkController.java   |  272 +-
 .../org/apache/solr/cloud/ZkDistributedQueue.java  |   17 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |    1 +
 .../apache/solr/cloud/ZkSolrResourceLoader.java    |    2 +-
 .../solr/cloud/api/collections/AddReplicaCmd.java  |   49 +-
 .../solr/cloud/api/collections/AliasCmd.java       |    1 +
 .../apache/solr/cloud/api/collections/Assign.java  |   86 +-
 .../solr/cloud/api/collections/BackupCmd.java      |    9 +-
 .../solr/cloud/api/collections/CreateAliasCmd.java |    2 +-
 .../cloud/api/collections/CreateCollectionCmd.java |   54 +-
 .../solr/cloud/api/collections/CreateShardCmd.java |    1 +
 .../cloud/api/collections/CreateSnapshotCmd.java   |    6 +-
 .../solr/cloud/api/collections/DeleteAliasCmd.java |    2 +-
 .../cloud/api/collections/DeleteCollectionCmd.java |    3 +-
 .../solr/cloud/api/collections/DeleteNodeCmd.java  |    7 +-
 .../cloud/api/collections/DeleteReplicaCmd.java    |   10 +-
 .../solr/cloud/api/collections/DeleteShardCmd.java |    5 +-
 .../cloud/api/collections/DeleteSnapshotCmd.java   |    6 +-
 .../api/collections/MaintainRoutedAliasCmd.java    |    8 +-
 .../solr/cloud/api/collections/MigrateCmd.java     |    5 +-
 .../solr/cloud/api/collections/MoveReplicaCmd.java |   16 +-
 .../OverseerCollectionMessageHandler.java          |   88 +-
 .../cloud/api/collections/OverseerRoleCmd.java     |    6 +-
 .../cloud/api/collections/OverseerStatusCmd.java   |    7 +-
 .../api/collections/ReindexCollectionCmd.java      |   16 +-
 .../solr/cloud/api/collections/RenameCmd.java      |    2 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |    5 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |   14 +-
 .../solr/cloud/api/collections/RoutedAlias.java    |    9 +-
 .../cloud/api/collections/SetAliasPropCmd.java     |    2 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |    5 +-
 .../solr/cloud/api/collections/UtilizeNodeCmd.java |    4 +-
 .../autoscaling/AutoAddReplicasPlanAction.java     |   47 +-
 .../apache/solr/cloud/autoscaling/AutoScaling.java |    2 +
 .../solr/cloud/autoscaling/AutoScalingHandler.java |   10 +
 .../solr/cloud/autoscaling/ComputePlanAction.java  |  174 +-
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |    2 +
 .../cloud/autoscaling/InactiveShardPlanAction.java |    1 +
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |    2 +
 .../solr/cloud/autoscaling/MetricTrigger.java      |    1 +
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |    2 +
 .../solr/cloud/autoscaling/NodeLostTrigger.java    |    2 +
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |    3 +
 .../solr/cloud/autoscaling/SearchRateTrigger.java  |    5 +
 .../solr/cloud/autoscaling/SystemLogListener.java  |    2 +
 .../apache/solr/cloud/autoscaling/TriggerBase.java |    3 +
 .../solr/cloud/autoscaling/TriggerEvent.java       |    4 +
 .../solr/cloud/autoscaling/TriggerEventQueue.java  |    2 +
 .../solr/cloud/autoscaling/TriggerUtils.java       |    1 +
 .../cloud/autoscaling/sim/SimCloudManager.java     |    9 +-
 .../autoscaling/sim/SimClusterStateProvider.java   |  298 +-
 .../autoscaling/sim/SimDistribStateManager.java    |    1 +
 .../sim/SimDistributedQueueFactory.java            |    1 +
 .../autoscaling/sim/SimNodeStateProvider.java      |    3 +
 .../solr/cloud/autoscaling/sim/SimScenario.java    |   19 +-
 .../solr/cloud/autoscaling/sim/SimUtils.java       |    1 +
 .../autoscaling/sim/SnapshotCloudManager.java      |    3 +
 .../sim/SnapshotClusterStateProvider.java          |   34 +-
 .../sim/SnapshotDistribStateManager.java           |    2 +
 .../autoscaling/sim/SnapshotNodeStateProvider.java |    3 +
 .../solr/cloud/overseer/ClusterStateMutator.java   |   19 +-
 .../solr/cloud/overseer/CollectionMutator.java     |    3 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |   44 +-
 .../apache/solr/cloud/overseer/ZkStateWriter.java  |   43 +-
 .../apache/solr/cloud/rule/ReplicaAssigner.java    |   13 +-
 .../src/java/org/apache/solr/cloud/rule/Rule.java  |   13 +-
 .../solr/cloud/rule/ServerSnitchContext.java       |    1 +
 .../solr/core/AbstractSolrEventListener.java       |    5 +-
 .../java/org/apache/solr/core/BlobRepository.java  |    9 +-
 .../apache/solr/core/CachingDirectoryFactory.java  |    4 +-
 .../java/org/apache/solr/core/CodecFactory.java    |    2 +-
 .../java/org/apache/solr/core/ConfigOverlay.java   |   14 +
 .../src/java/org/apache/solr/core/ConfigSet.java   |    3 +
 .../org/apache/solr/core/ConfigSetProperties.java  |    2 +
 .../org/apache/solr/core/ConfigSetService.java     |    3 +
 .../java/org/apache/solr/core/CoreContainer.java   |  153 +-
 .../java/org/apache/solr/core/CoreDescriptor.java  |   10 +-
 .../apache/solr/core/CorePropertiesLocator.java    |    6 +-
 .../org/apache/solr/core/DirectoryFactory.java     |   19 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |    2 +-
 .../solr/core/IndexDeletionPolicyWrapper.java      |    4 +-
 .../org/apache/solr/core/IndexReaderFactory.java   |    2 +-
 .../src/java/org/apache/solr/core/InitParams.java  |   12 +-
 .../org/apache/solr/core/MMapDirectoryFactory.java |    1 +
 .../java/org/apache/solr/core/MemClassLoader.java  |    5 +-
 .../solr/core/NRTCachingDirectoryFactory.java      |    1 +
 .../src/java/org/apache/solr/core/NodeConfig.java  |   40 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   27 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    6 +-
 .../org/apache/solr/core/QuerySenderListener.java  |   54 +-
 .../java/org/apache/solr/core/RequestParams.java   |   57 +-
 .../org/apache/solr/core/SchemaCodecFactory.java   |    5 +-
 .../apache/solr/core/SimpleTextCodecFactory.java   |    1 +
 .../src/java/org/apache/solr/core/SolrConfig.java  |   21 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   25 +-
 .../org/apache/solr/core/SolrDeletionPolicy.java   |    2 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |   41 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  100 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |   16 +
 .../solr/core/TransientSolrCoreCacheDefault.java   |    6 +-
 .../src/java/org/apache/solr/core/ZkContainer.java |   14 +-
 .../org/apache/solr/core/backup/BackupManager.java |    2 +-
 .../backup/repository/HdfsBackupRepository.java    |    1 +
 .../repository/LocalFileSystemRepository.java      |    3 +-
 .../solr/core/snapshots/SolrSnapshotManager.java   |    4 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java     |    1 +
 .../apache/solr/filestore/DistribPackageStore.java |    8 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |    6 +-
 .../solr/handler/AnalysisRequestHandlerBase.java   |    3 +
 .../org/apache/solr/handler/AnalyzeEvaluator.java  |    2 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |   16 +-
 .../java/org/apache/solr/handler/CatStream.java    |   20 +-
 .../solr/handler/CdcrBufferStateManager.java       |    6 +-
 .../solr/handler/CdcrLeaderStateManager.java       |    2 +-
 .../solr/handler/CdcrProcessStateManager.java      |    6 +-
 .../org/apache/solr/handler/CdcrReplicator.java    |   11 +-
 .../apache/solr/handler/CdcrReplicatorManager.java |   37 +-
 .../solr/handler/CdcrReplicatorScheduler.java      |    4 +-
 .../apache/solr/handler/CdcrRequestHandler.java    |   18 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java    |    8 +-
 .../solr/handler/ContentStreamHandlerBase.java     |    2 +-
 .../handler/DocumentAnalysisRequestHandler.java    |    8 +-
 .../apache/solr/handler/DumpRequestHandler.java    |   10 +-
 .../org/apache/solr/handler/ExportHandler.java     |   70 +-
 .../solr/handler/FieldAnalysisRequestHandler.java  |    3 +
 .../java/org/apache/solr/handler/GraphHandler.java |   23 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |  109 +-
 .../apache/solr/handler/MoreLikeThisHandler.java   |    5 +-
 .../apache/solr/handler/PingRequestHandler.java    |    2 +-
 .../apache/solr/handler/ReplicationHandler.java    |   59 +-
 .../apache/solr/handler/RequestHandlerBase.java    |    8 +-
 .../java/org/apache/solr/handler/RestoreCore.java  |    3 +-
 .../java/org/apache/solr/handler/SQLHandler.java   |   10 +-
 .../org/apache/solr/handler/SchemaHandler.java     |   16 +-
 .../java/org/apache/solr/handler/SnapShooter.java  |   25 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   62 +-
 .../org/apache/solr/handler/StreamHandler.java     |   99 +-
 .../apache/solr/handler/UpdateRequestHandler.java  |    4 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |    2 +
 .../handler/admin/AutoscalingHistoryHandler.java   |    1 +
 .../solr/handler/admin/BaseHandlerApiSupport.java  |    5 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |   34 +-
 .../org/apache/solr/handler/admin/ColStatus.java   |    7 +-
 .../solr/handler/admin/CollectionsHandler.java     |   23 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |    3 +
 .../solr/handler/admin/CoreAdminHandler.java       |    2 +-
 .../solr/handler/admin/CoreAdminOperation.java     |    7 +-
 .../solr/handler/admin/HealthCheckHandler.java     |    2 +-
 .../solr/handler/admin/IndexSizeEstimator.java     |    3 +
 .../org/apache/solr/handler/admin/InfoHandler.java |    2 +-
 .../apache/solr/handler/admin/LoggingHandler.java  |    2 +
 .../solr/handler/admin/LukeRequestHandler.java     |   34 +-
 .../handler/admin/MetricsCollectorHandler.java     |    2 +-
 .../apache/solr/handler/admin/MetricsHandler.java  |    7 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    4 +
 .../solr/handler/admin/RebalanceLeaders.java       |    8 +-
 .../solr/handler/admin/SecurityConfHandler.java    |    7 +-
 .../handler/admin/SegmentsInfoRequestHandler.java  |    7 +-
 .../solr/handler/admin/ShowFileRequestHandler.java |    2 +-
 .../solr/handler/admin/SolrInfoMBeanHandler.java   |    4 +
 .../org/apache/solr/handler/admin/SplitOp.java     |    2 +
 .../solr/handler/admin/SystemInfoHandler.java      |   42 +-
 .../solr/handler/admin/ZookeeperInfoHandler.java   |  201 +-
 .../solr/handler/admin/ZookeeperReadAPI.java       |  145 +
 .../solr/handler/admin/ZookeeperStatusHandler.java |    8 +-
 .../solr/handler/component/CloudReplicaSource.java |    2 +
 .../solr/handler/component/DebugComponent.java     |    8 +
 .../solr/handler/component/ExpandComponent.java    |   15 +-
 .../solr/handler/component/FieldFacetStats.java    |    4 +-
 .../solr/handler/component/HighlightComponent.java |    9 +-
 .../solr/handler/component/HttpShardHandler.java   |  142 +-
 .../handler/component/HttpShardHandlerFactory.java |   10 +-
 .../handler/component/IterativeMergeStrategy.java  |    1 +
 .../solr/handler/component/MergeStrategy.java      |    1 +
 .../component/PhrasesIdentificationComponent.java  |    4 +
 .../component/PivotFacetFieldValueCollection.java  |    1 +
 .../solr/handler/component/PivotFacetHelper.java   |    5 +
 .../handler/component/PivotFacetProcessor.java     |    4 +-
 .../solr/handler/component/QueryComponent.java     |   37 +-
 .../handler/component/QueryElevationComponent.java |    7 +-
 .../handler/component/RangeFacetProcessor.java     |    1 +
 .../handler/component/RealTimeGetComponent.java    |   33 +-
 .../solr/handler/component/ResponseBuilder.java    |    6 +-
 .../solr/handler/component/SearchComponent.java    |    2 +-
 .../solr/handler/component/SearchHandler.java      |    4 +
 .../apache/solr/handler/component/ShardDoc.java    |    1 +
 .../component/ShardFieldSortedHitQueue.java        |    6 +-
 .../solr/handler/component/ShardRequestor.java     |  178 +
 .../handler/component/SortedDateStatsValues.java   |    6 +-
 .../component/SortedNumericStatsValues.java        |    6 +-
 .../handler/component/SpatialHeatmapFacets.java    |    4 +-
 .../handler/component/SpellCheckComponent.java     |   31 +-
 .../handler/component/StandaloneReplicaSource.java |    1 +
 .../solr/handler/component/StatsComponent.java     |  113 +-
 .../apache/solr/handler/component/StatsInfo.java   |  108 +
 .../apache/solr/handler/component/StatsValues.java |    2 +-
 .../solr/handler/component/StatsValuesFactory.java | 1385 ++---
 .../solr/handler/component/SuggestComponent.java   |   22 +-
 .../handler/component/TermVectorComponent.java     |    6 +-
 .../solr/handler/component/TermsComponent.java     |    4 +-
 .../org/apache/solr/handler/export/DoubleCmp.java  |   43 -
 .../org/apache/solr/handler/export/DoubleComp.java |   45 +
 .../apache/solr/handler/export/ExportWriter.java   |  275 +-
 .../org/apache/solr/handler/export/FloatCmp.java   |   44 -
 .../org/apache/solr/handler/export/FloatComp.java  |   44 +
 .../org/apache/solr/handler/export/IntComp.java    |   32 +-
 .../org/apache/solr/handler/export/LongCmp.java    |   45 -
 .../org/apache/solr/handler/export/LongComp.java   |   46 +
 .../solr/handler/export/SingleValueSortDoc.java    |    5 +
 .../org/apache/solr/handler/export/SortDoc.java    |    4 +
 .../solr/handler/export/StringFieldWriter.java     |   16 +-
 .../apache/solr/handler/export/StringValue.java    |   22 +-
 .../apache/solr/handler/loader/JavabinLoader.java  |    6 +-
 .../org/apache/solr/handler/loader/JsonLoader.java |   11 +-
 .../org/apache/solr/handler/loader/XMLLoader.java  |    2 +
 .../apache/solr/handler/sql/CalciteSolrDriver.java |   16 +-
 .../org/apache/solr/handler/sql/LimitStream.java   |    6 +-
 .../org/apache/solr/handler/sql/SolrAggregate.java |    1 +
 .../apache/solr/handler/sql/SolrEnumerator.java    |    3 +
 .../org/apache/solr/handler/sql/SolrFilter.java    |   16 +-
 .../org/apache/solr/handler/sql/SolrMethod.java    |    1 +
 .../org/apache/solr/handler/sql/SolrSchema.java    |   62 +-
 .../org/apache/solr/handler/sql/SolrTable.java     |   31 +-
 .../handler/sql/SolrToEnumerableConverter.java     |    3 +
 .../solr/handler/tagger/TaggerRequestHandler.java  |   12 +-
 .../solr/handler/tagger/TermPrefixCursor.java      |    1 +
 .../solr/highlight/DefaultSolrHighlighter.java     |  512 +-
 .../solr/highlight/HighlightingPluginBase.java     |    2 +-
 .../org/apache/solr/highlight/RegexFragmenter.java |    2 +-
 .../org/apache/solr/highlight/SolrEncoder.java     |    2 +-
 .../org/apache/solr/highlight/SolrFormatter.java   |    2 +-
 .../apache/solr/highlight/SolrFragListBuilder.java |    2 +-
 .../org/apache/solr/highlight/SolrFragmenter.java  |    2 +-
 .../solr/index/WrapperMergePolicyFactory.java      |    1 +
 .../org/apache/solr/internal/csv/CSVParser.java    |    4 +
 .../org/apache/solr/internal/csv/CSVPrinter.java   |    1 +
 .../java/org/apache/solr/logging/LogWatcher.java   |    2 +
 .../org/apache/solr/metrics/MetricSuppliers.java   |    5 +
 .../java/org/apache/solr/metrics/MetricsMap.java   |    3 +
 .../org/apache/solr/metrics/SolrMetricManager.java |    8 +-
 .../apache/solr/metrics/SolrMetricProducer.java    |    9 +-
 .../solr/metrics/reporters/SolrSlf4jReporter.java  |    1 +
 .../reporters/solr/SolrClusterReporter.java        |    4 +-
 .../solr/metrics/reporters/solr/SolrReporter.java  |   73 +-
 .../metrics/reporters/solr/SolrShardReporter.java  |    6 +-
 .../solr/metrics/rrd/SolrRrdBackendFactory.java    |    2 +-
 .../apache/solr/packagemanager/PackageManager.java |    5 +-
 .../solr/packagemanager/RepositoryManager.java     |    1 +
 .../solr/packagemanager/SolrPackageInstance.java   |    5 +
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |    7 +
 .../java/org/apache/solr/pkg/PackageListeners.java |    4 +-
 .../java/org/apache/solr/pkg/PackageLoader.java    |   45 +-
 .../org/apache/solr/pkg/PackagePluginHolder.java   |   35 +-
 .../apache/solr/request/LocalSolrQueryRequest.java |   12 +-
 .../java/org/apache/solr/request/SimpleFacets.java |   12 +-
 .../apache/solr/request/SolrQueryRequestBase.java  |    1 +
 .../apache/solr/request/SolrRequestHandler.java    |    2 +-
 .../org/apache/solr/request/SolrRequestInfo.java   |   89 +-
 .../solr/request/json/JsonQueryConverter.java      |   52 +-
 .../org/apache/solr/request/json/ObjectUtil.java   |    8 +-
 .../apache/solr/response/BinaryResponseWriter.java |   11 +-
 .../apache/solr/response/CSVResponseWriter.java    |    4 +-
 .../org/apache/solr/response/DocsStreamer.java     |    1 +
 .../solr/response/GeoJSONResponseWriter.java       |   20 +-
 .../solr/response/GraphMLResponseWriter.java       |    8 +-
 .../apache/solr/response/JSONResponseWriter.java   |   25 +-
 .../java/org/apache/solr/response/JSONWriter.java  |   43 +-
 .../apache/solr/response/PHPResponseWriter.java    |    6 +-
 .../solr/response/PHPSerializedResponseWriter.java |   24 +-
 .../apache/solr/response/PythonResponseWriter.java |    4 +-
 .../apache/solr/response/QueryResponseWriter.java  |    2 +-
 .../apache/solr/response/RawResponseWriter.java    |    2 +-
 .../apache/solr/response/RubyResponseWriter.java   |    4 +-
 .../solr/response/SchemaXmlResponseWriter.java     |    2 +-
 .../org/apache/solr/response/SchemaXmlWriter.java  |   23 +-
 .../apache/solr/response/SmileResponseWriter.java  |    2 +-
 .../apache/solr/response/SolrQueryResponse.java    |    1 +
 .../solr/response/TabularResponseWriter.java       |   13 +-
 .../apache/solr/response/TextResponseWriter.java   |   16 +-
 .../apache/solr/response/XMLResponseWriter.java    |    2 +-
 .../java/org/apache/solr/response/XMLWriter.java   |   29 +-
 .../apache/solr/response/XSLTResponseWriter.java   |    2 +-
 .../response/transform/DocIdAugmenterFactory.java  |   31 +-
 .../transform/ExplainAugmenterFactory.java         |    2 +-
 .../response/transform/GeoTransformerFactory.java  |    1 +
 .../transform/RawValueTransformerFactory.java      |    3 +-
 .../response/transform/ShardAugmenterFactory.java  |    2 +-
 .../transform/SubQueryAugmenterFactory.java        |   54 +-
 .../response/transform/TransformerFactory.java     |    2 +-
 .../response/transform/ValueAugmenterFactory.java  |   80 +-
 .../response/transform/ValueSourceAugmenter.java   |    3 +
 .../org/apache/solr/rest/BaseSolrResource.java     |    8 +-
 .../java/org/apache/solr/rest/ManagedResource.java |    2 +
 .../analysis/ManagedSynonymFilterFactory.java      |    1 +
 .../analysis/ManagedSynonymGraphFilterFactory.java |    1 +
 .../src/java/org/apache/solr/schema/BoolField.java |  145 +-
 .../solr/schema/ClassicIndexSchemaFactory.java     |    2 +-
 .../org/apache/solr/schema/CurrencyFieldType.java  |    5 +-
 .../org/apache/solr/schema/DatePointField.java     |   49 +-
 .../solr/schema/ExternalFileFieldReloader.java     |    2 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |   11 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |    7 +-
 .../solr/schema/LatLonPointSpatialField.java       |    1 +
 .../java/org/apache/solr/schema/LatLonType.java    |    4 +
 .../org/apache/solr/schema/ManagedIndexSchema.java |    6 +
 .../solr/schema/ManagedIndexSchemaFactory.java     |    2 +-
 .../solr/schema/OpenExchangeRatesOrgProvider.java  |    4 +-
 .../org/apache/solr/schema/RandomSortField.java    |    2 +-
 .../solr/schema/RptWithGeometrySpatialField.java   |    1 +
 .../java/org/apache/solr/schema/SchemaManager.java |    2 +
 .../org/apache/solr/schema/StrFieldSource.java     |    2 +-
 .../org/apache/solr/schema/TrieDoubleField.java    |    2 +-
 .../org/apache/solr/schema/TrieFloatField.java     |    2 +-
 .../java/org/apache/solr/schema/TrieIntField.java  |    2 +-
 .../java/org/apache/solr/schema/TrieLongField.java |    2 +-
 .../apache/solr/search/AbstractReRankQuery.java    |    2 +-
 .../java/org/apache/solr/search/CacheConfig.java   |    8 +
 .../org/apache/solr/search/CacheRegenerator.java   |    4 +-
 .../java/org/apache/solr/search/CaffeineCache.java |    5 +-
 .../solr/search/CollapsingQParserPlugin.java       |   12 +-
 .../solr/search/ComplexPhraseQParserPlugin.java    |    2 +-
 .../java/org/apache/solr/search/CursorMark.java    |    1 +
 .../src/java/org/apache/solr/search/DocList.java   |    3 +
 .../src/java/org/apache/solr/search/DocSlice.java  |   13 +-
 .../apache/solr/search/ExportQParserPlugin.java    |    5 +
 .../apache/solr/search/ExtendedDismaxQParser.java  |    5 +-
 .../solr/search/FloatPayloadValueSource.java       |    4 +-
 .../org/apache/solr/search/FunctionQParser.java    |    6 +-
 .../org/apache/solr/search/FunctionRangeQuery.java |    4 +
 .../solr/search/GraphTermsQParserPlugin.java       |   96 +-
 .../src/java/org/apache/solr/search/Grouping.java  |   42 +-
 .../solr/search/IGainTermsQParserPlugin.java       |    2 +
 .../org/apache/solr/search/MaxScoreCollector.java  |   10 +-
 .../java/org/apache/solr/search/QParserPlugin.java |    2 +-
 .../java/org/apache/solr/search/QueryCommand.java  |   10 +
 .../java/org/apache/solr/search/QueryContext.java  |    2 +
 .../java/org/apache/solr/search/QueryParsing.java  |    1 +
 .../org/apache/solr/search/QueryResultKey.java     |   15 +-
 .../src/java/org/apache/solr/search/RankQuery.java |    1 +
 .../org/apache/solr/search/ReRankCollector.java    |   12 +-
 .../solr/search/SignificantTermsQParserPlugin.java |    6 +
 .../src/java/org/apache/solr/search/SolrCache.java |    5 +-
 .../apache/solr/search/SolrConstantScoreQuery.java |    1 +
 .../org/apache/solr/search/SolrCoreParser.java     |    1 +
 .../apache/solr/search/SolrDocumentFetcher.java    |    1 +
 .../java/org/apache/solr/search/SolrFilter.java    |    6 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   73 +-
 .../org/apache/solr/search/TermsQParserPlugin.java |    3 +
 .../TextLogisticRegressionQParserPlugin.java       |    4 +-
 .../org/apache/solr/search/ValueSourceParser.java  |  651 +--
 .../org/apache/solr/search/XmlQParserPlugin.java   |    3 +-
 .../apache/solr/search/facet/AggValueSource.java   |    1 +
 .../java/org/apache/solr/search/facet/AvgAgg.java  |   20 +-
 .../org/apache/solr/search/facet/CountAgg.java     |    4 +-
 .../org/apache/solr/search/facet/CountValsAgg.java |   10 +-
 .../org/apache/solr/search/facet/DocValuesAcc.java |  575 +--
 .../org/apache/solr/search/facet/FacetBucket.java  |   15 +-
 .../org/apache/solr/search/facet/FacetContext.java |   74 +
 .../apache/solr/search/facet/FacetDebugInfo.java   |    2 +-
 .../org/apache/solr/search/facet/FacetField.java   |   45 +-
 .../apache/solr/search/facet/FacetFieldMerger.java |    7 +-
 .../solr/search/facet/FacetFieldProcessor.java     |   35 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    6 +-
 .../FacetFieldProcessorByEnumTermsStream.java      |    1 +
 .../search/facet/FacetFieldProcessorByHashDV.java  |    7 +-
 .../org/apache/solr/search/facet/FacetHeatmap.java |    8 +-
 .../org/apache/solr/search/facet/FacetModule.java  |  307 +-
 .../org/apache/solr/search/facet/FacetParser.java  |  637 +++
 .../apache/solr/search/facet/FacetProcessor.java   |    9 +-
 .../org/apache/solr/search/facet/FacetQuery.java   |    3 +-
 .../org/apache/solr/search/facet/FacetRange.java   | 1038 +---
 .../apache/solr/search/facet/FacetRangeMerger.java |    4 +-
 .../apache/solr/search/facet/FacetRangeParser.java |   76 +
 .../solr/search/facet/FacetRangeProcessor.java     | 1077 ++++
 .../org/apache/solr/search/facet/FacetRequest.java |  712 +--
 .../solr/search/facet/FacetRequestSorted.java      |   58 +
 .../search/facet/FacetRequestSortedMerger.java     |   10 +-
 .../java/org/apache/solr/search/facet/HLLAgg.java  |    8 +-
 .../org/apache/solr/search/facet/LegacyFacet.java  |    1 +
 .../org/apache/solr/search/facet/MinMaxAgg.java    |   19 +-
 .../org/apache/solr/search/facet/MissingAgg.java   |    4 +-
 .../apache/solr/search/facet/PercentileAgg.java    |    6 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |  101 +-
 .../solr/search/facet/SimpleAggValueSource.java    |    1 +
 .../java/org/apache/solr/search/facet/SlotAcc.java |  760 +--
 .../org/apache/solr/search/facet/StddevAgg.java    |   10 +-
 .../java/org/apache/solr/search/facet/SumAgg.java  |   10 +-
 .../org/apache/solr/search/facet/SumsqAgg.java     |    8 +-
 .../apache/solr/search/facet/UnInvertedField.java  |    4 +-
 .../solr/search/facet/UnInvertedFieldAcc.java      |  174 +-
 .../org/apache/solr/search/facet/UniqueAgg.java    |    6 +-
 .../apache/solr/search/facet/UniqueBlockAgg.java   |    2 +-
 .../solr/search/facet/UniqueBlockQueryAgg.java     |    4 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java    |    2 +
 .../org/apache/solr/search/facet/VarianceAgg.java  |   10 +-
 .../search/function/CollapseScoreFunction.java     |    2 +
 .../solr/search/function/FieldNameValueSource.java |    1 +
 .../solr/search/function/FileFloatSource.java      |   11 +-
 .../solr/search/function/MultiStringFunction.java  |    3 +-
 .../solr/search/function/OrdFieldSource.java       |    1 +
 .../search/function/ReverseOrdFieldSource.java     |    1 +
 .../search/function/ValueSourceRangeFilter.java    |    5 +-
 .../distance/GeoDistValueSourceParser.java         |    3 +-
 .../search/function/distance/GeohashFunction.java  |    3 +
 .../distance/GeohashHaversineFunction.java         |    8 +-
 .../function/distance/HaversineConstFunction.java  |    8 +-
 .../function/distance/HaversineFunction.java       |    7 +-
 .../function/distance/StringDistanceFunction.java  |    3 +
 .../function/distance/VectorDistanceFunction.java  |    7 +-
 .../solr/search/grouping/CommandHandler.java       |   14 +-
 .../distributed/command/GroupConverter.java        |    6 +-
 .../grouping/distributed/command/QueryCommand.java |    1 +
 .../command/SearchGroupsFieldCommand.java          |    3 +
 .../distributed/command/TopGroupsFieldCommand.java |    2 +
 .../SearchGroupShardResponseProcessor.java         |    3 +-
 .../TopGroupsShardResponseProcessor.java           |    4 +-
 .../SearchGroupsResultTransformer.java             |    7 +-
 .../ShardResultTransformer.java                    |    2 +
 .../TopGroupsResultTransformer.java                |    3 +-
 .../GroupedEndResultTransformer.java               |    1 +
 .../solr/search/join/BlockJoinChildQParser.java    |    7 +-
 .../solr/search/join/BlockJoinParentQParser.java   |  105 +-
 .../search/join/ChildFieldValueSourceParser.java   |    4 +-
 .../solr/search/join/GraphEdgeCollector.java       |  207 +
 .../org/apache/solr/search/join/GraphQuery.java    |    2 +-
 .../solr/search/join/GraphTermsCollector.java      |  202 -
 .../apache/solr/search/join/XCJFQParserPlugin.java |    4 +-
 .../org/apache/solr/search/join/XCJFQuery.java     |    3 +-
 .../apache/solr/search/mlt/CloudMLTQParser.java    |    4 +
 .../apache/solr/search/mlt/SimpleMLTQParser.java   |    1 +
 .../apache/solr/search/stats/ExactStatsCache.java  |   10 +
 .../apache/solr/search/stats/LRUStatsCache.java    |    2 +
 .../apache/solr/security/AuditLoggerPlugin.java    |    2 +
 .../apache/solr/security/AuthorizationContext.java |    1 +
 .../solr/security/AutorizationEditOperation.java   |    9 +
 .../org/apache/solr/security/BasicAuthPlugin.java  |    2 +-
 .../org/apache/solr/security/CertAuthPlugin.java   |   51 +
 .../ExternalRoleRuleBasedAuthorizationPlugin.java  |   57 +
 .../org/apache/solr/security/HadoopAuthPlugin.java |    6 +-
 .../org/apache/solr/security/JWTAuthPlugin.java    |   31 +-
 .../org/apache/solr/security/JWTPrincipal.java     |    4 +-
 .../org/apache/solr/security/KerberosFilter.java   |    2 +-
 .../org/apache/solr/security/KerberosPlugin.java   |   31 +-
 .../solr/security/PKIAuthenticationPlugin.java     |    1 +
 .../java/org/apache/solr/security/Permission.java  |    9 +-
 .../solr/security/PermissionNameProvider.java      |    2 +
 .../security/RuleBasedAuthorizationPlugin.java     |  308 +-
 .../security/RuleBasedAuthorizationPluginBase.java |  341 ++
 .../security/Sha256AuthenticationProvider.java     |    9 +-
 .../apache/solr/servlet/DirectSolrConnection.java  |    2 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |   15 +-
 .../apache/solr/servlet/LoadAdminUiServlet.java    |   31 +-
 .../org/apache/solr/servlet/ResponseUtils.java     |    3 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |   20 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |  151 +-
 .../solr/spelling/AbstractLuceneSpellChecker.java  |    3 +-
 .../solr/spelling/DirectSolrSpellChecker.java      |    3 +-
 .../solr/spelling/FileBasedSpellChecker.java       |    2 +-
 .../solr/spelling/IndexBasedSpellChecker.java      |    2 +-
 .../org/apache/solr/spelling/QueryConverter.java   |    3 +-
 .../org/apache/solr/spelling/SolrSpellChecker.java |    2 +-
 .../apache/solr/spelling/SpellCheckCollator.java   |    2 +-
 .../solr/spelling/WordBreakSolrSpellChecker.java   |    8 +-
 .../solr/spelling/suggest/DictionaryFactory.java   |    3 +-
 .../solr/spelling/suggest/LookupFactory.java       |    2 +-
 .../solr/spelling/suggest/SolrSuggester.java       |    1 +
 .../apache/solr/spelling/suggest/Suggester.java    |    2 +-
 .../suggest/fst/AnalyzingInfixLookupFactory.java   |    2 +-
 .../suggest/fst/AnalyzingLookupFactory.java        |    2 +-
 .../suggest/fst/BlendedInfixLookupFactory.java     |    2 +-
 .../spelling/suggest/fst/FSTLookupFactory.java     |    2 +-
 .../suggest/fst/FreeTextLookupFactory.java         |    2 +-
 .../spelling/suggest/fst/FuzzyLookupFactory.java   |    2 +-
 .../spelling/suggest/fst/WFSTLookupFactory.java    |    2 +-
 .../suggest/jaspell/JaspellLookupFactory.java      |    2 +-
 .../spelling/suggest/tst/TSTLookupFactory.java     |    2 +-
 .../solr/store/blockcache/BlockDirectory.java      |    2 +-
 .../org/apache/solr/store/hdfs/HdfsDirectory.java  |    2 +-
 .../org/apache/solr/update/AddUpdateCommand.java   |    1 +
 .../java/org/apache/solr/update/CdcrUpdateLog.java |    4 +
 .../java/org/apache/solr/update/CommitTracker.java |   17 +-
 .../apache/solr/update/DefaultSolrCoreState.java   |    4 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |   16 +-
 .../org/apache/solr/update/DocumentBuilder.java    |    1 +
 .../org/apache/solr/update/HdfsTransactionLog.java |    2 +
 .../java/org/apache/solr/update/HdfsUpdateLog.java |    1 +
 .../org/apache/solr/update/IndexFingerprint.java   |    5 +-
 .../src/java/org/apache/solr/update/PeerSync.java  |    6 +
 .../org/apache/solr/update/PeerSyncWithLeader.java |    4 +
 .../org/apache/solr/update/SolrCmdDistributor.java |    1 +
 .../java/org/apache/solr/update/SolrCoreState.java |    3 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |    7 +-
 .../org/apache/solr/update/SolrIndexSplitter.java  |    6 +-
 .../org/apache/solr/update/SolrIndexWriter.java    |    2 +-
 .../org/apache/solr/update/TransactionLog.java     |  165 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |   16 +-
 .../java/org/apache/solr/update/VersionInfo.java   |    4 +
 ...AbstractDefaultValueUpdateProcessorFactory.java |    2 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java     |    9 +-
 .../processor/AtomicUpdateDocumentMerger.java      |   58 +-
 .../processor/CdcrUpdateProcessorFactory.java      |    2 +-
 .../ClassificationUpdateProcessorFactory.java      |    2 +-
 .../CloneFieldUpdateProcessorFactory.java          |   11 +-
 .../ConcatFieldUpdateProcessorFactory.java         |    2 +-
 .../DefaultValueUpdateProcessorFactory.java        |    2 +-
 .../processor/DistributedZkUpdateProcessor.java    |    2 +-
 .../DocBasedVersionConstraintsProcessor.java       |    8 +-
 ...DocBasedVersionConstraintsProcessorFactory.java |    2 +-
 .../DocExpirationUpdateProcessorFactory.java       |    5 +-
 .../FieldLengthUpdateProcessorFactory.java         |    2 +-
 .../processor/FieldMutatingUpdateProcessor.java    |    7 +-
 .../FieldMutatingUpdateProcessorFactory.java       |   11 +-
 .../FieldNameMutatingUpdateProcessorFactory.java   |    2 +-
 ...IgnoreCommitOptimizeUpdateProcessorFactory.java |    2 +-
 .../IgnoreLargeDocumentProcessorFactory.java       |    5 +-
 .../LastFieldValueUpdateProcessorFactory.java      |    1 +
 .../processor/LogUpdateProcessorFactory.java       |    5 +-
 .../MaxFieldValueUpdateProcessorFactory.java       |    5 +-
 .../MinFieldValueUpdateProcessorFactory.java       |    5 +-
 .../ParseBooleanFieldUpdateProcessorFactory.java   |    4 +-
 .../ParseDateFieldUpdateProcessorFactory.java      |    3 +-
 .../ParseNumericFieldUpdateProcessorFactory.java   |    2 +-
 .../PreAnalyzedUpdateProcessorFactory.java         |    2 +-
 .../processor/RegexReplaceProcessorFactory.java    |    2 +-
 .../update/processor/RegexpBoostProcessor.java     |    1 +
 .../RemoveBlankFieldUpdateProcessorFactory.java    |    2 +-
 .../processor/RunUpdateProcessorFactory.java       |  123 +-
 .../processor/SignatureUpdateProcessorFactory.java |    2 +-
 .../processor/SimpleUpdateProcessorFactory.java    |    3 +-
 .../SkipExistingDocumentsProcessorFactory.java     |    2 +-
 .../StatelessScriptUpdateProcessorFactory.java     |    5 +-
 .../processor/TrimFieldUpdateProcessorFactory.java |    2 +-
 .../TruncateFieldUpdateProcessorFactory.java       |    2 +-
 .../update/processor/URLClassifyProcessor.java     |   56 +
 .../processor/UUIDUpdateProcessorFactory.java      |    2 +-
 .../UniqFieldsUpdateProcessorFactory.java          |    3 +-
 .../processor/UpdateRequestProcessorChain.java     |   10 +-
 .../processor/UpdateRequestProcessorFactory.java   |    2 +-
 .../org/apache/solr/util/ConcurrentLRUCache.java   |   10 +-
 .../src/java/org/apache/solr/util/DOMUtil.java     |    6 +-
 .../src/java/org/apache/solr/util/ExportTool.java  |   56 +-
 .../apache/solr/util/MockSearchableSolrClient.java |    3 +-
 .../src/java/org/apache/solr/util/PackageTool.java |   69 +-
 .../src/java/org/apache/solr/util/RTimerTree.java  |    1 +
 .../src/java/org/apache/solr/util/SolrCLI.java     | 1280 +++--
 .../apache/solr/util/SolrFileCleaningTracker.java  |  147 -
 .../java/org/apache/solr/util/SolrLogLayout.java   |    1 +
 .../java/org/apache/solr/util/SolrLogPostTool.java |  291 +-
 .../java/org/apache/solr/util/SolrPluginUtils.java |   27 +-
 .../java/org/apache/solr/util/TestInjection.java   |    3 +
 .../SSLCredentialProviderFactory.java              |    4 +-
 .../util/plugin/NamedListInitializedPlugin.java    |    2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    |    8 +-
 .../solr/util/tracing/SolrRequestCarrier.java      |    3 +-
 .../apache/solr/util/xslt/TransformerProvider.java |    7 +-
 solr/core/src/test-files/log4j2.xml                |   44 +-
 solr/core/src/test-files/solr/solr-50-all.xml      |    1 +
 .../core/src/test-files/solr/solr-solrreporter.xml |    6 +-
 solr/core/src/test-files/solr/solr.xml             |    1 +
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |   28 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java    |   50 +-
 .../test/org/apache/hadoop/http/HttpServer2.java   |   55 +-
 .../test/org/apache/hadoop/util/DiskChecker.java   |    4 +-
 .../org/apache/solr/BasicFunctionalityTest.java    |   12 +-
 .../src/test/org/apache/solr/CursorPagingTest.java |    8 +
 .../src/test/org/apache/solr/OutputWriterTest.java |    2 +-
 .../src/test/org/apache/solr/SolrInfoBeanTest.java |    6 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java    |    4 +-
 .../org/apache/solr/TestDistributedGrouping.java   |    3 +
 .../org/apache/solr/TestDistributedSearch.java     |   42 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |  207 +-
 solr/core/src/test/org/apache/solr/TestJoin.java   |   38 +-
 .../test/org/apache/solr/TestRandomDVFaceting.java |   10 +-
 .../test/org/apache/solr/TestRandomFaceting.java   |   22 +-
 .../org/apache/solr/TestSolrCoreProperties.java    |    1 +
 .../apache/solr/analysis/TokenizerChainTest.java   |    1 +
 .../TestEmbeddedSolrServerAdminHandler.java        |    1 +
 .../TestEmbeddedSolrServerConstructors.java        |    1 +
 .../apache/solr/cloud/AliasIntegrationTest.java    |    2 +-
 .../cloud/AssignBackwardCompatibilityTest.java     |    4 +-
 .../apache/solr/cloud/BasicDistributedZkTest.java  |    9 +
 .../test/org/apache/solr/cloud/BasicZkTest.java    |  181 -
 .../solr/cloud/ChaosMonkeyNothingIsSafeTest.java   |    1 +
 ...aosMonkeyNothingIsSafeWithPullReplicasTest.java |    6 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |    9 +-
 .../solr/cloud/ChaosMonkeyShardSplitTest.java      |   17 +-
 .../test/org/apache/solr/cloud/CloudTestUtils.java |    6 +
 .../apache/solr/cloud/ClusterStateMockUtil.java    |    2 +-
 .../org/apache/solr/cloud/ClusterStateTest.java    |    8 +-
 .../org/apache/solr/cloud/CollectionPropsTest.java |    9 +-
 .../solr/cloud/CollectionStateFormat2Test.java     |   71 -
 .../solr/cloud/CollectionStateZnodeTest.java       |   70 +
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |   34 +-
 .../org/apache/solr/cloud/ConfigSetsAPITest.java   |    1 +
 .../apache/solr/cloud/CreateRoutedAliasTest.java   |    2 -
 .../solr/cloud/DeleteInactiveReplicaTest.java      |    6 +-
 .../test/org/apache/solr/cloud/DeleteNodeTest.java |    6 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |   38 +-
 .../apache/solr/cloud/DistribCursorPagingTest.java |    1 +
 .../DistribDocExpirationUpdateProcessorTest.java   |    1 +
 .../solr/cloud/DistribJoinFromCollectionTest.java  |    4 +-
 .../solr/cloud/DistributedVersionInfoTest.java     |    8 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java     |   24 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   |    6 +-
 .../cloud/FullThrottleStoppableIndexingThread.java |    2 +-
 .../solr/cloud/HttpPartitionOnCommitTest.java      |   33 +-
 .../org/apache/solr/cloud/HttpPartitionTest.java   |   27 +-
 .../apache/solr/cloud/KerberosTestServices.java    |    6 +-
 .../org/apache/solr/cloud/LeaderElectionTest.java  |    4 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java    |    2 +-
 .../apache/solr/cloud/LeaderTragicEventTest.java   |    8 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |    6 +-
 .../solr/cloud/LegacyCloudClusterPropTest.java     |  180 -
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |    4 +
 .../org/apache/solr/cloud/MigrateRouteKeyTest.java |   11 +-
 .../test/org/apache/solr/cloud/MockSolrSource.java |    2 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java     |   18 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java    |   68 +-
 .../solr/cloud/NestedShardedAtomicUpdateTest.java  |    4 +
 .../OutOfBoxZkACLAndCredentialsProvidersTest.java  |   12 +-
 ...OverriddenZkACLAndCredentialsProvidersTest.java |   10 +-
 .../OverseerCollectionConfigSetProcessorTest.java  |    7 +-
 .../solr/cloud/OverseerModifyCollectionTest.java   |    1 +
 .../org/apache/solr/cloud/OverseerRolesTest.java   |   10 +-
 .../org/apache/solr/cloud/OverseerStatusTest.java  |    1 +
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |    1 +
 .../test/org/apache/solr/cloud/OverseerTest.java   |  183 +-
 .../apache/solr/cloud/ReindexCollectionTest.java   |    2 +
 .../apache/solr/cloud/ReplaceNodeNoTargetTest.java |   17 +-
 .../org/apache/solr/cloud/ReplaceNodeTest.java     |   10 +-
 .../apache/solr/cloud/ReplicationFactorTest.java   |    6 +-
 .../org/apache/solr/cloud/RollingRestartTest.java  |   10 +-
 .../cloud/RoutingToNodesWithPropertiesTest.java    |    1 +
 .../org/apache/solr/cloud/SSLMigrationTest.java    |    1 +
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |   10 +-
 .../apache/solr/cloud/ShardRoutingCustomTest.java  |    3 -
 .../cloud/SharedFSAutoReplicaFailoverTest.java     |    5 -
 .../test/org/apache/solr/cloud/SliceStateTest.java |    4 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java    |   20 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java     |    8 +-
 .../test/org/apache/solr/cloud/SplitShardTest.java |    6 +-
 .../test/org/apache/solr/cloud/SyncSliceTest.java  |    1 +
 .../solr/cloud/SystemCollectionCompatTest.java     |   15 +-
 .../solr/cloud/TestAuthenticationFramework.java    |    6 +-
 .../apache/solr/cloud/TestBaseStatsCacheCloud.java |    1 +
 .../apache/solr/cloud/TestCloudConsistency.java    |    6 +-
 .../TestCloudPhrasesIdentificationComponent.java   |    4 +
 .../org/apache/solr/cloud/TestCloudPivotFacet.java |    4 +-
 .../solr/cloud/TestCloudSearcherWarming.java       |   20 +-
 .../apache/solr/cloud/TestClusterProperties.java   |   10 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |   29 +-
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |    4 +
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |    1 +
 .../cloud/TestDynamicFieldNamesIndexCorrectly.java |    4 +-
 .../org/apache/solr/cloud/TestHashPartitioner.java |    1 +
 .../solr/cloud/TestLeaderElectionZkExpiry.java     |    4 +-
 .../org/apache/solr/cloud/TestPullReplica.java     |   17 +-
 .../solr/cloud/TestPullReplicaErrorHandling.java   |   19 +-
 .../solr/cloud/TestQueryingOnDownCollection.java   |    2 +
 .../solr/cloud/TestRandomRequestDistribution.java  |   10 +-
 .../apache/solr/cloud/TestRebalanceLeaders.java    |    1 +
 .../apache/solr/cloud/TestSSLRandomization.java    |   12 +-
 .../cloud/TestSolrCloudWithDelegationTokens.java   |   12 +-
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |    2 +-
 .../TestSolrCloudWithSecureImpersonation.java      |    3 +
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |   19 +-
 .../solr/cloud/TestStressInPlaceUpdates.java       |   16 +-
 .../org/apache/solr/cloud/TestStressLiveNodes.java |    8 +-
 .../solr/cloud/TestTlogReplayVsRecovery.java       |    4 +-
 .../org/apache/solr/cloud/TestTlogReplica.java     |    9 +-
 .../TestTolerantUpdateProcessorRandomCloud.java    |   10 +-
 .../org/apache/solr/cloud/TestUtilizeNode.java     |   22 +-
 .../cloud/TestWaitForStateWithJettyShutdowns.java  |    6 +-
 .../org/apache/solr/cloud/TestWithCollection.java  |    6 +
 .../test/org/apache/solr/cloud/TestZkChroot.java   |  153 -
 .../apache/solr/cloud/UnloadDistributedZkTest.java |    2 +
 .../VMParamsZkACLAndCredentialsProvidersTest.java  |   10 +-
 .../src/test/org/apache/solr/cloud/ZkCLITest.java  |   10 +-
 .../org/apache/solr/cloud/ZkControllerTest.java    |    3 +-
 .../org/apache/solr/cloud/ZkNodePropsTest.java     |    4 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java    |   12 +-
 .../AbstractCloudBackupRestoreTestCase.java        |   12 +-
 .../solr/cloud/api/collections/AssignTest.java     |    1 +
 .../api/collections/CollectionReloadTest.java      |    2 +-
 .../CollectionsAPIAsyncDistributedZkTest.java      |   24 +-
 .../CollectionsAPIDistributedZkTest.java           |    6 +
 .../ConcurrentCreateCollectionTest.java            |   13 +-
 .../solr/cloud/api/collections/ShardSplitTest.java |   73 +-
 .../SimpleCollectionCreateDeleteTest.java          |    7 +-
 .../cloud/api/collections/SplitByPrefixTest.java   |    2 +-
 .../cloud/api/collections/TestCollectionAPI.java   |   85 +-
 .../api/collections/TestReplicaProperties.java     |    2 +
 .../TestRequestStatusCollectionAPI.java            |    2 +
 .../AutoAddReplicasIntegrationTest.java            |  104 +-
 .../autoscaling/AutoAddReplicasPlanActionTest.java |   22 +-
 .../cloud/autoscaling/AutoScalingHandlerTest.java  |   38 +-
 .../cloud/autoscaling/ComputePlanActionTest.java   |  127 +-
 .../cloud/autoscaling/ExecutePlanActionTest.java   |    5 +
 .../cloud/autoscaling/HttpTriggerListenerTest.java |    1 +
 .../IndexSizeTriggerMixedBoundsTest.java           |    4 +-
 .../IndexSizeTriggerSizeEstimationTest.java        |    5 +-
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |   21 +-
 .../autoscaling/MetricTriggerIntegrationTest.java  |    1 +
 .../NodeAddedTriggerIntegrationTest.java           |    6 +-
 .../cloud/autoscaling/NodeAddedTriggerTest.java    |    3 +
 .../NodeLostTriggerIntegrationTest.java            |    6 +-
 .../cloud/autoscaling/NodeLostTriggerTest.java     |    3 +
 .../autoscaling/NodeMarkersRegistrationTest.java   |    2 +
 .../cloud/autoscaling/RestoreTriggerStateTest.java |    2 +
 .../ScheduledMaintenanceTriggerTest.java           |    9 +-
 .../ScheduledTriggerIntegrationTest.java           |    4 +-
 .../SearchRateTriggerIntegrationTest.java          |   10 +-
 .../cloud/autoscaling/SearchRateTriggerTest.java   |    3 +
 .../cloud/autoscaling/SystemLogListenerTest.java   |    7 +-
 .../solr/cloud/autoscaling/TestPolicyCloud.java    |    6 +-
 .../TriggerCooldownIntegrationTest.java            |    1 +
 .../cloud/autoscaling/TriggerEventQueueTest.java   |    1 +
 .../cloud/autoscaling/TriggerIntegrationTest.java  |   30 +-
 .../TriggerSetPropertiesIntegrationTest.java       |   42 +-
 .../autoscaling/sim/SimSolrCloudTestCase.java      |    5 +-
 .../sim/TestSimClusterStateProvider.java           |    2 +-
 .../autoscaling/sim/TestSimComputePlanAction.java  |   50 +-
 .../sim/TestSimDistribStateManager.java            |    4 +-
 .../autoscaling/sim/TestSimExecutePlanAction.java  |   31 +-
 .../autoscaling/sim/TestSimExtremeIndexing.java    |    5 +-
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   89 +-
 .../autoscaling/sim/TestSimNodeAddedTrigger.java   |    2 +
 .../autoscaling/sim/TestSimNodeLostTrigger.java    |    3 +
 .../cloud/autoscaling/sim/TestSimPolicyCloud.java  |    2 +
 .../cloud/autoscaling/sim/TestSimScenario.java     |    4 +
 .../autoscaling/sim/TestSimTriggerIntegration.java |   23 +-
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   18 +-
 .../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java |   17 +-
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java     |   32 +-
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |   30 +-
 .../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java  |    5 +-
 .../cloud/cdcr/CdcrReplicationHandlerTest.java     |    4 +-
 .../solr/cloud/cdcr/CdcrRequestHandlerTest.java    |    5 +
 .../org/apache/solr/cloud/cdcr/CdcrTestsUtil.java  |    6 +-
 .../cloud/cdcr/CdcrVersionReplicationTest.java     |    2 +-
 .../org/apache/solr/cloud/hdfs/StressHdfsTest.java |    2 +
 .../cloud/overseer/TestClusterStateMutator.java    |    4 +-
 .../overseer/ZkCollectionPropsCachingTest.java     |    4 -
 .../solr/cloud/overseer/ZkStateReaderTest.java     |  111 +-
 .../solr/cloud/overseer/ZkStateWriterTest.java     |  150 +-
 .../apache/solr/cloud/rule/ImplicitSnitchTest.java |    3 +
 .../org/apache/solr/cloud/rule/RuleEngineTest.java |    8 +
 .../test/org/apache/solr/cloud/rule/RulesTest.java |    7 +
 .../solr/core/BlobRepositoryMockingTest.java       |    8 +-
 .../test/org/apache/solr/core/CoreSorterTest.java  |    4 +
 .../solr/core/CountUsageValueSourceParser.java     |    3 +-
 .../org/apache/solr/core/DirectoryFactoryTest.java |    7 +-
 .../apache/solr/core/DummyValueSourceParser.java   |    3 +-
 .../solr/core/ExitableDirectoryReaderTest.java     |    6 +
 .../org/apache/solr/core/FakeDeletionPolicy.java   |    6 +-
 .../apache/solr/core/HdfsDirectoryFactoryTest.java |    1 +
 .../src/test/org/apache/solr/core/HelloStream.java |   10 +-
 .../org/apache/solr/core/MockEventListener.java    |    2 +-
 .../core/MockQuerySenderListenerReqHandler.java    |    2 +-
 .../apache/solr/core/MockShardHandlerFactory.java  |    1 +
 .../org/apache/solr/core/QueryResultKeyTest.java   |   16 +-
 .../org/apache/solr/core/RequestHandlersTest.java  |    1 +
 .../org/apache/solr/core/ResourceLoaderTest.java   |   11 +-
 .../solr/core/SolrCoreCheckLockOnStartupTest.java  |    4 +-
 .../org/apache/solr/core/TestConfigOverlay.java    |    1 +
 .../apache/solr/core/TestConfigSetImmutable.java   |    3 +
 .../apache/solr/core/TestConfigSetProperties.java  |    4 +
 .../org/apache/solr/core/TestCoreContainer.java    |   85 +
 .../org/apache/solr/core/TestCoreDiscovery.java    |    3 +-
 .../org/apache/solr/core/TestDirectoryFactory.java |    1 +
 .../org/apache/solr/core/TestDynamicLoading.java   |    9 +-
 .../apache/solr/core/TestDynamicLoadingUrl.java    |    1 +
 .../test/org/apache/solr/core/TestInitParams.java  |   12 +-
 .../org/apache/solr/core/TestJmxIntegration.java   |   13 +-
 .../test/org/apache/solr/core/TestLazyCores.java   |   75 +-
 .../apache/solr/core/TestShardHandlerFactory.java  |    1 +
 .../apache/solr/core/TestSolrConfigHandler.java    |   14 +
 .../src/test/org/apache/solr/core/TestSolrXml.java |   10 +
 .../repository/HdfsBackupRepositoryTest.java       |   94 +-
 .../core/snapshots/TestSolrCloudSnapshots.java     |    8 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |    2 +
 .../solr/filestore/TestDistribPackageStore.java    |   16 +-
 .../handler/AnalysisRequestHandlerTestBase.java    |    2 +-
 .../apache/solr/handler/BackupStatusChecker.java   |    4 +
 .../handler/BinaryUpdateRequestHandlerTest.java    |   30 +-
 .../DocumentAnalysisRequestHandlerTest.java        |    2 +
 .../handler/FieldAnalysisRequestHandlerTest.java   |   32 +-
 .../org/apache/solr/handler/JsonLoaderTest.java    |    4 +
 .../solr/handler/MoreLikeThisHandlerTest.java      |   11 +-
 .../solr/handler/PingRequestHandlerTest.java       |    3 +
 .../org/apache/solr/handler/TestBlobHandler.java   |    1 +
 .../org/apache/solr/handler/TestConfigReload.java  |    9 +-
 .../org/apache/solr/handler/TestCoreBackup.java    |   24 +-
 .../solr/handler/TestReplicationHandler.java       |   49 +-
 .../TestReplicationHandlerDiskOverFlow.java        |    5 +-
 .../org/apache/solr/handler/TestReqParamsAPI.java  |    2 +
 .../org/apache/solr/handler/TestSQLHandler.java    |    6 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |    4 +-
 .../handler/TestSolrConfigHandlerConcurrent.java   |   14 +-
 .../handler/ThrowErrorOnInitRequestHandler.java    |    2 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |    6 +
 .../org/apache/solr/handler/V2StandaloneTest.java  |    2 +
 .../solr/handler/XsltUpdateRequestHandlerTest.java |    7 +-
 .../admin/AutoscalingHistoryHandlerTest.java       |   25 +-
 .../handler/admin/CoreAdminCreateDiscoverTest.java |    2 +
 .../solr/handler/admin/CoreAdminHandlerTest.java   |    7 +-
 .../handler/admin/CoreAdminRequestStatusTest.java  |    2 +
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |    5 +-
 .../solr/handler/admin/HealthCheckHandlerTest.java |    1 +
 .../solr/handler/admin/IndexSizeEstimatorTest.java |   10 +
 .../solr/handler/admin/LukeRequestHandlerTest.java |   15 +
 .../solr/handler/admin/MBeansHandlerTest.java      |    2 +
 .../solr/handler/admin/MetricsHandlerTest.java     |   18 +
 .../admin/PropertiesRequestHandlerTest.java        |    1 +
 .../handler/admin/SecurityConfHandlerTest.java     |    7 +-
 .../admin/SegmentsInfoRequestHandlerTest.java      |   16 +-
 .../solr/handler/admin/StatsReloadRaceTest.java    |    2 +
 .../solr/handler/admin/TestApiFramework.java       |   33 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |   24 +-
 .../apache/solr/handler/admin/TestConfigsApi.java  |   20 +-
 .../solr/handler/admin/TestCoreAdminApis.java      |   12 +-
 .../solr/handler/admin/ZookeeperReadAPITest.java   |  101 +
 .../handler/admin/ZookeeperStatusHandlerTest.java  |   52 +-
 .../component/CustomHighlightComponentTest.java    |   21 +-
 .../component/CustomTermsComponentTest.java        |    2 +-
 .../component/DistributedDebugComponentTest.java   |    8 +-
 .../component/DistributedFacetPivotLargeTest.java  |    3 +-
 .../DistributedFacetPivotLongTailTest.java         |    2 +
 .../component/DistributedFacetPivotSmallTest.java  |   26 +-
 .../component/DistributedMLTComponentTest.java     |    2 +-
 .../DistributedQueryComponentOptimizationTest.java |    1 +
 .../handler/component/InfixSuggestersTest.java     |    2 +
 .../PhrasesIdentificationComponentTest.java        |    4 +
 .../component/QueryElevationComponentTest.java     |   75 +-
 .../component/ResourceSharingTestComponent.java    |    4 +-
 .../solr/handler/component/SearchHandlerTest.java  |   74 +-
 .../handler/component/SpellCheckComponentTest.java |    7 +-
 .../solr/handler/component/StatsComponentTest.java |    7 +-
 .../solr/handler/component/TermsComponentTest.java |   13 +-
 .../component/TestHttpShardHandlerFactory.java     |    4 +-
 .../component/TestTrackingShardHandlerFactory.java |    2 +
 .../solr/handler/export/TestExportWriter.java      |   59 +-
 .../org/apache/solr/handler/tagger/TaggerTest.java |    6 +-
 .../apache/solr/handler/tagger/TaggerTestCase.java |   11 +-
 .../apache/solr/highlight/DummyHighlighter.java    |    1 +
 .../org/apache/solr/highlight/HighlighterTest.java |   20 +-
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |    2 +
 .../org/apache/solr/logging/TestLogWatcher.java    |    1 +
 .../apache/solr/metrics/SolrMetricManagerTest.java |    2 +
 .../solr/metrics/SolrMetricsIntegrationTest.java   |    2 +-
 .../reporters/SolrGraphiteReporterTest.java        |    2 +-
 .../reporters/SolrJmxReporterCloudTest.java        |    6 +-
 .../metrics/reporters/SolrSlf4jReporterTest.java   |    1 +
 .../reporters/solr/SolrCloudReportersTest.java     |    4 +-
 .../reporters/solr/SolrShardReporterTest.java      |   12 +
 .../src/test/org/apache/solr/pkg/TestPackages.java |  155 +-
 .../org/apache/solr/request/SimpleFacetsTest.java  |    3 +-
 .../test/org/apache/solr/request/TestFaceting.java |   25 +
 .../apache/solr/request/TestIntervalFaceting.java  |    2 +-
 .../org/apache/solr/request/TestWriterPerf.java    |    5 +-
 .../solr/request/macro/TestMacroExpander.java      |    2 +
 .../org/apache/solr/response/JSONWriterTest.java   |   10 +-
 .../org/apache/solr/response/SmileWriterTest.java  |   11 +
 .../solr/response/TestBinaryResponseWriter.java    |    2 +
 .../solr/response/TestGeoJSONResponseWriter.java   |    4 +
 .../solr/response/TestGraphMLResponseWriter.java   |   22 +-
 .../response/TestJavabinTupleStreamParser.java     |    7 +-
 .../response/TestPHPSerializedResponseWriter.java  |    2 +-
 .../org/apache/solr/response/TestPushWriter.java   |    7 +-
 .../solr/response/TestRawResponseWriter.java       |    2 +
 .../solr/response/TestRetrieveFieldsOptimizer.java |    3 +
 .../solr/response/TestSolrQueryResponse.java       |    1 +
 .../TestChildDocTransformerHierarchy.java          |    1 +
 .../apache/solr/rest/schema/TestBulkSchemaAPI.java |   40 +-
 .../apache/solr/schema/ChangedSchemaMergeTest.java |    3 +-
 .../test/org/apache/solr/schema/DocValuesTest.java |    4 +-
 .../schema/OpenExchangeRatesOrgProviderTest.java   |    2 +-
 .../solr/schema/ResolveAnalyzerByNameTest.java     |    7 +
 .../solr/schema/SpatialRPTFieldTypeTest.java       |    2 +
 .../solr/schema/TestBulkSchemaConcurrent.java      |   23 +-
 .../apache/solr/schema/TestCloudManagedSchema.java |    3 +
 .../org/apache/solr/schema/TestManagedSchema.java  |    3 +
 .../apache/solr/schema/TestManagedSchemaAPI.java   |    2 +-
 .../solr/schema/TestManagedSchemaThreadSafety.java |    1 +
 .../org/apache/solr/schema/TestPointFields.java    |    1 +
 .../solr/schema/TestUseDocValuesAsStored2.java     |    1 +
 .../solr/search/AnalyticsMergeStrategyTest.java    |    4 +
 .../solr/search/AnalyticsTestQParserPlugin.java    |   11 +
 .../solr/search/CurrencyRangeFacetCloudTest.java   |   27 +
 .../org/apache/solr/search/LargeFieldTest.java     |    1 +
 .../apache/solr/search/MaxScoreCollectorTest.java  |   91 +
 .../org/apache/solr/search/MergeStrategyTest.java  |    1 +
 .../apache/solr/search/MockSearchComponent.java    |    2 +-
 .../org/apache/solr/search/QueryEqualityTest.java  |   10 +-
 .../apache/solr/search/RankQueryTestPlugin.java    |   25 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |  330 ++
 .../solr/search/TestAddFieldRealTimeGet.java       |    8 +-
 .../solr/search/TestCollapseQParserPlugin.java     |   37 +-
 .../test/org/apache/solr/search/TestDocSet.java    |    3 +-
 .../solr/search/TestExtendedDismaxParser.java      |   60 +-
 .../apache/solr/search/TestHashQParserPlugin.java  |   26 +-
 .../org/apache/solr/search/TestIndexSearcher.java  |    8 +-
 .../solr/search/TestMaxScoreQueryParser.java       |    1 +
 .../solr/search/TestReRankQParserPlugin.java       |   95 +
 .../org/apache/solr/search/TestRealTimeGet.java    |    8 +-
 .../test/org/apache/solr/search/TestRecovery.java  |   10 +
 .../org/apache/solr/search/TestRecoveryHdfs.java   |    5 +
 .../org/apache/solr/search/TestReloadDeadlock.java |    2 +-
 .../org/apache/solr/search/TestSmileRequest.java   |    2 +
 .../org/apache/solr/search/TestSolrCachePerf.java  |    3 +
 .../src/test/org/apache/solr/search/TestSolrJ.java |    2 +
 .../apache/solr/search/TestSolrQueryParser.java    |    1 +
 .../src/test/org/apache/solr/search/TestSort.java  |    5 +-
 .../org/apache/solr/search/TestStressRecovery.java |    2 +
 .../org/apache/solr/search/TestStressReorder.java  |    6 +-
 .../apache/solr/search/TestStressUserVersions.java |    8 +-
 .../org/apache/solr/search/TestStressVersions.java |    2 +
 .../apache/solr/search/TestTermsQParserPlugin.java |    6 +
 .../org/apache/solr/search/facet/DebugAgg.java     |    6 +-
 ...stributedFacetSimpleRefinementLongTailTest.java |   11 +-
 .../solr/search/facet/RangeFacetCloudTest.java     |   40 +-
 .../search/facet/SpatialHeatmapFacetsTest.java     |    5 +
 .../search/facet/TestCloudJSONFacetJoinDomain.java |    9 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |  342 +-
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   | 1001 ++++
 .../solr/search/facet/TestJsonFacetRefinement.java |   54 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |  170 +-
 .../search/facet/TestJsonFacetsStatsParsing.java   |    2 +
 .../facet/TestJsonFacetsWithNestedObjects.java     |   12 +-
 .../solr/search/function/NvlValueSourceParser.java |    2 +-
 .../function/TestMinMaxOnMultiValuedField.java     |   13 +-
 .../solr/search/join/TestCloudNestedDocsSort.java  |    4 +-
 .../solr/search/join/TestNestedDocsSort.java       |    1 +
 .../solr/search/join/TestScoreJoinQPNoScore.java   |   27 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |   18 +-
 .../join/another/BJQFilterAccessibleTest.java      |    2 +-
 .../apache/solr/search/json/TestJsonRequest.java   |   70 +-
 .../solr/search/mlt/CloudMLTQParserTest.java       |    1 +
 .../solr/security/AuditLoggerIntegrationTest.java  |   14 +-
 .../BaseTestRuleBasedAuthorizationPlugin.java      |  606 +++
 .../solr/security/BasicAuthIntegrationTest.java    |    7 +-
 .../solr/security/BasicAuthOnSingleNodeTest.java   |   44 +-
 .../solr/security/CallbackAuditLoggerPlugin.java   |    4 +-
 .../apache/solr/security/CertAuthPluginTest.java   |   79 +
 .../security/HttpParamDelegationTokenPlugin.java   |    2 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |   22 +-
 .../security/JWTVerificationkeyResolverTest.java   |    4 +-
 .../solr/security/MockAuditLoggerPlugin.java       |    4 +-
 .../solr/security/MockAuthorizationPlugin.java     |    2 +-
 .../solr/security/PrincipalWithUserRoles.java      |   91 +
 .../solr/security/TestAuthorizationFramework.java  |    3 +
 ...stExternalRoleRuleBasedAuthorizationPlugin.java |   78 +
 .../security/TestRuleBasedAuthorizationPlugin.java |  585 ---
 .../security/TestSha256AuthenticationProvider.java |    4 +
 .../solr/security/hadoop/ImpersonationUtil.java    |    1 +
 .../hadoop/TestDelegationWithHadoopAuth.java       |    7 +-
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |    1 +
 .../apache/solr/servlet/SolrRequestParserTest.java |    2 +
 .../solr/spelling/DirectSolrSpellCheckerTest.java  |    3 +
 .../solr/spelling/FileBasedSpellCheckerTest.java   |    7 +
 .../solr/spelling/IndexBasedSpellCheckerTest.java  |    8 +
 .../solr/spelling/SpellCheckCollatorTest.java      |    9 +
 .../solr/spelling/SpellingQueryConverterTest.java  |    6 +
 .../suggest/RandomTestDictionaryFactory.java       |    6 +-
 .../solr/spelling/suggest/SuggesterTest.java       |    2 +
 .../solr/store/blockcache/BlockCacheTest.java      |    4 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    2 +-
 .../org/apache/solr/update/CdcrUpdateLogTest.java  |    8 +
 .../solr/update/DirectUpdateHandlerTest.java       |   15 +-
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |    2 +-
 .../solr/update/MockStreamingSolrClients.java      |    2 +-
 .../apache/solr/update/MockingHttp2SolrClient.java |    7 +-
 .../test/org/apache/solr/update/PeerSyncTest.java  |    1 +
 .../solr/update/PeerSyncWithBufferUpdatesTest.java |    1 +
 .../PeerSyncWithIndexFingerprintCachingTest.java   |    2 +
 ...ncWithLeaderAndIndexFingerprintCachingTest.java |    1 +
 .../apache/solr/update/PeerSyncWithLeaderTest.java |    1 +
 .../org/apache/solr/update/SoftAutoCommitTest.java |    2 +-
 .../apache/solr/update/SolrCmdDistributorTest.java |    2 +-
 .../apache/solr/update/SolrIndexSplitterTest.java  |    3 +
 .../solr/update/TestInPlaceUpdatesDistrib.java     |   63 +-
 .../solr/update/TestInPlaceUpdatesStandalone.java  |    1 +
 .../solr/update/TestIndexingPerformance.java       |    8 +-
 .../solr/update/TestNestedUpdateProcessor.java     |    2 +
 .../test/org/apache/solr/update/TestUpdate.java    |    2 +-
 .../test/org/apache/solr/update/UpdateLogTest.java |    1 +
 .../solr/update/processor/AtomicUpdatesTest.java   |   15 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    |    6 +-
 .../ClassificationUpdateProcessorFactoryTest.java  |    4 +
 ...assificationUpdateProcessorIntegrationTest.java |    2 -
 .../ClassificationUpdateProcessorTest.java         |    5 +
 .../CustomUpdateRequestProcessorFactory.java       |    3 +-
 .../DimensionalRoutedAliasUpdateProcessorTest.java |    6 +-
 .../IgnoreLargeDocumentProcessorFactoryTest.java   |    1 +
 .../update/processor/NestedAtomicUpdateTest.java   |    1 +
 .../processor/RoutedAliasUpdateProcessorTest.java  |    1 +
 .../SignatureUpdateProcessorFactoryTest.java       |    1 +
 .../SkipExistingDocumentsProcessorFactoryTest.java |    1 +
 .../processor/TestNamedUpdateProcessors.java       |    7 +-
 .../TimeRoutedAliasUpdateProcessorTest.java        |    8 +-
 .../processor/TolerantUpdateProcessorTest.java     |    2 +-
 .../processor/TrackingUpdateProcessorFactory.java  |    2 +-
 .../UpdateRequestProcessorFactoryTest.java         |    2 +-
 .../org/apache/solr/util/MockCoreContainer.java    |    2 +-
 .../org/apache/solr/util/OrderedExecutorTest.java  |   28 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |   42 +-
 .../org/apache/solr/util/SolrPluginUtilsTest.java  |    2 +-
 .../test/org/apache/solr/util/TestRTimerTree.java  |    3 +
 .../apache/solr/util/TestSolrCLIRunExample.java    |   17 +-
 .../solr/util/TestSolrJacksonAnnotation.java       |    2 +
 .../src/test/org/apache/solr/util/TestUtils.java   |   12 +-
 .../apache/solr/util/stats/MetricUtilsTest.java    |   10 +
 .../solr/util/tracing/TestHttpServletCarrier.java  |    1 +
 solr/example/build.gradle                          |    2 +
 solr/licenses/caffeine-2.8.0.jar.sha1              |    1 -
 solr/licenses/caffeine-2.8.4.jar.sha1              |    1 +
 solr/licenses/commons-cli-1.2.jar.sha1             |    1 -
 solr/licenses/commons-cli-1.4.jar.sha1             |    1 +
 solr/licenses/commons-fileupload-1.3.3.jar.sha1    |    1 -
 solr/licenses/commons-fileupload-LICENSE-ASL.txt   |  202 -
 solr/licenses/commons-fileupload-NOTICE.txt        |    5 -
 solr/licenses/hppc-0.8.1.jar.sha1                  |    1 -
 solr/licenses/hppc-0.8.2.jar.sha1                  |    1 +
 solr/licenses/log4j-1.2-api-2.11.2.jar.sha1        |    1 -
 solr/licenses/log4j-1.2-api-2.13.2.jar.sha1        |    1 +
 solr/licenses/log4j-api-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-api-2.13.2.jar.sha1            |    1 +
 solr/licenses/log4j-core-2.11.2.jar.sha1           |    1 -
 solr/licenses/log4j-core-2.13.2.jar.sha1           |    1 +
 solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1     |    1 -
 solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1     |    1 +
 solr/licenses/log4j-web-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-web-2.13.2.jar.sha1            |    1 +
 solr/packaging/build.gradle                        |    3 +-
 solr/server/build.gradle                           |    2 +
 solr/server/resources/log4j2-console.xml           |   28 +-
 solr/server/resources/log4j2.xml                   |   67 +-
 solr/server/solr/solr.xml                          |    1 +
 solr/site/index.template.md                        |   37 +
 solr/site/online-link.template.md                  |   19 +
 solr/solr-ref-guide/build.gradle                   |    5 +-
 solr/solr-ref-guide/build.xml                      |    1 -
 solr/solr-ref-guide/src/_config.yml.template       |    2 -
 solr/solr-ref-guide/src/_includes/head.html        |   26 +-
 solr/solr-ref-guide/src/_includes/head_print.html  |   29 -
 solr/solr-ref-guide/src/_includes/sidebar.html     |   35 +-
 solr/solr-ref-guide/src/_includes/taglogic.html    |   22 -
 solr/solr-ref-guide/src/_includes/toc.html         |    9 -
 solr/solr-ref-guide/src/_includes/topnav.html      |   39 +-
 solr/solr-ref-guide/src/_layouts/default.html      |   33 +-
 .../solr-ref-guide/src/_layouts/default_print.html |   25 -
 solr/solr-ref-guide/src/_layouts/home.html         |   27 +-
 solr/solr-ref-guide/src/_layouts/page.html         |   29 +-
 solr/solr-ref-guide/src/_layouts/page_print.html   |   15 -
 solr/solr-ref-guide/src/_templates/open.html.slim  |    2 +-
 .../src/analytics-expression-sources.adoc          |    1 -
 .../src/analytics-mapping-functions.adoc           |    1 -
 .../src/analytics-reduction-functions.adoc         |    3 +-
 solr/solr-ref-guide/src/analytics.adoc             |    3 +-
 .../authentication-and-authorization-plugins.adoc  |    2 +-
 .../src/cert-authentication-plugin.adoc            |   61 +
 .../src/cluster-node-management.adoc               |   41 +-
 solr/solr-ref-guide/src/collection-aliasing.adoc   |    3 +-
 solr/solr-ref-guide/src/collection-management.adoc |    5 +-
 solr/solr-ref-guide/src/collections-api.adoc       |    2 +-
 .../solr-ref-guide/src/colocating-collections.adoc |    3 +-
 .../src/common-query-parameters.adoc               |   42 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |    2 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |    6 +-
 solr/solr-ref-guide/src/css/customstyles.css       |  919 ----
 solr/solr-ref-guide/src/css/decoration.css         |  254 +
 solr/solr-ref-guide/src/css/font-awesome.min.css   |    4 -
 solr/solr-ref-guide/src/css/lavish-bootstrap.css   | 5423 --------------------
 solr/solr-ref-guide/src/css/navs.css               |  366 ++
 solr/solr-ref-guide/src/css/printstyles.css        |  160 -
 solr/solr-ref-guide/src/css/ref-guide.css          | 2919 +++++------
 solr/solr-ref-guide/src/css/search.css             |   47 +
 solr/solr-ref-guide/src/css/theme-solr.css         |  147 -
 solr/solr-ref-guide/src/distributed-requests.adoc  |    4 +
 solr/solr-ref-guide/src/enabling-ssl.adoc          |  238 +-
 solr/solr-ref-guide/src/exporting-result-sets.adoc |   28 +
 .../glyphicons/glyphicons-halflings-regular.eot    |  Bin 20127 -> 0 bytes
 .../glyphicons/glyphicons-halflings-regular.svg    |  288 --
 .../glyphicons/glyphicons-halflings-regular.ttf    |  Bin 45404 -> 0 bytes
 .../glyphicons/glyphicons-halflings-regular.woff   |  Bin 23424 -> 0 bytes
 .../glyphicons/glyphicons-halflings-regular.woff2  |  Bin 18028 -> 0 bytes
 .../src/fonts/mplus1mn/mplus1mn-bold-ascii.ttf     |  Bin 15868 -> 0 bytes
 .../fonts/mplus1mn/mplus1mn-bold_italic-ascii.ttf  |  Bin 15908 -> 0 bytes
 .../src/fonts/mplus1mn/mplus1mn-italic-ascii.ttf   |  Bin 15928 -> 0 bytes
 .../mplus1mn/mplus1mn-regular-ascii-conums.ttf     |  Bin 20024 -> 0 bytes
 .../src/fonts/mplus1p-regular-fallback.ttf         |  Bin 1405716 -> 0 bytes
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |    4 +
 solr/solr-ref-guide/src/function-queries.adoc      |    1 -
 solr/solr-ref-guide/src/how-to-contribute.adoc     |   16 +-
 solr/solr-ref-guide/src/index.adoc                 |   31 +-
 solr/solr-ref-guide/src/installing-solr.adoc       |    2 +-
 solr/solr-ref-guide/src/js/customscripts.js        |   68 +-
 solr/solr-ref-guide/src/js/ref-guide-toc.js        |   36 -
 solr/solr-ref-guide/src/js/toc.js                  |   82 -
 solr/solr-ref-guide/src/json-facet-api.adoc        |    5 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc        |    4 +-
 .../src/jwt-authentication-plugin.adoc             |    3 +-
 .../src/major-changes-in-solr-7.adoc               |    1 -
 .../src/major-changes-in-solr-8.adoc               |    1 -
 .../src/major-changes-in-solr-9.adoc               |   13 +-
 solr/solr-ref-guide/src/meta-docs/jekyll.adoc      |   72 +-
 solr/solr-ref-guide/src/meta-docs/publish.adoc     |    6 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc     |    2 +-
 .../src/overview-of-the-solr-admin-ui.adoc         |    2 +-
 .../src/package-manager-internals.adoc             |    1 -
 solr/solr-ref-guide/src/package-manager.adoc       |    1 -
 solr/solr-ref-guide/src/replica-management.adoc    |   91 +-
 ...andlers-and-searchcomponents-in-solrconfig.adoc |    9 +
 .../src/rule-based-authorization-plugin.adoc       |   63 +-
 .../src/rule-based-replica-placement.adoc          |    2 +-
 solr/solr-ref-guide/src/schema-api.adoc            |    1 -
 solr/solr-ref-guide/src/securing-solr.adoc         |    2 +
 solr/solr-ref-guide/src/shard-management.adoc      |    5 +-
 .../src/solr-control-script-reference.adoc         |    1 -
 solr/solr-ref-guide/src/solr-glossary.adoc         |    2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    1 -
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |    3 +-
 .../src/solrcloud-autoscaling-api.adoc             |    3 +-
 .../src/solrcloud-autoscaling-overview.adoc        |    3 +-
 .../solrcloud-autoscaling-policy-preferences.adoc  |    3 +-
 .../src/solrcloud-autoscaling-trigger-actions.adoc |   71 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |    1 -
 .../src/stream-decorator-reference.adoc            |    3 +-
 .../src/stream-evaluator-reference.adoc            |    3 +-
 .../src/stream-source-reference.adoc               |    3 +-
 ...ding-data-with-solr-cell-using-apache-tika.adoc |    1 -
 ...ta-store-data-with-the-data-import-handler.adoc |    2 +-
 solr/solrj/build.gradle                            |    2 +
 .../org/apache/solr/client/solrj/SolrClient.java   |    4 +-
 .../org/apache/solr/client/solrj/SolrRequest.java  |    3 +
 .../org/apache/solr/client/solrj/SolrResponse.java |    1 +
 .../apache/solr/client/solrj/V2RequestSupport.java |    1 +
 .../client/solrj/beans/DocumentObjectBinder.java   |   13 +-
 .../solr/client/solrj/cloud/SocketProxy.java       |   56 +-
 .../solr/client/solrj/cloud/SolrCloudManager.java  |    2 +-
 .../cloud/autoscaling/AddReplicaSuggester.java     |    3 +
 .../solrj/cloud/autoscaling/AutoScalingConfig.java |   29 +
 .../client/solrj/cloud/autoscaling/Clause.java     |   19 +-
 .../cloud/autoscaling/DelegatingCloudManager.java  |    2 +-
 .../cloud/autoscaling/DeleteNodeSuggester.java     |    2 +
 .../cloud/autoscaling/DeleteReplicaSuggester.java  |    4 +
 .../cloud/autoscaling/MoveReplicaSuggester.java    |    2 +
 .../solrj/cloud/autoscaling/NoneSuggester.java     |    2 +
 .../client/solrj/cloud/autoscaling/Operand.java    |    1 +
 .../client/solrj/cloud/autoscaling/Policy.java     |  107 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java      |   71 +-
 .../client/solrj/cloud/autoscaling/Preference.java |    9 +
 .../solrj/cloud/autoscaling/ReplicaCount.java      |    6 +
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |   10 +-
 .../solrj/cloud/autoscaling/ReplicaVariable.java   |    1 +
 .../solr/client/solrj/cloud/autoscaling/Row.java   |   40 +-
 .../cloud/autoscaling/SplitShardSuggester.java     |    3 +
 .../client/solrj/cloud/autoscaling/Suggester.java  |   16 +-
 .../client/solrj/cloud/autoscaling/Suggestion.java |    4 +
 .../cloud/autoscaling/UnsupportedSuggester.java    |    4 +-
 .../client/solrj/cloud/autoscaling/Variable.java   |    3 +
 .../solrj/cloud/autoscaling/VariableBase.java      |    2 +
 .../solrj/cloud/autoscaling/VersionedData.java     |    7 +
 .../cloud/autoscaling/WithCollectionVariable.java  |    4 +
 .../client/solrj/impl/BaseCloudSolrClient.java     |   59 +-
 .../solrj/impl/BaseHttpClusterStateProvider.java   |   16 +-
 .../solr/client/solrj/impl/BaseHttpSolrClient.java |    6 +-
 .../client/solrj/impl/BinaryRequestWriter.java     |    6 +-
 .../client/solrj/impl/BinaryResponseParser.java    |    1 +
 .../solr/client/solrj/impl/CloudSolrClient.java    |    2 +-
 .../client/solrj/impl/ClusterStateProvider.java    |    2 +
 .../impl/ConcurrentUpdateHttp2SolrClient.java      |   19 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java     |   18 +-
 .../solrj/impl/DelegationTokenHttpSolrClient.java  |    2 +-
 .../solrj/impl/Http2ClusterStateProvider.java      |    1 +
 .../solr/client/solrj/impl/Http2SolrClient.java    |  112 +-
 .../solr/client/solrj/impl/HttpClientUtil.java     |    8 +-
 .../solrj/impl/HttpClusterStateProvider.java       |    1 +
 .../solr/client/solrj/impl/HttpSolrClient.java     |   92 +-
 .../client/solrj/impl/Krb5HttpClientBuilder.java   |   13 +-
 .../solr/client/solrj/impl/LBHttpSolrClient.java   |    4 +-
 .../solr/client/solrj/impl/LBSolrClient.java       |   15 +-
 .../client/solrj/impl/SolrClientCloudManager.java  |   20 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |   31 +-
 .../solrj/impl/SolrHttpRequestRetryHandler.java    |    4 +-
 .../solrj/impl/StreamingBinaryResponseParser.java  |    3 +
 .../solr/client/solrj/impl/XMLResponseParser.java  |    6 +-
 .../solrj/impl/ZkClientClusterStateProvider.java   |    3 +-
 .../client/solrj/impl/ZkDistribStateManager.java   |    1 +
 .../client/solrj/io/ClassificationEvaluation.java  |    8 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |    4 +
 .../apache/solr/client/solrj/io/ModelCache.java    |    2 +-
 .../solr/client/solrj/io/SolrClientCache.java      |    2 +-
 .../org/apache/solr/client/solrj/io/Tuple.java     |  168 +-
 .../solr/client/solrj/io/comp/FieldComparator.java |    5 +
 .../solr/client/solrj/io/eq/FieldEqualitor.java    |    3 +
 .../solr/client/solrj/io/eval/AkimaEvaluator.java  |    3 +-
 .../solr/client/solrj/io/eval/AnovaEvaluator.java  |   12 +-
 .../solr/client/solrj/io/eval/ArrayEvaluator.java  |    2 +
 .../solr/client/solrj/io/eval/AscEvaluator.java    |    1 +
 .../solr/client/solrj/io/eval/Attributes.java      |    1 +
 .../solrj/io/eval/BicubicSplineEvaluator.java      |    2 +
 .../solrj/io/eval/ChebyshevDistanceEvaluator.java  |    1 +
 .../solrj/io/eval/ChiSquareDataSetEvaluator.java   |   13 +-
 .../client/solrj/io/eval/ColumnAtEvaluator.java    |    2 +-
 .../client/solrj/io/eval/ConvexHullEvaluator.java  |    2 +-
 .../client/solrj/io/eval/ConvolutionEvaluator.java |    1 +
 .../client/solrj/io/eval/CorrelationEvaluator.java |    3 +-
 .../solrj/io/eval/CosineSimilarityEvaluator.java   |    2 +
 .../client/solrj/io/eval/CovarianceEvaluator.java  |    1 +
 .../solr/client/solrj/io/eval/DbscanEvaluator.java |    7 +-
 .../client/solrj/io/eval/DensityEvaluator.java     |    1 +
 .../client/solrj/io/eval/DescribeEvaluator.java    |   30 +-
 .../client/solrj/io/eval/DistanceEvaluator.java    |    1 +
 .../client/solrj/io/eval/DotProductEvaluator.java  |    2 +
 .../solr/client/solrj/io/eval/EBEAddEvaluator.java |    3 +-
 .../client/solrj/io/eval/EBEDivideEvaluator.java   |    3 +-
 .../client/solrj/io/eval/EBEMultiplyEvaluator.java |    3 +-
 .../client/solrj/io/eval/EBESubtractEvaluator.java |    3 +-
 .../solrj/io/eval/EnclosingDiskEvaluator.java      |    5 +-
 .../io/eval/EnumeratedDistributionEvaluator.java   |    6 +
 .../solrj/io/eval/EuclideanDistanceEvaluator.java  |    1 +
 .../solr/client/solrj/io/eval/FFTEvaluator.java    |    2 +-
 .../solrj/io/eval/FeatureSelectEvaluator.java      |    5 +-
 .../client/solrj/io/eval/FieldValueEvaluator.java  |    1 +
 .../client/solrj/io/eval/FindDelayEvaluator.java   |    2 +
 .../solrj/io/eval/FrequencyTableEvaluator.java     |   17 +-
 .../client/solrj/io/eval/FuzzyKmeansEvaluator.java |    7 +-
 .../solrj/io/eval/GTestDataSetEvaluator.java       |   13 +-
 .../client/solrj/io/eval/GaussFitEvaluator.java    |    1 +
 .../solrj/io/eval/GetBaryCenterEvaluator.java      |    2 +-
 .../client/solrj/io/eval/GetCacheEvaluator.java    |    2 +
 .../client/solrj/io/eval/GetCenterEvaluator.java   |    3 +-
 .../client/solrj/io/eval/GetClusterEvaluator.java  |    4 +-
 .../client/solrj/io/eval/GetRadiusEvaluator.java   |    1 +
 .../solrj/io/eval/GetSupportPointsEvaluator.java   |    4 +-
 .../client/solrj/io/eval/HarmonicFitEvaluator.java |    3 +
 .../client/solrj/io/eval/HistogramEvaluator.java   |   24 +-
 .../solr/client/solrj/io/eval/IFFTEvaluator.java   |    2 +-
 .../client/solrj/io/eval/IndexOfEvaluator.java     |    1 +
 .../client/solrj/io/eval/IntegrateEvaluator.java   |    2 +-
 .../solr/client/solrj/io/eval/IsNullEvaluator.java |    1 +
 .../solr/client/solrj/io/eval/KmeansEvaluator.java |    9 +-
 .../solr/client/solrj/io/eval/KnnEvaluator.java    |    9 +-
 .../solrj/io/eval/KnnRegressionEvaluator.java      |    3 +
 .../solrj/io/eval/KolmogorovSmirnovEvaluator.java  |   19 +-
 .../solr/client/solrj/io/eval/L1NormEvaluator.java |    1 +
 .../client/solrj/io/eval/LInfNormEvaluator.java    |    1 +
 .../solrj/io/eval/LatLonVectorsEvaluator.java      |    6 +-
 .../solr/client/solrj/io/eval/LerpEvaluator.java   |    3 +-
 .../client/solrj/io/eval/ListCacheEvaluator.java   |    8 +
 .../solr/client/solrj/io/eval/LoessEvaluator.java  |    3 +-
 .../solrj/io/eval/MannWhitneyUEvaluator.java       |   12 +-
 .../apache/solr/client/solrj/io/eval/Matrix.java   |    7 +-
 .../solr/client/solrj/io/eval/MatrixEvaluator.java |    1 +
 .../solrj/io/eval/MatrixMultiplyEvaluator.java     |    1 +
 .../solrj/io/eval/MeanDifferenceEvaluator.java     |    1 +
 .../solr/client/solrj/io/eval/MeanEvaluator.java   |    1 +
 .../solr/client/solrj/io/eval/MemsetEvaluator.java |    6 +-
 .../client/solrj/io/eval/MinMaxScaleEvaluator.java |    3 +-
 .../solr/client/solrj/io/eval/ModeEvaluator.java   |    3 +-
 .../client/solrj/io/eval/MonteCarloEvaluator.java  |   10 +-
 .../client/solrj/io/eval/MultiKmeansEvaluator.java |    6 +-
 .../MultiVariateNormalDistributionEvaluator.java   |    1 +
 .../client/solrj/io/eval/NaturalEvaluator.java     |    2 +-
 .../solr/client/solrj/io/eval/NormEvaluator.java   |    1 +
 .../solrj/io/eval/NormalizeSumEvaluator.java       |    3 +-
 .../client/solrj/io/eval/NotNullEvaluator.java     |    1 +
 .../solrj/io/eval/OLSRegressionEvaluator.java      |    7 +-
 .../solr/client/solrj/io/eval/OnesEvaluator.java   |    2 +-
 .../client/solrj/io/eval/OscillateEvaluator.java   |    2 +
 .../client/solrj/io/eval/OutliersEvaluator.java    |    8 +-
 .../client/solrj/io/eval/PairSortEvaluator.java    |    3 +-
 .../client/solrj/io/eval/PairedTTestEvaluator.java |   10 +-
 .../client/solrj/io/eval/PercentileEvaluator.java  |    3 +-
 .../solr/client/solrj/io/eval/PivotEvaluator.java  |   13 +-
 .../solrj/io/eval/PolyFitDerivativeEvaluator.java  |    2 +
 .../client/solrj/io/eval/PolyFitEvaluator.java     |    1 +
 .../solr/client/solrj/io/eval/PowerEvaluator.java  |    9 +-
 .../client/solrj/io/eval/PredictEvaluator.java     |   11 +-
 .../solr/client/solrj/io/eval/PrimesEvaluator.java |    2 +-
 .../client/solrj/io/eval/PutCacheEvaluator.java    |    1 +
 .../client/solrj/io/eval/RecursiveEvaluator.java   |   14 +-
 .../client/solrj/io/eval/RegressionEvaluator.java  |    2 +
 .../client/solrj/io/eval/RemoveCacheEvaluator.java |    2 +
 .../solr/client/solrj/io/eval/RepeatEvaluator.java |    2 +-
 .../solr/client/solrj/io/eval/RowAtEvaluator.java  |    2 +-
 .../solr/client/solrj/io/eval/SampleEvaluator.java |    2 +-
 .../client/solrj/io/eval/ScalarAddEvaluator.java   |    3 +-
 .../solr/client/solrj/io/eval/ScaleEvaluator.java  |    2 +-
 .../solrj/io/eval/SetColumnLabelsEvaluator.java    |    3 +-
 .../solrj/io/eval/SetRowLabelsEvaluator.java       |    3 +-
 .../client/solrj/io/eval/SetValueEvaluator.java    |    8 +-
 .../solr/client/solrj/io/eval/SplineEvaluator.java |    3 +-
 .../solr/client/solrj/io/eval/SplitEvaluator.java  |    2 +-
 .../solrj/io/eval/StandardDeviationEvaluator.java  |    1 +
 .../client/solrj/io/eval/SumColumnsEvaluator.java  |    2 +-
 .../solrj/io/eval/SumDifferenceEvaluator.java      |    1 +
 .../client/solrj/io/eval/SumRowsEvaluator.java     |    2 +-
 .../solr/client/solrj/io/eval/SumSqEvaluator.java  |    1 +
 .../solr/client/solrj/io/eval/TTestEvaluator.java  |   13 +-
 .../client/solrj/io/eval/TermVectorsEvaluator.java |   16 +-
 .../solrj/io/eval/TimeDifferencingEvaluator.java   |   97 +-
 .../client/solrj/io/eval/TopFeaturesEvaluator.java |    8 +-
 .../solr/client/solrj/io/eval/UnitEvaluator.java   |    3 +-
 .../client/solrj/io/eval/ValueAtEvaluator.java     |    1 +
 .../client/solrj/io/eval/VarianceEvaluator.java    |    1 +
 .../solr/client/solrj/io/eval/VectorFunction.java  |    4 +
 .../solr/client/solrj/io/eval/ZerosEvaluator.java  |    2 +-
 .../client/solrj/io/graph/GatherNodesStream.java   |   52 +-
 .../apache/solr/client/solrj/io/graph/Node.java    |   20 +-
 .../client/solrj/io/graph/ShortestPathStream.java  |   31 +-
 .../solr/client/solrj/io/graph/Traversal.java      |   11 +-
 .../client/solrj/io/graph/TraversalIterator.java   |    9 +-
 .../solr/client/solrj/io/ops/GroupOperation.java   |   17 +-
 .../client/solrj/io/sql/ResultSetMetaDataImpl.java |    2 +
 .../client/solrj/io/stream/CalculatorStream.java   |   12 +-
 .../solrj/io/stream/CartesianProductStream.java    |    1 +
 .../solr/client/solrj/io/stream/CellStream.java    |    9 +-
 .../client/solrj/io/stream/CloudSolrStream.java    |   24 +-
 .../solr/client/solrj/io/stream/CommitStream.java  |    2 +-
 .../solr/client/solrj/io/stream/CsvStream.java     |    3 +-
 .../solr/client/solrj/io/stream/DaemonStream.java  |   27 +-
 .../client/solrj/io/stream/DeepRandomStream.java   |   20 +-
 .../solr/client/solrj/io/stream/EchoStream.java    |   11 +-
 .../solr/client/solrj/io/stream/EvalStream.java    |    2 +-
 .../client/solrj/io/stream/ExceptionStream.java    |   12 +-
 .../client/solrj/io/stream/ExecutorStream.java     |    9 +-
 .../solr/client/solrj/io/stream/Facet2DStream.java |   26 +-
 .../solr/client/solrj/io/stream/FacetStream.java   |   96 +-
 .../solrj/io/stream/FeaturesSelectionStream.java   |   33 +-
 .../solr/client/solrj/io/stream/FetchStream.java   |    4 +-
 .../solr/client/solrj/io/stream/GetStream.java     |   14 +-
 .../client/solrj/io/stream/HashRollupStream.java   |   12 +-
 .../solr/client/solrj/io/stream/JDBCStream.java    |   23 +-
 .../client/solrj/io/stream/JSONTupleStream.java    |    1 +
 .../solrj/io/stream/JavabinTupleStreamParser.java  |    3 +
 .../solr/client/solrj/io/stream/KnnStream.java     |   13 +-
 .../solr/client/solrj/io/stream/LetStream.java     |    6 +-
 .../solr/client/solrj/io/stream/ListStream.java    |    5 +-
 .../solr/client/solrj/io/stream/ModelStream.java   |    6 +-
 .../solr/client/solrj/io/stream/NoOpStream.java    |    6 +-
 .../solr/client/solrj/io/stream/NullStream.java    |    3 +-
 .../client/solrj/io/stream/ParallelListStream.java |    9 +-
 .../client/solrj/io/stream/ParallelStream.java     |   10 +-
 .../solr/client/solrj/io/stream/PlotStream.java    |   21 +-
 .../client/solrj/io/stream/PriorityStream.java     |    2 +-
 .../solr/client/solrj/io/stream/RandomStream.java  |   15 +-
 .../solr/client/solrj/io/stream/RollupStream.java  |   16 +-
 .../client/solrj/io/stream/ScoreNodesStream.java   |   15 +-
 .../solr/client/solrj/io/stream/SearchStream.java  |   16 +-
 .../solr/client/solrj/io/stream/SelectStream.java  |   15 +-
 .../solrj/io/stream/SignificantTermsStream.java    |   27 +-
 .../solr/client/solrj/io/stream/SolrStream.java    |   13 +-
 .../solr/client/solrj/io/stream/StatsStream.java   |  286 +-
 .../solr/client/solrj/io/stream/StreamContext.java |   11 +-
 .../client/solrj/io/stream/TextLogitStream.java    |   50 +-
 .../client/solrj/io/stream/TimeSeriesStream.java   |   30 +-
 .../solr/client/solrj/io/stream/TopicStream.java   |   12 +-
 .../solr/client/solrj/io/stream/TupStream.java     |   20 +-
 .../solr/client/solrj/io/stream/TupleStream.java   |    3 +-
 .../solr/client/solrj/io/stream/UpdateStream.java  |   21 +-
 .../solr/client/solrj/io/stream/ZplotStream.java   |   38 +-
 .../client/solrj/io/stream/expr/Explanation.java   |    1 +
 .../solrj/io/stream/expr/StreamExplanation.java    |    1 +
 .../solrj/io/stream/expr/StreamExpression.java     |    1 +
 .../expr/StreamExpressionNamedParameter.java       |    1 +
 .../io/stream/expr/StreamExpressionValue.java      |    1 +
 .../client/solrj/io/stream/expr/StreamFactory.java |  249 +-
 .../solrj/io/stream/metrics/CountMetric.java       |    4 +-
 .../solrj/io/stream/metrics/PercentileMetric.java  |   84 +
 .../client/solrj/io/stream/metrics/StdMetric.java  |   93 +
 .../solrj/request/CollectionAdminRequest.java      |   40 +-
 .../client/solrj/request/CollectionApiMapping.java |    9 +-
 .../solrj/request/ConfigSetAdminRequest.java       |    3 +-
 .../solr/client/solrj/request/CoreApiMapping.java  |    3 +-
 .../solrj/request/JavaBinUpdateRequestCodec.java   |   17 +-
 .../solrj/request/MultiContentWriterRequest.java   |    7 +-
 .../solr/client/solrj/request/RequestWriter.java   |   13 +-
 .../solr/client/solrj/request/UpdateRequest.java   |    2 +-
 .../solr/client/solrj/request/V1toV2ApiMapper.java |    1 +
 .../solr/client/solrj/request/json/DomainMap.java  |    3 +
 .../client/solrj/request/json/HeatmapFacetMap.java |    3 +-
 .../client/solrj/request/json/JsonFacetMap.java    |    5 +-
 .../solrj/request/json/JsonQueryRequest.java       |    8 +
 .../solrj/response/AnalysisResponseBase.java       |    1 +
 .../solrj/response/CollectionAdminResponse.java    |    1 +
 .../solrj/response/ConfigSetAdminResponse.java     |    3 +-
 .../solrj/response/DelegationTokenResponse.java    |    3 +
 .../solr/client/solrj/response/FieldStatsInfo.java |    1 +
 .../client/solrj/response/HealthCheckResponse.java |    1 +
 .../solr/client/solrj/response/PivotField.java     |    5 +-
 .../solr/client/solrj/response/QueryResponse.java  |   11 +-
 .../solr/client/solrj/response/RangeFacet.java     |    5 +-
 .../client/solrj/response/SolrResponseBase.java    |    3 +
 .../client/solrj/response/SpellCheckResponse.java  |    1 +
 .../client/solrj/response/SuggesterResponse.java   |    1 +
 .../solrj/response/json/BucketBasedJsonFacet.java  |    1 +
 .../solrj/response/json/HeatmapJsonFacet.java      |    1 +
 .../solrj/response/json/NestableJsonFacet.java     |    1 +
 .../solrj/response/schema/SchemaResponse.java      |   32 +-
 .../RequestReplicaListTransformerGenerator.java    |    6 +-
 .../apache/solr/client/solrj/util/ClientUtils.java |    2 +
 .../org/apache/solr/common/IteratorWriter.java     |    1 +
 .../apache/solr/common/LinkedHashMapWriter.java    |    2 +
 .../org/apache/solr/common/MapSerializable.java    |    1 +
 .../src/java/org/apache/solr/common/MapWriter.java |    1 +
 .../java/org/apache/solr/common/MapWriterMap.java  |    7 +-
 .../org/apache/solr/common/NavigableObject.java    |    6 +-
 .../java/org/apache/solr/common/SolrDocument.java  |    5 +-
 .../org/apache/solr/common/SolrDocumentBase.java   |    1 +
 .../org/apache/solr/common/SolrDocumentList.java   |   10 +
 .../java/org/apache/solr/common/SolrException.java |   14 +-
 .../org/apache/solr/common/SolrInputField.java     |    4 +-
 .../java/org/apache/solr/common/cloud/Aliases.java |    4 +-
 .../solr/common/cloud/ClusterProperties.java       |    4 +
 .../org/apache/solr/common/cloud/ClusterState.java |   87 +-
 .../solr/common/cloud/CompositeIdRouter.java       |    1 +
 .../solr/common/cloud/ConnectionManager.java       |    6 +-
 .../apache/solr/common/cloud/DocCollection.java    |   31 +-
 .../org/apache/solr/common/cloud/DocRouter.java    |    2 +
 .../solr/common/cloud/NodesSysPropsCacher.java     |    4 +-
 .../java/org/apache/solr/common/cloud/Replica.java |    7 +-
 .../java/org/apache/solr/common/cloud/Slice.java   |    3 +
 .../org/apache/solr/common/cloud/SolrZkClient.java |   15 +-
 .../apache/solr/common/cloud/SolrZooKeeper.java    |    1 +
 .../apache/solr/common/cloud/ZkConfigManager.java  |    3 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    2 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |    6 +
 .../apache/solr/common/cloud/ZkStateReader.java    |  282 +-
 .../solr/common/cloud/rule/ImplicitSnitch.java     |    5 +-
 .../org/apache/solr/common/cloud/rule/Snitch.java  |    1 +
 .../solr/common/cloud/rule/SnitchContext.java      |    1 +
 .../solr/common/params/CollectionParams.java       |   43 +-
 .../apache/solr/common/params/CommonParams.java    |    6 +
 .../apache/solr/common/params/MapSolrParams.java   |   22 +-
 .../solr/common/params/MultiMapSolrParams.java     |    5 +
 .../org/apache/solr/common/params/SolrParams.java  |    7 +-
 .../apache/solr/common/params/StreamParams.java    |   41 +
 .../common/util/ByteArrayUtf8CharSequence.java     |    6 +-
 .../apache/solr/common/util/CommandOperation.java  |   16 +-
 .../apache/solr/common/util/ContentStreamBase.java |    3 +-
 .../org/apache/solr/common/util/ExecutorUtil.java  |    2 +
 .../solr/common/util/FastJavaBinDecoder.java       |    6 +
 .../src/java/org/apache/solr/common/util/Hash.java |    2 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |   20 +-
 .../apache/solr/common/util/JsonRecordReader.java  |   10 +
 .../apache/solr/common/util/JsonSchemaCreator.java |    3 +-
 .../solr/common/util/JsonSchemaValidator.java      |   22 +-
 .../apache/solr/common/util/JsonTextWriter.java    |   24 +-
 .../apache/solr/common/util/MapBackedCache.java    |    4 +
 .../org/apache/solr/common/util/NamedList.java     |    6 +-
 .../src/java/org/apache/solr/common/util/Pair.java |    1 +
 .../org/apache/solr/common/util/RetryUtil.java     |   13 +-
 .../java/org/apache/solr/common/util/StrUtils.java |    2 +-
 .../org/apache/solr/common/util/TextWriter.java    |    8 +-
 .../org/apache/solr/common/util/TimeSource.java    |    4 +-
 .../java/org/apache/solr/common/util/Utils.java    |   43 +-
 .../apache/solr/common/util/ValidatingJsonMap.java |   19 +-
 .../apache/solr/common/util/XMLErrorLogger.java    |    4 +-
 solr/solrj/src/java/org/noggit/CharArr.java        |  262 +-
 solr/solrj/src/java/org/noggit/JSONParser.java     |    2 +-
 .../src/resources/apispec/cluster.Commands.json    |    3 -
 .../apispec/collections.collection.Commands.json   |    8 +-
 ...collections.collection.shards.shard.delete.json |    2 +-
 ...ons.collection.shards.shard.replica.delete.json |    2 +-
 solr/solrj/src/test-files/log4j2.xml               |   45 +-
 .../src/test-files/solrj/javabin_backcompat.bin    |  Bin 169 -> 170 bytes
 .../ref_guide_examples/JsonRequestApiTest.java     |    2 +-
 .../UsingSolrJRefGuideExamplesTest.java            |    5 +-
 .../solr/client/solrj/LargeVolumeTestBase.java     |   10 +-
 .../client/solrj/MergeIndexesExampleTestBase.java  |    4 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |   19 +-
 .../client/solrj/SolrSchemalessExampleTest.java    |    2 +
 .../solr/client/solrj/TestSolrJErrorHandling.java  |   16 +-
 .../solrj/beans/TestDocumentObjectBinder.java      |    1 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  159 +-
 .../solrj/cloud/autoscaling/TestPolicy2.java       |   28 +-
 .../solrj/embedded/SolrExampleJettyTest.java       |    1 +
 .../solrj/embedded/TestEmbeddedSolrServer.java     |    2 +-
 .../client/solrj/impl/BasicHttpSolrClientTest.java |   53 +-
 .../impl/CloudHttp2SolrClientBadInputTest.java     |    4 +-
 .../solrj/impl/CloudHttp2SolrClientRetryTest.java  |    1 +
 .../solrj/impl/CloudHttp2SolrClientTest.java       |   38 +-
 .../solrj/impl/CloudSolrClientBadInputTest.java    |    4 +-
 .../solrj/impl/CloudSolrClientBuilderTest.java     |    2 +-
 .../solrj/impl/CloudSolrClientCacheTest.java       |   11 +-
 .../solrj/impl/CloudSolrClientRetryTest.java       |    1 +
 .../client/solrj/impl/CloudSolrClientTest.java     |   34 +-
 ...oncurrentUpdateHttp2SolrClientBadInputTest.java |    4 +-
 .../ConcurrentUpdateSolrClientBadInputTest.java    |    4 +-
 .../ConcurrentUpdateSolrClientBuilderTest.java     |    2 +-
 .../impl/Http2SolrClientCompatibilityTest.java     |    7 +-
 .../client/solrj/impl/Http2SolrClientTest.java     |   44 +-
 .../solrj/impl/HttpSolrClientBadInputTest.java     |    4 +-
 .../solrj/impl/LBHttpSolrClientBadInputTest.java   |    4 +-
 .../org/apache/solr/client/solrj/io/TestLang.java  |    4 +-
 .../client/solrj/io/graph/GraphExpressionTest.java |   16 +-
 .../solr/client/solrj/io/graph/GraphTest.java      |   10 +-
 .../apache/solr/client/solrj/io/sql/JdbcTest.java  |    2 +
 .../solrj/io/stream/CloudAuthStreamTest.java       |    9 +-
 .../client/solrj/io/stream/JDBCStreamTest.java     |    4 +-
 .../client/solrj/io/stream/MathExpressionTest.java |  258 +-
 .../client/solrj/io/stream/RecordCountStream.java  |    2 +-
 .../solrj/io/stream/SelectWithEvaluatorsTest.java  |   10 +-
 .../solrj/io/stream/StreamDecoratorTest.java       |   33 +-
 .../solrj/io/stream/StreamExpressionTest.java      |  308 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |   14 +-
 .../solrj/io/stream/eval/AscEvaluatorTest.java     |    6 +
 .../io/stream/eval/ConversionEvaluatorsTest.java   |   24 +-
 .../solrj/io/stream/eval/ReverseEvaluatorTest.java |    1 +
 .../io/stream/eval/TemporalEvaluatorsTest.java     |    1 +
 .../solrj/io/stream/ops/ConcatOperationTest.java   |    1 +
 .../client/solrj/io/stream/ops/OperationsTest.java |    1 +
 .../solr/client/solrj/request/SchemaTest.java      |    2 +
 .../solrj/request/TestConfigSetAdminRequest.java   |    3 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |    4 +-
 .../solrj/request/TestUpdateRequestCodec.java      |    6 +-
 .../solr/client/solrj/request/TestV2Request.java   |    4 +-
 .../client/solrj/request/json/DomainMapTest.java   |    7 +
 .../solrj/response/AnlysisResponseBaseTest.java    |    6 +-
 .../response/DocumentAnalysisResponseTest.java     |    2 +
 .../solrj/response/FieldAnalysisResponseTest.java  |    2 +
 .../solrj/response/NoOpResponseParserTest.java     |    2 +
 .../client/solrj/response/QueryResponseTest.java   |    1 +
 .../response/TestDelegationTokenResponse.java      |    2 +-
 ...RequestReplicaListTransformerGeneratorTest.java |   17 +-
 .../org/apache/solr/common/SolrDocumentTest.java   |    5 +-
 .../solr/common/TestToleratedUpdateError.java      |    2 +
 .../apache/solr/common/cloud/SolrZkClientTest.java |    2 +-
 .../cloud/TestCloudCollectionsListeners.java       |  110 -
 .../common/cloud/TestCollectionStateWatchers.java  |   23 -
 .../common/cloud/TestDocCollectionWatcher.java     |   26 -
 .../solr/common/params/CommonParamsTest.java       |    2 +
 .../apache/solr/common/util/JsonValidatorTest.java |    3 +
 .../org/apache/solr/common/util/NamedListTest.java |    5 +-
 .../solr/common/util/TestFastJavabinDecoder.java   |   13 +
 .../apache/solr/common/util/TestJavaBinCodec.java  |   54 +-
 .../solr/common/util/TestJsonRecordReader.java     |    5 +
 .../solr/common/util/TestNamedListCodec.java       |   15 +
 .../org/apache/solr/common/util/TestPathTrie.java  |    2 +
 .../solr/common/util/TestValidatingJsonMap.java    |    1 +
 .../solr/common/util/Utf8CharSequenceTest.java     |    6 +
 solr/test-framework/build.gradle                   |    3 +-
 .../apache/solr/BaseDistributedSearchTestCase.java |   24 +-
 .../src/java/org/apache/solr/JSONTestUtil.java     |    7 +
 .../java/org/apache/solr/SolrJettyTestBase.java    |    2 +-
 .../src/java/org/apache/solr/SolrTestCase.java     |    2 +-
 .../src/java/org/apache/solr/SolrTestCaseHS.java   |   50 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |  103 +-
 .../solr/cloud/AbstractDistribZkTestBase.java      |   15 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |  102 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java    |    6 +-
 .../org/apache/solr/cloud/CloudInspectUtil.java    |   23 +-
 .../java/org/apache/solr/cloud/ConfigRequest.java  |    1 +
 .../src/java/org/apache/solr/cloud/IpTables.java   |    4 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   12 +-
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |    4 +
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |    9 +-
 .../apache/solr/cloud/StoppableCommitThread.java   |    4 +-
 .../apache/solr/cloud/StoppableSearchThread.java   |    2 +-
 .../java/org/apache/solr/cloud/ZkTestServer.java   |   24 +-
 .../apache/solr/core/MockTracerConfigurator.java   |    2 +-
 .../component/TrackingShardHandlerFactory.java     |    3 +-
 .../org/apache/solr/util/RandomMergePolicy.java    |    4 +-
 .../java/org/apache/solr/util/RandomizeSSL.java    |    4 +-
 .../java/org/apache/solr/util/RestTestBase.java    |   71 +-
 .../src/java/org/apache/solr/util/TestHarness.java |    5 +-
 solr/webapp/build.gradle                           |    2 +
 solr/webapp/web/css/angular/index.css              |    3 +
 solr/webapp/web/js/angular/controllers/index.js    |    6 +
 solr/webapp/web/js/angular/controllers/login.js    |    2 +-
 solr/webapp/web/partials/index.html                |   34 +
 solr/webapp/web/partials/login.html                |   17 +
 versions.lock                                      |   21 +-
 versions.props                                     |    9 +-
 2203 files changed, 47634 insertions(+), 38551 deletions(-)

diff --cc solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index 8ef9376,b577340..d692cae
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@@ -647,9 -679,14 +680,10 @@@ public class Assign 
        this.solrCloudManager = solrCloudManager;
      }
  
 -    public AssignStrategy create(ClusterState clusterState, DocCollection collection) throws IOException, InterruptedException {
 +    public Strategy getStrategy(ClusterState clusterState, DocCollection collection) throws IOException, InterruptedException {
+       @SuppressWarnings({"unchecked", "rawtypes"})
        List<Map> ruleMaps = (List<Map>) collection.get("rule");
 -      String policyName = collection.getStr(POLICY);
 -      @SuppressWarnings({"rawtypes"})
 -      List snitches = (List) collection.get(SNITCH);
 -
 -      Strategy strategy = null;
 +      Strategy strategy;
        if ((ruleMaps == null || ruleMaps.isEmpty()) && !usePolicyFramework(collection, solrCloudManager)) {
          strategy = Strategy.LEGACY;
        } else if (ruleMaps != null && !ruleMaps.isEmpty()) {
@@@ -657,15 -694,6 +691,17 @@@
        } else {
          strategy = Strategy.POLICY;
        }
 +      return strategy;
 +    }
 +
 +    public AssignStrategy create(ClusterState clusterState, DocCollection collection) throws IOException, InterruptedException {
++      @SuppressWarnings({"unchecked", "rawtypes"})
 +      List<Map> ruleMaps = (List<Map>) collection.get("rule");
 +      String policyName = collection.getStr(POLICY);
++      @SuppressWarnings({"rawtypes"})
 +      List snitches = (List) collection.get(SNITCH);
 +
 +      Strategy strategy = getStrategy(clusterState, collection);
  
        switch (strategy) {
          case LEGACY:
diff --cc solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index e0ad126,6498c8b..6b488f3
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@@ -316,8 -289,8 +308,8 @@@ public class CreateCollectionCmd implem
        }
  
        shardRequestTracker.processResponses(results, shardHandler, false, null, Collections.emptySet());
 -      @SuppressWarnings({"rawtypes"})
 -      boolean failure = results.get("failure") != null && ((SimpleOrderedMap)results.get("failure")).size() > 0;
 +      TestInjection.injectCollectionCreateFailure();
-       failure = results.get("failure") != null && ((SimpleOrderedMap)results.get("failure")).size() > 0;
++      failure = results.get("failure") != null && ((SimpleOrderedMap<?>)results.get("failure")).size() > 0;
        if (failure) {
          // Let's cleanup as we hit an exception
          // We shouldn't be passing 'results' here for the cleanup as the response would then contain 'success'