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/08/11 17:16:01 UTC

[lucene-solr] branch jira/solr-13579 updated (9f3431e -> 2bc8c90)

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

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


    from 9f3431e  SOLR-13579: Fix issues after merge.
     add ac80fb9  DOAP changes for release 8.5.2
     add 07a9b5d  SOLR-14474: Fix remaining auxilliary class warnings in Solr
     add b576ef6  LUCENE-9380: Fix auxiliary class warnings in Lucene
     add a240f0b  Add bugfix version 8.5.2
     add 18519f3  Add back-compat indices for 8.5.2
     add 598cbc5  SOLR-14498: BlockCache gets stuck not accepting new stores. Fix gradle :solr:core:validateJarChecksums
     add 84c5dfc  SOLR-14498: BlockCache gets stuck not accepting new stores fixing checksums
     add 679cebe  SOLR-14237: Fix an error on admin UI due to improper variable handling
     add 724709c  SOLR-14498: BlockCache gets stuck not accepting new stores. Fix gradle check
     add 596c64a  SOLR-11934: REVERT addition of collection to log message This reverts commit e4dc9e94
     add 5251c40  SOLR-14511: Documented node.sysprop shard preference (#1536)
     add 2c8cfa6  SOLR-14419: adding {param:ref} to Query DSL
     add 90d84d4  ref_guide - metrics reporting - small typo (#1544)
     add bfb6bf9  LUCENE-9359: Always call checkFooter in SegmentInfos#readCommit. (#1483)
     add fe07d9d  Revert "LUCENE-9359: Always call checkFooter in SegmentInfos#readCommit. (#1483)"
     add f908f2c  LUCENE-9359: Always call checkFooter in SegmentInfos#readCommit. (#1483)
     add 22cb4d4  LUCENE-9359: Address test failures when the codec version gets modified.
     add a6a02ac  SOLR-14494: Refactor BlockJoin to not use Filter (#1523)
     add e1cc7a7  SOLR-14519:Fix or suppress warnings in solr/cloud/autoscaling
     add 1dda684  SOLR-14491: Intercepting internode requests in KerberosPlugin when HTTP/2 client is used
     add da3dbb1  LUCENE-9301: include build time and user name only in non-snapshot builds so that jars are not recompiled on each build in development.
     add cb7e948  SOLR-14517 Obey "mm" local param on edismax queries with operators (#1540)
     add e841d76  SOLR-14525 For components loaded from packages SolrCoreAware, ResourceLoaderAware are not honored (#1547)
     add 552f194  SOLR-14525: Test failure
     add 502f62c  SOLR-14531: Refactor out internode requests from HttpShardHandler
     add 3e8e5d8  LUCENE-9382: update gradle to 6.4.1. (#1549)
     add f59f8fd  Add license file to ShardRequestor.
     add db9cd0c  SOLR-14526: fix or suppress warnings in apache/solr/core
     add 549c42d  Ref Guide: Add docs for updating urlscheme on existing collections; reorg page; fix hover color on tabs
     add a06f57c  SOLR: Use absolute paths for server paths. (#1546)
     add 2af82c8  SOLR-11334: Split some field lists better Used by HighlightComponent and TermVectorComponent Used to produce an empty string on comma-space, leading to an exception.
     add fb58f43  SOLR-14520: Fixed server errors from the json.facet allBuckets:true option when combined with refine:true
     add 90039fc  SOLR-14476: Add percentiles and standard deviation aggregations to stats, facet and timeseries Streaming Expressions
     add 45611d0  LUCENE-9365 FuzzyQuery false negative when prefix length == search term length (#1545)
     add 58958c9  LUCENE-9365 CHANGES.txt
     add 674c2c2  Fix typos in release wizard (#1539)
     add 0c4836b  Add 7.7.3 back compat test indexes
     add 08a13ce  Upgrade forbiddenapis to hotfix release 3.0.1 (allows upgrade to commons-io 2.7 in Solr)
     add bab4fcc  SOLR-14533: Fix or suppress warnings in solr/handler/admin
     add 7c55ba9  SOLR-14419: Ref Guide update for {ref:param}
     add dec6922  SOLR-14524: Harden MultiThreadedOCPTest testFillWorkQueue() (#1548)
     add 0c4d8fb  SOLR-14535: Fix or suppress warnings in apache/solr/handler/component, sql and loader
     add b055c74  SOLR-14467: Fix relatedness() stat in json.facets to no longer cause server errors (or nonsense results) when combined with allBuckets:true
     add e1a97a0  LUCENE-9393: FunctionScoreQuery turns TOP_DOCS to COMPLETE in inner weights (#1553)
     add 62abdac  LUCENE-9393: Fix CHANGES entry
     add 924e7d5  Assume the 'javascript' engine is supported before trying test, to prevent spurious failures on systems w/o javascript engine
     add 2f57386  Fix minExactCount documentation in the ref guide
     add ae3de57  SOLR-14538: Fix or suppress remaining warnings in apache/solr/handler
     add 4b496b3  SOLR-13169 Improve docs for MOVEREPLICA - correct existing parameter docs.
     add ff8caeb  SOLR-13169 Improve docs for MOVEREPLICA - improve examples
     add 89784ad  LUCENE-9383: benchmark module: Gradle conversion (#1550)
     add c8e4334  SOLR-14442: call jstack before force kill; force kill regardles of open port.
     add 6d5b1ae  SOLR-14536: Fix or suppress warnings in apache/solr/common
     add a60f17d  SOLR-14442: add improvement to CHANGES.txt
     add 3cbb1e0  SOLR-14480: Fix or suppress warnings in solr/cloud/api
     add aca95a1  SOLR-13492: perform explicit GC concurrently (#1370)
     add f964881  SOLR-14542: Fix or suppress warnings in solr/handler/dataimport
     add 291e358  SOLR-13203: return 400 on invalid dynamic field for edismax uf (#1502)
     add 14a988c  Legibility: Only get the value of node from messages once.
     add ebd4091  Refactor for code clarity, add some comments.
     add 1228081  SOLR-13169 Improve docs for MOVEREPLICA - Warn that maxShardsPerNode is ignored, better detail on when some parameters are ignored
     add ae6fe8d  Revert "Refactor for code clarity, add some comments."
     add f404a38  SOLR-9679: Exception when removing zk node /security.json (#1403)
     add 04ba04c  SOLR-14543: Fix or suppress warnings in apache/solr/search
     add 7bf59a1  SOLR-14544: Fix or suppress warnings in solr/client/solrj/io/eval
     add 3e53800  SOLR-9679: Harden BasicAuthOnSingleNodeTest#testDeleteSecurityJsonZnode
     add 30924f2  SOLR-14470: Add streaming expressions to /export handler.
     add 8663a42  fix typo in the Solr CHANGES file
     add 4dcdd75  SOLR-14545: Fix or suppress warnings in apache/solr/update
     add 684c2e6  SOLR-14470: Fix precommit
     add 54c5dd7  LUCENE-9148: Move the BKD index to its own file. (#1475)
     add 1ab9b81  SOLR-12823: remove /clusterstate.json (#1528)
     add 8ee6e67  SOLR-14548 Address warning: static member should be qualified by type… (#1555)
     add 7b5d244  awaitsfix failing test
     add c8f48d4  SOLR-14547: Fix or suppress warnings in solr/client/solrj/io/stream
     add 2660139  few more awaitsfix
     add 37a8367  LUCENE-9398: Always keep BKD index off-heap. BKD reader does not implement Accountable any more (#1558)
     add d4f7c90  SOLR-14347: fix cached session update to not depend on Zookeeper state (#1542)
     add 001c4e2  SOLR-14550: fix duplicate issue in Atomic updates with add-distinct
     add 5304098  SOLR-14345: return correct err msg when non-binary resp parser is used
     add 2fe713b  Fix TestPhraseWildcardQuery.testExplain to make it less fragile.
     add 138cdd7  LUCENE-9392: make FacetsConfig.DELIM_CHAR public
     add 9728f4e  SOLR-14552: Add BMW support to ReRank queries (#1559)
     add 07a2036  SOLR-14455: Fix or suppress warnings in solr/test-framework
     add b4dcbfa  SOLR-12823: fix failures in CloudHttp2SolrClientTest CloudSolrClientTest TestCloudSolrClientConnections (#1565)
     add 36109ec  LUCENE-9356: Add a test that verifies that Lucene catches bit flips. (#1569)
     add 75d25ad  LUCENE-9397: UniformSplit supports encodable fields metadata.
     add fb98f30  SOLR-8392 type safety on SolrParam (#1556)
     add ff39144  SOLR-14559: Fix or suppress warnings in solr/core/src/java/org/apache/solr/util, response, cloud, security, schema, api
     add 2991acf  LUCENE-9391: Upgrade HPPC to 0.8.2 (#1560)
     add 38adf09  LUCENE-9356: Make FST throw the correct exception upon incorrect input type.
     add cf8f83c  LUCENE-9356: Disable test, some corruptions are still not detected as corruptions.
     add 26075fc  LUCENE-9394: fix and suppress warnings (#1563)
     add 8cbfb19  SOLR-14563: Fix or suppress warnings in solr/contrib
     add 6801d4c  SOLR-14565: Fix or suppress warnings in solrj/impl and solrj/io/graph
     add a41aa20  SOLR-14564: Fix or suppress remaining warnings in solr/core
     add b8ff4c7  Refactor for code clarity, add some comments.
     add b00d747  SOLR-13169 Improve docs for MOVEREPLICA - document additional existing parameters, second pass fixing spelling and other details.
     add 396490b  SOLR-13169 Improve docs for MOVEREPLICA - better parity with ref guide for v2 api descriptions
     add 4e90e48  SOLR-14567: Fix or suppress remaining warnings in solrj
     add 8426dc7  SOLR-14556: Fix or suppress warnings in solrj/cloud/autoscaling
     add fabc704  SOLR-14516: NPE in JsonTextWriter
     add 47cffbc  LUCENE-9405: Ensure IndexWriter only closes merge readers once. (#1580)
     add 2da71c2  SOLR-14384: SolrRequestInfo now stacks internally. * "set" now MUST pair with a "clear" * fixes SolrIndexSearcher.warm which should have re-instated previous SRI * cleans up some SRI set/clear users
     add 75491ab  LUCENE-9400: Tessellator might fail when several holes share the same vertex (#1562)
     add 2b61b20  LUCENE-9396: Improve truncation detection for points. (#1557)
     add 4decd5a  LUCENE-9403: tune BufferedChecksum.DEFAULT_BUFFERSIZE
     add a108f90  LUCENE-9404: simplify checksum calculation of ByteBuffersIndexOutput
     add a7792b1  SOLR-14558: Record all log lines in SolrLogPostTool (#1570)
     add c083e54  Cleanup TermsHashPerField (#1573)
     add 87a3bef  LUCENE-9353: Move terms metadata to its own file. (#1473)
     add 6357b3b  SOLR-14573: Fix or suppress warnings in solrj/src/test
     add ea0ad3e  LUCENE-9359: Avoid test failures when the extra file is a dir.
     add 207efbc  SOLR-14572 document missing SearchComponents (#1581)
     add 59efe22  LUCENE-8962: Allow waiting for all merges in a merge spec (#1585)
     add 9524cc4  LUCENE-9408: roll back only called once enforcement
     add efcf75a  remove debug code
     add b01e249  SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 1)
     add cfae052  SOLR-14577: Return BAD REQUEST when field is missing in terms QP (#1588)
     add 0ea0358  SOLR-14532: Add *.iml files to gitignore
     add 936b9d7  SOLR-14561 CoreAdminAPI's parameters instanceDir and dataDir are now validated (#1572)
     add 84729ed  SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 2)
     add 4db1e38  LUCENE-9402: Let MultiCollector handle minCompetitiveScore (#1567)
     add 56febf0  Replace DWPT.DocState with simple method parameters (#1594)
     add 972c840  LUCENE-8962: add ability to selectively merge on commit (#1552)
     add 591d844  LUCENE-9412 Do not validate jenkins HTTPS cert
     add 541fc98  LUCENE-9409: Disable TestAllFilesDetectTruncation temporarily.
     add aa5b26f  Remove some needless toAbsolutePath calls (#1582)
     add 62dd94d  SOLR-12823: fix TestZKPropertiesWriter (#1575)
     add 5d43e73  Revert "LUCENE-8962: add ability to selectively merge on commit (#1552)"
     add 4774c6f  Include delegate in AssertingSimilarity toString (#1596)
     add a1be1de  SOLR-14554: Let Solr use WAND algorithm when scores are requested (#1566)
     add 3e42286  SOLR-14546: OverseerTaskProcessor can process messages out of order (#1561)
     add dc1e359  fixes SOLR-14584
     add 3f4f5e2  SOLR-14584: CHANGES.txt entry
     add 6b55d79  SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)
     add b4b641e  Revert "SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)"
     add 710fe3a  SOLR-14502: increase bin/solr's post kill sleep (from 1s to 10s)
     add 3c6e092  SOLR-14546: add a Bug Fixes section for Solr 9.0.0 in CHANGES.txt (#1607)
     add ea1bb9f  SOLR-13268: Clean up any test failures resulting from defaulting to async logging
     add b0333ab  LUCENE-9280: Collectors to skip noncompetitive documents (#1351)
     add 9c1772f  LUCENE-9411: Fail complation on warnings, 9x gradle-only
     add db98608  SOLR-14541: Remove IntelliJ //noinspection comments
     add 7030bb5  SOLR-14591: Move JoinQuery To Its Own File (#1609)
     add 6a45586  Change JoinQuery class's visibility to package again (#1611)
     add f47de19  LUCENE-9408: Ensure OneMerge#mergeFinished is only called once (#1590)
     add 2542801  SOLR-14462: cache more than one autoscaling session (#1504)
     add fa44f82  LUCENE-6669 Fix repeated "the the"
     add 419560e  SOLR-14409: Existing violations allow bypassing policy rules when add… (#1598)
     add 57a892f  SOLR-14404 CoreContainer level custom requesthandlers (#1432)
     add 3000bbd  SOLR Move "userfiles" stuff from SolrPaths to CoreContainer. (#1600)
     add 73a5016  Use simplified API signatures. @EndPoint annotation can be attached to a method and it's posisble to have just a single parameter for an end point
     add 54e6528  SOLR-13749: XCJF -> Cross-Collection Join change solrUrlWhitelist -> allowSolrUrls ref guide: update join parser section to be inline with the unit tests.
     add 7b54902  SOLR-14588: Implement Circuit Breakers (#1606)
     add aba7a61  CHANGES.txt entry for SOLR-14588
     add 1ab9835  SOLR-14307: add enabled parameter to cache documents; typos in common-query-parameters in cache section
     add df81ba9  SOLR-14594: Make titles bold in Admin UI Dashboard screen
     add aad8c98  SOLR-14237: refguide: update dashboard screenshot to show security panel; add'l text edits
     add f1650d5  Ref Guide: prep for 8.6: upgrade notes, typos
     add 11538e5  SOLR-14541: Ensure classes that implement equals implement hashCode or suppress warnings
     add 31de01f  SOLR-14578: Update solrcloud-autoscaling-triggers.adoc and test (#1591)
     add cb6b031  SOLR-14588: fix failing test
     add ed02574  LUCENE-9389: Enhance logging messages in Lucene's Luke module
     add 74ac97e  SOLR-14588: Follow Up Fixes and Documentation (#1615)
     add 68a9e8f  SOLR-14376: remove no-longer-needed 'not no filter queries' check in SolrFeatureWeight
     add 455f2e6  SOLR-13286 Quiet down metrics logging, add a marker to allow any handler to be silenced via log4j2.xml
     add b7f8baa  SOLR-13286 changes comment to correct section
     add e6ffa8e  SOLR-14598: Granting reflection access for using annotations in SOLR-14404
     add 20f39b9  Revert "SOLR-14598: Granting reflection access for using annotations in SOLR-14404"
     add 80bc86d  SOLR Revert change in path separator exposed by cat() Previous change *should* have been purely a refactor but accidentally  changed the path separator this streaming expression exposed to always be '/'.  Apparently this is controversial so the previous behavior is re-instated here (and fixes a failing test on Windows).
     add 45763b6  Revert "SOLR-14588: Follow Up Fixes and Documentation (#1615)"
     add 529faf1  Revert "SOLR-14588: Implement Circuit Breakers (#1606)"
     add 698c9cc  Revert "CHANGES.txt entry for SOLR-14588"
     add 7f352a9  LUCENE-8962: Merge small segments on commit (#1617)
     add fb3c5d2  LUCENE-8962: Fix changes entry. This feature is added to 8.6
     add 1590ed5  SOLR-14404: support for openResource() in PackageResourceLoader & path-prefix for container plugins
     add 584e4d5  syncing with branch_8x
     add 3377b09  LUCENE-8962: Ensure we never flush by ram buffer or doc count in test
     add 7bb9926  SOLR-14481: Add drill Streaming Expression
     add 94684cc  SOLR-14481: precommit error
     add d883cd6  SOLR-14481: use classloader to open resource
     add 574e399  SOLR-14588: Fix failing DebugComponentTest by reverting test to pre-patch state
     add 49a3f0a  SOLR-14561 Followup - validate params for more core operations  (#1629)
     add 0cef29f  LUCENE-9417: Tessellator might fail when several holes share are connected to the same vertex (#1614)
     add 0cc45f6  SOLR-14481: Update CHANGES.txt
     add 3ff3310  LUCENE-9418: Fix ordered intervals over interleaved terms (#1618)
     add 1ec78ac  LUCENE-9418: Add CHANGES entry
     add adf3361  SOLR-14599: Package manager support for cluster level plugins
     add f0764db  SOLR-14561: Fix failing @Nightly test
     add 20c1fdb  SOLR-14404: use MethodHandles in AnnotatedAPI (#1624)
     add f647400  SOLR-14539: Introducing {!bool excludeTags=foo,bar}
     add ccbdb77  Remove Unused Import in BoolQParserPlugin
     add d1c29ae  SOLR-14609: Fix Unused Imports in TestJsonFacetsWithNestedObjects
     add 6eb7bc3  SOLR-14590 : Add support for Lucene's FeatureField in Solr (#1620)
     add 1f6de31  SOLR-14539 Ref Guide update {!bool excludeTags}
     add 76e1d90  SOLR-14592: Upgrade Zookeeper to 3.6.1
     add d0864a1  SOLR-14523: Enhance gradle logging calls validation: eliminate getMessage()
     add 2e60e1f  SOLR-14404: Unregister was not working for plugins with $path-prefix
     add ccdfee2  Remove Redundant Import in TestContainerPlugin
     add 3f9cc22  SOLR-14588: Implement Circuit Breakers (#1626)
     add 7c593b1  SOLR-14022: Deprecate CDCR
     add dd6d1c9  SOLR-14066: Deprecate DIH
     add cc9df5a  SOLR-14561: Adding upgrade notes for allowPaths (#1641)
     add 257a185  SOLR-14561: Fix silly mistake in refguide link
     add 1b8fb70  SOLR-14537: Improve performance of ExportWriter.
     add b50dd0c  SOLR-14358 respond to feedback on URLClassifyProcessorFactory (#1632)
     add 2005c43  fix link and wordsmith a bit (#1642)
     add e9568c3  SOLR-10742: SolrCores.getNamesForCore is quite inefficient and blocks other core operations
     add 05324e7  SOLR-14610: ReflectMapWriter to use VarHandle instead of old legacy reflection (#1635)
     add 35b5eea  SOLR-14537: Fix gradle precommit failures
     add df3bc42  SOLR-14603: Upgrade Restlet to 2.4.3
     add 04d9b52  SOLR-14603: Update CHANGES.txt
     add c3d6a8b  SOLR-14021: Deprecate HDFS support
     add 743234e  SOLR-14523: Enhance gradle logging calls validation: eliminate getMessage(). Added Gradle validation check.
     add 3642aa3  SOLR-14404: update was not working
     add fea6c1b  SOLR-14595: add AwaitsFix test to TestJsonFacetRefinement demonstrating problem, and work around to randomized testing in TestCloudJSONFacetSKGEquiv
     add 4e20986  update the name of the deletegation method in docs to be correct method name (#1652)
     add 31e7ad9  SOLR-14628: hl.fragsizeIsMinimum now defaults to true (#1651)
     add 45573b9  SOLR-14422 progressive render load main admin page (#1654)
     add 5fc1274  SOLR-14599: Ref guide updates and some error handling fixes
     add a80eb84  SOLR-14354: HttpShardHandler send requests in async (#1470)
     add a88a333  SOLR-14599: Some more ref guide updates
     add 5154b60  SOLR-14634: Limit the HTTP security headers to "/solr" end point (#1655)
     add f19057f  SOLR-14537: Fix inner class visibility, reduce diffs with branch_8x.
     add 06b1f3e  SOLR-14462: adjust test so less sessions are used even if test runs slowly. fix synchronization issue. (#1656)
     add d3f4b21  SOLR-10814 Add short-name feature to RuleBasedAuthz plugin
     add 80f8ab7  SOLR-14566: Add request-ID to all distrib-search requests (#1574)
     add 00203c2  SOLR-14566: Correct CHANGES.txt entry
     add 887fe4c  LUCENE-9386 add case insensitive RegExp matching option (#1541)
     add fc58871  SOLR-10814 changes entry
     add cf742f4  SOLR-12847: Remove support for maxShardsPerNode.
     add 7bf2153  Ref Guide: add more context to HDFS, CDCR, DIH deprecations; put CDCR notice on all CDCR pages
     add 3b8ae56  Ref Guide: Add Streaming Expression documentation for 8.6 release
     add 294caa8  LUCENE-9411: Fail complation on warnings, 9x gradle-only. Explicitly list warnings to check for
     add 2155258  SOLR-14610 : Use Methodhandles instead of VarHandle. Works with java8 as well
     add 4ae976b  SOLR-14610: CHANGES.txt
     add 20ec57a  LUCENE-9423: Handle exc in NIOFSDirectory#openInput (#1658)
     add 2341c22  SOLR-11390 Trie* field javadocs to @see *Point (#1612)
     add 5c6314a  SOLR-14635: ThreadDumpHandler has been enhanced to show lock ownership
     add 60e0d8a  LUCENE-8574: the DoubleValues for dependent bindings for an expression are now cached and reused and no longer inefficiently recomputed per hit
     add 5a422db  SOLR-14635: disable test that has silly concurrency assumptions
     add 40e2122  SOLR-13132: JSON Facet perf improvements to support "sweeping" collection of "relatedness()"
     add c20501a  SOLR-13132: fix some small package visibility and javadoc glitches that were caught on backport by the java8/branch_8x precommit but slipped past the java11/master precommit
     add c1ea964  Ref Guide: fix template to put list items inside a <p> element for consistent styling
     add 1862171  Ref Guide: move allowPaths note into Security section for 8.6
     add e355c61  Ref Guide: fix documentation for forceElevation param
     add 8c9c064  SOLR-11262: XML writer implements writeMap and writeIterator (#1665)
     add c346881  SOLR-13939: https://issues.apache.org/jira/browse/SOLR-13939
     add a73dbdd  Harden TestBuildingUpMemoryPressure (#1662)
     add e9e2ff9  Ref Guide: fix aliases.adoc TIP for proper conversion
     add e3c2a93  SOLR-14635: re-enable test with better gatekeeping of expected 'ownership threads' and (nightly only) polling of 'locked/waiting threads' before making asserts
     add a0488c1  SOLR-14244: Remove ReplicaInfo.
     add 1d5a0ad  SOLR-14637 update CloudSolrClient examples to remove deprecated .Builder() method (#1670)
     add e5007c1  SOLR-14647
     add cebdae2  DOAP changes for release 8.6.0
     add f3de646  SOLR-13939: Extract any non-gradle related patches (deprecations, URL fixes, etc.) from gradle effort (thread leaks)
     add efb936b  Sync CHANGES for 8.6.0
     add 522c146  Add back-compat indices for 8.6.0
     add c57a54b  SOLR-14646: Add STEM notation support for the Ref Guide
     add 9c2e781  SOLR-13939: Extract any non-gradle related patches (deprecations, URL fixes, etc.) from gradle effort. Attmept to fix Windows disk full issues
     add 03d658a  SOLR-14151 Make schema components load from packages (#1669)
     add db4516b  SOLR-13391: Removing unused imports
     add 1a7db1c  SOLR-14653: Replace usages of org.apache.hadoop.fs.Path that are used to construct Zookeeper paths
     add 8cf84a3  Import Download task's plugin explicitly.
     add f9fff6e  LUCENE-9436: use release flag for javac rather than source and target.
     add 1d14374  SOLR-14523: moved logger message to info so that it doesn't pollute console on regular runs.
     add cc0c111  SOLR-14656: Removing Autoscaling Framework
     add b46321e  SOLR-14656: Adding back REPLACENODE documentation that was omitted by mistake
     add 48e92ba  SOLR-13205: Improve empty-string handling in SolrQueryParserBase
     add 8ebf2d0  LUCENE-9312: Allow builds against arbitrary JVMs (squashed jira/LUCENE-9312)
     add 03a03b3  LUCENE-9437: make DocValuesOrdinalsReader.decode public
     add 67da34a  SOLR-14676: Update commons-collections to 4.4 and use it in Solr
     add 80b6dce  SOLR-14435: Update collection management docs on RESTORE (#1683)
     add ec007c4  Use FileSystem.newInstance instead of FileSystem.get in HDFSBackupRepository (#1682)
     add 4b2e90b3 SOLR-11656: TLOG replication doesn't work properly after rebalancing leaders.
     add d064260  LUCENE-9429 add missing semicolon (#1673)
     add 5295007  SOLR-14652: SolrCore should hold its own CoreDescriptor (#1675)
     add 6bf5f4a  SOLR-11868: CloudSolrClient.setIdField is confusing, it's really the routing field. Should be deprecated.
     add e4c2be9  LUCENE-9424: add a performance warning to AttributeSource.captureState javadocs
     add 5d46361  LUCENE-9321: Fix offline link base url for snapshot build (#1695)
     add a362402  SOLR-14651: Metrics History could disable better (#1672)
     add ebb5219  SOLR-14671: Parsing dynamic ZK config sometimes cause NuberFormatException (#1701)
     add 2f155aa  SOLR-14489: remove ReplicationHandler's deprecated "master.commitReserveDuration" use (in favour of "commitReserveDuration")
     add 327d860  LUCENE-9416: fix CheckIndex to print an invalid non-zero norm as unsigned long when detecting corruption
     add 7d5b617  LUCENE-9443: UnifiedHighlighter shouldn't close reader (#1706)
     add d894a7e  LUCENE-9395: ConstantValuesSource now shares a single DoubleValues instance across all segments
     add cb45757  LUCENE-9440: call FieldInfo.checkConsistency for real (not under assert)
     add f443ede  SOLR-14681: Introduce ability to delete .jar stored in the Package Store (#1702)
     add 44865c5  moved SOLR-14681 from 9.0section to 8.7
     add 80c6251  SOLR-11262: reword changes entry
     add 07a89e7  SOLR-14516: fix NPE is resp writer while writing docvalue only field
     add a6c058a  SOLR-14657: Improve error handling in IndexReader realted metrics that were causing scary ERROR logging if metrics were requested while Solr was in the process of closing/re-opening a new IndexReader
     add bd21da6  SOLR-14604: Add the ability to uninstall a package from with the Package CLI (#1710)
     add b91a161  LUCENE-9446: In boolean rewrite, remove MatchAllDocsQuery filter clauses (#1709)
     add 9b369ab  LUCENE-9446: Move CHANGES entry from 9.0 to 8.7.
     add 7110118  SOLR-14702: Remove oppressive language (part1) (#1711)
     add 6752111  SOLR-14702: doFetch reads legacy parameters too
     add 6f2f1c3  SOLR-14654 Remove plugin loading from .system collection (for 9.0) (#1677)
     add 321c4bb  SOLR-14654: clean up ref guide, CHANGES.txt
     add 688583f  LUCENE-9427: Fuzzy query should always call consumeTermsMatching in visitor
     add ddbe949  SOLR-14654: ref-guide build failure
     add 35bf178  SOLR-14654: actually fix the Ref Guide build failure
     add cd98b1f  Update batches with new ASF Cloudbees infrastructure
     add 9dcc42a  fix copypaste
     add a96499e  SOLR-13499: Fix "Apache License, Version 2.0" spelling in in pom.xml.template (#674)
     add 2bf092b  SOLR-14702: Add Upgrade Notes and CHANGES entry (#1718)
     add e6275d9  SOLR-14582: Expose IWC.setMaxCommitMergeWaitMillis in Solr's index config (#1602)
     add a03e323  INFRA-20656: comment out RVM install to fix the Ref Guide build on new Jenkins
     add abf637f  INFRA-20656: remove more RVM stuff for Ref Guide build on new CI machines
     add fb9110a  This time comment out ALL the RVM commands to fix the build
     add 5dd4cd1  Comment out RVM_PATH and RUBY_VERSION
     add 10baa50  Add paths for gems on new CI machines
     add a074418  SOLR-13528: Implement Request Rate Limiters (#1686)
     add f827286  SOLR-14582 - Broken test needs fix (#1727)
     add bd1dd6b  SOLR-14582: Fix TestConfig
     add 35771c3  SOLR-14581 Document the way auto commits work in SolrCloud (#1692)
     add 57b0160  SOLR-14641: PeerSync, remove canHandleVersionRanges check (#1663)
     add 9b1aeb3  SOLR-14641: Update CHANGES.txt
     add a747051  LUCENE-9452: remove jenkins.build.ref.guide.sh as it's no longer needed
     add 424a9a6  SOLR-13528: fix heading levels
     add 15ae014  SOLR-14680: Provide simple interfaces to our cloud classes  (only API) (#1694)
     add 5375a2d  LUCENE-9454: upgrade hamcrest to version 2.2. (#1738)
     add 5887032  SOLR-14692: Allow 'method' specification on JSON Facet join domain transforms (#1707)
     add 092076e  LUCENE-9453 Assert lock held before volatile write (#1734)
     add 97c9bb7  LUCENE spell: Implement SuggestWord.toString (#1735)
     new 4669387  Merge branch 'master' into jira/solr-13579
     new 2bc8c90  SOLR-13579: Fix merge issues.

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


Summary of changes:
 .gitignore                                         |     8 +-
 README.md                                          |     2 +-
 build.gradle                                       |    10 +-
 dev-tools/doap/lucene.rdf                          |    14 +
 dev-tools/doap/solr.rdf                            |    14 +
 dev-tools/maven/pom.xml.template                   |     4 +-
 dev-tools/scripts/SOLR-2452.patch.hack.pl          |     4 +-
 dev-tools/scripts/jenkins.build.ref.guide.sh       |    73 -
 dev-tools/scripts/releaseWizard.py                 |     2 +-
 dev-tools/scripts/releaseWizard.yaml               |    27 +-
 dev-tools/scripts/reproduceJenkinsFailures.py      |     5 +-
 gradle/defaults-java.gradle                        |    25 +-
 gradle/documentation/documentation.gradle          |    24 +-
 gradle/documentation/render-javadoc.gradle         |   324 +
 gradle/generate-defaults.gradle                    |     2 +-
 gradle/hacks/findbugs.gradle                       |    46 +
 gradle/help.gradle                                 |     1 +
 gradle/jar-manifest.gradle                         |     9 +-
 gradle/render-javadoc.gradle                       |   302 -
 gradle/testing/alternative-jdk-support.gradle      |    72 +
 gradle/testing/runtime-jvm-support.gradle          |    52 -
 gradle/validation/check-environment.gradle         |     2 +-
 gradle/validation/jar-checks.gradle                |     4 +-
 gradle/validation/validate-log-calls.gradle        |    46 +-
 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 +-
 help/ant.txt                                       |     4 +-
 help/jvms.txt                                      |    18 +
 help/tests.txt                                     |    15 -
 lucene/CHANGES.txt                                 |   131 +-
 lucene/MIGRATE.md                                  |     6 +
 .../compound/hyphenation/HyphenationTree.java      |     2 +-
 .../ConcatenateGraphFilterFactory.java             |     4 +-
 .../FixBrokenOffsetsFilterFactory.java             |     1 +
 .../miscellaneous/WordDelimiterFilterFactory.java  |    19 +-
 .../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/ICUTransformFilter.java    |     1 +
 .../analysis/ja/dict/TokenInfoDictionary.java      |     4 +-
 .../analysis/ko/dict/TokenInfoDictionary.java      |     4 +-
 .../codecs/lucene60/Lucene60PointsFormat.java      |   110 +
 .../codecs/lucene60/Lucene60PointsReader.java      |   146 +
 .../org/apache/lucene/codecs/lucene60/package.html |    25 +
 .../lucene/codecs/lucene84/Lucene84Codec.java      |     4 +-
 .../lucene/codecs/lucene84/package-info.java       |    22 -
 .../org/apache/lucene/codecs/lucene84/package.html |    25 +
 .../codecs/lucene60/Lucene60PointsWriter.java      |   267 +
 .../codecs/lucene60/Lucene60RWPointsFormat.java    |    35 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |   354 +
 .../lucene/codecs/lucene84/Lucene84RWCodec.java    |    39 +
 .../lucene/index/TestBackwardsCompatibility.java   |    14 +-
 .../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
 .../org/apache/lucene/index/index.8.6.0-cfs.zip    |   Bin 0 -> 16442 bytes
 .../org/apache/lucene/index/index.8.6.0-nocfs.zip  |   Bin 0 -> 16428 bytes
 .../test/org/apache/lucene/index/sorted.8.5.2.zip  |   Bin 0 -> 80768 bytes
 .../test/org/apache/lucene/index/sorted.8.6.0.zip  |   Bin 0 -> 140450 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                      |   123 +-
 lucene/benchmark/scripts/collation.bm2jira.pl      |    22 +-
 .../document/DocumentClassificationTestBase.java   |     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 +-
 .../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 +-
 .../java/org/apache/lucene/codecs/CodecUtil.java   |    20 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |   157 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java     |   134 +-
 .../lucene/codecs/blocktree/FieldReader.java       |    32 +-
 .../codecs/lucene50/Lucene50FieldInfosFormat.java  |     1 -
 .../codecs/lucene60/Lucene60FieldInfosFormat.java  |     1 -
 .../codecs/lucene60/Lucene60PointsFormat.java      |   110 -
 .../codecs/lucene60/Lucene60PointsReader.java      |   166 -
 .../codecs/lucene60/Lucene60PointsWriter.java      |   263 -
 .../lucene/codecs/lucene60/package-info.java       |     2 +-
 .../lucene/codecs/lucene86/Lucene86Codec.java      |     4 +-
 .../codecs/lucene86/Lucene86PointsFormat.java      |    80 +
 .../codecs/lucene86/Lucene86PointsReader.java      |   152 +
 .../codecs/lucene86/Lucene86PointsWriter.java      |   265 +
 .../lucene/codecs/lucene86/package-info.java       |     4 +-
 .../java/org/apache/lucene/geo/Tessellator.java    |    18 +-
 .../org/apache/lucene/index/ByteSliceWriter.java   |     1 -
 .../java/org/apache/lucene/index/CheckIndex.java   |     2 +-
 .../apache/lucene/index/DefaultIndexingChain.java  |   100 +-
 .../java/org/apache/lucene/index/DocConsumer.java  |     2 +-
 .../org/apache/lucene/index/DocumentsWriter.java   |     2 +-
 .../lucene/index/DocumentsWriterFlushControl.java  |     8 +-
 .../lucene/index/DocumentsWriterPerThread.java     |    51 +-
 .../java/org/apache/lucene/index/FieldInfo.java    |    16 +-
 .../org/apache/lucene/index/FilterMergePolicy.java |     5 +
 .../org/apache/lucene/index/FreqProxFields.java    |    19 +-
 .../apache/lucene/index/FreqProxTermsWriter.java   |     6 +-
 .../lucene/index/FreqProxTermsWriterPerField.java  |    57 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |   273 +-
 .../org/apache/lucene/index/IndexWriterConfig.java |    18 +
 .../apache/lucene/index/LiveIndexWriterConfig.java |    13 +
 .../java/org/apache/lucene/index/MergePolicy.java  |   170 +-
 .../java/org/apache/lucene/index/MergeTrigger.java |     7 +-
 .../org/apache/lucene/index/NoMergePolicy.java     |     3 +
 .../lucene/index/OneMergeWrappingMergePolicy.java  |     5 +
 .../apache/lucene/index/ParallelPostingsArray.java |    10 +-
 .../org/apache/lucene/index/ReadersAndUpdates.java |    14 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |   236 +-
 .../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 +-
 .../org/apache/lucene/search/BooleanQuery.java     |    12 +-
 .../apache/lucene/search/ConstantScoreQuery.java   |     2 +-
 .../apache/lucene/search/DoubleValuesSource.java   |    24 +-
 .../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 +
 .../java/org/apache/lucene/search/FuzzyQuery.java  |     8 +-
 .../org/apache/lucene/search/LeafCollector.java    |    12 +
 .../apache/lucene/search/MatchAllDocsQuery.java    |     2 +-
 .../org/apache/lucene/search/MultiCollector.java   |   111 +-
 .../java/org/apache/lucene/search/RegexpQuery.java |    38 +-
 .../java/org/apache/lucene/search/ScoreMode.java   |    54 +-
 .../java/org/apache/lucene/search/SortField.java   |     4 +
 .../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 +-
 .../org/apache/lucene/store/NIOFSDirectory.java    |    13 +-
 .../org/apache/lucene/util/AttributeSource.java    |     2 +
 .../src/java/org/apache/lucene/util/IOUtils.java   |    10 +
 .../java/org/apache/lucene/util/IntBlockPool.java  |     2 +-
 .../src/java/org/apache/lucene/util/Version.java   |     7 +
 .../org/apache/lucene/util/automaton/RegExp.java   |   215 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |   252 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |   127 +-
 .../src/java/org/apache/lucene/util/fst/FST.java   |    47 +-
 .../apache/lucene/util/fst/PositiveIntOutputs.java |     1 +
 .../lucene/util/packed/Packed64SingleBlock.java    |     3 +
 lucene/core/src/java/overview.html                 |     2 +-
 .../apache/lucene/analysis/TestCharArraySet.java   |     8 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java    |    45 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |   395 -
 .../codecs/lucene86/TestLucene86PointsFormat.java  |   393 +
 .../org/apache/lucene/document/TestDocument.java   |    12 +-
 .../org/apache/lucene/geo/TestTessellator.java     |    22 +
 .../lucene/index/TestAllFilesDetectBitFlips.java   |   141 +
 .../lucene/index/TestAllFilesDetectTruncation.java |     4 +-
 .../lucene/index/TestDemoParallelLeafReader.java   |     5 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |   177 +-
 .../lucene/index/TestIndexWriterMergePolicy.java   |   242 +-
 .../org/apache/lucene/index/TestMergePolicy.java   |   158 +
 .../org/apache/lucene/index/TestSegmentInfos.java  |    65 +
 .../apache/lucene/index/TestTermsHashPerField.java |   209 +
 .../apache/lucene/search/MultiCollectorTest.java   |   172 +
 .../apache/lucene/search/TestBooleanRewrites.java  |    18 +-
 .../search/TestFieldSortOptimizationSkipping.java  |   294 +
 .../org/apache/lucene/search/TestFuzzyQuery.java   |    41 +-
 .../lucene/search/TestMultiTermConstantScore.java  |     3 +-
 .../org/apache/lucene/search/TestPointQueries.java |     8 +-
 .../org/apache/lucene/search/TestRegexpQuery.java  |    11 +
 .../org/apache/lucene/search/TestSearchAfter.java  |     2 +-
 .../apache/lucene/store/TestNIOFSDirectory.java    |    35 +
 .../test/org/apache/lucene/util/TestCharsRef.java  |     2 +
 .../test/org/apache/lucene/util/TestVersion.java   |     1 +
 .../apache/lucene/util/automaton/TestRegExp.java   |    42 +-
 .../apache/lucene/util/bkd/Test2BBKDPoints.java    |    12 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |    76 +-
 .../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 +-
 .../expressions/CachingExpressionValueSource.java  |    75 +
 .../expressions/ExpressionFunctionValues.java      |    14 +-
 .../lucene/expressions/ExpressionValueSource.java  |     7 +-
 .../expressions/TestExpressionValueSource.java     |    29 +
 .../org/apache/lucene/facet/DrillSideways.java     |     3 +-
 .../java/org/apache/lucene/facet/FacetsConfig.java |    11 +-
 .../facet/taxonomy/DocValuesOrdinalsReader.java    |    15 +-
 .../lucene/facet/taxonomy/TaxonomyReader.java      |     2 +-
 .../lucene/search/grouping/GroupingSearch.java     |     2 +-
 .../search/grouping/ValueSourceGroupSelector.java  |     4 +-
 .../search/grouping/BaseGroupSelectorTestCase.java |     2 +-
 .../lucene/search/grouping/TestGrouping.java       |     2 +
 .../search/uhighlight/UnifiedHighlighter.java      |     5 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java      |    11 +-
 .../uhighlight/TestUnifiedHighlighterTermVec.java  |     1 +
 lucene/ivy-versions.properties                     |    21 +-
 .../search/join/ToParentBlockJoinSortField.java    |    12 +-
 .../lucene/search/join/TestBlockJoinSelector.java  |     9 +-
 lucene/licenses/hamcrest-2.2.jar.sha1              |     1 +
 .../licenses/hamcrest-LICENSE-BSD.txt              |     0
 .../licenses/hamcrest-NOTICE.txt                   |     0
 lucene/licenses/hamcrest-core-1.3.jar.sha1         |     1 -
 lucene/licenses/hppc-0.8.1.jar.sha1                |     1 -
 lucene/licenses/hppc-0.8.2.jar.sha1                |     1 +
 .../org/apache/lucene/luke/app/IndexHandler.java   |     2 +-
 .../dialog/documents/AddDocumentDialogFactory.java |     4 +-
 .../dialog/menubar/CheckIndexDialogFactory.java    |     2 +-
 .../dialog/menubar/OpenIndexDialogFactory.java     |     2 +-
 .../luke/app/desktop/util/ExceptionHandler.java    |     4 +-
 .../apache/lucene/luke/models/util/IndexUtils.java |     8 +-
 .../lucene/util/fst/UpToTwoPositiveIntOutputs.java |     3 +-
 .../similarity/TestLegacyBM25Similarity.java       |     1 +
 .../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/intervals/OrderedIntervalsSource.java  |     4 +-
 .../queries/function/TestFunctionScoreQuery.java   |    32 +
 .../lucene/queries/function/TestValueSources.java  |    10 +-
 .../queries/intervals/TestIntervalQuery.java       |    10 +-
 .../lucene/queries/intervals/TestIntervals.java    |    15 +-
 .../queryparser/docs/xml/LuceneCoreQuery.dtd.html  |     2 +-
 .../docs/xml/LuceneCoreQuery.dtd.org.html          |     2 +-
 .../lucene/queryparser/classic/FastCharStream.java |     9 +-
 .../flexible/core/nodes/QueryNodeImpl.java         |     2 +-
 .../flexible/standard/parser/FastCharStream.java   |    11 +-
 .../surround/parser/FastCharStream.java            |    11 +-
 .../lucene/queryparser/xml/LuceneCoreQuery.dtd     |     2 +-
 .../apache/lucene/replicator/nrt/SimpleServer.java |     1 +
 .../idversion/VersionBlockTreeTermsWriter.java     |     2 +-
 .../codecs/idversion/VersionFieldReader.java       |     2 +-
 .../lucene/search/LatLonPointPrototypeQueries.java |     4 +-
 .../apache/lucene/search/PhraseWildcardQuery.java  |     2 +-
 .../lucene/search/TestPhraseWildcardQuery.java     |    10 +-
 lucene/site/changes/changes2html.pl                |     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 +-
 .../lucene/spatial/bbox/TestBBoxStrategy.java      |    32 +-
 .../lucene/spatial/prefix/DateNRStrategyTest.java  |     2 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java    |    32 +-
 .../lucene/spatial/prefix/JtsPolygonTest.java      |     6 +-
 .../spatial/prefix/NumberRangeFacetsTest.java      |    11 +-
 .../prefix/RandomSpatialOpStrategyTestCase.java    |     3 +-
 .../prefix/TestRecursivePrefixTreeStrategy.java    |     6 +-
 .../Geo3dShapeSphereModelRectRelationTest.java     |     2 +-
 .../spatial/spatial4j/RandomizedShapeTestCase.java |   233 -
 .../apache/lucene/spatial3d/TestGeo3DPoint.java    |     8 +-
 .../search/spell/LuceneLevenshteinDistance.java    |    24 +-
 .../apache/lucene/search/spell/SuggestWord.java    |     5 +
 .../suggest/analyzing/AnalyzingSuggester.java      |     4 +-
 .../suggest/analyzing/FreeTextSuggester.java       |     8 +-
 .../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 +-
 lucene/test-framework/build.gradle                 |    10 +-
 lucene/test-framework/ivy.xml                      |     2 +-
 .../UniformSplitRot13PostingsFormat.java           |    15 +
 .../STUniformSplitRot13PostingsFormat.java         |     7 +
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |     8 +-
 .../org/apache/lucene/geo/BaseXYPointTestCase.java |     8 +-
 .../apache/lucene/index/MockRandomMergePolicy.java |    32 +
 .../java/org/apache/lucene/index/RandomCodec.java  |    16 +-
 .../lucene/search/AssertingLeafCollector.java      |     6 +-
 .../java/org/apache/lucene/search/CheckHits.java   |    75 +-
 .../java/org/apache/lucene/search/QueryUtils.java  |    26 +-
 .../search/similarities/AssertingSimilarity.java   |     2 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |     1 +
 .../java/org/apache/lucene/util/fst/FSTTester.java |     5 +-
 .../org/apache/lucene/geo/lucene-9417.geojson.gz   |   Bin 0 -> 79049 bytes
 .../lucene/search/TestBaseExplanationTestCase.java |    12 +-
 .../util/TestExceptionInBeforeClassHooks.java      |     3 +-
 solr/CHANGES.txt                                   |   313 +-
 solr/bin/solr                                      |    31 +-
 solr/bin/solr.cmd                                  |    35 +-
 solr/bin/solr.in.cmd                               |     9 +-
 solr/bin/solr.in.sh                                |    10 +-
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |    11 +-
 .../mapping/DecimalNumericConversionFunction.java  |     2 +-
 .../function/mapping/ReplaceFunction.java          |     2 +-
 .../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 +
 .../handler/dataimport/MailEntityProcessor.java    |     7 +-
 .../handler/dataimport/TikaEntityProcessor.java    |     1 +
 .../src/java/overview.html                         |     2 +-
 .../collection1/conf/dataimport-solrconfig.xml     |     2 +-
 .../dataimport/TestMailEntityProcessor.java        |    13 +-
 solr/contrib/dataimporthandler/README.md           |     9 +
 .../solr/handler/dataimport/ClobTransformer.java   |     1 +
 .../apache/solr/handler/dataimport/Context.java    |     2 +
 .../solr/handler/dataimport/ContextImpl.java       |     7 +-
 .../solr/handler/dataimport/DataImportHandler.java |    11 +-
 .../solr/handler/dataimport/DataImporter.java      |     6 +
 .../handler/dataimport/DateFormatTransformer.java  |     1 +
 .../solr/handler/dataimport/DebugLogger.java       |    12 +-
 .../apache/solr/handler/dataimport/DocBuilder.java |    12 +-
 .../handler/dataimport/EntityProcessorWrapper.java |    22 +-
 .../handler/dataimport/HTMLStripTransformer.java   |     1 +
 .../solr/handler/dataimport/JdbcDataSource.java    |     1 +
 .../dataimport/NumberFormatTransformer.java        |     1 +
 .../dataimport/PlainTextEntityProcessor.java       |     1 +
 .../solr/handler/dataimport/RegexTransformer.java  |     4 +-
 .../handler/dataimport/TemplateTransformer.java    |     1 +
 .../handler/dataimport/XPathEntityProcessor.java   |     8 +-
 .../solr/handler/dataimport/XPathRecordReader.java |     1 +
 .../dataimporthandler/src/java/overview.html       |     2 +-
 .../collection1/conf/contentstream-solrconfig.xml  |     2 +-
 .../conf/dataimport-nodatasource-solrconfig.xml    |     2 +-
 .../collection1/conf/dataimport-solrconfig.xml     |     2 +-
 .../dataimporthandler/src/test-files/log4j2.xml    |    42 +
 .../src/test-files/solr/collection1/README         |     1 +
 .../solr/configsets/dihconfigset/conf/README       |     2 +
 .../configsets/dihconfigset/conf/schema.xml}       |     0
 .../configsets/dihconfigset/conf/solrconfig.xml    |   287 +
 .../src/test-files/{dih => }/solr/solr.xml         |     0
 .../dataimport/AbstractDIHCacheTestCase.java       |     2 +-
 .../AbstractDataImportHandlerTestCase.java         |     9 +-
 .../dataimport/MockInitialContextFactory.java      |     2 +-
 .../handler/dataimport/TestClobTransformer.java    |     2 +
 .../dataimport/TestContentStreamDataSource.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    |    14 +-
 .../dataimport/TestJdbcDataSourceConvertType.java  |     2 +-
 .../dataimport/TestLineEntityProcessor.java        |    14 +-
 .../dataimport/TestPlainTextEntityProcessor.java   |     3 +
 .../handler/dataimport/TestRegexTransformer.java   |     5 +
 .../handler/dataimport/TestScriptTransformer.java  |     4 +-
 .../TestSolrEntityProcessorEndToEnd.java           |    16 +-
 .../dataimport/TestSolrEntityProcessorUnit.java    |     3 +-
 .../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 |   207 +-
 .../extraction/ExtractingDocumentLoader.java       |     2 +
 .../extraction/ExtractingRequestHandler.java       |     2 +-
 .../handler/extraction/XLSXResponseWriter.java     |     4 +-
 .../extraction/ExtractingRequestHandlerTest.java   |     3 +
 .../solr/jaeger/JaegerTracerConfigurator.java      |     2 +-
 .../apache/solr/jaeger/TestJaegerConfigurator.java |     4 +
 .../OpenNLPLangDetectUpdateProcessorFactory.java   |     2 +-
 .../java/org/apache/solr/ltr/LTRThreadModule.java  |     7 +-
 .../java/org/apache/solr/ltr/feature/Feature.java  |     1 +
 .../org/apache/solr/ltr/feature/SolrFeature.java   |     8 +-
 .../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     |     1 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java    |    12 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |    25 -
 .../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 +
 .../conf/solr-exporter-config.xml                  |     8 +-
 .../collector/SchedulerMetricsCollector.java       |     3 +-
 .../solr/prometheus/exporter/MetricsQuery.java     |     1 +
 .../exporter/PrometheusExporterSettings.java       |     4 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |     1 +
 .../solr/prometheus/scraper/SolrScraper.java       |     2 +-
 ...theus-solr-exporter-integration-test-config.xml |     8 +-
 .../prometheus/PrometheusExporterTestBase.java     |     4 +-
 .../solr/response/VelocityResponseWriter.java      |     8 +-
 solr/core/build.gradle                             |     4 +
 solr/core/ivy.xml                                  |     1 +
 .../src/java/org/apache/solr/api/AnnotatedApi.java |   183 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |    21 +-
 .../apache/solr/api/CustomContainerPlugins.java    |   354 +
 .../src/java/org/apache/solr/api/PayloadObj.java   |    35 +-
 .../src/java/org/apache/solr/api/V2HttpCall.java   |    31 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    11 +-
 .../client/solrj/embedded/JettySolrRunner.java     |     6 +-
 .../apache/solr/cloud/CloudConfigSetService.java   |     1 +
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |     2 +-
 .../org/apache/solr/cloud/ElectionContext.java     |   709 -
 .../src/java/org/apache/solr/cloud/LockTree.java   |    54 +-
 .../src/java/org/apache/solr/cloud/Overseer.java   |    39 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |    18 +-
 .../apache/solr/cloud/OverseerElectionContext.java |   110 +
 .../apache/solr/cloud/OverseerMessageHandler.java  |     7 +-
 .../apache/solr/cloud/OverseerNodePrioritizer.java |    11 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |     4 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   181 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |     8 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    10 +-
 .../solr/cloud/ShardLeaderElectionContext.java     |   493 +
 .../solr/cloud/ShardLeaderElectionContextBase.java |   195 +
 .../java/org/apache/solr/cloud/SolrZkServer.java   |    70 -
 .../java/org/apache/solr/cloud/SyncStrategy.java   |     3 +-
 .../core/src/java/org/apache/solr/cloud/ZkCLI.java |    16 +-
 .../java/org/apache/solr/cloud/ZkController.java   |   199 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |     1 +
 .../solr/cloud/api/collections/AddReplicaCmd.java  |    77 +-
 .../solr/cloud/api/collections/AliasCmd.java       |     1 +
 .../apache/solr/cloud/api/collections/Assign.java  |   238 +-
 .../solr/cloud/api/collections/BackupCmd.java      |    11 +-
 .../solr/cloud/api/collections/CreateAliasCmd.java |     2 +-
 .../cloud/api/collections/CreateCollectionCmd.java |    94 +-
 .../solr/cloud/api/collections/CreateShardCmd.java |     1 +
 .../cloud/api/collections/CreateSnapshotCmd.java   |     8 +-
 .../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    |    12 +-
 .../solr/cloud/api/collections/DeleteShardCmd.java |     5 +-
 .../cloud/api/collections/DeleteSnapshotCmd.java   |     8 +-
 .../api/collections/MaintainRoutedAliasCmd.java    |     8 +-
 .../solr/cloud/api/collections/MigrateCmd.java     |     8 +-
 .../solr/cloud/api/collections/MoveReplicaCmd.java |    16 +-
 .../OverseerCollectionMessageHandler.java          |   101 +-
 .../cloud/api/collections/OverseerRoleCmd.java     |     6 +-
 .../cloud/api/collections/OverseerStatusCmd.java   |     7 +-
 .../api/collections/ReindexCollectionCmd.java      |    18 +-
 .../solr/cloud/api/collections/RenameCmd.java      |     2 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |    12 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |   387 +-
 .../solr/cloud/api/collections/RoutedAlias.java    |     9 +-
 .../cloud/api/collections/SetAliasPropCmd.java     |     2 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |    70 +-
 .../solr/cloud/api/collections/UtilizeNodeCmd.java |   137 -
 .../solr/cloud/autoscaling/ActionContext.java      |    68 -
 .../autoscaling/AutoAddReplicasPlanAction.java     |    40 -
 .../apache/solr/cloud/autoscaling/AutoScaling.java |   244 -
 .../solr/cloud/autoscaling/AutoScalingHandler.java |   732 -
 .../solr/cloud/autoscaling/ComputePlanAction.java  |   348 -
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |   248 -
 .../cloud/autoscaling/HttpTriggerListener.java     |   164 -
 .../autoscaling/InactiveMarkersPlanAction.java     |   141 -
 .../cloud/autoscaling/InactiveShardPlanAction.java |   162 -
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |   561 -
 .../solr/cloud/autoscaling/LoggingListener.java    |    38 -
 .../solr/cloud/autoscaling/MetricTrigger.java      |   219 -
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |   248 -
 .../solr/cloud/autoscaling/NodeLostTrigger.java    |   238 -
 .../cloud/autoscaling/OverseerTriggerThread.java   |   407 -
 .../solr/cloud/autoscaling/ScheduledTrigger.java   |   227 -
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |   910 --
 .../solr/cloud/autoscaling/SearchRateTrigger.java  |   801 --
 .../solr/cloud/autoscaling/SystemLogListener.java  |   219 -
 .../solr/cloud/autoscaling/TriggerAction.java      |    51 -
 .../solr/cloud/autoscaling/TriggerActionBase.java  |    87 -
 .../cloud/autoscaling/TriggerActionException.java  |    33 -
 .../apache/solr/cloud/autoscaling/TriggerBase.java |   297 -
 .../solr/cloud/autoscaling/TriggerEvent.java       |   311 -
 .../solr/cloud/autoscaling/TriggerEventQueue.java  |   119 -
 .../solr/cloud/autoscaling/TriggerListener.java    |    65 -
 .../cloud/autoscaling/TriggerListenerBase.java     |    97 -
 .../solr/cloud/autoscaling/TriggerUtils.java       |    87 -
 .../autoscaling/TriggerValidationException.java    |    74 -
 .../solr/cloud/autoscaling/package-info.java       |    21 -
 .../solr/cloud/autoscaling/sim/ActionError.java    |    24 -
 .../cloud/autoscaling/sim/FakeDocIterator.java     |    56 -
 .../autoscaling/sim/GenericDistributedQueue.java   |   601 -
 .../sim/GenericDistributedQueueFactory.java        |    45 -
 .../solr/cloud/autoscaling/sim/LiveNodesSet.java   |   113 -
 .../sim/NoopDistributedQueueFactory.java           |    94 -
 .../cloud/autoscaling/sim/SimCloudManager.java     |  1055 --
 .../autoscaling/sim/SimClusterStateProvider.java   |  2552 ----
 .../autoscaling/sim/SimDistribStateManager.java    |   648 -
 .../sim/SimDistributedQueueFactory.java            |   286 -
 .../autoscaling/sim/SimNodeStateProvider.java      |   356 -
 .../solr/cloud/autoscaling/sim/SimScenario.java    |  1121 --
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   435 -
 .../autoscaling/sim/SnapshotCloudManager.java      |   257 -
 .../sim/SnapshotClusterStateProvider.java          |   154 -
 .../sim/SnapshotDistribStateManager.java           |   226 -
 .../autoscaling/sim/SnapshotNodeStateProvider.java |   200 -
 .../solr/cloud/autoscaling/sim/package-info.java   |    94 -
 .../solr/cloud/overseer/ClusterStateMutator.java   |    19 +-
 .../solr/cloud/overseer/CollectionMutator.java     |     3 +-
 .../apache/solr/cloud/overseer/NodeMutator.java    |     4 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |    50 +-
 .../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   |    29 +-
 .../org/apache/solr/core/ConfigSetProperties.java  |     4 +-
 .../org/apache/solr/core/ConfigSetService.java     |    11 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   217 +-
 .../java/org/apache/solr/core/CoreDescriptor.java  |    10 +-
 .../apache/solr/core/CorePropertiesLocator.java    |    10 +-
 .../org/apache/solr/core/DirectoryFactory.java     |    19 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |     6 +-
 .../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  |   200 -
 .../solr/core/NRTCachingDirectoryFactory.java      |     1 +
 .../src/java/org/apache/solr/core/NodeConfig.java  |    40 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   239 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    58 +-
 .../org/apache/solr/core/QuerySenderListener.java  |    52 +-
 .../java/org/apache/solr/core/RequestParams.java   |    57 +-
 .../org/apache/solr/core/SchemaCodecFactory.java   |     1 +
 .../apache/solr/core/SimpleTextCodecFactory.java   |     1 +
 .../java/org/apache/solr/core/SolrClassLoader.java |    29 +
 .../src/java/org/apache/solr/core/SolrConfig.java  |    57 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   123 +-
 .../src/java/org/apache/solr/core/SolrCores.java   |    25 +-
 .../org/apache/solr/core/SolrDeletionPolicy.java   |     2 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |    71 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |   115 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |    18 +-
 .../apache/solr/core/TransientSolrCoreCache.java   |    10 -
 .../solr/core/TransientSolrCoreCacheDefault.java   |    17 +-
 .../solr/core/TransientSolrCoreCacheFactory.java   |     6 +-
 .../org/apache/solr/core/backup/BackupManager.java |     2 +-
 .../backup/repository/HdfsBackupRepository.java    |    14 +-
 .../repository/LocalFileSystemRepository.java      |     3 +-
 .../solr/core/snapshots/SolrSnapshotManager.java   |     4 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java     |     1 +
 .../apache/solr/filestore/DistribPackageStore.java |    75 +-
 .../org/apache/solr/filestore/PackageStore.java    |     7 +
 .../org/apache/solr/filestore/PackageStoreAPI.java |    72 +-
 .../solr/handler/AnalysisRequestHandlerBase.java   |     3 +
 .../org/apache/solr/handler/AnalyzeEvaluator.java  |     2 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |     2 +
 .../java/org/apache/solr/handler/CatStream.java    |    92 +-
 .../solr/handler/CdcrBufferStateManager.java       |     2 +
 .../solr/handler/CdcrLeaderStateManager.java       |     2 +
 .../solr/handler/CdcrProcessStateManager.java      |     2 +
 .../org/apache/solr/handler/CdcrReplicator.java    |     5 +
 .../apache/solr/handler/CdcrReplicatorManager.java |     9 +-
 .../apache/solr/handler/CdcrReplicatorState.java   |     2 +-
 .../apache/solr/handler/CdcrRequestHandler.java    |    36 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java    |    10 +-
 .../solr/handler/ContentStreamHandlerBase.java     |     2 +-
 .../handler/DocumentAnalysisRequestHandler.java    |     4 +-
 .../apache/solr/handler/DumpRequestHandler.java    |    10 +-
 .../org/apache/solr/handler/ExportHandler.java     |    80 +-
 .../solr/handler/FieldAnalysisRequestHandler.java  |     3 +
 .../java/org/apache/solr/handler/GraphHandler.java |    18 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |   144 +-
 .../apache/solr/handler/MoreLikeThisHandler.java   |     5 +-
 .../apache/solr/handler/PingRequestHandler.java    |     2 +-
 .../apache/solr/handler/ReplicationHandler.java    |   298 +-
 .../apache/solr/handler/RequestHandlerBase.java    |     8 +-
 .../java/org/apache/solr/handler/RestoreCore.java  |     1 +
 .../java/org/apache/solr/handler/SQLHandler.java   |    10 +-
 .../org/apache/solr/handler/SchemaHandler.java     |    58 +-
 .../java/org/apache/solr/handler/SnapShooter.java  |     6 +
 .../org/apache/solr/handler/SolrConfigHandler.java |    47 +-
 .../org/apache/solr/handler/StreamHandler.java     |    69 +-
 .../apache/solr/handler/UpdateRequestHandler.java  |     4 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |     2 +
 .../handler/admin/AutoscalingHistoryHandler.java   |   165 -
 .../solr/handler/admin/BaseHandlerApiSupport.java  |     5 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |    34 +-
 .../org/apache/solr/handler/admin/ColStatus.java   |     2 +-
 .../solr/handler/admin/CollectionsHandler.java     |    38 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |     6 +-
 .../solr/handler/admin/ContainerPluginsApi.java    |   179 +
 .../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     |     1 +
 .../apache/solr/handler/admin/MergeIndexesOp.java  |     8 +-
 .../handler/admin/MetricsCollectorHandler.java     |     2 +-
 .../apache/solr/handler/admin/MetricsHandler.java  |     7 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    36 +-
 .../solr/handler/admin/RebalanceLeaders.java       |     8 +-
 .../solr/handler/admin/SecurityConfHandler.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      |     1 +
 .../solr/handler/admin/ThreadDumpHandler.java      |    54 +-
 .../solr/handler/admin/ZookeeperInfoHandler.java   |   201 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |    14 +-
 .../solr/handler/component/CloudReplicaSource.java |     2 +
 .../solr/handler/component/DebugComponent.java     |    38 +-
 .../solr/handler/component/ExpandComponent.java    |    11 +-
 .../solr/handler/component/FacetComponent.java     |     6 +-
 .../solr/handler/component/FieldFacetStats.java    |     4 +-
 .../solr/handler/component/HighlightComponent.java |     9 +-
 .../solr/handler/component/HttpShardHandler.java   |   176 +-
 .../handler/component/HttpShardHandlerFactory.java |    70 +-
 .../handler/component/IterativeMergeStrategy.java  |     1 +
 .../solr/handler/component/MergeStrategy.java      |     1 +
 .../component/PhrasesIdentificationComponent.java  |     4 +
 .../component/PivotFacetFieldValueCollection.java  |     3 +-
 .../solr/handler/component/PivotFacetHelper.java   |     5 +
 .../handler/component/PivotFacetProcessor.java     |     4 +-
 .../solr/handler/component/QueryComponent.java     |     9 +-
 .../handler/component/QueryElevationComponent.java |     7 +-
 .../handler/component/RangeFacetProcessor.java     |     1 +
 .../handler/component/RealTimeGetComponent.java    |    43 +-
 .../solr/handler/component/ResponseBuilder.java    |     3 +-
 .../solr/handler/component/SearchComponent.java    |     2 +-
 .../solr/handler/component/SearchHandler.java      |    88 +-
 .../apache/solr/handler/component/ShardDoc.java    |     1 +
 .../component/ShardFieldSortedHitQueue.java        |     6 +-
 .../solr/handler/component/ShardResponse.java      |     4 +-
 .../handler/component/SortedDateStatsValues.java   |     2 +-
 .../component/SortedNumericStatsValues.java        |     2 +-
 .../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 |    20 +-
 .../solr/handler/component/SuggestComponent.java   |     9 +-
 .../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 +
 .../solr/handler/export/DoubleValueSortDoc.java    |     1 +
 .../apache/solr/handler/export/ExportBuffers.java  |   271 +
 .../apache/solr/handler/export/ExportWriter.java   |   306 +-
 .../solr/handler/export/ExportWriterStream.java    |   242 +
 .../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 +
 .../org/apache/solr/handler/export/LongValue.java  |     4 +-
 .../apache/solr/handler/export/PriorityQueue.java  |   218 -
 .../solr/handler/export/QuadValueSortDoc.java      |     1 +
 .../solr/handler/export/SingleValueSortDoc.java    |     3 +-
 .../org/apache/solr/handler/export/SortDoc.java    |    19 +-
 .../org/apache/solr/handler/export/SortQueue.java  |   155 +-
 .../solr/handler/export/StringFieldWriter.java     |    25 +-
 .../apache/solr/handler/export/StringValue.java    |    36 +-
 .../solr/handler/export/TripleValueSortDoc.java    |     1 +
 .../apache/solr/handler/loader/JavabinLoader.java  |     6 +-
 .../org/apache/solr/handler/loader/JsonLoader.java |    11 +-
 .../org/apache/solr/handler/loader/XMLLoader.java  |     2 +
 .../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/SolrTable.java     |    26 +-
 .../handler/sql/SolrToEnumerableConverter.java     |     3 +
 .../solr/handler/tagger/TaggerRequestHandler.java  |     9 +-
 .../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/highlight/UnifiedSolrHighlighter.java     |     3 +-
 .../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 +
 .../apache/solr/managed/ResourceManagerAPI.java    |     2 +-
 .../org/apache/solr/metrics/MetricSuppliers.java   |     5 +
 .../java/org/apache/solr/metrics/MetricsMap.java   |     3 +
 .../apache/solr/metrics/SolrCoreMetricManager.java |     4 +-
 .../org/apache/solr/metrics/SolrMetricManager.java |     8 +-
 .../solr/metrics/reporters/SolrSlf4jReporter.java  |     1 +
 .../reporters/solr/SolrClusterReporter.java        |     4 +-
 .../solr/metrics/reporters/solr/SolrReporter.java  |     3 +
 .../metrics/reporters/solr/SolrShardReporter.java  |     2 +-
 .../solr/metrics/rrd/SolrRrdBackendFactory.java    |     7 +-
 .../apache/solr/packagemanager/PackageManager.java |   444 +-
 .../apache/solr/packagemanager/PackageUtils.java   |     3 +
 .../solr/packagemanager/RepositoryManager.java     |    34 +-
 .../apache/solr/packagemanager/SolrPackage.java    |     4 +
 .../solr/packagemanager/SolrPackageInstance.java   |    23 +
 .../org/apache/solr/parser/FastCharStream.java     |    12 +
 .../apache/solr/parser/SolrQueryParserBase.java    |    27 +-
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |    62 +-
 .../java/org/apache/solr/pkg/PackageListeners.java |    53 +-
 .../solr/pkg/PackageListeningClassLoader.java      |   151 +
 .../java/org/apache/solr/pkg/PackageLoader.java    |    56 +-
 .../org/apache/solr/pkg/PackagePluginHolder.java   |    56 +-
 .../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 |     7 +-
 .../apache/solr/response/CSVResponseWriter.java    |     4 +-
 .../org/apache/solr/response/DocsStreamer.java     |     1 +
 .../solr/response/GeoJSONResponseWriter.java       |     2 +
 .../solr/response/GraphMLResponseWriter.java       |     8 +-
 .../apache/solr/response/JSONResponseWriter.java   |     9 +-
 .../apache/solr/response/PHPResponseWriter.java    |     6 +-
 .../solr/response/PHPSerializedResponseWriter.java |     8 +-
 .../apache/solr/response/PythonResponseWriter.java |     2 +-
 .../apache/solr/response/QueryResponseWriter.java  |     2 +-
 .../apache/solr/response/RawResponseWriter.java    |     2 +-
 .../apache/solr/response/RubyResponseWriter.java   |     2 +-
 .../solr/response/SchemaXmlResponseWriter.java     |     2 +-
 .../org/apache/solr/response/SchemaXmlWriter.java  |    18 +-
 .../apache/solr/response/SmileResponseWriter.java  |     2 +-
 .../apache/solr/response/SolrQueryResponse.java    |     1 +
 .../solr/response/TabularResponseWriter.java       |     6 +-
 .../apache/solr/response/XMLResponseWriter.java    |     2 +-
 .../java/org/apache/solr/response/XMLWriter.java   |    53 +-
 .../apache/solr/response/XSLTResponseWriter.java   |     2 +-
 .../transform/ExplainAugmenterFactory.java         |     2 +-
 .../response/transform/GeoTransformerFactory.java  |     1 +
 .../transform/RawValueTransformerFactory.java      |     3 +-
 .../response/transform/ShardAugmenterFactory.java  |     2 +-
 .../transform/SubQueryAugmenterFactory.java        |    50 +-
 .../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 |     4 +-
 .../solr/schema/ClassicIndexSchemaFactory.java     |     2 +-
 .../org/apache/solr/schema/CurrencyFieldType.java  |     5 +-
 .../org/apache/solr/schema/DatePointField.java     |     1 -
 .../solr/schema/ExternalFileFieldReloader.java     |     2 +-
 .../src/java/org/apache/solr/schema/FieldType.java |     3 +
 .../apache/solr/schema/FieldTypePluginLoader.java  |    15 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |   114 +-
 .../solr/schema/LatLonPointSpatialField.java       |     1 +
 .../java/org/apache/solr/schema/LatLonType.java    |     4 +
 .../org/apache/solr/schema/ManagedIndexSchema.java |    13 +-
 .../solr/schema/ManagedIndexSchemaFactory.java     |     2 +-
 .../solr/schema/OpenExchangeRatesOrgProvider.java  |     4 +-
 .../java/org/apache/solr/schema/PointField.java    |     2 +-
 .../org/apache/solr/schema/PreAnalyzedField.java   |     4 +-
 .../org/apache/solr/schema/RandomSortField.java    |     2 +-
 .../src/java/org/apache/solr/schema/RankField.java |   140 +
 .../solr/schema/RptWithGeometrySpatialField.java   |     1 +
 .../java/org/apache/solr/schema/SchemaManager.java |     2 +
 .../src/java/org/apache/solr/schema/StrField.java  |     2 +-
 .../org/apache/solr/schema/StrFieldSource.java     |     2 +-
 .../src/java/org/apache/solr/schema/TextField.java |     2 +-
 .../java/org/apache/solr/schema/TrieDateField.java |     1 +
 .../org/apache/solr/schema/TrieDoubleField.java    |     3 +-
 .../src/java/org/apache/solr/schema/TrieField.java |     1 +
 .../org/apache/solr/schema/TrieFloatField.java     |     3 +-
 .../java/org/apache/solr/schema/TrieIntField.java  |     3 +-
 .../java/org/apache/solr/schema/TrieLongField.java |     3 +-
 .../src/java/org/apache/solr/schema/UUIDField.java |     4 +-
 .../apache/solr/search/AbstractReRankQuery.java    |     2 +-
 .../org/apache/solr/search/BoolQParserPlugin.java  |    53 +-
 .../java/org/apache/solr/search/CacheConfig.java   |     8 +
 .../org/apache/solr/search/CacheRegenerator.java   |     4 +-
 .../java/org/apache/solr/search/CaffeineCache.java |     2 +
 .../solr/search/CollapsingQParserPlugin.java       |    12 +-
 .../solr/search/ComplexPhraseQParserPlugin.java    |     2 +-
 .../java/org/apache/solr/search/CursorMark.java    |     1 +
 .../apache/solr/search/ExportQParserPlugin.java    |     5 +
 .../apache/solr/search/ExtendedDismaxQParser.java  |     5 +-
 .../solr/search/FloatPayloadValueSource.java       |     4 +-
 .../org/apache/solr/search/FunctionRangeQuery.java |     1 +
 .../src/java/org/apache/solr/search/Grouping.java  |    41 +-
 .../solr/search/IGainTermsQParserPlugin.java       |     2 +
 .../org/apache/solr/search/JoinQParserPlugin.java  |   571 +-
 .../src/java/org/apache/solr/search/JoinQuery.java |   508 +
 .../org/apache/solr/search/MaxScoreCollector.java  |     6 +-
 .../java/org/apache/solr/search/QParserPlugin.java |     5 +-
 .../java/org/apache/solr/search/QueryContext.java  |     1 +
 .../java/org/apache/solr/search/QueryParsing.java  |     1 +
 .../org/apache/solr/search/RankQParserPlugin.java  |   158 +
 .../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 |     2 +-
 .../apache/solr/search/SolrConstantScoreQuery.java |     1 +
 .../org/apache/solr/search/SolrCoreParser.java     |     1 +
 .../apache/solr/search/SolrDocumentFetcher.java    |     3 +-
 .../java/org/apache/solr/search/SolrFilter.java    |     6 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |    63 +-
 .../org/apache/solr/search/TermsQParserPlugin.java |     3 +
 .../TextLogisticRegressionQParserPlugin.java       |     4 +-
 .../org/apache/solr/search/ValueSourceParser.java  |    26 +-
 .../org/apache/solr/search/XmlQParserPlugin.java   |     3 +-
 .../org/apache/solr/search/facet/FacetBucket.java  |     5 +-
 .../solr/search/facet/FacetFieldProcessor.java     |   101 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    38 +
 .../search/facet/FacetFieldProcessorByArrayDV.java |   177 +-
 .../org/apache/solr/search/facet/FacetParser.java  |   235 +-
 .../apache/solr/search/facet/FacetProcessor.java   |     1 -
 .../org/apache/solr/search/facet/FacetRequest.java |   258 +-
 .../solr/search/facet/ReadOnlyCountSlotAcc.java    |    31 +
 .../apache/solr/search/facet/RelatednessAgg.java   |   265 +-
 .../apache/solr/search/facet/SingletonDISI.java    |    48 +
 .../solr/search/facet/SingletonDocIterator.java    |    52 +
 .../java/org/apache/solr/search/facet/SlotAcc.java |   289 +-
 .../apache/solr/search/facet/SweepCountAware.java  |   187 +
 .../org/apache/solr/search/facet/SweepDISI.java    |    85 +
 .../apache/solr/search/facet/SweepDocIterator.java |    87 +
 .../apache/solr/search/facet/UnInvertedField.java  |    71 +-
 .../org/apache/solr/search/facet/UnionDISI.java    |   100 +
 .../apache/solr/search/facet/UnionDocIterator.java |   107 +
 .../solr/search/facet/UniqueBlockQueryAgg.java     |     4 +-
 .../solr/search/function/MultiStringFunction.java  |     4 +-
 .../search/function/ValueSourceRangeFilter.java    |     5 +-
 .../distance/GeoDistValueSourceParser.java         |     3 +-
 .../search/function/distance/GeohashFunction.java  |     2 +
 .../distance/GeohashHaversineFunction.java         |    10 +-
 .../function/distance/HaversineConstFunction.java  |    10 +-
 .../function/distance/HaversineFunction.java       |     9 +-
 .../function/distance/StringDistanceFunction.java  |     2 +
 .../function/distance/VectorDistanceFunction.java  |     9 +-
 .../solr/search/grouping/CommandHandler.java       |    16 +-
 .../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               |     4 +-
 .../solr/search/join/BlockJoinChildQParser.java    |     7 +-
 .../solr/search/join/BlockJoinParentQParser.java   |   105 +-
 .../search/join/ChildFieldValueSourceParser.java   |     4 +-
 .../search/join/CrossCollectionJoinQParser.java    |    92 +
 .../solr/search/join/CrossCollectionJoinQuery.java |   380 +
 .../apache/solr/search/join/FiltersQParser.java    |    91 +-
 .../solr/search/join/GraphEdgeCollector.java       |   207 +
 .../org/apache/solr/search/join/GraphQuery.java    |     2 +-
 .../solr/search/join/GraphTermsCollector.java      |   202 -
 .../solr/search/join/ScoreJoinQParserPlugin.java   |    19 +-
 .../org/apache/solr/search/join/XCJFQParser.java   |    90 -
 .../apache/solr/search/join/XCJFQParserPlugin.java |    66 -
 .../org/apache/solr/search/join/XCJFQuery.java     |   379 -
 .../apache/solr/search/mlt/CloudMLTQParser.java    |     4 +
 .../apache/solr/search/mlt/SimpleMLTQParser.java   |     1 +
 .../solr/search/stats/ExactSharedStatsCache.java   |     2 +-
 .../apache/solr/search/stats/ExactStatsCache.java  |    10 +
 .../apache/solr/search/stats/LRUStatsCache.java    |     4 +-
 .../org/apache/solr/search/stats/StatsCache.java   |     2 +-
 .../apache/solr/security/AuditLoggerPlugin.java    |     2 +
 .../apache/solr/security/AuthenticationPlugin.java |     9 +
 .../apache/solr/security/AuthorizationContext.java |    27 +-
 .../solr/security/AutorizationEditOperation.java   |     9 +
 .../org/apache/solr/security/BasicAuthPlugin.java  |     4 +-
 .../security/DelegationTokenKerberosFilter.java    |    19 +-
 .../ExternalRoleRuleBasedAuthorizationPlugin.java  |     7 +-
 .../solr/security/JWTVerificationkeyResolver.java  |     2 +-
 .../org/apache/solr/security/KerberosPlugin.java   |    35 +-
 .../solr/security/PKIAuthenticationPlugin.java     |     1 +
 .../java/org/apache/solr/security/Permission.java  |     9 +-
 .../solr/security/PermissionNameProvider.java      |     1 +
 .../security/RuleBasedAuthorizationPlugin.java     |    24 +-
 .../security/RuleBasedAuthorizationPluginBase.java |    68 +-
 .../security/Sha256AuthenticationProvider.java     |    11 +-
 .../apache/solr/servlet/DirectSolrConnection.java  |     4 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |    42 +-
 .../org/apache/solr/servlet/QueryRateLimiter.java  |    55 +
 .../org/apache/solr/servlet/RateLimitManager.java  |   181 +
 .../apache/solr/servlet/RequestRateLimiter.java    |   168 +
 .../org/apache/solr/servlet/ResponseUtils.java     |     3 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |    40 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |     2 +-
 .../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 +-
 .../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  |     6 +
 .../org/apache/solr/store/hdfs/HdfsFileWriter.java |     2 +
 .../solr/store/hdfs/HdfsLocalityReporter.java      |     4 +
 .../apache/solr/store/hdfs/HdfsLockFactory.java    |     4 +
 .../org/apache/solr/update/AddUpdateCommand.java   |     1 +
 .../org/apache/solr/update/CdcrTransactionLog.java |     2 +
 .../java/org/apache/solr/update/CdcrUpdateLog.java |     4 +
 .../java/org/apache/solr/update/CommitTracker.java |     1 +
 .../apache/solr/update/DefaultSolrCoreState.java   |     4 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |     1 +
 .../org/apache/solr/update/DocumentBuilder.java    |     1 +
 .../org/apache/solr/update/HdfsTransactionLog.java |     4 +
 .../java/org/apache/solr/update/HdfsUpdateLog.java |     9 +-
 .../org/apache/solr/update/IndexFingerprint.java   |     5 +-
 .../src/java/org/apache/solr/update/PeerSync.java  |    82 +-
 .../org/apache/solr/update/PeerSyncWithLeader.java |    29 +-
 .../org/apache/solr/update/SolrCmdDistributor.java |     1 +
 .../java/org/apache/solr/update/SolrCoreState.java |     3 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |    27 +-
 .../org/apache/solr/update/SolrIndexSplitter.java  |     1 +
 .../org/apache/solr/update/TransactionLog.java     |   165 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |    18 +-
 .../java/org/apache/solr/update/VersionInfo.java   |     4 +
 ...AbstractDefaultValueUpdateProcessorFactory.java |     2 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java     |     9 +-
 .../processor/AtomicUpdateDocumentMerger.java      |    58 +-
 .../processor/AtomicUpdateProcessorFactory.java    |     3 +-
 .../solr/update/processor/CdcrUpdateProcessor.java |     2 +
 .../processor/CdcrUpdateProcessorFactory.java      |     2 +-
 .../ClassificationUpdateProcessorFactory.java      |     2 +-
 .../CloneFieldUpdateProcessorFactory.java          |    11 +-
 .../ConcatFieldUpdateProcessorFactory.java         |     2 +-
 .../CountFieldValuesUpdateProcessorFactory.java    |     2 +-
 .../DefaultValueUpdateProcessorFactory.java        |     2 +-
 .../processor/DistributedZkUpdateProcessor.java    |     2 +-
 .../DocBasedVersionConstraintsProcessor.java       |     6 +-
 ...DocBasedVersionConstraintsProcessorFactory.java |     4 +-
 .../DocExpirationUpdateProcessorFactory.java       |    15 +-
 .../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       |     2 +-
 .../MaxFieldValueUpdateProcessorFactory.java       |     7 +-
 .../MinFieldValueUpdateProcessorFactory.java       |     7 +-
 .../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 +-
 .../update/processor/TolerantUpdateProcessor.java  |     2 +-
 .../processor/TrimFieldUpdateProcessorFactory.java |     2 +-
 .../TruncateFieldUpdateProcessorFactory.java       |     2 +-
 .../update/processor/URLClassifyProcessor.java     |    58 +-
 .../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 |   120 +-
 .../src/java/org/apache/solr/util/RTimerTree.java  |     1 +
 .../src/java/org/apache/solr/util/SolrCLI.java     |   425 +-
 .../java/org/apache/solr/util/SolrLogLayout.java   |     1 +
 .../java/org/apache/solr/util/SolrLogPostTool.java |   134 +-
 .../java/org/apache/solr/util/SolrPluginUtils.java |    25 +-
 .../java/org/apache/solr/util/TestInjection.java   |    15 +-
 .../solr/util/circuitbreaker/CircuitBreaker.java   |    56 +
 .../util/circuitbreaker/CircuitBreakerManager.java |   134 +
 .../util/circuitbreaker/MemoryCircuitBreaker.java  |   114 +
 .../SSLCredentialProviderFactory.java              |     4 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |     8 +-
 .../util/plugin/NamedListInitializedPlugin.java    |     2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    |     8 +-
 .../solr/util/tracing/SolrRequestCarrier.java      |     3 +-
 .../resources/EditableSolrConfigAttributes.json    |     5 +-
 solr/core/src/test-files/log4j2.xml                |    44 +-
 solr/core/src/test-files/runtimecode/MyPlugin.java |    43 +
 .../runtimecode/containerplugin.v.1.jar.bin        |   Bin 0 -> 867 bytes
 .../runtimecode/containerplugin.v.2.jar.bin        |   Bin 0 -> 867 bytes
 .../test-files/runtimecode/schema-plugins.jar.bin  |   Bin 0 -> 6814 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |    13 +
 .../solr/collection1/conf/schema-rank-fields.xml   |    27 +
 .../test-files/solr/collection1/conf/schema15.xml  |     3 +
 .../solr/collection1/conf/schema_latest.xml        |     4 +
 .../solr/collection1/conf/solrconfig-follower.xml  |    59 +
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |     0
 ...rottled.xml => solrconfig-leader-throttled.xml} |     0
 .../solr/collection1/conf/solrconfig-leader.xml    |    70 +
 .../conf/solrconfig-leader1-keepOneBackup.xml      |    49 +
 .../solr/collection1/conf/solrconfig-leader1.xml   |    68 +
 .../solr/collection1/conf/solrconfig-leader2.xml   |    66 +
 .../solr/collection1/conf/solrconfig-leader3.xml   |    67 +
 .../solr/collection1/conf/solrconfig-master.xml    |    70 -
 .../conf/solrconfig-master1-keepOneBackup.xml      |    49 -
 .../solr/collection1/conf/solrconfig-master1.xml   |    68 -
 .../solr/collection1/conf/solrconfig-master2.xml   |    66 -
 .../solr/collection1/conf/solrconfig-master3.xml   |    67 -
 .../conf/solrconfig-memory-circuitbreaker.xml      |    95 +
 .../solr/collection1/conf/solrconfig-repeater.xml  |     6 +-
 .../conf/solrconfig-replication-legacy.xml         |    62 +
 .../solr/collection1/conf/solrconfig-slave.xml     |    59 -
 .../solr/collection1/conf/solrconfig-tlog.xml      |     4 -
 .../conf/solrconfig.snippet.randomindexconfig.xml  |     1 +
 .../configsets/{xcjf => ccjoin}/conf/schema.xml    |     0
 .../solr/configsets/ccjoin/conf/solrconfig.xml     |    62 +
 .../solr/configsets/xcjf/conf/solrconfig.xml       |    72 -
 .../security/hadoop_kerberos_authz_config.json     |    37 +
 .../solr/simSnapshot/autoscalingState.json         |  3923 ------
 .../test-files/solr/simSnapshot/clusterState.json  |  2854 ----
 .../test-files/solr/simSnapshot/distribState.json  |   206 -
 .../test-files/solr/simSnapshot/managerState.json  |     1 -
 .../src/test-files/solr/simSnapshot/nodeState.json |  3823 ------
 .../test-files/solr/simSnapshot/statistics.json    |  2045 ---
 solr/core/src/test-files/solr/solr-50-all.xml      |     1 +
 .../core/src/test-files/solr/solr-solrreporter.xml |     2 +
 solr/core/src/test-files/solr/solr.xml             |     1 +
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |     7 +-
 .../org/apache/solr/BasicFunctionalityTest.java    |    10 +-
 .../src/test/org/apache/solr/CursorPagingTest.java |     8 +
 .../apache/solr/HelloWorldSolrCloudTestCase.java   |     4 +-
 .../src/test/org/apache/solr/OutputWriterTest.java |     2 +-
 .../src/test/org/apache/solr/SolrInfoBeanTest.java |     6 +-
 .../org/apache/solr/TestDistributedGrouping.java   |     3 +
 .../org/apache/solr/TestDistributedSearch.java     |    10 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |     7 +-
 solr/core/src/test/org/apache/solr/TestJoin.java   |    12 +-
 .../test/org/apache/solr/TestRandomDVFaceting.java |     3 +-
 .../test/org/apache/solr/TestRandomFaceting.java   |    15 +-
 .../org/apache/solr/TestSolrCoreProperties.java    |     1 +
 .../solr/analysis/TestDeprecatedFilters.java       |     2 +-
 .../apache/solr/analysis/TokenizerChainTest.java   |     1 +
 .../TestEmbeddedSolrServerAdminHandler.java        |     6 +
 .../TestEmbeddedSolrServerConstructors.java        |     1 +
 .../test/org/apache/solr/cloud/AddReplicaTest.java |    12 +-
 .../apache/solr/cloud/AliasIntegrationTest.java    |     2 +-
 .../cloud/AssignBackwardCompatibilityTest.java     |     1 -
 .../apache/solr/cloud/BasicDistributedZk2Test.java |     5 +-
 .../apache/solr/cloud/BasicDistributedZkTest.java  |    14 +-
 .../test/org/apache/solr/cloud/BasicZkTest.java    |   181 -
 .../solr/cloud/ChaosMonkeyNothingIsSafeTest.java   |     3 +-
 ...aosMonkeyNothingIsSafeWithPullReplicasTest.java |     3 +-
 .../solr/cloud/ChaosMonkeySafeLeaderTest.java      |     2 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |     2 +-
 .../test/org/apache/solr/cloud/CloudTestUtils.java |   189 -
 .../apache/solr/cloud/ClusterStateMockUtil.java    |    13 +-
 .../org/apache/solr/cloud/ClusterStateTest.java    |     8 +-
 .../org/apache/solr/cloud/CollectionPropsTest.java |     5 +-
 .../solr/cloud/CollectionStateFormat2Test.java     |    71 -
 .../solr/cloud/CollectionStateZnodeTest.java       |    70 +
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |    50 +-
 .../org/apache/solr/cloud/ConfigSetsAPITest.java   |     1 +
 .../apache/solr/cloud/CreateRoutedAliasTest.java   |     4 -
 .../solr/cloud/DeleteInactiveReplicaTest.java      |     4 -
 .../cloud/DeleteLastCustomShardedReplicaTest.java  |     1 -
 .../test/org/apache/solr/cloud/DeleteNodeTest.java |     2 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |    34 +-
 .../org/apache/solr/cloud/DeleteShardTest.java     |     1 -
 .../apache/solr/cloud/DistribCursorPagingTest.java |     1 +
 .../DistribDocExpirationUpdateProcessorTest.java   |     5 +-
 .../apache/solr/cloud/DocValuesNotIndexedTest.java |     1 -
 .../org/apache/solr/cloud/ForceLeaderTest.java     |     2 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   |     2 +-
 .../solr/cloud/HttpPartitionOnCommitTest.java      |     4 +-
 .../org/apache/solr/cloud/HttpPartitionTest.java   |    13 +-
 .../apache/solr/cloud/KerberosTestServices.java    |     4 +-
 .../solr/cloud/LeaderElectionContextKeyTest.java   |     1 -
 .../solr/cloud/LeaderElectionIntegrationTest.java  |     2 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java    |     2 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |     2 +
 .../solr/cloud/LegacyCloudClusterPropTest.java     |   180 -
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |    28 +-
 .../org/apache/solr/cloud/MigrateRouteKeyTest.java |     5 -
 .../solr/cloud/MissingSegmentRecoveryTest.java     |     1 -
 .../test/org/apache/solr/cloud/MockSolrSource.java |     2 +-
 .../solr/cloud/MoveReplicaHDFSFailoverTest.java    |     4 +
 .../org/apache/solr/cloud/MoveReplicaHDFSTest.java |     4 +
 .../org/apache/solr/cloud/MoveReplicaTest.java     |     3 -
 .../solr/cloud/MultiSolrCloudTestCaseTest.java     |     6 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java    |    68 +-
 .../solr/cloud/NestedShardedAtomicUpdateTest.java  |     4 +
 .../org/apache/solr/cloud/NodeMutatorTest.java     |     6 +-
 .../OverseerCollectionConfigSetProcessorTest.java  |    90 +-
 .../solr/cloud/OverseerModifyCollectionTest.java   |     1 +
 .../org/apache/solr/cloud/OverseerStatusTest.java  |     1 +
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |     1 +
 .../test/org/apache/solr/cloud/OverseerTest.java   |   163 +-
 .../test/org/apache/solr/cloud/RecoveryZkTest.java |     1 -
 .../apache/solr/cloud/ReindexCollectionTest.java   |     3 +-
 .../apache/solr/cloud/ReplaceNodeNoTargetTest.java |   126 -
 .../org/apache/solr/cloud/ReplaceNodeTest.java     |     2 +-
 .../apache/solr/cloud/ReplicationFactorTest.java   |    12 +-
 .../org/apache/solr/cloud/RollingRestartTest.java  |     2 +-
 .../test/org/apache/solr/cloud/RouteFieldTest.java |   163 +
 .../cloud/RoutingToNodesWithPropertiesTest.java    |   241 -
 .../org/apache/solr/cloud/SSLMigrationTest.java    |     1 +
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |     4 +
 .../apache/solr/cloud/ShardRoutingCustomTest.java  |     3 -
 .../cloud/SharedFSAutoReplicaFailoverTest.java     |    28 +-
 .../test/org/apache/solr/cloud/SliceStateTest.java |     4 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java    |     2 +
 .../test/org/apache/solr/cloud/SplitShardTest.java |     3 -
 .../test/org/apache/solr/cloud/SyncSliceTest.java  |     1 +
 .../solr/cloud/SystemCollectionCompatTest.java     |     2 +-
 .../solr/cloud/TestAuthenticationFramework.java    |     9 +-
 .../apache/solr/cloud/TestBaseStatsCacheCloud.java |     2 +-
 .../apache/solr/cloud/TestCloudConsistency.java    |     2 +
 .../TestCloudPhrasesIdentificationComponent.java   |     4 +
 .../org/apache/solr/cloud/TestCloudRecovery.java   |     1 -
 .../org/apache/solr/cloud/TestCloudRecovery2.java  |     1 -
 .../solr/cloud/TestCloudSearcherWarming.java       |     4 +-
 .../apache/solr/cloud/TestClusterProperties.java   |    12 -
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    27 +-
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |     4 +
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |    28 +-
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |   208 -
 .../cloud/TestDeleteCollectionOnDownNodes.java     |     1 -
 .../cloud/TestDynamicFieldNamesIndexCorrectly.java |     2 +-
 .../org/apache/solr/cloud/TestHashPartitioner.java |     1 +
 .../solr/cloud/TestOnReconnectListenerSupport.java |     2 +-
 .../org/apache/solr/cloud/TestPullReplica.java     |    24 +-
 .../solr/cloud/TestPullReplicaErrorHandling.java   |    18 -
 .../solr/cloud/TestQueryingOnDownCollection.java   |     2 +
 .../apache/solr/cloud/TestRebalanceLeaders.java    |     2 +-
 .../apache/solr/cloud/TestRequestForwarding.java   |     1 -
 .../apache/solr/cloud/TestSSLRandomization.java    |    12 +-
 .../solr/cloud/TestSkipOverseerOperations.java     |     1 -
 .../cloud/TestSolrCloudWithDelegationTokens.java   |    12 +-
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |     8 +-
 .../TestSolrCloudWithSecureImpersonation.java      |     4 +-
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |    16 +-
 .../org/apache/solr/cloud/TestTlogReplica.java     |    98 +-
 .../org/apache/solr/cloud/TestUtilizeNode.java     |   184 -
 .../org/apache/solr/cloud/TestWithCollection.java  |   605 -
 .../test/org/apache/solr/cloud/TestZkChroot.java   |   153 -
 .../apache/solr/cloud/UnloadDistributedZkTest.java |     2 +
 .../org/apache/solr/cloud/ZkControllerTest.java    |     3 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java    |     1 -
 .../org/apache/solr/cloud/ZkSolrClientTest.java    |    12 +-
 .../AbstractCloudBackupRestoreTestCase.java        |    57 +-
 .../solr/cloud/api/collections/AssignTest.java     |   203 -
 .../AsyncCallRequestStatusResponseTest.java        |     1 -
 .../api/collections/CollectionReloadTest.java      |     2 +-
 .../collections/CollectionTooManyReplicasTest.java |    68 +-
 .../CollectionsAPIAsyncDistributedZkTest.java      |    18 +-
 .../CollectionsAPIDistributedZkTest.java           |    31 +-
 .../ConcurrentCreateCollectionTest.java            |   293 -
 .../api/collections/CustomCollectionTest.java      |     8 -
 .../HdfsCollectionsAPIDistributedZkTest.java       |     4 +
 .../solr/cloud/api/collections/ShardSplitTest.java |    26 +-
 .../SimpleCollectionCreateDeleteTest.java          |     7 +-
 .../cloud/api/collections/SplitByPrefixTest.java   |     1 -
 .../cloud/api/collections/TestCollectionAPI.java   |   114 +-
 .../TestCollectionsAPIViaSolrCloudCluster.java     |     3 -
 .../collections/TestHdfsCloudBackupRestore.java    |     5 +
 .../collections/TestLocalFSCloudBackupRestore.java |     3 +-
 .../api/collections/TestReplicaProperties.java     |     6 +-
 .../TestRequestStatusCollectionAPI.java            |     5 +-
 .../AutoAddReplicasIntegrationTest.java            |   473 -
 .../autoscaling/AutoAddReplicasPlanActionTest.java |   260 -
 .../cloud/autoscaling/AutoScalingHandlerTest.java  |  1093 --
 .../solr/cloud/autoscaling/CapturedEvent.java      |    65 -
 .../cloud/autoscaling/ComputePlanActionTest.java   |   771 --
 .../cloud/autoscaling/ExecutePlanActionTest.java   |   380 -
 .../HdfsAutoAddReplicasIntegrationTest.java        |    57 -
 .../cloud/autoscaling/HttpTriggerListenerTest.java |   207 -
 .../IndexSizeTriggerMixedBoundsTest.java           |   372 -
 .../IndexSizeTriggerSizeEstimationTest.java        |   320 -
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |   780 --
 .../autoscaling/MetricTriggerIntegrationTest.java  |   241 -
 .../solr/cloud/autoscaling/MetricTriggerTest.java  |   136 -
 .../NodeAddedTriggerIntegrationTest.java           |   318 -
 .../cloud/autoscaling/NodeAddedTriggerTest.java    |   342 -
 .../NodeLostTriggerIntegrationTest.java            |   354 -
 .../cloud/autoscaling/NodeLostTriggerTest.java     |   391 -
 .../autoscaling/NodeMarkersRegistrationTest.java   |   354 -
 .../cloud/autoscaling/RestoreTriggerStateTest.java |   166 -
 .../ScheduledMaintenanceTriggerTest.java           |   379 -
 .../ScheduledTriggerIntegrationTest.java           |   148 -
 .../cloud/autoscaling/ScheduledTriggerTest.java    |   141 -
 .../SearchRateTriggerIntegrationTest.java          |   744 --
 .../cloud/autoscaling/SearchRateTriggerTest.java   |   357 -
 .../cloud/autoscaling/SystemLogListenerTest.java   |   291 -
 .../solr/cloud/autoscaling/TestPolicyCloud.java    |   542 -
 .../TriggerCooldownIntegrationTest.java            |   227 -
 .../cloud/autoscaling/TriggerEventQueueTest.java   |    98 -
 .../cloud/autoscaling/TriggerIntegrationTest.java  |   724 -
 .../TriggerSetPropertiesIntegrationTest.java       |   275 -
 .../autoscaling/sim/SimSolrCloudTestCase.java      |   255 -
 .../sim/TestSimClusterStateProvider.java           |   228 -
 .../autoscaling/sim/TestSimComputePlanAction.java  |   388 -
 .../sim/TestSimDistribStateManager.java            |   380 -
 .../autoscaling/sim/TestSimDistributedQueue.java   |   221 -
 .../autoscaling/sim/TestSimExecutePlanAction.java  |   223 -
 .../autoscaling/sim/TestSimExtremeIndexing.java    |   146 -
 .../sim/TestSimGenericDistributedQueue.java        |    38 -
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   874 --
 .../autoscaling/sim/TestSimNodeAddedTrigger.java   |   329 -
 .../autoscaling/sim/TestSimNodeLostTrigger.java    |   347 -
 .../cloud/autoscaling/sim/TestSimPolicyCloud.java  |   379 -
 .../cloud/autoscaling/sim/TestSimScenario.java     |   169 -
 .../autoscaling/sim/TestSimTriggerIntegration.java |  1544 ---
 .../solr/cloud/autoscaling/sim/TestSimUtils.java   |    95 -
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   275 -
 .../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java |    20 +-
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java     |     2 -
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |     1 -
 .../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java  |     5 +-
 .../cloud/cdcr/CdcrReplicationHandlerTest.java     |    88 +-
 .../solr/cloud/cdcr/CdcrRequestHandlerTest.java    |     5 +
 .../solr/cloud/hdfs/HDFSCollectionsAPITest.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java     |     4 +
 .../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java     |     4 +
 .../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java |     6 +-
 .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java      |     4 +
 .../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java |     4 +
 .../cloud/hdfs/HdfsRestartWhileUpdatingTest.java   |     4 +
 .../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java |     4 +
 .../HdfsTlogReplayBufferedWhileIndexingTest.java   |     4 +
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java    |     4 +
 .../hdfs/HdfsWriteToMultipleCollectionsTest.java   |     6 +-
 .../org/apache/solr/cloud/hdfs/StressHdfsTest.java |    13 +-
 .../cloud/overseer/TestClusterStateMutator.java    |     9 +-
 .../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 |    14 +-
 .../test/org/apache/solr/cloud/rule/RulesTest.java |    72 +-
 .../solr/common/cloud/ZkDynamicConfigTest.java     |     9 +-
 .../solr/core/BlobRepositoryMockingTest.java       |    10 +-
 .../test/org/apache/solr/core/CoreSorterTest.java  |     6 +-
 .../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 |     5 +
 .../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/RequestHandlersTest.java  |     1 +
 .../org/apache/solr/core/ResourceLoaderTest.java   |     8 +-
 .../test/org/apache/solr/core/SolrCoreTest.java    |     2 +
 .../org/apache/solr/core/TestCodecSupport.java     |     2 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |     2 +
 .../org/apache/solr/core/TestConfigOverlay.java    |     3 +
 .../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   |   287 -
 .../apache/solr/core/TestDynamicLoadingUrl.java    |   127 -
 .../test/org/apache/solr/core/TestDynamicURP.java  |   111 -
 .../test/org/apache/solr/core/TestInitParams.java  |    12 +-
 .../org/apache/solr/core/TestJmxIntegration.java   |     1 +
 .../test/org/apache/solr/core/TestLazyCores.java   |     4 +
 .../apache/solr/core/TestShardHandlerFactory.java  |     1 +
 .../apache/solr/core/TestSolrConfigHandler.java    |    71 +-
 .../src/test/org/apache/solr/core/TestSolrXml.java |    10 +
 .../core/snapshots/TestSolrCloudSnapshots.java     |    20 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |    26 +-
 .../solr/filestore/TestDistribPackageStore.java    |    79 +-
 .../handler/AnalysisRequestHandlerTestBase.java    |     2 +-
 .../apache/solr/handler/BackupRestoreUtils.java    |    20 +-
 .../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  |     1 +
 .../apache/solr/handler/TestContainerPlugin.java   |   377 +
 .../org/apache/solr/handler/TestCoreBackup.java    |    46 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |    18 +-
 .../solr/handler/TestReplicationHandler.java       |  1284 +-
 .../solr/handler/TestReplicationHandlerBackup.java |    68 +-
 .../TestReplicationHandlerDiskOverFlow.java        |    79 +-
 .../org/apache/solr/handler/TestReqParamsAPI.java  |     2 +
 .../org/apache/solr/handler/TestRestoreCore.java   |    83 +-
 .../org/apache/solr/handler/TestSQLHandler.java    |     3 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |     4 +-
 .../handler/TestSolrConfigHandlerConcurrent.java   |    12 +-
 .../solr/handler/TestStressThreadBackup.java       |    13 +
 .../handler/ThrowErrorOnInitRequestHandler.java    |     2 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |    29 +-
 .../org/apache/solr/handler/V2StandaloneTest.java  |     2 +
 .../solr/handler/XsltUpdateRequestHandlerTest.java |     7 +-
 .../admin/AutoscalingHistoryHandlerTest.java       |   463 -
 .../handler/admin/CoreAdminCreateDiscoverTest.java |     2 +
 .../solr/handler/admin/CoreAdminHandlerTest.java   |     7 +-
 .../handler/admin/CoreAdminRequestStatusTest.java  |     2 +
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |    13 +-
 .../solr/handler/admin/DaemonStreamApiTest.java    |     3 -
 .../solr/handler/admin/HealthCheckHandlerTest.java |     3 +-
 .../solr/handler/admin/IndexSizeEstimatorTest.java |    12 +-
 .../solr/handler/admin/MBeansHandlerTest.java      |     2 +
 .../solr/handler/admin/MetricsHandlerTest.java     |    18 +
 .../handler/admin/MetricsHistoryHandlerTest.java   |    45 +-
 .../admin/PropertiesRequestHandlerTest.java        |     1 +
 .../handler/admin/SecurityConfHandlerTest.java     |     7 +-
 .../solr/handler/admin/StatsReloadRaceTest.java    |     2 +
 .../solr/handler/admin/TestApiFramework.java       |    55 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |    28 +-
 .../apache/solr/handler/admin/TestConfigsApi.java  |    20 +-
 .../solr/handler/admin/TestCoreAdminApis.java      |    12 +-
 .../solr/handler/admin/ThreadDumpHandlerTest.java  |   239 +
 .../handler/admin/ZookeeperStatusHandlerTest.java  |    17 +-
 .../component/CustomHighlightComponentTest.java    |    25 +-
 .../component/CustomTermsComponentTest.java        |     2 +-
 .../solr/handler/component/DebugComponentTest.java |    40 +-
 .../component/DistributedDebugComponentTest.java   |     8 +-
 .../component/DistributedFacetPivotLargeTest.java  |     3 +-
 .../DistributedFacetPivotLongTailTest.java         |     2 +
 .../component/DistributedFacetPivotSmallTest.java  |    26 +-
 .../component/DistributedMLTComponentTest.java     |     2 +-
 .../DistributedQueryComponentOptimizationTest.java |     2 +-
 .../handler/component/InfixSuggestersTest.java     |     2 +
 .../PhrasesIdentificationComponentTest.java        |     4 +
 .../component/QueryElevationComponentTest.java     |    71 +-
 .../solr/handler/component/SearchHandlerTest.java  |    74 +-
 .../handler/component/ShardsWhitelistTest.java     |     6 +-
 .../handler/component/SpellCheckComponentTest.java |     7 +-
 .../solr/handler/component/StatsComponentTest.java |     7 +-
 .../solr/handler/component/TermsComponentTest.java |    13 +-
 .../component/TestHttpShardHandlerFactory.java     |     4 +-
 .../component/TestTrackingShardHandlerFactory.java |     4 +-
 .../solr/handler/export/TestExportWriter.java      |    82 +-
 .../apache/solr/handler/tagger/TaggerTestCase.java |     5 +-
 .../apache/solr/highlight/DummyHighlighter.java    |     1 +
 .../org/apache/solr/highlight/HighlighterTest.java |    20 +-
 .../solr/highlight/TestUnifiedSolrHighlighter.java |    16 +-
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |     6 +
 .../org/apache/solr/logging/TestLogWatcher.java    |     1 +
 .../managed/TestResourceManagerIntegration.java    |     1 -
 .../solr/managed/types/TestCacheDynamics.java      |     1 -
 .../apache/solr/metrics/SolrMetricManagerTest.java |     2 +
 .../solr/metrics/SolrMetricsIntegrationTest.java   |     2 +-
 .../reporters/SolrGraphiteReporterTest.java        |     2 +-
 .../reporters/SolrJmxReporterCloudTest.java        |     1 -
 .../metrics/reporters/SolrSlf4jReporterTest.java   |     1 +
 .../reporters/solr/SolrCloudReportersTest.java     |     2 -
 .../reporters/solr/SolrShardReporterTest.java      |    12 +
 .../solr/parser/SolrQueryParserBaseTest.java       |   137 +
 .../src/test/org/apache/solr/pkg/TestPackages.java |   318 +-
 .../org/apache/solr/request/SimpleFacetsTest.java  |     1 +
 .../apache/solr/request/TestIntervalFaceting.java  |     2 +-
 .../solr/request/macro/TestMacroExpander.java      |     2 +
 .../org/apache/solr/response/JSONWriterTest.java   |     2 +
 .../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 +-
 .../org/apache/solr/response/TestPushWriter.java   |    65 +-
 .../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 |     4 +-
 .../schema/ManagedSchemaRoundRobinCloudTest.java   |     1 -
 .../schema/OpenExchangeRatesOrgProviderTest.java   |     2 +-
 .../PreAnalyzedFieldManagedSchemaCloudTest.java    |     1 -
 .../test/org/apache/solr/schema/RankFieldTest.java |   285 +
 .../solr/schema/ResolveAnalyzerByNameTest.java     |     7 +
 .../apache/solr/schema/SchemaApiFailureTest.java   |     1 -
 .../solr/schema/SpatialRPTFieldTypeTest.java       |     2 +
 .../solr/schema/TestBulkSchemaConcurrent.java      |    21 +-
 .../apache/solr/schema/TestCloudManagedSchema.java |     3 +
 .../org/apache/solr/schema/TestManagedSchema.java  |     3 +
 .../solr/schema/TestManagedSchemaThreadSafety.java |     1 +
 .../org/apache/solr/schema/TestPointFields.java    |     1 +
 .../solr/schema/TestUseDocValuesAsStored2.java     |     1 +
 .../apache/solr/schema/WrappedTrieIntField.java    |     1 +
 .../solr/search/AnalyticsMergeStrategyTest.java    |     4 +
 .../solr/search/AnalyticsTestQParserPlugin.java    |    11 +
 .../solr/search/CurrencyRangeFacetCloudTest.java   |    29 +-
 .../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  |    28 +-
 .../apache/solr/search/RankQParserPluginTest.java  |   260 +
 .../apache/solr/search/RankQueryTestPlugin.java    |    25 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |     8 +-
 .../solr/search/TestCollapseQParserPlugin.java     |     8 +-
 .../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    |    14 +-
 .../test/org/apache/solr/search/TestRecovery.java  |    10 +
 .../org/apache/solr/search/TestRecoveryHdfs.java   |     9 +
 .../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 +
 .../org/apache/solr/search/TestStressRecovery.java |     2 +
 .../org/apache/solr/search/TestStressReorder.java  |     2 +
 .../apache/solr/search/TestStressUserVersions.java |     2 +
 .../org/apache/solr/search/TestStressVersions.java |     2 +
 .../apache/solr/search/TestTermsQParserPlugin.java |     6 +
 .../org/apache/solr/search/facet/DebugAgg.java     |     4 +-
 ...stributedFacetSimpleRefinementLongTailTest.java |    11 +-
 .../solr/search/facet/RangeFacetCloudTest.java     |    42 +-
 .../search/facet/SpatialHeatmapFacetsTest.java     |     5 +
 .../search/facet/TestCloudJSONFacetJoinDomain.java |    45 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |    64 +-
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |   314 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |    97 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |   111 +
 .../search/facet/TestJsonFacetsStatsParsing.java   |     2 +
 .../facet/TestJsonFacetsWithNestedObjects.java     |    58 +
 .../solr/search/function/NvlValueSourceParser.java |     2 +-
 .../function/TestMinMaxOnMultiValuedField.java     |    13 +-
 .../search/join/CrossCollectionJoinQueryTest.java  |   280 +
 .../solr/search/join/TestCloudNestedDocsSort.java  |     4 +-
 .../solr/search/join/TestNestedDocsSort.java       |     1 +
 .../org/apache/solr/search/join/XCJFQueryTest.java |   280 -
 .../join/another/BJQFilterAccessibleTest.java      |     2 +-
 .../apache/solr/search/json/TestJsonRequest.java   |    70 +-
 .../solr/search/mlt/CloudMLTQParserTest.java       |     1 +
 .../apache/solr/search/stats/TestDistribIDF.java   |     2 -
 .../solr/security/AuditLoggerIntegrationTest.java  |    10 +-
 .../BaseTestRuleBasedAuthorizationPlugin.java      |   181 +-
 .../solr/security/BasicAuthIntegrationTest.java    |     3 +
 .../solr/security/BasicAuthOnSingleNodeTest.java   |    45 +-
 .../solr/security/BasicAuthStandaloneTest.java     |     2 +-
 .../security/HttpParamDelegationTokenPlugin.java   |     2 +-
 .../security/JWTAuthPluginIntegrationTest.java     |     6 +-
 .../security/JWTVerificationkeyResolverTest.java   |     4 +-
 .../solr/security/TestAuthorizationFramework.java  |     3 +
 .../security/TestSha256AuthenticationProvider.java |     4 +
 .../solr/security/hadoop/ImpersonationUtil.java    |     1 +
 .../apache/solr/security/hadoop/KerberosUtils.java |    93 +
 .../hadoop/TestDelegationWithHadoopAuth.java       |     7 +-
 .../TestRuleBasedAuthorizationWithKerberos.java    |    81 +
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |    61 +-
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |     1 +
 .../solr/servlet/HttpSolrCallGetCoreTest.java      |     1 -
 .../apache/solr/servlet/SolrRequestParserTest.java |     2 +
 .../solr/servlet/TestRequestRateLimiter.java       |   231 +
 .../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 +
 .../solr/spelling/suggest/SuggesterTest.java       |     2 +
 .../solr/store/blockcache/BlockCacheTest.java      |    16 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |     6 +-
 .../solr/store/hdfs/HdfsLockFactoryTest.java       |     4 +
 .../org/apache/solr/update/CdcrUpdateLogTest.java  |     8 +
 .../solr/update/DirectUpdateHandlerTest.java       |     3 +-
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |     2 +-
 .../solr/update/MockStreamingSolrClients.java      |     2 +-
 .../apache/solr/update/MockingHttp2SolrClient.java |    26 +-
 .../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/SolrIndexConfigTest.java    |    19 +
 .../apache/solr/update/SolrIndexSplitterTest.java  |     3 +
 .../org/apache/solr/update/TestHdfsUpdateLog.java  |     4 +
 .../update/TestInPlaceUpdateWithRouteField.java    |     1 -
 .../solr/update/TestInPlaceUpdatesDistrib.java     |     8 +-
 .../solr/update/TestInPlaceUpdatesStandalone.java  |     1 +
 .../solr/update/TestNestedUpdateProcessor.java     |     2 +
 .../test/org/apache/solr/update/TestUpdate.java    |     2 +-
 .../test/org/apache/solr/update/UpdateLogTest.java |     1 +
 .../processor/AtomicUpdateRemovalJavabinTest.java  |     2 -
 .../solr/update/processor/AtomicUpdatesTest.java   |    15 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    |    18 +-
 .../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 +
 .../apache/solr/update/processor/RuntimeUrp.java   |    40 -
 .../SignatureUpdateProcessorFactoryTest.java       |     1 +
 .../SkipExistingDocumentsProcessorFactoryTest.java |     1 +
 .../processor/TestNamedUpdateProcessors.java       |   162 -
 .../TimeRoutedAliasUpdateProcessorTest.java        |    28 +-
 .../processor/TolerantUpdateProcessorTest.java     |     2 +-
 .../processor/TrackingUpdateProcessorFactory.java  |     2 +-
 .../update/processor/URLClassifyProcessorTest.java |     2 +
 .../UpdateRequestProcessorFactoryTest.java         |     2 +-
 .../org/apache/solr/util/MockCoreContainer.java    |     2 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |    18 +-
 .../org/apache/solr/util/SolrPluginUtilsTest.java  |     2 +-
 .../org/apache/solr/util/TestCircuitBreaker.java   |   243 +
 .../test/org/apache/solr/util/TestExportTool.java  |     2 -
 .../test/org/apache/solr/util/TestRTimerTree.java  |     3 +
 .../apache/solr/util/TestSolrCLIRunExample.java    |   116 -
 .../solr/util/TestSolrJacksonAnnotation.java       |     2 +
 .../src/test/org/apache/solr/util/TestUtils.java   |    11 +-
 .../apache/solr/util/stats/MetricUtilsTest.java    |    10 +
 .../solr/util/tracing/TestHttpServletCarrier.java  |     2 +-
 solr/example/example-DIH/README.md                 |     2 +
 solr/example/files/conf/solrconfig.xml             |    38 +
 solr/licenses/commons-collections4-4.2.jar.sha1    |     1 -
 solr/licenses/commons-collections4-4.4.jar.sha1    |     1 +
 solr/licenses/commons-lang-2.6.jar.sha1            |     1 +
 .../commons-lang-LICENSE-ASL.txt}                  |     0
 solr/licenses/commons-lang-NOTICE.txt              |     5 +
 solr/licenses/hamcrest-2.2.jar.sha1                |     1 +
 .../licenses/hamcrest-LICENSE-BSD.txt              |     0
 .../licenses/hamcrest-NOTICE.txt                   |     0
 solr/licenses/hamcrest-core-1.3.jar.sha1           |     1 -
 solr/licenses/hppc-0.8.1.jar.sha1                  |     1 -
 solr/licenses/hppc-0.8.2.jar.sha1                  |     1 +
 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1   |     1 -
 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1   |     1 +
 solr/licenses/netty-codec-4.1.47.Final.jar.sha1    |     1 -
 solr/licenses/netty-codec-4.1.50.Final.jar.sha1    |     1 +
 solr/licenses/netty-common-4.1.47.Final.jar.sha1   |     1 -
 solr/licenses/netty-common-4.1.50.Final.jar.sha1   |     1 +
 solr/licenses/netty-handler-4.1.47.Final.jar.sha1  |     1 -
 solr/licenses/netty-handler-4.1.50.Final.jar.sha1  |     1 +
 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1 |     1 -
 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 |     1 +
 .../licenses/netty-transport-4.1.47.Final.jar.sha1 |     1 -
 .../licenses/netty-transport-4.1.50.Final.jar.sha1 |     1 +
 ...ty-transport-native-epoll-4.1.47.Final.jar.sha1 |     1 -
 ...ty-transport-native-epoll-4.1.50.Final.jar.sha1 |     1 +
 ...nsport-native-unix-common-4.1.47.Final.jar.sha1 |     1 -
 ...nsport-native-unix-common-4.1.50.Final.jar.sha1 |     1 +
 solr/licenses/org.restlet-2.4.0.jar.sha1           |     1 -
 solr/licenses/org.restlet-2.4.3.jar.sha1           |     1 +
 .../org.restlet.ext.servlet-2.4.0.jar.sha1         |     1 -
 .../org.restlet.ext.servlet-2.4.3.jar.sha1         |     1 +
 solr/licenses/snappy-java-1.1.7.6.jar.sha1         |     1 +
 .../snappy-java-LICENSE-ASL.txt}                   |     0
 solr/licenses/snappy-java-NOTICE.txt               |    17 +
 solr/licenses/zookeeper-3.5.7.jar.sha1             |     1 -
 solr/licenses/zookeeper-3.6.1.jar.sha1             |     1 +
 solr/licenses/zookeeper-jute-3.5.7.jar.sha1        |     1 -
 solr/licenses/zookeeper-jute-3.6.1.jar.sha1        |     1 +
 solr/server/etc/jetty.xml                          |     8 +-
 solr/server/resources/log4j2-console.xml           |    28 +-
 solr/server/resources/log4j2.xml                   |    72 +-
 .../solr/configsets/_default/conf/managed-schema   |     7 +
 .../solr/configsets/_default/conf/solrconfig.xml   |    59 +
 .../conf/solrconfig.xml                            |    44 +-
 solr/server/solr/solr.xml                          |     1 +
 solr/solr-ref-guide/src/_config.yml.template       |     1 +
 .../src/_includes/mathjax-support.html             |    22 +
 solr/solr-ref-guide/src/_layouts/default.html      |     2 +
 solr/solr-ref-guide/src/_templates/ulist.html.slim |     2 +-
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   333 -
 solr/solr-ref-guide/src/aliases.adoc               |     9 +-
 solr/solr-ref-guide/src/cdcr-api.adoc              |     8 +
 solr/solr-ref-guide/src/cdcr-architecture.adoc     |     8 +
 solr/solr-ref-guide/src/cdcr-config.adoc           |     8 +
 solr/solr-ref-guide/src/cdcr-operations.adoc       |     8 +
 solr/solr-ref-guide/src/circuit-breakers.adoc      |    68 +
 solr/solr-ref-guide/src/cloud-screens.adoc         |     2 +-
 .../src/cluster-node-management.adoc               |    54 +-
 .../src/collapse-and-expand-results.adoc           |    15 +-
 solr/solr-ref-guide/src/collection-aliasing.adoc   |     2 -
 solr/solr-ref-guide/src/collection-management.adoc |    65 +-
 .../src/collection-specific-tools.adoc             |     2 +-
 .../solr-ref-guide/src/colocating-collections.adoc |    75 -
 .../combining-distribution-and-replication.adoc    |    12 +-
 .../src/common-query-parameters.adoc               |    23 +-
 solr/solr-ref-guide/src/config-api.adoc            |    10 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |     6 +-
 .../src/cross-data-center-replication-cdcr.adoc    |    14 +
 solr/solr-ref-guide/src/css/decoration.css         |     2 +-
 solr/solr-ref-guide/src/css/ref-guide.css          |     6 +-
 solr/solr-ref-guide/src/dataimport-screen.adoc     |     2 +
 solr/solr-ref-guide/src/distributed-requests.adoc  |     6 +-
 .../distributed-search-with-index-sharding.adoc    |     2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   241 +-
 solr/solr-ref-guide/src/exporting-result-sets.adoc |    30 +
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |     4 +
 solr/solr-ref-guide/src/highlighting.adoc          |    13 +-
 .../overview-of-the-solr-admin-ui/dashboard.png    |   Bin 92750 -> 172175 bytes
 .../src/implicit-requesthandlers.adoc              |    30 +-
 solr/solr-ref-guide/src/index-replication.adoc     |   177 +-
 solr/solr-ref-guide/src/index.adoc                 |     6 +
 solr/solr-ref-guide/src/json-facet-api.adoc        |     6 +
 .../src/json-faceting-domain-changes.adoc          |     8 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc        |    36 +-
 solr/solr-ref-guide/src/jvm-settings.adoc          |     2 +-
 .../src/kerberos-authentication-plugin.adoc        |     7 +-
 .../src/major-changes-in-solr-7.adoc               |     2 -
 .../src/major-changes-in-solr-8.adoc               |    10 +-
 .../src/major-changes-in-solr-9.adoc               |    27 +-
 .../src/making-and-restoring-backups.adoc          |     2 +-
 .../src/meta-docs/asciidoc-syntax.adoc             |    45 +
 solr/solr-ref-guide/src/meta-docs/publish.adoc     |     4 +-
 solr/solr-ref-guide/src/metrics-history.adoc       |     2 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc     |     2 +-
 .../solr-ref-guide/src/migrate-to-policy-rule.adoc |   198 -
 .../src/near-real-time-searching.adoc              |     2 +-
 solr/solr-ref-guide/src/other-parsers.adoc         |   208 +-
 .../src/overview-of-the-solr-admin-ui.adoc         |    16 +-
 solr/solr-ref-guide/src/package-manager.adoc       |    54 +-
 .../src/query-settings-in-solrconfig.adoc          |    24 +-
 solr/solr-ref-guide/src/rate-limiters.adoc         |   131 +
 solr/solr-ref-guide/src/replica-management.adoc    |    88 +-
 solr/solr-ref-guide/src/replication-screen.adoc    |     8 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |     2 +-
 ...andlers-and-searchcomponents-in-solrconfig.adoc |     9 +
 .../src/rule-based-authorization-plugin.adoc       |    35 +-
 .../src/rule-based-replica-placement.adoc          |     2 +-
 solr/solr-ref-guide/src/running-solr-on-hdfs.adoc  |    41 +-
 solr/solr-ref-guide/src/shard-management.adoc      |     8 +-
 .../src/shards-and-indexing-data-in-solrcloud.adoc |     4 +-
 solr/solr-ref-guide/src/solr-glossary.adoc         |     2 +-
 solr/solr-ref-guide/src/solr-plugins.adoc          |    19 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |     4 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |   106 +-
 .../src/solrcloud-autoscaling-api.adoc             |   808 --
 .../solrcloud-autoscaling-auto-add-replicas.adoc   |    73 -
 .../src/solrcloud-autoscaling-fault-tolerance.adoc |    59 -
 .../src/solrcloud-autoscaling-listeners.adoc       |   220 -
 .../src/solrcloud-autoscaling-overview.adoc        |   116 -
 .../solrcloud-autoscaling-policy-preferences.adoc  |   640 -
 .../src/solrcloud-autoscaling-trigger-actions.adoc |   145 -
 .../src/solrcloud-autoscaling-triggers.adoc        |   627 -
 solr/solr-ref-guide/src/solrcloud-autoscaling.adoc |    35 -
 solr/solr-ref-guide/src/solrcloud.adoc             |     8 +-
 .../src/stream-source-reference.adoc               |    63 +-
 solr/solr-ref-guide/src/suggestions-screen.adoc    |    40 -
 .../src/the-query-elevation-component.adoc         |     2 +-
 solr/solr-ref-guide/src/the-stats-component.adoc   |     2 +-
 solr/solr-ref-guide/src/the-tagger-handler.adoc    |     2 +-
 .../src/updatehandlers-in-solrconfig.adoc          |     2 +-
 ...ta-store-data-with-the-data-import-handler.adoc |     2 +
 solr/solr-ref-guide/src/using-solrj.adoc           |    33 +-
 ...ing-the-solr-administration-user-interface.adoc |     3 +-
 solr/solr-ref-guide/src/v2-api.adoc                |    12 +-
 solr/solrj/ivy.xml                                 |     4 +
 .../org/apache/solr/client/solrj/SolrClient.java   |    12 +-
 .../org/apache/solr/client/solrj/SolrRequest.java  |    22 +
 .../org/apache/solr/client/solrj/SolrResponse.java |     1 +
 .../apache/solr/client/solrj/V2RequestSupport.java |     1 +
 .../client/solrj/beans/DocumentObjectBinder.java   |    13 +-
 .../client/solrj/cloud/AlreadyExistsException.java |    35 +
 .../client/solrj/cloud/BadVersionException.java    |    40 +
 .../client/solrj/cloud/DelegatingCloudManager.java |    89 +
 .../cloud/DelegatingClusterStateProvider.java      |   130 +
 .../client/solrj/cloud/DistribStateManager.java    |    11 -
 .../solr/client/solrj/cloud/NodeStateProvider.java |     5 +-
 .../solr/client/solrj/cloud/NotEmptyException.java |    35 +
 .../solr/client/solrj/cloud/SolrCloudManager.java  |     2 +-
 .../solr/client/solrj/cloud/VersionedData.java     |    99 +
 .../cloud/autoscaling/AddReplicaSuggester.java     |    81 -
 .../cloud/autoscaling/AlreadyExistsException.java  |    35 -
 .../solrj/cloud/autoscaling/AutoScalingConfig.java |   589 -
 .../cloud/autoscaling/BadVersionException.java     |    40 -
 .../solr/client/solrj/cloud/autoscaling/Cell.java  |    74 -
 .../client/solrj/cloud/autoscaling/Clause.java     |   830 --
 .../solrj/cloud/autoscaling/ComputedType.java      |    99 -
 .../client/solrj/cloud/autoscaling/Condition.java  |   125 -
 .../solrj/cloud/autoscaling/CoresVariable.java     |   125 -
 .../cloud/autoscaling/DelegatingCloudManager.java  |    93 -
 .../DelegatingClusterStateProvider.java            |   130 -
 .../autoscaling/DelegatingDistribStateManager.java |   107 -
 .../autoscaling/DelegatingNodeStateProvider.java   |    56 -
 .../cloud/autoscaling/DeleteNodeSuggester.java     |    46 -
 .../cloud/autoscaling/DeleteReplicaSuggester.java  |    74 -
 .../solrj/cloud/autoscaling/FreeDiskVariable.java  |   175 -
 .../cloud/autoscaling/MoveReplicaSuggester.java    |   112 -
 .../solrj/cloud/autoscaling/NodeVariable.java      |    44 -
 .../solrj/cloud/autoscaling/NoneSuggester.java     |    39 -
 .../solrj/cloud/autoscaling/NotEmptyException.java |    35 -
 .../client/solrj/cloud/autoscaling/Operand.java    |   209 -
 .../client/solrj/cloud/autoscaling/Policy.java     |   714 -
 .../solrj/cloud/autoscaling/PolicyHelper.java      |   615 -
 .../client/solrj/cloud/autoscaling/Preference.java |   148 -
 .../client/solrj/cloud/autoscaling/RangeVal.java   |    61 -
 .../solrj/cloud/autoscaling/ReplicaCount.java      |   128 -
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |   219 -
 .../solrj/cloud/autoscaling/ReplicaVariable.java   |   175 -
 .../solr/client/solrj/cloud/autoscaling/Row.java   |   379 -
 .../solrj/cloud/autoscaling/SealedClause.java      |    29 -
 .../cloud/autoscaling/SplitShardSuggester.java     |    65 -
 .../client/solrj/cloud/autoscaling/Suggester.java  |   518 -
 .../client/solrj/cloud/autoscaling/Suggestion.java |   129 -
 .../autoscaling/TriggerEventProcessorStage.java    |    30 -
 .../solrj/cloud/autoscaling/TriggerEventType.java  |    33 -
 .../cloud/autoscaling/UnsupportedSuggester.java    |    59 -
 .../client/solrj/cloud/autoscaling/Variable.java   |   406 -
 .../solrj/cloud/autoscaling/VariableBase.java      |   211 -
 .../solrj/cloud/autoscaling/VersionedData.java     |    94 -
 .../client/solrj/cloud/autoscaling/Violation.java  |   181 -
 .../cloud/autoscaling/WithCollectionVariable.java  |   166 -
 .../solrj/cloud/autoscaling/package-info.java      |    23 -
 .../client/solrj/impl/BaseCloudSolrClient.java     |    82 +-
 .../solrj/impl/BaseHttpClusterStateProvider.java   |     7 +-
 .../solr/client/solrj/impl/BaseHttpSolrClient.java |     8 +-
 .../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      |     3 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java     |     4 +-
 .../solrj/impl/DelegationTokenHttpSolrClient.java  |     2 +-
 .../solrj/impl/Http2ClusterStateProvider.java      |     1 +
 .../solr/client/solrj/impl/Http2SolrClient.java    |   229 +-
 .../solrj/impl/HttpClusterStateProvider.java       |     1 +
 .../solr/client/solrj/impl/HttpSolrClient.java     |    98 +-
 .../client/solrj/impl/Krb5HttpClientBuilder.java   |     1 +
 .../solr/client/solrj/impl/LBHttp2SolrClient.java  |   141 +-
 .../solr/client/solrj/impl/LBHttpSolrClient.java   |     8 +-
 .../solr/client/solrj/impl/LBSolrClient.java       |   202 +-
 .../client/solrj/impl/SolrClientCloudManager.java  |     2 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |   121 +-
 .../solrj/impl/StreamingBinaryResponseParser.java  |     3 +
 .../solr/client/solrj/impl/XMLResponseParser.java  |     2 +-
 .../solrj/impl/ZkClientClusterStateProvider.java   |     1 +
 .../client/solrj/impl/ZkDistribStateManager.java   |    33 +-
 .../client/solrj/io/ClassificationEvaluation.java  |     8 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |   100 +-
 .../apache/solr/client/solrj/io/ModelCache.java    |     2 +-
 .../org/apache/solr/client/solrj/io/Tuple.java     |   185 +-
 .../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  |     3 +-
 .../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   |     5 +-
 .../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    |     3 +-
 .../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    |    28 +-
 .../solr/client/solrj/io/stream/CommitStream.java  |     2 +-
 .../solr/client/solrj/io/stream/CsvStream.java     |     3 +-
 .../solr/client/solrj/io/stream/DaemonStream.java  |    15 +-
 .../client/solrj/io/stream/DeepRandomStream.java   |    24 +-
 .../solr/client/solrj/io/stream/DrillStream.java   |   280 +
 .../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     |     6 +-
 .../solr/client/solrj/io/stream/Facet2DStream.java |    26 +-
 .../solr/client/solrj/io/stream/FacetStream.java   |    25 +-
 .../solrj/io/stream/FeaturesSelectionStream.java   |    33 +-
 .../solr/client/solrj/io/stream/FetchStream.java   |     3 +-
 .../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   |    18 +-
 .../solr/client/solrj/io/stream/StreamContext.java |    11 +-
 .../client/solrj/io/stream/TextLogitStream.java    |    50 +-
 .../client/solrj/io/stream/TimeSeriesStream.java   |    22 +-
 .../solr/client/solrj/io/stream/TopicStream.java   |    11 +-
 .../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     |     6 +
 .../expr/StreamExpressionNamedParameter.java       |     7 +
 .../io/stream/expr/StreamExpressionValue.java      |     9 +-
 .../client/solrj/io/stream/expr/StreamFactory.java |   249 +-
 .../solrj/io/stream/metrics/CountMetric.java       |     4 +-
 .../solrj/request/AbstractUpdateRequest.java       |     5 +
 .../solrj/request/CollectionAdminRequest.java      |   112 +-
 .../client/solrj/request/CollectionApiMapping.java |    14 +-
 .../solrj/request/ConfigSetAdminRequest.java       |     8 +-
 .../client/solrj/request/CoreAdminRequest.java     |     5 +
 .../solr/client/solrj/request/CoreApiMapping.java  |     3 +-
 .../solrj/request/DelegationTokenRequest.java      |    15 +
 .../client/solrj/request/DirectXmlRequest.java     |     5 +
 .../solrj/request/DocumentAnalysisRequest.java     |     5 +
 .../client/solrj/request/FieldAnalysisRequest.java |     5 +
 .../client/solrj/request/GenericSolrRequest.java   |     5 +
 .../client/solrj/request/HealthCheckRequest.java   |     5 +-
 .../solrj/request/JavaBinUpdateRequestCodec.java   |    19 +-
 .../solr/client/solrj/request/LukeRequest.java     |     5 +
 .../solrj/request/MultiContentWriterRequest.java   |     7 +-
 .../solr/client/solrj/request/QueryRequest.java    |     4 +
 .../solr/client/solrj/request/RequestWriter.java   |    13 +-
 .../apache/solr/client/solrj/request/SolrPing.java |     5 +
 .../solr/client/solrj/request/UpdateRequest.java   |     2 +-
 .../solr/client/solrj/request/V1toV2ApiMapper.java |     1 +
 .../solr/client/solrj/request/V2Request.java       |     5 +
 .../client/solrj/request/beans/PluginMeta.java     |    64 +
 .../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 +
 .../request/schema/AbstractSchemaRequest.java      |     4 +
 .../solrj/response/AnalysisResponseBase.java       |     3 +-
 .../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 +-
 .../solr/client/solrj/util/AsyncListener.java      |    33 +
 .../apache/solr/client/solrj/util/Cancellable.java |    22 +
 .../apache/solr/client/solrj/util/ClientUtils.java |     2 +
 .../java/org/apache/solr/cluster/api/ApiType.java  |    31 +
 .../apache/solr/cluster/api/CollectionConfig.java  |    27 +
 .../org/apache/solr/cluster/api/HashRange.java     |    42 +
 .../java/org/apache/solr/cluster/api/Resource.java |    41 +
 .../java/org/apache/solr/cluster/api/Router.java   |    25 +
 .../java/org/apache/solr/cluster/api/Shard.java    |    39 +
 .../org/apache/solr/cluster/api/ShardReplica.java  |    57 +
 .../org/apache/solr/cluster/api/SimpleMap.java     |    80 +
 .../org/apache/solr/cluster/api/SolrCluster.java   |    48 +
 .../apache/solr/cluster/api/SolrCollection.java    |    34 +
 .../java/org/apache/solr/cluster/api/SolrNode.java |    36 +
 .../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  |     7 +-
 .../org/apache/solr/common/SolrDocumentBase.java   |     1 +
 .../java/org/apache/solr/common/SolrException.java |    15 +-
 .../org/apache/solr/common/SolrInputDocument.java  |     1 +
 .../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       |     2 +-
 .../apache/solr/common/cloud/DocCollection.java    |    63 +-
 .../org/apache/solr/common/cloud/DocRouter.java    |     3 +-
 .../java/org/apache/solr/common/cloud/Replica.java |   193 +-
 .../java/org/apache/solr/common/cloud/Slice.java   |     3 +
 .../org/apache/solr/common/cloud/SolrZkClient.java |     7 +-
 .../apache/solr/common/cloud/SolrZooKeeper.java    |     1 +
 .../apache/solr/common/cloud/ZkDynamicConfig.java  |     3 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    31 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |    11 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   297 +-
 .../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/AutoScalingParams.java      |    76 -
 .../solr/common/params/CollectionAdminParams.java  |    11 +-
 .../solr/common/params/CollectionParams.java       |    37 +-
 .../apache/solr/common/params/CommonParams.java    |    27 +-
 .../org/apache/solr/common/params/FacetParams.java |     4 +-
 .../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  |    10 +-
 .../solr/common/util/FastJavaBinDecoder.java       |     3 +
 .../src/java/org/apache/solr/common/util/Hash.java |     2 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |    11 +-
 .../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    |    19 +-
 .../org/apache/solr/common/util/NamedList.java     |     8 +-
 .../src/java/org/apache/solr/common/util/Pair.java |     1 +
 .../java/org/apache/solr/common/util/PathTrie.java |    50 +-
 .../apache/solr/common/util/ReflectMapWriter.java  |    29 +-
 .../org/apache/solr/common/util/RetryUtil.java     |    11 +-
 .../org/apache/solr/common/util/TextWriter.java    |    21 +-
 .../java/org/apache/solr/common/util/Utils.java    |   183 +-
 .../apache/solr/common/util/ValidatingJsonMap.java |    19 +-
 .../apache/solr/common/util/XMLErrorLogger.java    |     2 +-
 solr/solrj/src/java/org/noggit/CharArr.java        |   262 +-
 solr/solrj/src/java/org/noggit/JSONParser.java     |     2 +-
 .../resources/apispec/autoscaling.Commands.json    |   199 -
 .../src/resources/apispec/autoscaling.history.json |    61 -
 .../src/resources/apispec/cluster.Commands.json    |    28 -
 .../resources/apispec/collections.Commands.json    |    15 -
 .../apispec/collections.collection.Commands.json   |     8 +-
 .../collections.collection.Commands.modify.json    |    15 -
 ...collections.collection.shards.shard.delete.json |     2 +-
 ...ons.collection.shards.shard.replica.delete.json |     2 +-
 solr/solrj/src/test-files/log4j2.xml               |    45 +-
 .../solr/autoscaling/testAddMissingReplica.json    |   123 -
 .../autoscaling/testAutoScalingHandlerFailure.json |   141 -
 ...testAutoscalingPreferencesUsedWithNoPolicy.json |    53 -
 .../autoscaling/testComputePlanAfterNodeAdded.json |    16 -
 .../solr/autoscaling/testCoresSuggestions.json     |    17 -
 .../testCreateCollectionWithEmptyPolicy.json       |    20 -
 .../solrj/solr/autoscaling/testDiskSpaceHint.json  |    16 -
 .../solr/autoscaling/testEmptyCollection.json      |    27 -
 .../solrj/solr/autoscaling/testEqualOnNonNode.json |    83 -
 .../solr/autoscaling/testFreeDiskDeviation.json    |    35 -
 .../solr/autoscaling/testFreeDiskSuggestions.json  |    27 -
 .../solr/autoscaling/testFreediskPercentage.json   |    25 -
 .../solrj/solr/autoscaling/testHostAttribute.json  |   119 -
 .../solrj/solr/autoscaling/testInfiniteLoop.json   | 13196 -------------------
 .../solr/autoscaling/testMoveReplicaSuggester.json |    15 -
 .../testMoveReplicasInMultipleCollections.json     |    88 -
 .../solrj/solr/autoscaling/testPolicy.json         |    41 -
 .../solr/autoscaling/testPortSuggestions.json      |    22 -
 .../autoscaling/testReplicaCountSuggestions.json   |    15 -
 .../solr/autoscaling/testReplicaPercentage.json    |    46 -
 .../autoscaling/testReplicaZonesPercentage.json    |    15 -
 .../autoscaling/testScheduledTriggerFailure.json   |    52 -
 .../solrj/solr/autoscaling/testSortError.json      |   225 -
 .../autoscaling/testSuggestionsRebalance2.json     |   131 -
 .../autoscaling/testSuggestionsRebalanceOnly.json  |   105 -
 .../solr/autoscaling/testSysPropSuggestions.json   |   127 -
 .../solr/autoscaling/testSyspropSuggestions1.json  |    24 -
 .../solr/autoscaling/testUnresolvedSuggestion.json |   212 -
 .../solr/autoscaling/testUtilizeNodeFailure.json   |    69 -
 .../solr/autoscaling/testUtilizeNodeFailure2.json  |    66 -
 .../solr/autoscaling/testViolationOutput.json      |    22 -
 .../solrj/solr/autoscaling/testWithCollection.json |    21 -
 .../autoscaling/testWithCollectionMoveReplica.json |    28 -
 .../testWithCollectionMoveVsAddSuggestions.json    |    49 -
 .../autoscaling/testWithCollectionSuggestions.json |    21 -
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |     0
 .../ref_guide_examples/JsonRequestApiTest.java     |     2 +-
 .../UsingSolrJRefGuideExamplesTest.java            |    59 +-
 .../solr/client/solrj/LargeVolumeTestBase.java     |     2 +-
 .../client/solrj/MergeIndexesExampleTestBase.java  |     3 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |    11 +-
 .../client/solrj/SolrSchemalessExampleTest.java    |     2 +
 .../solr/client/solrj/TestLBHttp2SolrClient.java   |     9 +-
 .../solr/client/solrj/TestLBHttpSolrClient.java    |     9 +-
 .../solrj/beans/TestDocumentObjectBinder.java      |     1 +
 .../solrj/cloud/autoscaling/ConditionTest.java     |    80 -
 .../autoscaling/MoveReplicaSuggesterTest.java      |   104 -
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  3121 -----
 .../solrj/cloud/autoscaling/TestPolicy2.java       |   505 -
 .../solrj/cloud/autoscaling/TestPolicy2Old.java    |    26 -
 .../solrj/cloud/autoscaling/TestPolicyOld.java     |    25 -
 .../solrj/embedded/SolrExampleJettyTest.java       |     1 +
 .../solrj/embedded/TestEmbeddedSolrServer.java     |     2 +-
 .../client/solrj/impl/BasicHttpSolrClientTest.java |     6 +-
 .../impl/CloudHttp2SolrClientBadInputTest.java     |     4 +-
 .../solrj/impl/CloudHttp2SolrClientRetryTest.java  |     1 +
 .../solrj/impl/CloudHttp2SolrClientTest.java       |    13 +-
 .../solrj/impl/CloudSolrClientBadInputTest.java    |     4 +-
 .../solrj/impl/CloudSolrClientBuilderTest.java     |     2 +-
 .../solrj/impl/CloudSolrClientCacheTest.java       |    15 +-
 .../solrj/impl/CloudSolrClientRetryTest.java       |     1 +
 .../client/solrj/impl/CloudSolrClientTest.java     |     9 +-
 ...oncurrentUpdateHttp2SolrClientBadInputTest.java |     4 +-
 .../ConcurrentUpdateSolrClientBadInputTest.java    |     4 +-
 .../ConcurrentUpdateSolrClientBuilderTest.java     |     2 +-
 .../client/solrj/impl/Http2SolrClientTest.java     |     3 +-
 .../solrj/impl/HttpSolrClientBadInputTest.java     |     4 +-
 .../solrj/impl/LBHttpSolrClientBadInputTest.java   |     4 +-
 .../solr/client/solrj/impl/LBSolrClientTest.java   |    90 +
 .../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       |     7 +-
 .../client/solrj/io/stream/JDBCStreamTest.java     |     4 +-
 .../client/solrj/io/stream/MathExpressionTest.java |   198 +-
 .../client/solrj/io/stream/RecordCountStream.java  |     2 +-
 .../solrj/io/stream/SelectWithEvaluatorsTest.java  |    10 +-
 .../solrj/io/stream/StreamDecoratorTest.java       |    16 +-
 .../solrj/io/stream/StreamExpressionTest.java      |   134 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |    15 +-
 .../solrj/io/stream/eval/AscEvaluatorTest.java     |     6 +
 .../io/stream/eval/ConversionEvaluatorsTest.java   |    27 +-
 .../solrj/io/stream/eval/ReverseEvaluatorTest.java |     1 +
 .../io/stream/eval/TemporalEvaluatorsTest.java     |     4 +-
 .../solrj/io/stream/ops/ConcatOperationTest.java   |     4 +-
 .../client/solrj/io/stream/ops/OperationsTest.java |     4 +-
 .../solr/client/solrj/request/SchemaTest.java      |     2 +
 .../solrj/request/TestConfigSetAdminRequest.java   |     3 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |    12 +-
 .../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 +-
 .../org/apache/solr/common/SolrDocumentTest.java   |     7 +-
 .../solr/common/TestToleratedUpdateError.java      |     2 +
 .../apache/solr/common/cloud/SolrZkClientTest.java |     1 -
 .../cloud/TestCloudCollectionsListeners.java       |   110 -
 .../common/cloud/TestCollectionStateWatchers.java  |    23 -
 .../common/cloud/TestDocCollectionWatcher.java     |    26 -
 .../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  |     9 +-
 .../solr/common/util/TestJsonRecordReader.java     |     5 +
 .../solr/common/util/TestNamedListCodec.java       |    15 +
 .../org/apache/solr/common/util/TestPathTrie.java  |    10 +
 .../solr/common/util/TestSolrJsonWriter.java       |   102 +-
 .../solr/common/util/TestValidatingJsonMap.java    |     1 +
 .../solr/common/util/TestZkMaintenanceUtils.java   |    55 +
 .../solr/common/util/Utf8CharSequenceTest.java     |     6 +
 solr/test-framework/ivy.xml                        |     2 +-
 .../apache/solr/BaseDistributedSearchTestCase.java |    20 +-
 .../src/java/org/apache/solr/JSONTestUtil.java     |     7 +
 .../org/apache/solr/SolrIgnoredThreadsFilter.java  |     5 +
 .../src/java/org/apache/solr/SolrTestCase.java     |    10 +
 .../src/java/org/apache/solr/SolrTestCaseHS.java   |    27 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |    62 +-
 .../solr/cloud/AbstractDistribZkTestBase.java      |     2 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |    52 +-
 .../org/apache/solr/cloud/CloudInspectUtil.java    |    17 +-
 .../java/org/apache/solr/cloud/ConfigRequest.java  |     6 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |     1 +
 .../apache/solr/cloud/MultiSolrCloudTestCase.java  |     5 +-
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |     4 +
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |     3 +
 .../java/org/apache/solr/cloud/ZkTestServer.java   |     9 +-
 .../apache/solr/core/MockTracerConfigurator.java   |     2 +-
 .../component/TrackingShardHandlerFactory.java     |    67 +-
 .../java/org/apache/solr/util/RandomizeSSL.java    |     4 +-
 .../src/java/org/apache/solr/util/TestHarness.java |    11 +-
 solr/webapp/web/css/angular/collections.css        |     2 +-
 solr/webapp/web/css/angular/dashboard.css          |     4 +-
 solr/webapp/web/css/angular/dataimport.css         |     3 +-
 solr/webapp/web/css/angular/index.css              |     4 +-
 solr/webapp/web/css/angular/menu.css               |     3 +-
 solr/webapp/web/css/angular/replication.css        |    10 +-
 solr/webapp/web/css/angular/suggestions.css        |    64 -
 .../img/ico/{node-slave.png => node-follower.png}  |   Bin
 .../img/ico/{node-master.png => node-leader.png}   |   Bin
 solr/webapp/web/index.html                         |    27 +-
 solr/webapp/web/js/angular/app.js                  |     4 -
 solr/webapp/web/js/angular/controllers/cloud.js    |     4 -
 .../js/angular/controllers/cluster-suggestions.js  |    62 -
 .../web/js/angular/controllers/collections.js      |     8 +-
 .../web/js/angular/controllers/core-overview.js    |     4 +-
 solr/webapp/web/js/angular/controllers/index.js    |     2 +-
 .../web/js/angular/controllers/replication.js      |   108 +-
 solr/webapp/web/partials/cluster_suggestions.html  |    49 -
 solr/webapp/web/partials/collection_overview.html  |     6 -
 solr/webapp/web/partials/collections.html          |    20 -
 solr/webapp/web/partials/core_overview.html        |    38 +-
 solr/webapp/web/partials/dataimport.html           |     1 +
 solr/webapp/web/partials/replication.html          |    62 +-
 versions.lock                                      |    40 +-
 versions.props                                     |    17 +-
 2285 files changed, 36350 insertions(+), 98932 deletions(-)
 delete mode 100755 dev-tools/scripts/jenkins.build.ref.guide.sh
 create mode 100644 gradle/documentation/render-javadoc.gradle
 create mode 100644 gradle/hacks/findbugs.gradle
 delete mode 100644 gradle/render-javadoc.gradle
 create mode 100644 gradle/testing/alternative-jdk-support.gradle
 delete mode 100644 gradle/testing/runtime-jvm-support.gradle
 create mode 100644 help/jvms.txt
 create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointsFormat.java
 create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointsReader.java
 create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/package.html
 delete mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene84/package-info.java
 create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene84/package.html
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/Lucene60PointsWriter.java
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/Lucene60RWPointsFormat.java
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointsFormat.java
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene84/Lucene84RWCodec.java
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.5.2-cfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.5.2-nocfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.6.0-cfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.6.0-nocfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.5.2.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.6.0.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.3-cfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.3-nocfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.7.3.zip
 delete mode 100644 lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/STBlockReaderTest.java
 create mode 100644 lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTBlockReader.java
 delete mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointsFormat.java
 delete mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointsReader.java
 delete mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointsWriter.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsFormat.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsReader.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsWriter.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringFieldComparator.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringLeafFieldComparator.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringNumericComparator.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringNumericLeafComparator.java
 delete mode 100644 lucene/core/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointsFormat.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86PointsFormat.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/index/TestTermsHashPerField.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestFieldSortOptimizationSkipping.java
 create mode 100644 lucene/expressions/src/java/org/apache/lucene/expressions/CachingExpressionValueSource.java
 create mode 100644 lucene/licenses/hamcrest-2.2.jar.sha1
 rename solr/licenses/hamcrest-core-LICENSE-BSD.txt => lucene/licenses/hamcrest-LICENSE-BSD.txt (100%)
 rename solr/licenses/hamcrest-core-NOTICE.txt => lucene/licenses/hamcrest-NOTICE.txt (100%)
 delete mode 100644 lucene/licenses/hamcrest-core-1.3.jar.sha1
 delete mode 100644 lucene/licenses/hppc-0.8.1.jar.sha1
 create mode 100644 lucene/licenses/hppc-0.8.2.jar.sha1
 create mode 100644 lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9417.geojson.gz
 create mode 100644 solr/contrib/dataimporthandler/src/test-files/log4j2.xml
 create mode 100644 solr/contrib/dataimporthandler/src/test-files/solr/collection1/README
 create mode 100644 solr/contrib/dataimporthandler/src/test-files/solr/configsets/dihconfigset/conf/README
 copy solr/contrib/dataimporthandler/src/test-files/{dih/solr/collection1/conf/dataimport-schema.xml => solr/configsets/dihconfigset/conf/schema.xml} (100%)
 create mode 100644 solr/contrib/dataimporthandler/src/test-files/solr/configsets/dihconfigset/conf/solrconfig.xml
 copy solr/contrib/dataimporthandler/src/test-files/{dih => }/solr/solr.xml (100%)
 create mode 100644 solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java
 create mode 100644 solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
 create mode 100644 solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContext.java
 create mode 100644 solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/UtilizeNodeCmd.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/ActionContext.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/SystemLogListener.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionException.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerValidationException.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/package-info.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/package-info.java
 delete mode 100644 solr/core/src/java/org/apache/solr/core/MemClassLoader.java
 create mode 100644 solr/core/src/java/org/apache/solr/core/SolrClassLoader.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/component/StatsInfo.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/export/DoubleCmp.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/DoubleComp.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/export/FloatCmp.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/FloatComp.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/export/LongCmp.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/LongComp.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/export/PriorityQueue.java
 create mode 100644 solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java
 create mode 100644 solr/core/src/java/org/apache/solr/schema/RankField.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/JoinQuery.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/RankQParserPlugin.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/ReadOnlyCountSlotAcc.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/SingletonDISI.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/SingletonDocIterator.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/SweepCountAware.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/SweepDISI.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/SweepDocIterator.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/UnionDISI.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/facet/UnionDocIterator.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/CrossCollectionJoinQParser.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/CrossCollectionJoinQuery.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/GraphTermsCollector.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQParser.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQParserPlugin.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQuery.java
 create mode 100644 solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java
 create mode 100644 solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
 create mode 100644 solr/core/src/java/org/apache/solr/servlet/RequestRateLimiter.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
 create mode 100644 solr/core/src/test-files/runtimecode/MyPlugin.java
 create mode 100644 solr/core/src/test-files/runtimecode/containerplugin.v.1.jar.bin
 create mode 100644 solr/core/src/test-files/runtimecode/containerplugin.v.2.jar.bin
 create mode 100644 solr/core/src/test-files/runtimecode/schema-plugins.jar.bin
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/schema-rank-fields.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml
 rename solr/core/src/test-files/solr/collection1/conf/{solrconfig-slave1.xml => solrconfig-follower1.xml} (100%)
 rename solr/core/src/test-files/solr/collection1/conf/{solrconfig-master-throttled.xml => solrconfig-leader-throttled.xml} (100%)
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-replication-legacy.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
 rename solr/core/src/test-files/solr/configsets/{xcjf => ccjoin}/conf/schema.xml (100%)
 create mode 100644 solr/core/src/test-files/solr/configsets/ccjoin/conf/solrconfig.xml
 delete mode 100644 solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
 create mode 100644 solr/core/src/test-files/solr/security/hadoop_kerberos_authz_config.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/autoscalingState.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/clusterState.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/distribState.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/managerState.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/nodeState.json
 delete mode 100644 solr/core/src/test-files/solr/simSnapshot/statistics.json
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/CloudTestUtils.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/CollectionStateZnodeTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/RoutingToNodesWithPropertiesTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/api/collections/AssignTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentCreateCollectionTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanActionTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/CapturedEvent.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/ExecutePlanActionTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/HdfsAutoAddReplicasIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/HttpTriggerListenerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerMixedBoundsTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerSizeEstimationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/MetricTriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/MetricTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeAddedTriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeAddedTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeMarkersRegistrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/RestoreTriggerStateTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/SystemLogListenerTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerCooldownIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerEventQueueTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerSetPropertiesIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimSolrCloudTestCase.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimClusterStateProvider.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimComputePlanAction.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistribStateManager.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExecutePlanAction.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimGenericDistributedQueue.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimNodeAddedTrigger.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimNodeLostTrigger.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimPolicyCloud.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimScenario.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimUtils.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
 delete mode 100644 solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
 delete mode 100644 solr/core/src/test/org/apache/solr/core/TestDynamicLoadingUrl.java
 delete mode 100644 solr/core/src/test/org/apache/solr/core/TestDynamicURP.java
 create mode 100644 solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
 delete mode 100644 solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/parser/SolrQueryParserBaseTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/schema/RankFieldTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/MaxScoreCollectorTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/join/CrossCollectionJoinQueryTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/security/hadoop/KerberosUtils.java
 create mode 100644 solr/core/src/test/org/apache/solr/security/hadoop/TestRuleBasedAuthorizationWithKerberos.java
 create mode 100644 solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
 delete mode 100644 solr/core/src/test/org/apache/solr/update/processor/RuntimeUrp.java
 delete mode 100644 solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
 create mode 100644 solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
 delete mode 100644 solr/licenses/commons-collections4-4.2.jar.sha1
 create mode 100644 solr/licenses/commons-collections4-4.4.jar.sha1
 create mode 100644 solr/licenses/commons-lang-2.6.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-lang-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/commons-lang-NOTICE.txt
 create mode 100644 solr/licenses/hamcrest-2.2.jar.sha1
 rename lucene/licenses/hamcrest-core-LICENSE-BSD.txt => solr/licenses/hamcrest-LICENSE-BSD.txt (100%)
 rename lucene/licenses/hamcrest-core-NOTICE.txt => solr/licenses/hamcrest-NOTICE.txt (100%)
 delete mode 100644 solr/licenses/hamcrest-core-1.3.jar.sha1
 delete mode 100644 solr/licenses/hppc-0.8.1.jar.sha1
 create mode 100644 solr/licenses/hppc-0.8.2.jar.sha1
 delete mode 100644 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/org.restlet-2.4.0.jar.sha1
 create mode 100644 solr/licenses/org.restlet-2.4.3.jar.sha1
 delete mode 100644 solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1
 create mode 100644 solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1
 create mode 100644 solr/licenses/snappy-java-1.1.7.6.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/snappy-java-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/snappy-java-NOTICE.txt
 delete mode 100644 solr/licenses/zookeeper-3.5.7.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.6.1.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-jute-3.5.7.jar.sha1
 create mode 100644 solr/licenses/zookeeper-jute-3.6.1.jar.sha1
 create mode 100644 solr/solr-ref-guide/src/_includes/mathjax-support.html
 delete mode 100644 solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc
 create mode 100644 solr/solr-ref-guide/src/circuit-breakers.adoc
 delete mode 100644 solr/solr-ref-guide/src/colocating-collections.adoc
 delete mode 100644 solr/solr-ref-guide/src/migrate-to-policy-rule.adoc
 create mode 100644 solr/solr-ref-guide/src/rate-limiters.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-auto-add-replicas.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-fault-tolerance.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-overview.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-policy-preferences.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-trigger-actions.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling-triggers.adoc
 delete mode 100644 solr/solr-ref-guide/src/solrcloud-autoscaling.adoc
 delete mode 100644 solr/solr-ref-guide/src/suggestions-screen.adoc
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/AlreadyExistsException.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/BadVersionException.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/DelegatingCloudManager.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/DelegatingClusterStateProvider.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/NotEmptyException.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/VersionedData.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/BadVersionException.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ComputedType.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Condition.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingClusterStateProvider.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingDistribStateManager.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NotEmptyException.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Operand.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Preference.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SealedClause.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventType.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Variable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VersionedData.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Violation.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/package-info.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/PluginMeta.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/util/AsyncListener.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/util/Cancellable.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/ApiType.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/CollectionConfig.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/HashRange.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/Resource.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/Router.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/Shard.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/ShardReplica.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/SimpleMap.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/SolrCluster.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/SolrCollection.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/cluster/api/SolrNode.java
 delete mode 100644 solr/solrj/src/java/org/apache/solr/common/params/AutoScalingParams.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/params/StreamParams.java
 delete mode 100644 solr/solrj/src/resources/apispec/autoscaling.Commands.json
 delete mode 100644 solr/solrj/src/resources/apispec/autoscaling.history.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testAddMissingReplica.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testAutoScalingHandlerFailure.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testAutoscalingPreferencesUsedWithNoPolicy.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testComputePlanAfterNodeAdded.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testCoresSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testCreateCollectionWithEmptyPolicy.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testDiskSpaceHint.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testEmptyCollection.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testEqualOnNonNode.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testFreeDiskDeviation.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testFreeDiskSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testFreediskPercentage.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testHostAttribute.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testInfiniteLoop.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testMoveReplicaSuggester.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testMoveReplicasInMultipleCollections.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testPolicy.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testPortSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testReplicaCountSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testReplicaPercentage.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testReplicaZonesPercentage.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testScheduledTriggerFailure.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testSortError.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testSuggestionsRebalance2.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testSuggestionsRebalanceOnly.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testSysPropSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testSyspropSuggestions1.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testUnresolvedSuggestion.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testUtilizeNodeFailure.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testUtilizeNodeFailure2.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testViolationOutput.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testWithCollection.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testWithCollectionMoveReplica.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testWithCollectionMoveVsAddSuggestions.json
 delete mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testWithCollectionSuggestions.json
 rename solr/solrj/src/test-files/solrj/solr/collection1/conf/{solrconfig-slave1.xml => solrconfig-follower1.xml} (100%)
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/ConditionTest.java
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggesterTest.java
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2Old.java
 delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicyOld.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/common/util/TestZkMaintenanceUtils.java
 delete mode 100644 solr/webapp/web/css/angular/suggestions.css
 rename solr/webapp/web/img/ico/{node-slave.png => node-follower.png} (100%)
 rename solr/webapp/web/img/ico/{node-master.png => node-leader.png} (100%)
 delete mode 100644 solr/webapp/web/js/angular/controllers/cluster-suggestions.js
 delete mode 100644 solr/webapp/web/partials/cluster_suggestions.html


[lucene-solr] 02/02: SOLR-13579: Fix merge issues.

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

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

commit 2bc8c906cb2730c7edffbe9b8613c1e60049a764
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Aug 11 19:14:23 2020 +0200

    SOLR-13579: Fix merge issues.
---
 .../org/apache/solr/handler/component/RealTimeGetComponent.java   | 4 ++--
 .../core/src/java/org/apache/solr/managed/ResourceManagerAPI.java | 2 +-
 .../org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java | 4 ++--
 .../test/org/apache/solr/handler/component/SearchHandlerTest.java | 8 ++++----
 .../org/apache/solr/handler/component/TermsComponentTest.java     | 2 +-
 .../org/apache/solr/managed/TestResourceManagerIntegration.java   | 1 -
 .../src/test/org/apache/solr/managed/types/TestCacheDynamics.java | 1 -
 .../src/test/org/apache/solr/search/RankQParserPluginTest.java    | 4 +++-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 3568a54..684d0e9 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1128,7 +1128,7 @@ public class RealTimeGetComponent extends SearchComponent
     try (PeerSyncWithLeader peerSync = new PeerSyncWithLeader(rb.req.getCore(), syncWithLeader, nVersions)) {
       boolean success = peerSync.sync(versions).isSuccess();
       rb.rsp.add("syncWithLeader", success);
-    } catch (IOException e) {
+    } catch (Exception e) {
       log.error("Error while closing", e);
     }
   }
@@ -1153,7 +1153,7 @@ public class RealTimeGetComponent extends SearchComponent
       boolean success = peerSync.sync().isSuccess();
       // TODO: more complex response?
       rb.rsp.add("sync", success);
-    } catch (IOException e) {
+    } catch (Exception e) {
       log.error("Error while closing", e);
     }
   }
diff --git a/solr/core/src/java/org/apache/solr/managed/ResourceManagerAPI.java b/solr/core/src/java/org/apache/solr/managed/ResourceManagerAPI.java
index 5f18c03..5d182f3 100644
--- a/solr/core/src/java/org/apache/solr/managed/ResourceManagerAPI.java
+++ b/solr/core/src/java/org/apache/solr/managed/ResourceManagerAPI.java
@@ -41,7 +41,7 @@ import org.apache.solr.api.PayloadObj;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.cloud.DistribStateManager;
 import org.apache.solr.client.solrj.cloud.SolrCloudManager;
-import org.apache.solr.client.solrj.cloud.autoscaling.VersionedData;
+import org.apache.solr.client.solrj.cloud.VersionedData;
 import org.apache.solr.client.solrj.request.beans.ResourcePoolConfig;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.annotation.JsonProperty;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
index cf2dd74..79f0a15 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
@@ -163,7 +163,7 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
     try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
      zsh.validateZkRawResponse(Collections.singletonList("mntr is not executed because it is not in the whitelist."),
           "zoo1:2181", "mntr");
-    }  catch (IOException e) {
+    }  catch (Exception e) {
       fail("Error closing ZookeeperStatusHandler");
     }
   }
@@ -172,7 +172,7 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
   public void validateEmptyResponse() {
     try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
       zsh.validateZkRawResponse(Collections.emptyList(), "zoo1:2181", "mntr");
-    } catch (IOException e) {
+    } catch (Exception e) {
       fail("Error closing ZookeeperStatusHandler");
     }
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index f0b2973..5a90582 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -65,8 +65,8 @@ public class SearchHandlerTest extends SolrTestCaseJ4
       assertEquals(1, handler.getComponents().size());
       assertEquals(core.getSearchComponent(MoreLikeThisComponent.COMPONENT_NAME),
           handler.getComponents().get(0));
-    } catch (IOException e) {
-      fail("IOExcepiton closing SearchHandler");
+    } catch (Exception e) {
+      fail("Excepiton closing SearchHandler");
     }
 
     // Build an explicit list that includes the debug comp.
@@ -89,7 +89,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4
           handler.getComponents().get(1));
       assertEquals(core.getSearchComponent(MoreLikeThisComponent.COMPONENT_NAME),
           handler.getComponents().get(2));
-    } catch (IOException e) {
+    } catch (Exception e) {
       fail("Exception when closing SearchHandler");
     }
     
@@ -115,7 +115,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4
       assertEquals(core.getSearchComponent(FacetComponent.COMPONENT_NAME), comps.get(comps.size() - 2));
       //Debug component is always last in this case
       assertEquals(core.getSearchComponent(DebugComponent.COMPONENT_NAME), comps.get(comps.size() - 1));
-    } catch (IOException e) {
+    } catch (Exception e) {
       fail("Exception when closing SearchHandler");
     }
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 660498a..9863c0e 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -160,7 +160,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
         int expected = Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.COMMENTS | Pattern.MULTILINE | Pattern.UNIX_LINES
             | Pattern.UNICODE_CASE | Pattern.DOTALL | Pattern.CANON_EQ;
         assertEquals(expected, flags);
-      } catch (IOException e) {
+      } catch (Exception e) {
         fail("Error closing TermsComponent");
       }
   }
diff --git a/solr/core/src/test/org/apache/solr/managed/TestResourceManagerIntegration.java b/solr/core/src/test/org/apache/solr/managed/TestResourceManagerIntegration.java
index b778543..2c7bebc 100644
--- a/solr/core/src/test/org/apache/solr/managed/TestResourceManagerIntegration.java
+++ b/solr/core/src/test/org/apache/solr/managed/TestResourceManagerIntegration.java
@@ -61,7 +61,6 @@ public class TestResourceManagerIntegration extends SolrCloudTestCase {
         .configure();
     cloudManager = cluster.getJettySolrRunner(0).getCoreContainer().getZkController().getSolrCloudManager();
     CollectionAdminRequest.createCollection(COLLECTION, "conf", 2, 2)
-        .setMaxShardsPerNode(5)
         .process(cluster.getSolrClient());
     CloudUtil.waitForState(cloudManager, "failed to create collection", COLLECTION, CloudUtil.clusterShape(2, 2));
     resourceManager = cluster.getJettySolrRunner(0).getCoreContainer().getResourceManagerApi().getResourceManager();
diff --git a/solr/core/src/test/org/apache/solr/managed/types/TestCacheDynamics.java b/solr/core/src/test/org/apache/solr/managed/types/TestCacheDynamics.java
index 0d01016..5246718 100644
--- a/solr/core/src/test/org/apache/solr/managed/types/TestCacheDynamics.java
+++ b/solr/core/src/test/org/apache/solr/managed/types/TestCacheDynamics.java
@@ -100,7 +100,6 @@ public class TestCacheDynamics extends SolrCloudTestCase {
         .configure();
     cloudManager = cluster.getJettySolrRunner(0).getCoreContainer().getZkController().getSolrCloudManager();
     CollectionAdminRequest.createCollection(COLLECTION, "conf", 2, 2)
-        .setMaxShardsPerNode(5)
         .process(cluster.getSolrClient());
     CloudUtil.waitForState(cloudManager, "failed to create collection", COLLECTION, CloudUtil.clusterShape(2, 2));
     resourceManager = cluster.getJettySolrRunner(0).getCoreContainer().getResourceManagerApi().getResourceManager();
diff --git a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
index 2e88ce2..e9d28e1 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
@@ -53,7 +53,7 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {
     assertEquals("RankQParserPlugin.EXPONENT changed in an incompatible way", "exponent", EXPONENT);
   }
   
-  public void testCreateParser() throws IOException {
+  public void testCreateParser() throws Exception {
     try (RankQParserPlugin rankQPPlugin = new RankQParserPlugin()) {
       QParser parser = rankQPPlugin.createParser("", new ModifiableSolrParams(), null, req()); 
       assertNotNull(parser);
@@ -252,6 +252,8 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {
   private RankQParser getRankQParser(SolrParams localParams, SolrParams params, SolrQueryRequest req) throws IOException {
     try (RankQParserPlugin rankQPPlugin = new RankQParserPlugin()) {
       return (RankQParser) rankQPPlugin.createParser("", localParams, params, req);
+    } catch (Exception e) {
+      throw new IOException(e);
     }
   }
 


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

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

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

commit 46693878933b7f0e54b8cb4d9dc1948385736323
Merge: 9f3431e 97c9bb7
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Aug 11 18:59:44 2020 +0200

    Merge branch 'master' into jira/solr-13579

 .gitignore                                         |     8 +-
 README.md                                          |     2 +-
 build.gradle                                       |    10 +-
 dev-tools/doap/lucene.rdf                          |    14 +
 dev-tools/doap/solr.rdf                            |    14 +
 dev-tools/maven/pom.xml.template                   |     4 +-
 dev-tools/scripts/SOLR-2452.patch.hack.pl          |     4 +-
 dev-tools/scripts/jenkins.build.ref.guide.sh       |    73 -
 dev-tools/scripts/releaseWizard.py                 |     2 +-
 dev-tools/scripts/releaseWizard.yaml               |    27 +-
 dev-tools/scripts/reproduceJenkinsFailures.py      |     5 +-
 gradle/defaults-java.gradle                        |    25 +-
 gradle/documentation/documentation.gradle          |    24 +-
 gradle/documentation/render-javadoc.gradle         |   324 +
 gradle/generate-defaults.gradle                    |     2 +-
 gradle/hacks/findbugs.gradle                       |    46 +
 gradle/help.gradle                                 |     1 +
 gradle/jar-manifest.gradle                         |     9 +-
 gradle/render-javadoc.gradle                       |   302 -
 gradle/testing/alternative-jdk-support.gradle      |    72 +
 gradle/testing/runtime-jvm-support.gradle          |    52 -
 gradle/validation/check-environment.gradle         |     2 +-
 gradle/validation/jar-checks.gradle                |     4 +-
 gradle/validation/validate-log-calls.gradle        |    46 +-
 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 +-
 help/ant.txt                                       |     4 +-
 help/jvms.txt                                      |    18 +
 help/tests.txt                                     |    15 -
 lucene/CHANGES.txt                                 |   131 +-
 lucene/MIGRATE.md                                  |     6 +
 .../compound/hyphenation/HyphenationTree.java      |     2 +-
 .../ConcatenateGraphFilterFactory.java             |     4 +-
 .../FixBrokenOffsetsFilterFactory.java             |     1 +
 .../miscellaneous/WordDelimiterFilterFactory.java  |    19 +-
 .../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/ICUTransformFilter.java    |     1 +
 .../analysis/ja/dict/TokenInfoDictionary.java      |     4 +-
 .../analysis/ko/dict/TokenInfoDictionary.java      |     4 +-
 .../codecs/lucene60/Lucene60PointsFormat.java      |   110 +
 .../codecs/lucene60/Lucene60PointsReader.java      |   146 +
 .../org/apache/lucene/codecs/lucene60/package.html |    25 +
 .../lucene/codecs/lucene84/Lucene84Codec.java      |     4 +-
 .../lucene/codecs/lucene84/package-info.java       |    22 -
 .../org/apache/lucene/codecs/lucene84/package.html |    25 +
 .../codecs/lucene60/Lucene60PointsWriter.java      |   267 +
 .../codecs/lucene60/Lucene60RWPointsFormat.java    |    35 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |   354 +
 .../lucene/codecs/lucene84/Lucene84RWCodec.java    |    39 +
 .../lucene/index/TestBackwardsCompatibility.java   |    14 +-
 .../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
 .../org/apache/lucene/index/index.8.6.0-cfs.zip    |   Bin 0 -> 16442 bytes
 .../org/apache/lucene/index/index.8.6.0-nocfs.zip  |   Bin 0 -> 16428 bytes
 .../test/org/apache/lucene/index/sorted.8.5.2.zip  |   Bin 0 -> 80768 bytes
 .../test/org/apache/lucene/index/sorted.8.6.0.zip  |   Bin 0 -> 140450 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                      |   123 +-
 lucene/benchmark/scripts/collation.bm2jira.pl      |    22 +-
 .../document/DocumentClassificationTestBase.java   |     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 +-
 .../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 +-
 .../java/org/apache/lucene/codecs/CodecUtil.java   |    20 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |   157 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java     |   134 +-
 .../lucene/codecs/blocktree/FieldReader.java       |    32 +-
 .../codecs/lucene50/Lucene50FieldInfosFormat.java  |     1 -
 .../codecs/lucene60/Lucene60FieldInfosFormat.java  |     1 -
 .../codecs/lucene60/Lucene60PointsFormat.java      |   110 -
 .../codecs/lucene60/Lucene60PointsReader.java      |   166 -
 .../codecs/lucene60/Lucene60PointsWriter.java      |   263 -
 .../lucene/codecs/lucene60/package-info.java       |     2 +-
 .../lucene/codecs/lucene86/Lucene86Codec.java      |     4 +-
 .../codecs/lucene86/Lucene86PointsFormat.java      |    80 +
 .../codecs/lucene86/Lucene86PointsReader.java      |   152 +
 .../codecs/lucene86/Lucene86PointsWriter.java      |   265 +
 .../lucene/codecs/lucene86/package-info.java       |     4 +-
 .../java/org/apache/lucene/geo/Tessellator.java    |    18 +-
 .../org/apache/lucene/index/ByteSliceWriter.java   |     1 -
 .../java/org/apache/lucene/index/CheckIndex.java   |     2 +-
 .../apache/lucene/index/DefaultIndexingChain.java  |   100 +-
 .../java/org/apache/lucene/index/DocConsumer.java  |     2 +-
 .../org/apache/lucene/index/DocumentsWriter.java   |     2 +-
 .../lucene/index/DocumentsWriterFlushControl.java  |     8 +-
 .../lucene/index/DocumentsWriterPerThread.java     |    51 +-
 .../java/org/apache/lucene/index/FieldInfo.java    |    16 +-
 .../org/apache/lucene/index/FilterMergePolicy.java |     5 +
 .../org/apache/lucene/index/FreqProxFields.java    |    19 +-
 .../apache/lucene/index/FreqProxTermsWriter.java   |     6 +-
 .../lucene/index/FreqProxTermsWriterPerField.java  |    57 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |   273 +-
 .../org/apache/lucene/index/IndexWriterConfig.java |    18 +
 .../apache/lucene/index/LiveIndexWriterConfig.java |    13 +
 .../java/org/apache/lucene/index/MergePolicy.java  |   170 +-
 .../java/org/apache/lucene/index/MergeTrigger.java |     7 +-
 .../org/apache/lucene/index/NoMergePolicy.java     |     3 +
 .../lucene/index/OneMergeWrappingMergePolicy.java  |     5 +
 .../apache/lucene/index/ParallelPostingsArray.java |    10 +-
 .../org/apache/lucene/index/ReadersAndUpdates.java |    14 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |   236 +-
 .../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 +-
 .../org/apache/lucene/search/BooleanQuery.java     |    12 +-
 .../apache/lucene/search/ConstantScoreQuery.java   |     2 +-
 .../apache/lucene/search/DoubleValuesSource.java   |    24 +-
 .../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 +
 .../java/org/apache/lucene/search/FuzzyQuery.java  |     8 +-
 .../org/apache/lucene/search/LeafCollector.java    |    12 +
 .../apache/lucene/search/MatchAllDocsQuery.java    |     2 +-
 .../org/apache/lucene/search/MultiCollector.java   |   111 +-
 .../java/org/apache/lucene/search/RegexpQuery.java |    38 +-
 .../java/org/apache/lucene/search/ScoreMode.java   |    54 +-
 .../java/org/apache/lucene/search/SortField.java   |     4 +
 .../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 +-
 .../org/apache/lucene/store/NIOFSDirectory.java    |    13 +-
 .../org/apache/lucene/util/AttributeSource.java    |     2 +
 .../src/java/org/apache/lucene/util/IOUtils.java   |    10 +
 .../java/org/apache/lucene/util/IntBlockPool.java  |     2 +-
 .../src/java/org/apache/lucene/util/Version.java   |     7 +
 .../org/apache/lucene/util/automaton/RegExp.java   |   215 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |   252 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |   127 +-
 .../src/java/org/apache/lucene/util/fst/FST.java   |    47 +-
 .../apache/lucene/util/fst/PositiveIntOutputs.java |     1 +
 .../lucene/util/packed/Packed64SingleBlock.java    |     3 +
 lucene/core/src/java/overview.html                 |     2 +-
 .../apache/lucene/analysis/TestCharArraySet.java   |     8 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java    |    45 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |   395 -
 .../codecs/lucene86/TestLucene86PointsFormat.java  |   393 +
 .../org/apache/lucene/document/TestDocument.java   |    12 +-
 .../org/apache/lucene/geo/TestTessellator.java     |    22 +
 .../lucene/index/TestAllFilesDetectBitFlips.java   |   141 +
 .../lucene/index/TestAllFilesDetectTruncation.java |     4 +-
 .../lucene/index/TestDemoParallelLeafReader.java   |     5 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |   177 +-
 .../lucene/index/TestIndexWriterMergePolicy.java   |   242 +-
 .../org/apache/lucene/index/TestMergePolicy.java   |   158 +
 .../org/apache/lucene/index/TestSegmentInfos.java  |    65 +
 .../apache/lucene/index/TestTermsHashPerField.java |   209 +
 .../apache/lucene/search/MultiCollectorTest.java   |   172 +
 .../apache/lucene/search/TestBooleanRewrites.java  |    18 +-
 .../search/TestFieldSortOptimizationSkipping.java  |   294 +
 .../org/apache/lucene/search/TestFuzzyQuery.java   |    41 +-
 .../lucene/search/TestMultiTermConstantScore.java  |     3 +-
 .../org/apache/lucene/search/TestPointQueries.java |     8 +-
 .../org/apache/lucene/search/TestRegexpQuery.java  |    11 +
 .../org/apache/lucene/search/TestSearchAfter.java  |     2 +-
 .../apache/lucene/store/TestNIOFSDirectory.java    |    35 +
 .../test/org/apache/lucene/util/TestCharsRef.java  |     2 +
 .../test/org/apache/lucene/util/TestVersion.java   |     1 +
 .../apache/lucene/util/automaton/TestRegExp.java   |    42 +-
 .../apache/lucene/util/bkd/Test2BBKDPoints.java    |    12 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |    76 +-
 .../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 +-
 .../expressions/CachingExpressionValueSource.java  |    75 +
 .../expressions/ExpressionFunctionValues.java      |    14 +-
 .../lucene/expressions/ExpressionValueSource.java  |     7 +-
 .../expressions/TestExpressionValueSource.java     |    29 +
 .../org/apache/lucene/facet/DrillSideways.java     |     3 +-
 .../java/org/apache/lucene/facet/FacetsConfig.java |    11 +-
 .../facet/taxonomy/DocValuesOrdinalsReader.java    |    15 +-
 .../lucene/facet/taxonomy/TaxonomyReader.java      |     2 +-
 .../lucene/search/grouping/GroupingSearch.java     |     2 +-
 .../search/grouping/ValueSourceGroupSelector.java  |     4 +-
 .../search/grouping/BaseGroupSelectorTestCase.java |     2 +-
 .../lucene/search/grouping/TestGrouping.java       |     2 +
 .../search/uhighlight/UnifiedHighlighter.java      |     5 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java      |    11 +-
 .../uhighlight/TestUnifiedHighlighterTermVec.java  |     1 +
 lucene/ivy-versions.properties                     |    21 +-
 .../search/join/ToParentBlockJoinSortField.java    |    12 +-
 .../lucene/search/join/TestBlockJoinSelector.java  |     9 +-
 lucene/licenses/hamcrest-2.2.jar.sha1              |     1 +
 .../licenses/hamcrest-LICENSE-BSD.txt              |     0
 .../licenses/hamcrest-NOTICE.txt                   |     0
 lucene/licenses/hamcrest-core-1.3.jar.sha1         |     1 -
 lucene/licenses/hppc-0.8.1.jar.sha1                |     1 -
 lucene/licenses/hppc-0.8.2.jar.sha1                |     1 +
 .../org/apache/lucene/luke/app/IndexHandler.java   |     2 +-
 .../dialog/documents/AddDocumentDialogFactory.java |     4 +-
 .../dialog/menubar/CheckIndexDialogFactory.java    |     2 +-
 .../dialog/menubar/OpenIndexDialogFactory.java     |     2 +-
 .../luke/app/desktop/util/ExceptionHandler.java    |     4 +-
 .../apache/lucene/luke/models/util/IndexUtils.java |     8 +-
 .../lucene/util/fst/UpToTwoPositiveIntOutputs.java |     3 +-
 .../similarity/TestLegacyBM25Similarity.java       |     1 +
 .../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/intervals/OrderedIntervalsSource.java  |     4 +-
 .../queries/function/TestFunctionScoreQuery.java   |    32 +
 .../lucene/queries/function/TestValueSources.java  |    10 +-
 .../queries/intervals/TestIntervalQuery.java       |    10 +-
 .../lucene/queries/intervals/TestIntervals.java    |    15 +-
 .../queryparser/docs/xml/LuceneCoreQuery.dtd.html  |     2 +-
 .../docs/xml/LuceneCoreQuery.dtd.org.html          |     2 +-
 .../lucene/queryparser/classic/FastCharStream.java |     9 +-
 .../flexible/core/nodes/QueryNodeImpl.java         |     2 +-
 .../flexible/standard/parser/FastCharStream.java   |    11 +-
 .../surround/parser/FastCharStream.java            |    11 +-
 .../lucene/queryparser/xml/LuceneCoreQuery.dtd     |     2 +-
 .../apache/lucene/replicator/nrt/SimpleServer.java |     1 +
 .../idversion/VersionBlockTreeTermsWriter.java     |     2 +-
 .../codecs/idversion/VersionFieldReader.java       |     2 +-
 .../lucene/search/LatLonPointPrototypeQueries.java |     4 +-
 .../apache/lucene/search/PhraseWildcardQuery.java  |     2 +-
 .../lucene/search/TestPhraseWildcardQuery.java     |    10 +-
 lucene/site/changes/changes2html.pl                |     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 +-
 .../lucene/spatial/bbox/TestBBoxStrategy.java      |    32 +-
 .../lucene/spatial/prefix/DateNRStrategyTest.java  |     2 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java    |    32 +-
 .../lucene/spatial/prefix/JtsPolygonTest.java      |     6 +-
 .../spatial/prefix/NumberRangeFacetsTest.java      |    11 +-
 .../prefix/RandomSpatialOpStrategyTestCase.java    |     3 +-
 .../prefix/TestRecursivePrefixTreeStrategy.java    |     6 +-
 .../Geo3dShapeSphereModelRectRelationTest.java     |     2 +-
 .../spatial/spatial4j/RandomizedShapeTestCase.java |   233 -
 .../apache/lucene/spatial3d/TestGeo3DPoint.java    |     8 +-
 .../search/spell/LuceneLevenshteinDistance.java    |    24 +-
 .../apache/lucene/search/spell/SuggestWord.java    |     5 +
 .../suggest/analyzing/AnalyzingSuggester.java      |     4 +-
 .../suggest/analyzing/FreeTextSuggester.java       |     8 +-
 .../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 +-
 lucene/test-framework/build.gradle                 |    10 +-
 lucene/test-framework/ivy.xml                      |     2 +-
 .../UniformSplitRot13PostingsFormat.java           |    15 +
 .../STUniformSplitRot13PostingsFormat.java         |     7 +
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |     8 +-
 .../org/apache/lucene/geo/BaseXYPointTestCase.java |     8 +-
 .../apache/lucene/index/MockRandomMergePolicy.java |    32 +
 .../java/org/apache/lucene/index/RandomCodec.java  |    16 +-
 .../lucene/search/AssertingLeafCollector.java      |     6 +-
 .../java/org/apache/lucene/search/CheckHits.java   |    75 +-
 .../java/org/apache/lucene/search/QueryUtils.java  |    26 +-
 .../search/similarities/AssertingSimilarity.java   |     2 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |     1 +
 .../java/org/apache/lucene/util/fst/FSTTester.java |     5 +-
 .../org/apache/lucene/geo/lucene-9417.geojson.gz   |   Bin 0 -> 79049 bytes
 .../lucene/search/TestBaseExplanationTestCase.java |    12 +-
 .../util/TestExceptionInBeforeClassHooks.java      |     3 +-
 solr/CHANGES.txt                                   |   313 +-
 solr/bin/solr                                      |    31 +-
 solr/bin/solr.cmd                                  |    35 +-
 solr/bin/solr.in.cmd                               |     9 +-
 solr/bin/solr.in.sh                                |    10 +-
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |    11 +-
 .../mapping/DecimalNumericConversionFunction.java  |     2 +-
 .../function/mapping/ReplaceFunction.java          |     2 +-
 .../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 +
 .../handler/dataimport/MailEntityProcessor.java    |     7 +-
 .../handler/dataimport/TikaEntityProcessor.java    |     1 +
 .../src/java/overview.html                         |     2 +-
 .../collection1/conf/dataimport-solrconfig.xml     |     2 +-
 .../dataimport/TestMailEntityProcessor.java        |    13 +-
 solr/contrib/dataimporthandler/README.md           |     9 +
 .../solr/handler/dataimport/ClobTransformer.java   |     1 +
 .../apache/solr/handler/dataimport/Context.java    |     2 +
 .../solr/handler/dataimport/ContextImpl.java       |     7 +-
 .../solr/handler/dataimport/DataImportHandler.java |    11 +-
 .../solr/handler/dataimport/DataImporter.java      |     6 +
 .../handler/dataimport/DateFormatTransformer.java  |     1 +
 .../solr/handler/dataimport/DebugLogger.java       |    12 +-
 .../apache/solr/handler/dataimport/DocBuilder.java |    12 +-
 .../handler/dataimport/EntityProcessorWrapper.java |    22 +-
 .../handler/dataimport/HTMLStripTransformer.java   |     1 +
 .../solr/handler/dataimport/JdbcDataSource.java    |     1 +
 .../dataimport/NumberFormatTransformer.java        |     1 +
 .../dataimport/PlainTextEntityProcessor.java       |     1 +
 .../solr/handler/dataimport/RegexTransformer.java  |     4 +-
 .../handler/dataimport/TemplateTransformer.java    |     1 +
 .../handler/dataimport/XPathEntityProcessor.java   |     8 +-
 .../solr/handler/dataimport/XPathRecordReader.java |     1 +
 .../dataimporthandler/src/java/overview.html       |     2 +-
 .../collection1/conf/contentstream-solrconfig.xml  |     2 +-
 .../conf/dataimport-nodatasource-solrconfig.xml    |     2 +-
 .../collection1/conf/dataimport-solrconfig.xml     |     2 +-
 .../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 +-
 .../dataimport/MockInitialContextFactory.java      |     2 +-
 .../handler/dataimport/TestClobTransformer.java    |     2 +
 .../dataimport/TestContentStreamDataSource.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    |    14 +-
 .../dataimport/TestJdbcDataSourceConvertType.java  |     2 +-
 .../dataimport/TestLineEntityProcessor.java        |    14 +-
 .../dataimport/TestPlainTextEntityProcessor.java   |     3 +
 .../handler/dataimport/TestRegexTransformer.java   |     5 +
 .../handler/dataimport/TestScriptTransformer.java  |     4 +-
 .../TestSolrEntityProcessorEndToEnd.java           |    16 +-
 .../dataimport/TestSolrEntityProcessorUnit.java    |     3 +-
 .../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 |   207 +-
 .../extraction/ExtractingDocumentLoader.java       |     2 +
 .../extraction/ExtractingRequestHandler.java       |     2 +-
 .../handler/extraction/XLSXResponseWriter.java     |     4 +-
 .../extraction/ExtractingRequestHandlerTest.java   |     3 +
 .../solr/jaeger/JaegerTracerConfigurator.java      |     2 +-
 .../apache/solr/jaeger/TestJaegerConfigurator.java |     4 +
 .../OpenNLPLangDetectUpdateProcessorFactory.java   |     2 +-
 .../java/org/apache/solr/ltr/LTRThreadModule.java  |     7 +-
 .../java/org/apache/solr/ltr/feature/Feature.java  |     1 +
 .../org/apache/solr/ltr/feature/SolrFeature.java   |     8 +-
 .../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     |     1 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java    |    12 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |    25 -
 .../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 +
 .../conf/solr-exporter-config.xml                  |     8 +-
 .../collector/SchedulerMetricsCollector.java       |     3 +-
 .../solr/prometheus/exporter/MetricsQuery.java     |     1 +
 .../exporter/PrometheusExporterSettings.java       |     4 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |     1 +
 .../solr/prometheus/scraper/SolrScraper.java       |     2 +-
 ...theus-solr-exporter-integration-test-config.xml |     8 +-
 .../prometheus/PrometheusExporterTestBase.java     |     4 +-
 .../solr/response/VelocityResponseWriter.java      |     8 +-
 solr/core/build.gradle                             |     4 +
 solr/core/ivy.xml                                  |     1 +
 .../src/java/org/apache/solr/api/AnnotatedApi.java |   183 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |    21 +-
 .../apache/solr/api/CustomContainerPlugins.java    |   354 +
 .../src/java/org/apache/solr/api/PayloadObj.java   |    35 +-
 .../src/java/org/apache/solr/api/V2HttpCall.java   |    31 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    11 +-
 .../client/solrj/embedded/JettySolrRunner.java     |     6 +-
 .../apache/solr/cloud/CloudConfigSetService.java   |     1 +
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |     2 +-
 .../org/apache/solr/cloud/ElectionContext.java     |   709 -
 .../src/java/org/apache/solr/cloud/LockTree.java   |    54 +-
 .../src/java/org/apache/solr/cloud/Overseer.java   |    39 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |    18 +-
 .../apache/solr/cloud/OverseerElectionContext.java |   110 +
 .../apache/solr/cloud/OverseerMessageHandler.java  |     7 +-
 .../apache/solr/cloud/OverseerNodePrioritizer.java |    11 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |     4 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   181 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |     8 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    10 +-
 .../solr/cloud/ShardLeaderElectionContext.java     |   493 +
 .../solr/cloud/ShardLeaderElectionContextBase.java |   195 +
 .../java/org/apache/solr/cloud/SolrZkServer.java   |    70 -
 .../java/org/apache/solr/cloud/SyncStrategy.java   |     3 +-
 .../core/src/java/org/apache/solr/cloud/ZkCLI.java |    16 +-
 .../java/org/apache/solr/cloud/ZkController.java   |   199 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |     1 +
 .../solr/cloud/api/collections/AddReplicaCmd.java  |    77 +-
 .../solr/cloud/api/collections/AliasCmd.java       |     1 +
 .../apache/solr/cloud/api/collections/Assign.java  |   238 +-
 .../solr/cloud/api/collections/BackupCmd.java      |    11 +-
 .../solr/cloud/api/collections/CreateAliasCmd.java |     2 +-
 .../cloud/api/collections/CreateCollectionCmd.java |    94 +-
 .../solr/cloud/api/collections/CreateShardCmd.java |     1 +
 .../cloud/api/collections/CreateSnapshotCmd.java   |     8 +-
 .../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    |    12 +-
 .../solr/cloud/api/collections/DeleteShardCmd.java |     5 +-
 .../cloud/api/collections/DeleteSnapshotCmd.java   |     8 +-
 .../api/collections/MaintainRoutedAliasCmd.java    |     8 +-
 .../solr/cloud/api/collections/MigrateCmd.java     |     8 +-
 .../solr/cloud/api/collections/MoveReplicaCmd.java |    16 +-
 .../OverseerCollectionMessageHandler.java          |   101 +-
 .../cloud/api/collections/OverseerRoleCmd.java     |     6 +-
 .../cloud/api/collections/OverseerStatusCmd.java   |     7 +-
 .../api/collections/ReindexCollectionCmd.java      |    18 +-
 .../solr/cloud/api/collections/RenameCmd.java      |     2 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |    12 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |   387 +-
 .../solr/cloud/api/collections/RoutedAlias.java    |     9 +-
 .../cloud/api/collections/SetAliasPropCmd.java     |     2 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |    70 +-
 .../solr/cloud/api/collections/UtilizeNodeCmd.java |   137 -
 .../solr/cloud/autoscaling/ActionContext.java      |    68 -
 .../autoscaling/AutoAddReplicasPlanAction.java     |    40 -
 .../apache/solr/cloud/autoscaling/AutoScaling.java |   244 -
 .../solr/cloud/autoscaling/AutoScalingHandler.java |   732 -
 .../solr/cloud/autoscaling/ComputePlanAction.java  |   348 -
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |   248 -
 .../cloud/autoscaling/HttpTriggerListener.java     |   164 -
 .../autoscaling/InactiveMarkersPlanAction.java     |   141 -
 .../cloud/autoscaling/InactiveShardPlanAction.java |   162 -
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |   561 -
 .../solr/cloud/autoscaling/LoggingListener.java    |    38 -
 .../solr/cloud/autoscaling/MetricTrigger.java      |   219 -
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |   248 -
 .../solr/cloud/autoscaling/NodeLostTrigger.java    |   238 -
 .../cloud/autoscaling/OverseerTriggerThread.java   |   407 -
 .../solr/cloud/autoscaling/ScheduledTrigger.java   |   227 -
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |   910 --
 .../solr/cloud/autoscaling/SearchRateTrigger.java  |   801 --
 .../solr/cloud/autoscaling/SystemLogListener.java  |   219 -
 .../solr/cloud/autoscaling/TriggerAction.java      |    51 -
 .../solr/cloud/autoscaling/TriggerActionBase.java  |    87 -
 .../cloud/autoscaling/TriggerActionException.java  |    33 -
 .../apache/solr/cloud/autoscaling/TriggerBase.java |   297 -
 .../solr/cloud/autoscaling/TriggerEvent.java       |   311 -
 .../solr/cloud/autoscaling/TriggerEventQueue.java  |   119 -
 .../solr/cloud/autoscaling/TriggerListener.java    |    65 -
 .../cloud/autoscaling/TriggerListenerBase.java     |    97 -
 .../solr/cloud/autoscaling/TriggerUtils.java       |    87 -
 .../autoscaling/TriggerValidationException.java    |    74 -
 .../solr/cloud/autoscaling/package-info.java       |    21 -
 .../solr/cloud/autoscaling/sim/ActionError.java    |    24 -
 .../cloud/autoscaling/sim/FakeDocIterator.java     |    56 -
 .../autoscaling/sim/GenericDistributedQueue.java   |   601 -
 .../sim/GenericDistributedQueueFactory.java        |    45 -
 .../solr/cloud/autoscaling/sim/LiveNodesSet.java   |   113 -
 .../sim/NoopDistributedQueueFactory.java           |    94 -
 .../cloud/autoscaling/sim/SimCloudManager.java     |  1055 --
 .../autoscaling/sim/SimClusterStateProvider.java   |  2552 ----
 .../autoscaling/sim/SimDistribStateManager.java    |   648 -
 .../sim/SimDistributedQueueFactory.java            |   286 -
 .../autoscaling/sim/SimNodeStateProvider.java      |   356 -
 .../solr/cloud/autoscaling/sim/SimScenario.java    |  1121 --
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   435 -
 .../autoscaling/sim/SnapshotCloudManager.java      |   257 -
 .../sim/SnapshotClusterStateProvider.java          |   154 -
 .../sim/SnapshotDistribStateManager.java           |   226 -
 .../autoscaling/sim/SnapshotNodeStateProvider.java |   200 -
 .../solr/cloud/autoscaling/sim/package-info.java   |    94 -
 .../solr/cloud/overseer/ClusterStateMutator.java   |    19 +-
 .../solr/cloud/overseer/CollectionMutator.java     |     3 +-
 .../apache/solr/cloud/overseer/NodeMutator.java    |     4 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |    50 +-
 .../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   |    29 +-
 .../org/apache/solr/core/ConfigSetProperties.java  |     4 +-
 .../org/apache/solr/core/ConfigSetService.java     |    11 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   217 +-
 .../java/org/apache/solr/core/CoreDescriptor.java  |    10 +-
 .../apache/solr/core/CorePropertiesLocator.java    |    10 +-
 .../org/apache/solr/core/DirectoryFactory.java     |    19 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |     6 +-
 .../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  |   200 -
 .../solr/core/NRTCachingDirectoryFactory.java      |     1 +
 .../src/java/org/apache/solr/core/NodeConfig.java  |    40 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   239 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    58 +-
 .../org/apache/solr/core/QuerySenderListener.java  |    52 +-
 .../java/org/apache/solr/core/RequestParams.java   |    57 +-
 .../org/apache/solr/core/SchemaCodecFactory.java   |     1 +
 .../apache/solr/core/SimpleTextCodecFactory.java   |     1 +
 .../java/org/apache/solr/core/SolrClassLoader.java |    29 +
 .../src/java/org/apache/solr/core/SolrConfig.java  |    57 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   123 +-
 .../src/java/org/apache/solr/core/SolrCores.java   |    25 +-
 .../org/apache/solr/core/SolrDeletionPolicy.java   |     2 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |    71 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |   115 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |    18 +-
 .../apache/solr/core/TransientSolrCoreCache.java   |    10 -
 .../solr/core/TransientSolrCoreCacheDefault.java   |    17 +-
 .../solr/core/TransientSolrCoreCacheFactory.java   |     6 +-
 .../org/apache/solr/core/backup/BackupManager.java |     2 +-
 .../backup/repository/HdfsBackupRepository.java    |    14 +-
 .../repository/LocalFileSystemRepository.java      |     3 +-
 .../solr/core/snapshots/SolrSnapshotManager.java   |     4 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java     |     1 +
 .../apache/solr/filestore/DistribPackageStore.java |    75 +-
 .../org/apache/solr/filestore/PackageStore.java    |     7 +
 .../org/apache/solr/filestore/PackageStoreAPI.java |    72 +-
 .../solr/handler/AnalysisRequestHandlerBase.java   |     3 +
 .../org/apache/solr/handler/AnalyzeEvaluator.java  |     2 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |     2 +
 .../java/org/apache/solr/handler/CatStream.java    |    92 +-
 .../solr/handler/CdcrBufferStateManager.java       |     2 +
 .../solr/handler/CdcrLeaderStateManager.java       |     2 +
 .../solr/handler/CdcrProcessStateManager.java      |     2 +
 .../org/apache/solr/handler/CdcrReplicator.java    |     5 +
 .../apache/solr/handler/CdcrReplicatorManager.java |     9 +-
 .../apache/solr/handler/CdcrReplicatorState.java   |     2 +-
 .../apache/solr/handler/CdcrRequestHandler.java    |    36 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java    |    10 +-
 .../solr/handler/ContentStreamHandlerBase.java     |     2 +-
 .../handler/DocumentAnalysisRequestHandler.java    |     4 +-
 .../apache/solr/handler/DumpRequestHandler.java    |    10 +-
 .../org/apache/solr/handler/ExportHandler.java     |    80 +-
 .../solr/handler/FieldAnalysisRequestHandler.java  |     3 +
 .../java/org/apache/solr/handler/GraphHandler.java |    18 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |   144 +-
 .../apache/solr/handler/MoreLikeThisHandler.java   |     5 +-
 .../apache/solr/handler/PingRequestHandler.java    |     2 +-
 .../apache/solr/handler/ReplicationHandler.java    |   298 +-
 .../apache/solr/handler/RequestHandlerBase.java    |     8 +-
 .../java/org/apache/solr/handler/RestoreCore.java  |     1 +
 .../java/org/apache/solr/handler/SQLHandler.java   |    10 +-
 .../org/apache/solr/handler/SchemaHandler.java     |    58 +-
 .../java/org/apache/solr/handler/SnapShooter.java  |     6 +
 .../org/apache/solr/handler/SolrConfigHandler.java |    47 +-
 .../org/apache/solr/handler/StreamHandler.java     |    69 +-
 .../apache/solr/handler/UpdateRequestHandler.java  |     4 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |     2 +
 .../handler/admin/AutoscalingHistoryHandler.java   |   165 -
 .../solr/handler/admin/BaseHandlerApiSupport.java  |     5 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |    34 +-
 .../org/apache/solr/handler/admin/ColStatus.java   |     2 +-
 .../solr/handler/admin/CollectionsHandler.java     |    38 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |     6 +-
 .../solr/handler/admin/ContainerPluginsApi.java    |   179 +
 .../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     |     1 +
 .../apache/solr/handler/admin/MergeIndexesOp.java  |     8 +-
 .../handler/admin/MetricsCollectorHandler.java     |     2 +-
 .../apache/solr/handler/admin/MetricsHandler.java  |     7 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    36 +-
 .../solr/handler/admin/RebalanceLeaders.java       |     8 +-
 .../solr/handler/admin/SecurityConfHandler.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      |     1 +
 .../solr/handler/admin/ThreadDumpHandler.java      |    54 +-
 .../solr/handler/admin/ZookeeperInfoHandler.java   |   201 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |    14 +-
 .../solr/handler/component/CloudReplicaSource.java |     2 +
 .../solr/handler/component/DebugComponent.java     |    38 +-
 .../solr/handler/component/ExpandComponent.java    |    11 +-
 .../solr/handler/component/FacetComponent.java     |     6 +-
 .../solr/handler/component/FieldFacetStats.java    |     4 +-
 .../solr/handler/component/HighlightComponent.java |     9 +-
 .../solr/handler/component/HttpShardHandler.java   |   176 +-
 .../handler/component/HttpShardHandlerFactory.java |    70 +-
 .../handler/component/IterativeMergeStrategy.java  |     1 +
 .../solr/handler/component/MergeStrategy.java      |     1 +
 .../component/PhrasesIdentificationComponent.java  |     4 +
 .../component/PivotFacetFieldValueCollection.java  |     3 +-
 .../solr/handler/component/PivotFacetHelper.java   |     5 +
 .../handler/component/PivotFacetProcessor.java     |     4 +-
 .../solr/handler/component/QueryComponent.java     |     9 +-
 .../handler/component/QueryElevationComponent.java |     7 +-
 .../handler/component/RangeFacetProcessor.java     |     1 +
 .../handler/component/RealTimeGetComponent.java    |    43 +-
 .../solr/handler/component/ResponseBuilder.java    |     3 +-
 .../solr/handler/component/SearchComponent.java    |     2 +-
 .../solr/handler/component/SearchHandler.java      |    88 +-
 .../apache/solr/handler/component/ShardDoc.java    |     1 +
 .../component/ShardFieldSortedHitQueue.java        |     6 +-
 .../solr/handler/component/ShardResponse.java      |     4 +-
 .../handler/component/SortedDateStatsValues.java   |     2 +-
 .../component/SortedNumericStatsValues.java        |     2 +-
 .../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 |    20 +-
 .../solr/handler/component/SuggestComponent.java   |     9 +-
 .../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 +
 .../solr/handler/export/DoubleValueSortDoc.java    |     1 +
 .../apache/solr/handler/export/ExportBuffers.java  |   271 +
 .../apache/solr/handler/export/ExportWriter.java   |   306 +-
 .../solr/handler/export/ExportWriterStream.java    |   242 +
 .../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 +
 .../org/apache/solr/handler/export/LongValue.java  |     4 +-
 .../apache/solr/handler/export/PriorityQueue.java  |   218 -
 .../solr/handler/export/QuadValueSortDoc.java      |     1 +
 .../solr/handler/export/SingleValueSortDoc.java    |     3 +-
 .../org/apache/solr/handler/export/SortDoc.java    |    19 +-
 .../org/apache/solr/handler/export/SortQueue.java  |   155 +-
 .../solr/handler/export/StringFieldWriter.java     |    25 +-
 .../apache/solr/handler/export/StringValue.java    |    36 +-
 .../solr/handler/export/TripleValueSortDoc.java    |     1 +
 .../apache/solr/handler/loader/JavabinLoader.java  |     6 +-
 .../org/apache/solr/handler/loader/JsonLoader.java |    11 +-
 .../org/apache/solr/handler/loader/XMLLoader.java  |     2 +
 .../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/SolrTable.java     |    26 +-
 .../handler/sql/SolrToEnumerableConverter.java     |     3 +
 .../solr/handler/tagger/TaggerRequestHandler.java  |     9 +-
 .../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/highlight/UnifiedSolrHighlighter.java     |     3 +-
 .../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 +
 .../apache/solr/metrics/SolrCoreMetricManager.java |     4 +-
 .../org/apache/solr/metrics/SolrMetricManager.java |     8 +-
 .../solr/metrics/reporters/SolrSlf4jReporter.java  |     1 +
 .../reporters/solr/SolrClusterReporter.java        |     4 +-
 .../solr/metrics/reporters/solr/SolrReporter.java  |     3 +
 .../metrics/reporters/solr/SolrShardReporter.java  |     2 +-
 .../solr/metrics/rrd/SolrRrdBackendFactory.java    |     7 +-
 .../apache/solr/packagemanager/PackageManager.java |   444 +-
 .../apache/solr/packagemanager/PackageUtils.java   |     3 +
 .../solr/packagemanager/RepositoryManager.java     |    34 +-
 .../apache/solr/packagemanager/SolrPackage.java    |     4 +
 .../solr/packagemanager/SolrPackageInstance.java   |    23 +
 .../org/apache/solr/parser/FastCharStream.java     |    12 +
 .../apache/solr/parser/SolrQueryParserBase.java    |    27 +-
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |    62 +-
 .../java/org/apache/solr/pkg/PackageListeners.java |    53 +-
 .../solr/pkg/PackageListeningClassLoader.java      |   151 +
 .../java/org/apache/solr/pkg/PackageLoader.java    |    56 +-
 .../org/apache/solr/pkg/PackagePluginHolder.java   |    56 +-
 .../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 |     7 +-
 .../apache/solr/response/CSVResponseWriter.java    |     4 +-
 .../org/apache/solr/response/DocsStreamer.java     |     1 +
 .../solr/response/GeoJSONResponseWriter.java       |     2 +
 .../solr/response/GraphMLResponseWriter.java       |     8 +-
 .../apache/solr/response/JSONResponseWriter.java   |     9 +-
 .../apache/solr/response/PHPResponseWriter.java    |     6 +-
 .../solr/response/PHPSerializedResponseWriter.java |     8 +-
 .../apache/solr/response/PythonResponseWriter.java |     2 +-
 .../apache/solr/response/QueryResponseWriter.java  |     2 +-
 .../apache/solr/response/RawResponseWriter.java    |     2 +-
 .../apache/solr/response/RubyResponseWriter.java   |     2 +-
 .../solr/response/SchemaXmlResponseWriter.java     |     2 +-
 .../org/apache/solr/response/SchemaXmlWriter.java  |    18 +-
 .../apache/solr/response/SmileResponseWriter.java  |     2 +-
 .../apache/solr/response/SolrQueryResponse.java    |     1 +
 .../solr/response/TabularResponseWriter.java       |     6 +-
 .../apache/solr/response/XMLResponseWriter.java    |     2 +-
 .../java/org/apache/solr/response/XMLWriter.java   |    53 +-
 .../apache/solr/response/XSLTResponseWriter.java   |     2 +-
 .../transform/ExplainAugmenterFactory.java         |     2 +-
 .../response/transform/GeoTransformerFactory.java  |     1 +
 .../transform/RawValueTransformerFactory.java      |     3 +-
 .../response/transform/ShardAugmenterFactory.java  |     2 +-
 .../transform/SubQueryAugmenterFactory.java        |    50 +-
 .../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 |     4 +-
 .../solr/schema/ClassicIndexSchemaFactory.java     |     2 +-
 .../org/apache/solr/schema/CurrencyFieldType.java  |     5 +-
 .../org/apache/solr/schema/DatePointField.java     |     1 -
 .../solr/schema/ExternalFileFieldReloader.java     |     2 +-
 .../src/java/org/apache/solr/schema/FieldType.java |     3 +
 .../apache/solr/schema/FieldTypePluginLoader.java  |    15 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |   114 +-
 .../solr/schema/LatLonPointSpatialField.java       |     1 +
 .../java/org/apache/solr/schema/LatLonType.java    |     4 +
 .../org/apache/solr/schema/ManagedIndexSchema.java |    13 +-
 .../solr/schema/ManagedIndexSchemaFactory.java     |     2 +-
 .../solr/schema/OpenExchangeRatesOrgProvider.java  |     4 +-
 .../java/org/apache/solr/schema/PointField.java    |     2 +-
 .../org/apache/solr/schema/PreAnalyzedField.java   |     4 +-
 .../org/apache/solr/schema/RandomSortField.java    |     2 +-
 .../src/java/org/apache/solr/schema/RankField.java |   140 +
 .../solr/schema/RptWithGeometrySpatialField.java   |     1 +
 .../java/org/apache/solr/schema/SchemaManager.java |     2 +
 .../src/java/org/apache/solr/schema/StrField.java  |     2 +-
 .../org/apache/solr/schema/StrFieldSource.java     |     2 +-
 .../src/java/org/apache/solr/schema/TextField.java |     2 +-
 .../java/org/apache/solr/schema/TrieDateField.java |     1 +
 .../org/apache/solr/schema/TrieDoubleField.java    |     3 +-
 .../src/java/org/apache/solr/schema/TrieField.java |     1 +
 .../org/apache/solr/schema/TrieFloatField.java     |     3 +-
 .../java/org/apache/solr/schema/TrieIntField.java  |     3 +-
 .../java/org/apache/solr/schema/TrieLongField.java |     3 +-
 .../src/java/org/apache/solr/schema/UUIDField.java |     4 +-
 .../apache/solr/search/AbstractReRankQuery.java    |     2 +-
 .../org/apache/solr/search/BoolQParserPlugin.java  |    53 +-
 .../java/org/apache/solr/search/CacheConfig.java   |     8 +
 .../org/apache/solr/search/CacheRegenerator.java   |     4 +-
 .../java/org/apache/solr/search/CaffeineCache.java |     2 +
 .../solr/search/CollapsingQParserPlugin.java       |    12 +-
 .../solr/search/ComplexPhraseQParserPlugin.java    |     2 +-
 .../java/org/apache/solr/search/CursorMark.java    |     1 +
 .../apache/solr/search/ExportQParserPlugin.java    |     5 +
 .../apache/solr/search/ExtendedDismaxQParser.java  |     5 +-
 .../solr/search/FloatPayloadValueSource.java       |     4 +-
 .../org/apache/solr/search/FunctionRangeQuery.java |     1 +
 .../src/java/org/apache/solr/search/Grouping.java  |    41 +-
 .../solr/search/IGainTermsQParserPlugin.java       |     2 +
 .../org/apache/solr/search/JoinQParserPlugin.java  |   571 +-
 .../src/java/org/apache/solr/search/JoinQuery.java |   508 +
 .../org/apache/solr/search/MaxScoreCollector.java  |     6 +-
 .../java/org/apache/solr/search/QParserPlugin.java |     5 +-
 .../java/org/apache/solr/search/QueryContext.java  |     1 +
 .../java/org/apache/solr/search/QueryParsing.java  |     1 +
 .../org/apache/solr/search/RankQParserPlugin.java  |   158 +
 .../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 |     2 +-
 .../apache/solr/search/SolrConstantScoreQuery.java |     1 +
 .../org/apache/solr/search/SolrCoreParser.java     |     1 +
 .../apache/solr/search/SolrDocumentFetcher.java    |     3 +-
 .../java/org/apache/solr/search/SolrFilter.java    |     6 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |    63 +-
 .../org/apache/solr/search/TermsQParserPlugin.java |     3 +
 .../TextLogisticRegressionQParserPlugin.java       |     4 +-
 .../org/apache/solr/search/ValueSourceParser.java  |    26 +-
 .../org/apache/solr/search/XmlQParserPlugin.java   |     3 +-
 .../org/apache/solr/search/facet/FacetBucket.java  |     5 +-
 .../solr/search/facet/FacetFieldProcessor.java     |   101 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    38 +
 .../search/facet/FacetFieldProcessorByArrayDV.java |   177 +-
 .../org/apache/solr/search/facet/FacetParser.java  |   235 +-
 .../apache/solr/search/facet/FacetProcessor.java   |     1 -
 .../org/apache/solr/search/facet/FacetRequest.java |   258 +-
 .../solr/search/facet/ReadOnlyCountSlotAcc.java    |    31 +
 .../apache/solr/search/facet/RelatednessAgg.java   |   265 +-
 .../apache/solr/search/facet/SingletonDISI.java    |    48 +
 .../solr/search/facet/SingletonDocIterator.java    |    52 +
 .../java/org/apache/solr/search/facet/SlotAcc.java |   289 +-
 .../apache/solr/search/facet/SweepCountAware.java  |   187 +
 .../org/apache/solr/search/facet/SweepDISI.java    |    85 +
 .../apache/solr/search/facet/SweepDocIterator.java |    87 +
 .../apache/solr/search/facet/UnInvertedField.java  |    71 +-
 .../org/apache/solr/search/facet/UnionDISI.java    |   100 +
 .../apache/solr/search/facet/UnionDocIterator.java |   107 +
 .../solr/search/facet/UniqueBlockQueryAgg.java     |     4 +-
 .../solr/search/function/MultiStringFunction.java  |     4 +-
 .../search/function/ValueSourceRangeFilter.java    |     5 +-
 .../distance/GeoDistValueSourceParser.java         |     3 +-
 .../search/function/distance/GeohashFunction.java  |     2 +
 .../distance/GeohashHaversineFunction.java         |    10 +-
 .../function/distance/HaversineConstFunction.java  |    10 +-
 .../function/distance/HaversineFunction.java       |     9 +-
 .../function/distance/StringDistanceFunction.java  |     2 +
 .../function/distance/VectorDistanceFunction.java  |     9 +-
 .../solr/search/grouping/CommandHandler.java       |    16 +-
 .../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               |     4 +-
 .../solr/search/join/BlockJoinChildQParser.java    |     7 +-
 .../solr/search/join/BlockJoinParentQParser.java   |   105 +-
 .../search/join/ChildFieldValueSourceParser.java   |     4 +-
 .../search/join/CrossCollectionJoinQParser.java    |    92 +
 .../solr/search/join/CrossCollectionJoinQuery.java |   380 +
 .../apache/solr/search/join/FiltersQParser.java    |    91 +-
 .../solr/search/join/GraphEdgeCollector.java       |   207 +
 .../org/apache/solr/search/join/GraphQuery.java    |     2 +-
 .../solr/search/join/GraphTermsCollector.java      |   202 -
 .../solr/search/join/ScoreJoinQParserPlugin.java   |    19 +-
 .../org/apache/solr/search/join/XCJFQParser.java   |    90 -
 .../apache/solr/search/join/XCJFQParserPlugin.java |    66 -
 .../org/apache/solr/search/join/XCJFQuery.java     |   379 -
 .../apache/solr/search/mlt/CloudMLTQParser.java    |     4 +
 .../apache/solr/search/mlt/SimpleMLTQParser.java   |     1 +
 .../solr/search/stats/ExactSharedStatsCache.java   |     2 +-
 .../apache/solr/search/stats/ExactStatsCache.java  |    10 +
 .../apache/solr/search/stats/LRUStatsCache.java    |     4 +-
 .../org/apache/solr/search/stats/StatsCache.java   |     2 +-
 .../apache/solr/security/AuditLoggerPlugin.java    |     2 +
 .../apache/solr/security/AuthenticationPlugin.java |     9 +
 .../apache/solr/security/AuthorizationContext.java |    27 +-
 .../solr/security/AutorizationEditOperation.java   |     9 +
 .../org/apache/solr/security/BasicAuthPlugin.java  |     4 +-
 .../security/DelegationTokenKerberosFilter.java    |    19 +-
 .../ExternalRoleRuleBasedAuthorizationPlugin.java  |     7 +-
 .../solr/security/JWTVerificationkeyResolver.java  |     2 +-
 .../org/apache/solr/security/KerberosPlugin.java   |    35 +-
 .../solr/security/PKIAuthenticationPlugin.java     |     1 +
 .../java/org/apache/solr/security/Permission.java  |     9 +-
 .../solr/security/PermissionNameProvider.java      |     1 +
 .../security/RuleBasedAuthorizationPlugin.java     |    24 +-
 .../security/RuleBasedAuthorizationPluginBase.java |    68 +-
 .../security/Sha256AuthenticationProvider.java     |    11 +-
 .../apache/solr/servlet/DirectSolrConnection.java  |     4 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |    42 +-
 .../org/apache/solr/servlet/QueryRateLimiter.java  |    55 +
 .../org/apache/solr/servlet/RateLimitManager.java  |   181 +
 .../apache/solr/servlet/RequestRateLimiter.java    |   168 +
 .../org/apache/solr/servlet/ResponseUtils.java     |     3 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |    40 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |     2 +-
 .../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 +-
 .../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  |     6 +
 .../org/apache/solr/store/hdfs/HdfsFileWriter.java |     2 +
 .../solr/store/hdfs/HdfsLocalityReporter.java      |     4 +
 .../apache/solr/store/hdfs/HdfsLockFactory.java    |     4 +
 .../org/apache/solr/update/AddUpdateCommand.java   |     1 +
 .../org/apache/solr/update/CdcrTransactionLog.java |     2 +
 .../java/org/apache/solr/update/CdcrUpdateLog.java |     4 +
 .../java/org/apache/solr/update/CommitTracker.java |     1 +
 .../apache/solr/update/DefaultSolrCoreState.java   |     4 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |     1 +
 .../org/apache/solr/update/DocumentBuilder.java    |     1 +
 .../org/apache/solr/update/HdfsTransactionLog.java |     4 +
 .../java/org/apache/solr/update/HdfsUpdateLog.java |     9 +-
 .../org/apache/solr/update/IndexFingerprint.java   |     5 +-
 .../src/java/org/apache/solr/update/PeerSync.java  |    82 +-
 .../org/apache/solr/update/PeerSyncWithLeader.java |    29 +-
 .../org/apache/solr/update/SolrCmdDistributor.java |     1 +
 .../java/org/apache/solr/update/SolrCoreState.java |     3 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |    27 +-
 .../org/apache/solr/update/SolrIndexSplitter.java  |     1 +
 .../org/apache/solr/update/TransactionLog.java     |   165 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |    18 +-
 .../java/org/apache/solr/update/VersionInfo.java   |     4 +
 ...AbstractDefaultValueUpdateProcessorFactory.java |     2 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java     |     9 +-
 .../processor/AtomicUpdateDocumentMerger.java      |    58 +-
 .../processor/AtomicUpdateProcessorFactory.java    |     3 +-
 .../solr/update/processor/CdcrUpdateProcessor.java |     2 +
 .../processor/CdcrUpdateProcessorFactory.java      |     2 +-
 .../ClassificationUpdateProcessorFactory.java      |     2 +-
 .../CloneFieldUpdateProcessorFactory.java          |    11 +-
 .../ConcatFieldUpdateProcessorFactory.java         |     2 +-
 .../CountFieldValuesUpdateProcessorFactory.java    |     2 +-
 .../DefaultValueUpdateProcessorFactory.java        |     2 +-
 .../processor/DistributedZkUpdateProcessor.java    |     2 +-
 .../DocBasedVersionConstraintsProcessor.java       |     6 +-
 ...DocBasedVersionConstraintsProcessorFactory.java |     4 +-
 .../DocExpirationUpdateProcessorFactory.java       |    15 +-
 .../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       |     2 +-
 .../MaxFieldValueUpdateProcessorFactory.java       |     7 +-
 .../MinFieldValueUpdateProcessorFactory.java       |     7 +-
 .../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 +-
 .../update/processor/TolerantUpdateProcessor.java  |     2 +-
 .../processor/TrimFieldUpdateProcessorFactory.java |     2 +-
 .../TruncateFieldUpdateProcessorFactory.java       |     2 +-
 .../update/processor/URLClassifyProcessor.java     |    58 +-
 .../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 |   120 +-
 .../src/java/org/apache/solr/util/RTimerTree.java  |     1 +
 .../src/java/org/apache/solr/util/SolrCLI.java     |   425 +-
 .../java/org/apache/solr/util/SolrLogLayout.java   |     1 +
 .../java/org/apache/solr/util/SolrLogPostTool.java |   134 +-
 .../java/org/apache/solr/util/SolrPluginUtils.java |    25 +-
 .../java/org/apache/solr/util/TestInjection.java   |    15 +-
 .../solr/util/circuitbreaker/CircuitBreaker.java   |    56 +
 .../util/circuitbreaker/CircuitBreakerManager.java |   134 +
 .../util/circuitbreaker/MemoryCircuitBreaker.java  |   114 +
 .../SSLCredentialProviderFactory.java              |     4 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |     8 +-
 .../util/plugin/NamedListInitializedPlugin.java    |     2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    |     8 +-
 .../solr/util/tracing/SolrRequestCarrier.java      |     3 +-
 .../resources/EditableSolrConfigAttributes.json    |     5 +-
 solr/core/src/test-files/log4j2.xml                |    44 +-
 solr/core/src/test-files/runtimecode/MyPlugin.java |    43 +
 .../runtimecode/containerplugin.v.1.jar.bin        |   Bin 0 -> 867 bytes
 .../runtimecode/containerplugin.v.2.jar.bin        |   Bin 0 -> 867 bytes
 .../test-files/runtimecode/schema-plugins.jar.bin  |   Bin 0 -> 6814 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |    13 +
 .../solr/collection1/conf/schema-rank-fields.xml   |    27 +
 .../test-files/solr/collection1/conf/schema15.xml  |     3 +
 .../solr/collection1/conf/schema_latest.xml        |     4 +
 .../solr/collection1/conf/solrconfig-follower.xml  |    59 +
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |     0
 ...rottled.xml => solrconfig-leader-throttled.xml} |     0
 .../solr/collection1/conf/solrconfig-leader.xml    |    70 +
 .../conf/solrconfig-leader1-keepOneBackup.xml      |    49 +
 .../solr/collection1/conf/solrconfig-leader1.xml   |    68 +
 .../solr/collection1/conf/solrconfig-leader2.xml   |    66 +
 .../solr/collection1/conf/solrconfig-leader3.xml   |    67 +
 .../solr/collection1/conf/solrconfig-master.xml    |    70 -
 .../conf/solrconfig-master1-keepOneBackup.xml      |    49 -
 .../solr/collection1/conf/solrconfig-master1.xml   |    68 -
 .../solr/collection1/conf/solrconfig-master2.xml   |    66 -
 .../solr/collection1/conf/solrconfig-master3.xml   |    67 -
 .../conf/solrconfig-memory-circuitbreaker.xml      |    95 +
 .../solr/collection1/conf/solrconfig-repeater.xml  |     6 +-
 .../conf/solrconfig-replication-legacy.xml         |    62 +
 .../solr/collection1/conf/solrconfig-slave.xml     |    59 -
 .../solr/collection1/conf/solrconfig-tlog.xml      |     4 -
 .../conf/solrconfig.snippet.randomindexconfig.xml  |     1 +
 .../configsets/{xcjf => ccjoin}/conf/schema.xml    |     0
 .../solr/configsets/ccjoin/conf/solrconfig.xml     |    62 +
 .../solr/configsets/xcjf/conf/solrconfig.xml       |    72 -
 .../security/hadoop_kerberos_authz_config.json     |    37 +
 .../solr/simSnapshot/autoscalingState.json         |  3923 ------
 .../test-files/solr/simSnapshot/clusterState.json  |  2854 ----
 .../test-files/solr/simSnapshot/distribState.json  |   206 -
 .../test-files/solr/simSnapshot/managerState.json  |     1 -
 .../src/test-files/solr/simSnapshot/nodeState.json |  3823 ------
 .../test-files/solr/simSnapshot/statistics.json    |  2045 ---
 solr/core/src/test-files/solr/solr-50-all.xml      |     1 +
 .../core/src/test-files/solr/solr-solrreporter.xml |     2 +
 solr/core/src/test-files/solr/solr.xml             |     1 +
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |     7 +-
 .../org/apache/solr/BasicFunctionalityTest.java    |    10 +-
 .../src/test/org/apache/solr/CursorPagingTest.java |     8 +
 .../apache/solr/HelloWorldSolrCloudTestCase.java   |     4 +-
 .../src/test/org/apache/solr/OutputWriterTest.java |     2 +-
 .../src/test/org/apache/solr/SolrInfoBeanTest.java |     6 +-
 .../org/apache/solr/TestDistributedGrouping.java   |     3 +
 .../org/apache/solr/TestDistributedSearch.java     |    10 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |     7 +-
 solr/core/src/test/org/apache/solr/TestJoin.java   |    12 +-
 .../test/org/apache/solr/TestRandomDVFaceting.java |     3 +-
 .../test/org/apache/solr/TestRandomFaceting.java   |    15 +-
 .../org/apache/solr/TestSolrCoreProperties.java    |     1 +
 .../solr/analysis/TestDeprecatedFilters.java       |     2 +-
 .../apache/solr/analysis/TokenizerChainTest.java   |     1 +
 .../TestEmbeddedSolrServerAdminHandler.java        |     6 +
 .../TestEmbeddedSolrServerConstructors.java        |     1 +
 .../test/org/apache/solr/cloud/AddReplicaTest.java |    12 +-
 .../apache/solr/cloud/AliasIntegrationTest.java    |     2 +-
 .../cloud/AssignBackwardCompatibilityTest.java     |     1 -
 .../apache/solr/cloud/BasicDistributedZk2Test.java |     5 +-
 .../apache/solr/cloud/BasicDistributedZkTest.java  |    14 +-
 .../test/org/apache/solr/cloud/BasicZkTest.java    |   181 -
 .../solr/cloud/ChaosMonkeyNothingIsSafeTest.java   |     3 +-
 ...aosMonkeyNothingIsSafeWithPullReplicasTest.java |     3 +-
 .../solr/cloud/ChaosMonkeySafeLeaderTest.java      |     2 +-
 .../ChaosMonkeySafeLeaderWithPullReplicasTest.java |     2 +-
 .../test/org/apache/solr/cloud/CloudTestUtils.java |   189 -
 .../apache/solr/cloud/ClusterStateMockUtil.java    |    13 +-
 .../org/apache/solr/cloud/ClusterStateTest.java    |     8 +-
 .../org/apache/solr/cloud/CollectionPropsTest.java |     5 +-
 .../solr/cloud/CollectionStateFormat2Test.java     |    71 -
 .../solr/cloud/CollectionStateZnodeTest.java       |    70 +
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |    50 +-
 .../org/apache/solr/cloud/ConfigSetsAPITest.java   |     1 +
 .../apache/solr/cloud/CreateRoutedAliasTest.java   |     4 -
 .../solr/cloud/DeleteInactiveReplicaTest.java      |     4 -
 .../cloud/DeleteLastCustomShardedReplicaTest.java  |     1 -
 .../test/org/apache/solr/cloud/DeleteNodeTest.java |     2 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |    34 +-
 .../org/apache/solr/cloud/DeleteShardTest.java     |     1 -
 .../apache/solr/cloud/DistribCursorPagingTest.java |     1 +
 .../DistribDocExpirationUpdateProcessorTest.java   |     5 +-
 .../apache/solr/cloud/DocValuesNotIndexedTest.java |     1 -
 .../org/apache/solr/cloud/ForceLeaderTest.java     |     2 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   |     2 +-
 .../solr/cloud/HttpPartitionOnCommitTest.java      |     4 +-
 .../org/apache/solr/cloud/HttpPartitionTest.java   |    13 +-
 .../apache/solr/cloud/KerberosTestServices.java    |     4 +-
 .../solr/cloud/LeaderElectionContextKeyTest.java   |     1 -
 .../solr/cloud/LeaderElectionIntegrationTest.java  |     2 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java    |     2 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |     2 +
 .../solr/cloud/LegacyCloudClusterPropTest.java     |   180 -
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |    28 +-
 .../org/apache/solr/cloud/MigrateRouteKeyTest.java |     5 -
 .../solr/cloud/MissingSegmentRecoveryTest.java     |     1 -
 .../test/org/apache/solr/cloud/MockSolrSource.java |     2 +-
 .../solr/cloud/MoveReplicaHDFSFailoverTest.java    |     4 +
 .../org/apache/solr/cloud/MoveReplicaHDFSTest.java |     4 +
 .../org/apache/solr/cloud/MoveReplicaTest.java     |     3 -
 .../solr/cloud/MultiSolrCloudTestCaseTest.java     |     6 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java    |    68 +-
 .../solr/cloud/NestedShardedAtomicUpdateTest.java  |     4 +
 .../org/apache/solr/cloud/NodeMutatorTest.java     |     6 +-
 .../OverseerCollectionConfigSetProcessorTest.java  |    90 +-
 .../solr/cloud/OverseerModifyCollectionTest.java   |     1 +
 .../org/apache/solr/cloud/OverseerStatusTest.java  |     1 +
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |     1 +
 .../test/org/apache/solr/cloud/OverseerTest.java   |   163 +-
 .../test/org/apache/solr/cloud/RecoveryZkTest.java |     1 -
 .../apache/solr/cloud/ReindexCollectionTest.java   |     3 +-
 .../apache/solr/cloud/ReplaceNodeNoTargetTest.java |   126 -
 .../org/apache/solr/cloud/ReplaceNodeTest.java     |     2 +-
 .../apache/solr/cloud/ReplicationFactorTest.java   |    12 +-
 .../org/apache/solr/cloud/RollingRestartTest.java  |     2 +-
 .../test/org/apache/solr/cloud/RouteFieldTest.java |   163 +
 .../cloud/RoutingToNodesWithPropertiesTest.java    |   241 -
 .../org/apache/solr/cloud/SSLMigrationTest.java    |     1 +
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |     4 +
 .../apache/solr/cloud/ShardRoutingCustomTest.java  |     3 -
 .../cloud/SharedFSAutoReplicaFailoverTest.java     |    28 +-
 .../test/org/apache/solr/cloud/SliceStateTest.java |     4 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java    |     2 +
 .../test/org/apache/solr/cloud/SplitShardTest.java |     3 -
 .../test/org/apache/solr/cloud/SyncSliceTest.java  |     1 +
 .../solr/cloud/SystemCollectionCompatTest.java     |     2 +-
 .../solr/cloud/TestAuthenticationFramework.java    |     9 +-
 .../apache/solr/cloud/TestBaseStatsCacheCloud.java |     2 +-
 .../apache/solr/cloud/TestCloudConsistency.java    |     2 +
 .../TestCloudPhrasesIdentificationComponent.java   |     4 +
 .../org/apache/solr/cloud/TestCloudRecovery.java   |     1 -
 .../org/apache/solr/cloud/TestCloudRecovery2.java  |     1 -
 .../solr/cloud/TestCloudSearcherWarming.java       |     4 +-
 .../apache/solr/cloud/TestClusterProperties.java   |    12 -
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    27 +-
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |     4 +
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |    28 +-
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |   208 -
 .../cloud/TestDeleteCollectionOnDownNodes.java     |     1 -
 .../cloud/TestDynamicFieldNamesIndexCorrectly.java |     2 +-
 .../org/apache/solr/cloud/TestHashPartitioner.java |     1 +
 .../solr/cloud/TestOnReconnectListenerSupport.java |     2 +-
 .../org/apache/solr/cloud/TestPullReplica.java     |    24 +-
 .../solr/cloud/TestPullReplicaErrorHandling.java   |    18 -
 .../solr/cloud/TestQueryingOnDownCollection.java   |     2 +
 .../apache/solr/cloud/TestRebalanceLeaders.java    |     2 +-
 .../apache/solr/cloud/TestRequestForwarding.java   |     1 -
 .../apache/solr/cloud/TestSSLRandomization.java    |    12 +-
 .../solr/cloud/TestSkipOverseerOperations.java     |     1 -
 .../cloud/TestSolrCloudWithDelegationTokens.java   |    12 +-
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |     8 +-
 .../TestSolrCloudWithSecureImpersonation.java      |     4 +-
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |    16 +-
 .../org/apache/solr/cloud/TestTlogReplica.java     |    98 +-
 .../org/apache/solr/cloud/TestUtilizeNode.java     |   184 -
 .../org/apache/solr/cloud/TestWithCollection.java  |   605 -
 .../test/org/apache/solr/cloud/TestZkChroot.java   |   153 -
 .../apache/solr/cloud/UnloadDistributedZkTest.java |     2 +
 .../org/apache/solr/cloud/ZkControllerTest.java    |     3 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java    |     1 -
 .../org/apache/solr/cloud/ZkSolrClientTest.java    |    12 +-
 .../AbstractCloudBackupRestoreTestCase.java        |    57 +-
 .../solr/cloud/api/collections/AssignTest.java     |   203 -
 .../AsyncCallRequestStatusResponseTest.java        |     1 -
 .../api/collections/CollectionReloadTest.java      |     2 +-
 .../collections/CollectionTooManyReplicasTest.java |    68 +-
 .../CollectionsAPIAsyncDistributedZkTest.java      |    18 +-
 .../CollectionsAPIDistributedZkTest.java           |    31 +-
 .../ConcurrentCreateCollectionTest.java            |   293 -
 .../api/collections/CustomCollectionTest.java      |     8 -
 .../HdfsCollectionsAPIDistributedZkTest.java       |     4 +
 .../solr/cloud/api/collections/ShardSplitTest.java |    26 +-
 .../SimpleCollectionCreateDeleteTest.java          |     7 +-
 .../cloud/api/collections/SplitByPrefixTest.java   |     1 -
 .../cloud/api/collections/TestCollectionAPI.java   |   114 +-
 .../TestCollectionsAPIViaSolrCloudCluster.java     |     3 -
 .../collections/TestHdfsCloudBackupRestore.java    |     5 +
 .../collections/TestLocalFSCloudBackupRestore.java |     3 +-
 .../api/collections/TestReplicaProperties.java     |     6 +-
 .../TestRequestStatusCollectionAPI.java            |     5 +-
 .../AutoAddReplicasIntegrationTest.java            |   473 -
 .../autoscaling/AutoAddReplicasPlanActionTest.java |   260 -
 .../cloud/autoscaling/AutoScalingHandlerTest.java  |  1093 --
 .../solr/cloud/autoscaling/CapturedEvent.java      |    65 -
 .../cloud/autoscaling/ComputePlanActionTest.java   |   771 --
 .../cloud/autoscaling/ExecutePlanActionTest.java   |   380 -
 .../HdfsAutoAddReplicasIntegrationTest.java        |    57 -
 .../cloud/autoscaling/HttpTriggerListenerTest.java |   207 -
 .../IndexSizeTriggerMixedBoundsTest.java           |   372 -
 .../IndexSizeTriggerSizeEstimationTest.java        |   320 -
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |   780 --
 .../autoscaling/MetricTriggerIntegrationTest.java  |   241 -
 .../solr/cloud/autoscaling/MetricTriggerTest.java  |   136 -
 .../NodeAddedTriggerIntegrationTest.java           |   318 -
 .../cloud/autoscaling/NodeAddedTriggerTest.java    |   342 -
 .../NodeLostTriggerIntegrationTest.java            |   354 -
 .../cloud/autoscaling/NodeLostTriggerTest.java     |   391 -
 .../autoscaling/NodeMarkersRegistrationTest.java   |   354 -
 .../cloud/autoscaling/RestoreTriggerStateTest.java |   166 -
 .../ScheduledMaintenanceTriggerTest.java           |   379 -
 .../ScheduledTriggerIntegrationTest.java           |   148 -
 .../cloud/autoscaling/ScheduledTriggerTest.java    |   141 -
 .../SearchRateTriggerIntegrationTest.java          |   744 --
 .../cloud/autoscaling/SearchRateTriggerTest.java   |   357 -
 .../cloud/autoscaling/SystemLogListenerTest.java   |   291 -
 .../solr/cloud/autoscaling/TestPolicyCloud.java    |   542 -
 .../TriggerCooldownIntegrationTest.java            |   227 -
 .../cloud/autoscaling/TriggerEventQueueTest.java   |    98 -
 .../cloud/autoscaling/TriggerIntegrationTest.java  |   724 -
 .../TriggerSetPropertiesIntegrationTest.java       |   275 -
 .../autoscaling/sim/SimSolrCloudTestCase.java      |   255 -
 .../sim/TestSimClusterStateProvider.java           |   228 -
 .../autoscaling/sim/TestSimComputePlanAction.java  |   388 -
 .../sim/TestSimDistribStateManager.java            |   380 -
 .../autoscaling/sim/TestSimDistributedQueue.java   |   221 -
 .../autoscaling/sim/TestSimExecutePlanAction.java  |   223 -
 .../autoscaling/sim/TestSimExtremeIndexing.java    |   146 -
 .../sim/TestSimGenericDistributedQueue.java        |    38 -
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   874 --
 .../autoscaling/sim/TestSimNodeAddedTrigger.java   |   329 -
 .../autoscaling/sim/TestSimNodeLostTrigger.java    |   347 -
 .../cloud/autoscaling/sim/TestSimPolicyCloud.java  |   379 -
 .../cloud/autoscaling/sim/TestSimScenario.java     |   169 -
 .../autoscaling/sim/TestSimTriggerIntegration.java |  1544 ---
 .../solr/cloud/autoscaling/sim/TestSimUtils.java   |    95 -
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   275 -
 .../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java |    20 +-
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java     |     2 -
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |     1 -
 .../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java  |     5 +-
 .../cloud/cdcr/CdcrReplicationHandlerTest.java     |    88 +-
 .../solr/cloud/cdcr/CdcrRequestHandlerTest.java    |     5 +
 .../solr/cloud/hdfs/HDFSCollectionsAPITest.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java     |     4 +
 .../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java     |     4 +
 .../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java |     6 +-
 .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java      |     4 +
 .../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java |     4 +
 .../cloud/hdfs/HdfsRestartWhileUpdatingTest.java   |     4 +
 .../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java |     4 +
 .../HdfsTlogReplayBufferedWhileIndexingTest.java   |     4 +
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java    |     4 +
 .../hdfs/HdfsWriteToMultipleCollectionsTest.java   |     6 +-
 .../org/apache/solr/cloud/hdfs/StressHdfsTest.java |    13 +-
 .../cloud/overseer/TestClusterStateMutator.java    |     9 +-
 .../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 |    14 +-
 .../test/org/apache/solr/cloud/rule/RulesTest.java |    72 +-
 .../solr/common/cloud/ZkDynamicConfigTest.java     |     9 +-
 .../solr/core/BlobRepositoryMockingTest.java       |    10 +-
 .../test/org/apache/solr/core/CoreSorterTest.java  |     6 +-
 .../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 |     5 +
 .../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/RequestHandlersTest.java  |     1 +
 .../org/apache/solr/core/ResourceLoaderTest.java   |     8 +-
 .../test/org/apache/solr/core/SolrCoreTest.java    |     2 +
 .../org/apache/solr/core/TestCodecSupport.java     |     2 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |     2 +
 .../org/apache/solr/core/TestConfigOverlay.java    |     3 +
 .../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   |   287 -
 .../apache/solr/core/TestDynamicLoadingUrl.java    |   127 -
 .../test/org/apache/solr/core/TestDynamicURP.java  |   111 -
 .../test/org/apache/solr/core/TestInitParams.java  |    12 +-
 .../org/apache/solr/core/TestJmxIntegration.java   |     1 +
 .../test/org/apache/solr/core/TestLazyCores.java   |     4 +
 .../apache/solr/core/TestShardHandlerFactory.java  |     1 +
 .../apache/solr/core/TestSolrConfigHandler.java    |    71 +-
 .../src/test/org/apache/solr/core/TestSolrXml.java |    10 +
 .../core/snapshots/TestSolrCloudSnapshots.java     |    20 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |    26 +-
 .../solr/filestore/TestDistribPackageStore.java    |    79 +-
 .../handler/AnalysisRequestHandlerTestBase.java    |     2 +-
 .../apache/solr/handler/BackupRestoreUtils.java    |    20 +-
 .../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  |     1 +
 .../apache/solr/handler/TestContainerPlugin.java   |   377 +
 .../org/apache/solr/handler/TestCoreBackup.java    |    46 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |    18 +-
 .../solr/handler/TestReplicationHandler.java       |  1284 +-
 .../solr/handler/TestReplicationHandlerBackup.java |    68 +-
 .../TestReplicationHandlerDiskOverFlow.java        |    79 +-
 .../org/apache/solr/handler/TestReqParamsAPI.java  |     2 +
 .../org/apache/solr/handler/TestRestoreCore.java   |    83 +-
 .../org/apache/solr/handler/TestSQLHandler.java    |     3 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |     4 +-
 .../handler/TestSolrConfigHandlerConcurrent.java   |    12 +-
 .../solr/handler/TestStressThreadBackup.java       |    13 +
 .../handler/ThrowErrorOnInitRequestHandler.java    |     2 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |    29 +-
 .../org/apache/solr/handler/V2StandaloneTest.java  |     2 +
 .../solr/handler/XsltUpdateRequestHandlerTest.java |     7 +-
 .../admin/AutoscalingHistoryHandlerTest.java       |   463 -
 .../handler/admin/CoreAdminCreateDiscoverTest.java |     2 +
 .../solr/handler/admin/CoreAdminHandlerTest.java   |     7 +-
 .../handler/admin/CoreAdminRequestStatusTest.java  |     2 +
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |    13 +-
 .../solr/handler/admin/DaemonStreamApiTest.java    |     3 -
 .../solr/handler/admin/HealthCheckHandlerTest.java |     3 +-
 .../solr/handler/admin/IndexSizeEstimatorTest.java |    12 +-
 .../solr/handler/admin/MBeansHandlerTest.java      |     2 +
 .../solr/handler/admin/MetricsHandlerTest.java     |    18 +
 .../handler/admin/MetricsHistoryHandlerTest.java   |    45 +-
 .../admin/PropertiesRequestHandlerTest.java        |     1 +
 .../handler/admin/SecurityConfHandlerTest.java     |     7 +-
 .../solr/handler/admin/StatsReloadRaceTest.java    |     2 +
 .../solr/handler/admin/TestApiFramework.java       |    55 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |    28 +-
 .../apache/solr/handler/admin/TestConfigsApi.java  |    20 +-
 .../solr/handler/admin/TestCoreAdminApis.java      |    12 +-
 .../solr/handler/admin/ThreadDumpHandlerTest.java  |   239 +
 .../handler/admin/ZookeeperStatusHandlerTest.java  |    17 +-
 .../component/CustomHighlightComponentTest.java    |    25 +-
 .../component/CustomTermsComponentTest.java        |     2 +-
 .../solr/handler/component/DebugComponentTest.java |    40 +-
 .../component/DistributedDebugComponentTest.java   |     8 +-
 .../component/DistributedFacetPivotLargeTest.java  |     3 +-
 .../DistributedFacetPivotLongTailTest.java         |     2 +
 .../component/DistributedFacetPivotSmallTest.java  |    26 +-
 .../component/DistributedMLTComponentTest.java     |     2 +-
 .../DistributedQueryComponentOptimizationTest.java |     2 +-
 .../handler/component/InfixSuggestersTest.java     |     2 +
 .../PhrasesIdentificationComponentTest.java        |     4 +
 .../component/QueryElevationComponentTest.java     |    71 +-
 .../solr/handler/component/SearchHandlerTest.java  |    74 +-
 .../handler/component/ShardsWhitelistTest.java     |     6 +-
 .../handler/component/SpellCheckComponentTest.java |     7 +-
 .../solr/handler/component/StatsComponentTest.java |     7 +-
 .../solr/handler/component/TermsComponentTest.java |    13 +-
 .../component/TestHttpShardHandlerFactory.java     |     4 +-
 .../component/TestTrackingShardHandlerFactory.java |     4 +-
 .../solr/handler/export/TestExportWriter.java      |    82 +-
 .../apache/solr/handler/tagger/TaggerTestCase.java |     5 +-
 .../apache/solr/highlight/DummyHighlighter.java    |     1 +
 .../org/apache/solr/highlight/HighlighterTest.java |    20 +-
 .../solr/highlight/TestUnifiedSolrHighlighter.java |    16 +-
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |     6 +
 .../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        |     1 -
 .../metrics/reporters/SolrSlf4jReporterTest.java   |     1 +
 .../reporters/solr/SolrCloudReportersTest.java     |     2 -
 .../reporters/solr/SolrShardReporterTest.java      |    12 +
 .../solr/parser/SolrQueryParserBaseTest.java       |   137 +
 .../src/test/org/apache/solr/pkg/TestPackages.java |   318 +-
 .../org/apache/solr/request/SimpleFacetsTest.java  |     1 +
 .../apache/solr/request/TestIntervalFaceting.java  |     2 +-
 .../solr/request/macro/TestMacroExpander.java      |     2 +
 .../org/apache/solr/response/JSONWriterTest.java   |     2 +
 .../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 +-
 .../org/apache/solr/response/TestPushWriter.java   |    65 +-
 .../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 |     4 +-
 .../schema/ManagedSchemaRoundRobinCloudTest.java   |     1 -
 .../schema/OpenExchangeRatesOrgProviderTest.java   |     2 +-
 .../PreAnalyzedFieldManagedSchemaCloudTest.java    |     1 -
 .../test/org/apache/solr/schema/RankFieldTest.java |   285 +
 .../solr/schema/ResolveAnalyzerByNameTest.java     |     7 +
 .../apache/solr/schema/SchemaApiFailureTest.java   |     1 -
 .../solr/schema/SpatialRPTFieldTypeTest.java       |     2 +
 .../solr/schema/TestBulkSchemaConcurrent.java      |    21 +-
 .../apache/solr/schema/TestCloudManagedSchema.java |     3 +
 .../org/apache/solr/schema/TestManagedSchema.java  |     3 +
 .../solr/schema/TestManagedSchemaThreadSafety.java |     1 +
 .../org/apache/solr/schema/TestPointFields.java    |     1 +
 .../solr/schema/TestUseDocValuesAsStored2.java     |     1 +
 .../apache/solr/schema/WrappedTrieIntField.java    |     1 +
 .../solr/search/AnalyticsMergeStrategyTest.java    |     4 +
 .../solr/search/AnalyticsTestQParserPlugin.java    |    11 +
 .../solr/search/CurrencyRangeFacetCloudTest.java   |    29 +-
 .../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  |    28 +-
 .../apache/solr/search/RankQParserPluginTest.java  |   258 +
 .../apache/solr/search/RankQueryTestPlugin.java    |    25 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |     8 +-
 .../solr/search/TestCollapseQParserPlugin.java     |     8 +-
 .../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    |    14 +-
 .../test/org/apache/solr/search/TestRecovery.java  |    10 +
 .../org/apache/solr/search/TestRecoveryHdfs.java   |     9 +
 .../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 +
 .../org/apache/solr/search/TestStressRecovery.java |     2 +
 .../org/apache/solr/search/TestStressReorder.java  |     2 +
 .../apache/solr/search/TestStressUserVersions.java |     2 +
 .../org/apache/solr/search/TestStressVersions.java |     2 +
 .../apache/solr/search/TestTermsQParserPlugin.java |     6 +
 .../org/apache/solr/search/facet/DebugAgg.java     |     4 +-
 ...stributedFacetSimpleRefinementLongTailTest.java |    11 +-
 .../solr/search/facet/RangeFacetCloudTest.java     |    42 +-
 .../search/facet/SpatialHeatmapFacetsTest.java     |     5 +
 .../search/facet/TestCloudJSONFacetJoinDomain.java |    45 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |    64 +-
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |   314 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |    97 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |   111 +
 .../search/facet/TestJsonFacetsStatsParsing.java   |     2 +
 .../facet/TestJsonFacetsWithNestedObjects.java     |    58 +
 .../solr/search/function/NvlValueSourceParser.java |     2 +-
 .../function/TestMinMaxOnMultiValuedField.java     |    13 +-
 .../search/join/CrossCollectionJoinQueryTest.java  |   280 +
 .../solr/search/join/TestCloudNestedDocsSort.java  |     4 +-
 .../solr/search/join/TestNestedDocsSort.java       |     1 +
 .../org/apache/solr/search/join/XCJFQueryTest.java |   280 -
 .../join/another/BJQFilterAccessibleTest.java      |     2 +-
 .../apache/solr/search/json/TestJsonRequest.java   |    70 +-
 .../solr/search/mlt/CloudMLTQParserTest.java       |     1 +
 .../apache/solr/search/stats/TestDistribIDF.java   |     2 -
 .../solr/security/AuditLoggerIntegrationTest.java  |    10 +-
 .../BaseTestRuleBasedAuthorizationPlugin.java      |   181 +-
 .../solr/security/BasicAuthIntegrationTest.java    |     3 +
 .../solr/security/BasicAuthOnSingleNodeTest.java   |    45 +-
 .../solr/security/BasicAuthStandaloneTest.java     |     2 +-
 .../security/HttpParamDelegationTokenPlugin.java   |     2 +-
 .../security/JWTAuthPluginIntegrationTest.java     |     6 +-
 .../security/JWTVerificationkeyResolverTest.java   |     4 +-
 .../solr/security/TestAuthorizationFramework.java  |     3 +
 .../security/TestSha256AuthenticationProvider.java |     4 +
 .../solr/security/hadoop/ImpersonationUtil.java    |     1 +
 .../apache/solr/security/hadoop/KerberosUtils.java |    93 +
 .../hadoop/TestDelegationWithHadoopAuth.java       |     7 +-
 .../TestRuleBasedAuthorizationWithKerberos.java    |    81 +
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |    61 +-
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |     1 +
 .../solr/servlet/HttpSolrCallGetCoreTest.java      |     1 -
 .../apache/solr/servlet/SolrRequestParserTest.java |     2 +
 .../solr/servlet/TestRequestRateLimiter.java       |   231 +
 .../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 +
 .../solr/spelling/suggest/SuggesterTest.java       |     2 +
 .../solr/store/blockcache/BlockCacheTest.java      |    16 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |     6 +-
 .../solr/store/hdfs/HdfsLockFactoryTest.java       |     4 +
 .../org/apache/solr/update/CdcrUpdateLogTest.java  |     8 +
 .../solr/update/DirectUpdateHandlerTest.java       |     3 +-
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |     2 +-
 .../solr/update/MockStreamingSolrClients.java      |     2 +-
 .../apache/solr/update/MockingHttp2SolrClient.java |    26 +-
 .../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/SolrIndexConfigTest.java    |    19 +
 .../apache/solr/update/SolrIndexSplitterTest.java  |     3 +
 .../org/apache/solr/update/TestHdfsUpdateLog.java  |     4 +
 .../update/TestInPlaceUpdateWithRouteField.java    |     1 -
 .../solr/update/TestInPlaceUpdatesDistrib.java     |     8 +-
 .../solr/update/TestInPlaceUpdatesStandalone.java  |     1 +
 .../solr/update/TestNestedUpdateProcessor.java     |     2 +
 .../test/org/apache/solr/update/TestUpdate.java    |     2 +-
 .../test/org/apache/solr/update/UpdateLogTest.java |     1 +
 .../processor/AtomicUpdateRemovalJavabinTest.java  |     2 -
 .../solr/update/processor/AtomicUpdatesTest.java   |    15 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    |    18 +-
 .../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 +
 .../apache/solr/update/processor/RuntimeUrp.java   |    40 -
 .../SignatureUpdateProcessorFactoryTest.java       |     1 +
 .../SkipExistingDocumentsProcessorFactoryTest.java |     1 +
 .../processor/TestNamedUpdateProcessors.java       |   162 -
 .../TimeRoutedAliasUpdateProcessorTest.java        |    28 +-
 .../processor/TolerantUpdateProcessorTest.java     |     2 +-
 .../processor/TrackingUpdateProcessorFactory.java  |     2 +-
 .../update/processor/URLClassifyProcessorTest.java |     2 +
 .../UpdateRequestProcessorFactoryTest.java         |     2 +-
 .../org/apache/solr/util/MockCoreContainer.java    |     2 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |    18 +-
 .../org/apache/solr/util/SolrPluginUtilsTest.java  |     2 +-
 .../org/apache/solr/util/TestCircuitBreaker.java   |   243 +
 .../test/org/apache/solr/util/TestExportTool.java  |     2 -
 .../test/org/apache/solr/util/TestRTimerTree.java  |     3 +
 .../apache/solr/util/TestSolrCLIRunExample.java    |   116 -
 .../solr/util/TestSolrJacksonAnnotation.java       |     2 +
 .../src/test/org/apache/solr/util/TestUtils.java   |    11 +-
 .../apache/solr/util/stats/MetricUtilsTest.java    |    10 +
 .../solr/util/tracing/TestHttpServletCarrier.java  |     2 +-
 solr/example/example-DIH/README.md                 |     2 +
 solr/example/files/conf/solrconfig.xml             |    38 +
 solr/licenses/commons-collections4-4.2.jar.sha1    |     1 -
 solr/licenses/commons-collections4-4.4.jar.sha1    |     1 +
 solr/licenses/commons-lang-2.6.jar.sha1            |     1 +
 solr/licenses/commons-lang-LICENSE-ASL.txt         |   202 +
 solr/licenses/commons-lang-NOTICE.txt              |     5 +
 solr/licenses/hamcrest-2.2.jar.sha1                |     1 +
 .../licenses/hamcrest-LICENSE-BSD.txt              |     0
 .../licenses/hamcrest-NOTICE.txt                   |     0
 solr/licenses/hamcrest-core-1.3.jar.sha1           |     1 -
 solr/licenses/hppc-0.8.1.jar.sha1                  |     1 -
 solr/licenses/hppc-0.8.2.jar.sha1                  |     1 +
 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1   |     1 -
 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1   |     1 +
 solr/licenses/netty-codec-4.1.47.Final.jar.sha1    |     1 -
 solr/licenses/netty-codec-4.1.50.Final.jar.sha1    |     1 +
 solr/licenses/netty-common-4.1.47.Final.jar.sha1   |     1 -
 solr/licenses/netty-common-4.1.50.Final.jar.sha1   |     1 +
 solr/licenses/netty-handler-4.1.47.Final.jar.sha1  |     1 -
 solr/licenses/netty-handler-4.1.50.Final.jar.sha1  |     1 +
 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1 |     1 -
 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 |     1 +
 .../licenses/netty-transport-4.1.47.Final.jar.sha1 |     1 -
 .../licenses/netty-transport-4.1.50.Final.jar.sha1 |     1 +
 ...ty-transport-native-epoll-4.1.47.Final.jar.sha1 |     1 -
 ...ty-transport-native-epoll-4.1.50.Final.jar.sha1 |     1 +
 ...nsport-native-unix-common-4.1.47.Final.jar.sha1 |     1 -
 ...nsport-native-unix-common-4.1.50.Final.jar.sha1 |     1 +
 solr/licenses/org.restlet-2.4.0.jar.sha1           |     1 -
 solr/licenses/org.restlet-2.4.3.jar.sha1           |     1 +
 .../org.restlet.ext.servlet-2.4.0.jar.sha1         |     1 -
 .../org.restlet.ext.servlet-2.4.3.jar.sha1         |     1 +
 solr/licenses/snappy-java-1.1.7.6.jar.sha1         |     1 +
 solr/licenses/snappy-java-LICENSE-ASL.txt          |   202 +
 solr/licenses/snappy-java-NOTICE.txt               |    17 +
 solr/licenses/zookeeper-3.5.7.jar.sha1             |     1 -
 solr/licenses/zookeeper-3.6.1.jar.sha1             |     1 +
 solr/licenses/zookeeper-jute-3.5.7.jar.sha1        |     1 -
 solr/licenses/zookeeper-jute-3.6.1.jar.sha1        |     1 +
 solr/server/etc/jetty.xml                          |     8 +-
 solr/server/resources/log4j2-console.xml           |    28 +-
 solr/server/resources/log4j2.xml                   |    72 +-
 .../solr/configsets/_default/conf/managed-schema   |     7 +
 .../solr/configsets/_default/conf/solrconfig.xml   |    59 +
 .../conf/solrconfig.xml                            |    44 +-
 solr/server/solr/solr.xml                          |     1 +
 solr/solr-ref-guide/src/_config.yml.template       |     1 +
 .../src/_includes/mathjax-support.html             |    22 +
 solr/solr-ref-guide/src/_layouts/default.html      |     2 +
 solr/solr-ref-guide/src/_templates/ulist.html.slim |     2 +-
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   333 -
 solr/solr-ref-guide/src/aliases.adoc               |     9 +-
 solr/solr-ref-guide/src/cdcr-api.adoc              |     8 +
 solr/solr-ref-guide/src/cdcr-architecture.adoc     |     8 +
 solr/solr-ref-guide/src/cdcr-config.adoc           |     8 +
 solr/solr-ref-guide/src/cdcr-operations.adoc       |     8 +
 solr/solr-ref-guide/src/circuit-breakers.adoc      |    68 +
 solr/solr-ref-guide/src/cloud-screens.adoc         |     2 +-
 .../src/cluster-node-management.adoc               |    54 +-
 .../src/collapse-and-expand-results.adoc           |    15 +-
 solr/solr-ref-guide/src/collection-aliasing.adoc   |     2 -
 solr/solr-ref-guide/src/collection-management.adoc |    65 +-
 .../src/collection-specific-tools.adoc             |     2 +-
 .../solr-ref-guide/src/colocating-collections.adoc |    75 -
 .../combining-distribution-and-replication.adoc    |    12 +-
 .../src/common-query-parameters.adoc               |    23 +-
 solr/solr-ref-guide/src/config-api.adoc            |    10 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |     6 +-
 .../src/cross-data-center-replication-cdcr.adoc    |    14 +
 solr/solr-ref-guide/src/css/decoration.css         |     2 +-
 solr/solr-ref-guide/src/css/ref-guide.css          |     6 +-
 solr/solr-ref-guide/src/dataimport-screen.adoc     |     2 +
 solr/solr-ref-guide/src/distributed-requests.adoc  |     6 +-
 .../distributed-search-with-index-sharding.adoc    |     2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   241 +-
 solr/solr-ref-guide/src/exporting-result-sets.adoc |    30 +
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |     4 +
 solr/solr-ref-guide/src/highlighting.adoc          |    13 +-
 .../overview-of-the-solr-admin-ui/dashboard.png    |   Bin 92750 -> 172175 bytes
 .../src/implicit-requesthandlers.adoc              |    30 +-
 solr/solr-ref-guide/src/index-replication.adoc     |   177 +-
 solr/solr-ref-guide/src/index.adoc                 |     6 +
 solr/solr-ref-guide/src/json-facet-api.adoc        |     6 +
 .../src/json-faceting-domain-changes.adoc          |     8 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc        |    36 +-
 solr/solr-ref-guide/src/jvm-settings.adoc          |     2 +-
 .../src/kerberos-authentication-plugin.adoc        |     7 +-
 .../src/major-changes-in-solr-7.adoc               |     2 -
 .../src/major-changes-in-solr-8.adoc               |    10 +-
 .../src/major-changes-in-solr-9.adoc               |    27 +-
 .../src/making-and-restoring-backups.adoc          |     2 +-
 .../src/meta-docs/asciidoc-syntax.adoc             |    45 +
 solr/solr-ref-guide/src/meta-docs/publish.adoc     |     4 +-
 solr/solr-ref-guide/src/metrics-history.adoc       |     2 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc     |     2 +-
 .../solr-ref-guide/src/migrate-to-policy-rule.adoc |   198 -
 .../src/near-real-time-searching.adoc              |     2 +-
 solr/solr-ref-guide/src/other-parsers.adoc         |   208 +-
 .../src/overview-of-the-solr-admin-ui.adoc         |    16 +-
 solr/solr-ref-guide/src/package-manager.adoc       |    54 +-
 .../src/query-settings-in-solrconfig.adoc          |    24 +-
 solr/solr-ref-guide/src/rate-limiters.adoc         |   131 +
 solr/solr-ref-guide/src/replica-management.adoc    |    88 +-
 solr/solr-ref-guide/src/replication-screen.adoc    |     8 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |     2 +-
 ...andlers-and-searchcomponents-in-solrconfig.adoc |     9 +
 .../src/rule-based-authorization-plugin.adoc       |    35 +-
 .../src/rule-based-replica-placement.adoc          |     2 +-
 solr/solr-ref-guide/src/running-solr-on-hdfs.adoc  |    41 +-
 solr/solr-ref-guide/src/shard-management.adoc      |     8 +-
 .../src/shards-and-indexing-data-in-solrcloud.adoc |     4 +-
 solr/solr-ref-guide/src/solr-glossary.adoc         |     2 +-
 solr/solr-ref-guide/src/solr-plugins.adoc          |    19 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |     4 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |   106 +-
 .../src/solrcloud-autoscaling-api.adoc             |   808 --
 .../solrcloud-autoscaling-auto-add-replicas.adoc   |    73 -
 .../src/solrcloud-autoscaling-fault-tolerance.adoc |    59 -
 .../src/solrcloud-autoscaling-listeners.adoc       |   220 -
 .../src/solrcloud-autoscaling-overview.adoc        |   116 -
 .../solrcloud-autoscaling-policy-preferences.adoc  |   640 -
 .../src/solrcloud-autoscaling-trigger-actions.adoc |   145 -
 .../src/solrcloud-autoscaling-triggers.adoc        |   627 -
 solr/solr-ref-guide/src/solrcloud-autoscaling.adoc |    35 -
 solr/solr-ref-guide/src/solrcloud.adoc             |     8 +-
 .../src/stream-source-reference.adoc               |    63 +-
 solr/solr-ref-guide/src/suggestions-screen.adoc    |    40 -
 .../src/the-query-elevation-component.adoc         |     2 +-
 solr/solr-ref-guide/src/the-stats-component.adoc   |     2 +-
 solr/solr-ref-guide/src/the-tagger-handler.adoc    |     2 +-
 .../src/updatehandlers-in-solrconfig.adoc          |     2 +-
 ...ta-store-data-with-the-data-import-handler.adoc |     2 +
 solr/solr-ref-guide/src/using-solrj.adoc           |    33 +-
 ...ing-the-solr-administration-user-interface.adoc |     3 +-
 solr/solr-ref-guide/src/v2-api.adoc                |    12 +-
 solr/solrj/ivy.xml                                 |     4 +
 .../org/apache/solr/client/solrj/SolrClient.java   |    12 +-
 .../org/apache/solr/client/solrj/SolrRequest.java  |    22 +
 .../org/apache/solr/client/solrj/SolrResponse.java |     1 +
 .../apache/solr/client/solrj/V2RequestSupport.java |     1 +
 .../client/solrj/beans/DocumentObjectBinder.java   |    13 +-
 .../client/solrj/cloud/AlreadyExistsException.java |    35 +
 .../client/solrj/cloud/BadVersionException.java    |    40 +
 .../client/solrj/cloud/DelegatingCloudManager.java |    89 +
 .../cloud/DelegatingClusterStateProvider.java      |   130 +
 .../client/solrj/cloud/DistribStateManager.java    |    11 -
 .../solr/client/solrj/cloud/NodeStateProvider.java |     5 +-
 .../solr/client/solrj/cloud/NotEmptyException.java |    35 +
 .../solr/client/solrj/cloud/SolrCloudManager.java  |     2 +-
 .../solr/client/solrj/cloud/VersionedData.java     |    99 +
 .../cloud/autoscaling/AddReplicaSuggester.java     |    81 -
 .../cloud/autoscaling/AlreadyExistsException.java  |    35 -
 .../solrj/cloud/autoscaling/AutoScalingConfig.java |   589 -
 .../cloud/autoscaling/BadVersionException.java     |    40 -
 .../solr/client/solrj/cloud/autoscaling/Cell.java  |    74 -
 .../client/solrj/cloud/autoscaling/Clause.java     |   830 --
 .../solrj/cloud/autoscaling/ComputedType.java      |    99 -
 .../client/solrj/cloud/autoscaling/Condition.java  |   125 -
 .../solrj/cloud/autoscaling/CoresVariable.java     |   125 -
 .../cloud/autoscaling/DelegatingCloudManager.java  |    93 -
 .../DelegatingClusterStateProvider.java            |   130 -
 .../autoscaling/DelegatingDistribStateManager.java |   107 -
 .../autoscaling/DelegatingNodeStateProvider.java   |    56 -
 .../cloud/autoscaling/DeleteNodeSuggester.java     |    46 -
 .../cloud/autoscaling/DeleteReplicaSuggester.java  |    74 -
 .../solrj/cloud/autoscaling/FreeDiskVariable.java  |   175 -
 .../cloud/autoscaling/MoveReplicaSuggester.java    |   112 -
 .../solrj/cloud/autoscaling/NodeVariable.java      |    44 -
 .../solrj/cloud/autoscaling/NoneSuggester.java     |    39 -
 .../solrj/cloud/autoscaling/NotEmptyException.java |    35 -
 .../client/solrj/cloud/autoscaling/Operand.java    |   209 -
 .../client/solrj/cloud/autoscaling/Policy.java     |   714 -
 .../solrj/cloud/autoscaling/PolicyHelper.java      |   615 -
 .../client/solrj/cloud/autoscaling/Preference.java |   148 -
 .../client/solrj/cloud/autoscaling/RangeVal.java   |    61 -
 .../solrj/cloud/autoscaling/ReplicaCount.java      |   128 -
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |   219 -
 .../solrj/cloud/autoscaling/ReplicaVariable.java   |   175 -
 .../solr/client/solrj/cloud/autoscaling/Row.java   |   379 -
 .../solrj/cloud/autoscaling/SealedClause.java      |    29 -
 .../cloud/autoscaling/SplitShardSuggester.java     |    65 -
 .../client/solrj/cloud/autoscaling/Suggester.java  |   518 -
 .../client/solrj/cloud/autoscaling/Suggestion.java |   129 -
 .../autoscaling/TriggerEventProcessorStage.java    |    30 -
 .../solrj/cloud/autoscaling/TriggerEventType.java  |    33 -
 .../cloud/autoscaling/UnsupportedSuggester.java    |    59 -
 .../client/solrj/cloud/autoscaling/Variable.java   |   406 -
 .../solrj/cloud/autoscaling/VariableBase.java      |   211 -
 .../solrj/cloud/autoscaling/VersionedData.java     |    94 -
 .../client/solrj/cloud/autoscaling/Violation.java  |   181 -
 .../cloud/autoscaling/WithCollectionVariable.java  |   166 -
 .../solrj/cloud/autoscaling/package-info.java      |    23 -
 .../client/solrj/impl/BaseCloudSolrClient.java     |    82 +-
 .../solrj/impl/BaseHttpClusterStateProvider.java   |     7 +-
 .../solr/client/solrj/impl/BaseHttpSolrClient.java |     8 +-
 .../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      |     3 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java     |     4 +-
 .../solrj/impl/DelegationTokenHttpSolrClient.java  |     2 +-
 .../solrj/impl/Http2ClusterStateProvider.java      |     1 +
 .../solr/client/solrj/impl/Http2SolrClient.java    |   229 +-
 .../solrj/impl/HttpClusterStateProvider.java       |     1 +
 .../solr/client/solrj/impl/HttpSolrClient.java     |    98 +-
 .../client/solrj/impl/Krb5HttpClientBuilder.java   |     1 +
 .../solr/client/solrj/impl/LBHttp2SolrClient.java  |   141 +-
 .../solr/client/solrj/impl/LBHttpSolrClient.java   |     8 +-
 .../solr/client/solrj/impl/LBSolrClient.java       |   202 +-
 .../client/solrj/impl/SolrClientCloudManager.java  |     2 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |   121 +-
 .../solrj/impl/StreamingBinaryResponseParser.java  |     3 +
 .../solr/client/solrj/impl/XMLResponseParser.java  |     2 +-
 .../solrj/impl/ZkClientClusterStateProvider.java   |     1 +
 .../client/solrj/impl/ZkDistribStateManager.java   |    33 +-
 .../client/solrj/io/ClassificationEvaluation.java  |     8 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |   100 +-
 .../apache/solr/client/solrj/io/ModelCache.java    |     2 +-
 .../org/apache/solr/client/solrj/io/Tuple.java     |   185 +-
 .../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  |     3 +-
 .../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   |     5 +-
 .../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    |     3 +-
 .../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    |    28 +-
 .../solr/client/solrj/io/stream/CommitStream.java  |     2 +-
 .../solr/client/solrj/io/stream/CsvStream.java     |     3 +-
 .../solr/client/solrj/io/stream/DaemonStream.java  |    15 +-
 .../client/solrj/io/stream/DeepRandomStream.java   |    24 +-
 .../solr/client/solrj/io/stream/DrillStream.java   |   280 +
 .../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     |     6 +-
 .../solr/client/solrj/io/stream/Facet2DStream.java |    26 +-
 .../solr/client/solrj/io/stream/FacetStream.java   |    25 +-
 .../solrj/io/stream/FeaturesSelectionStream.java   |    33 +-
 .../solr/client/solrj/io/stream/FetchStream.java   |     3 +-
 .../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   |    18 +-
 .../solr/client/solrj/io/stream/StreamContext.java |    11 +-
 .../client/solrj/io/stream/TextLogitStream.java    |    50 +-
 .../client/solrj/io/stream/TimeSeriesStream.java   |    22 +-
 .../solr/client/solrj/io/stream/TopicStream.java   |    11 +-
 .../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     |     6 +
 .../expr/StreamExpressionNamedParameter.java       |     7 +
 .../io/stream/expr/StreamExpressionValue.java      |     9 +-
 .../client/solrj/io/stream/expr/StreamFactory.java |   249 +-
 .../solrj/io/stream/metrics/CountMetric.java       |     4 +-
 .../solrj/request/AbstractUpdateRequest.java       |     5 +
 .../solrj/request/CollectionAdminRequest.java      |   112 +-
 .../client/solrj/request/CollectionApiMapping.java |    14 +-
 .../solrj/request/ConfigSetAdminRequest.java       |     8 +-
 .../client/solrj/request/CoreAdminRequest.java     |     5 +
 .../solr/client/solrj/request/CoreApiMapping.java  |     3 +-
 .../solrj/request/DelegationTokenRequest.java      |    15 +
 .../client/solrj/request/DirectXmlRequest.java     |     5 +
 .../solrj/request/DocumentAnalysisRequest.java     |     5 +
 .../client/solrj/request/FieldAnalysisRequest.java |     5 +
 .../client/solrj/request/GenericSolrRequest.java   |     5 +
 .../client/solrj/request/HealthCheckRequest.java   |     5 +-
 .../solrj/request/JavaBinUpdateRequestCodec.java   |    19 +-
 .../solr/client/solrj/request/LukeRequest.java     |     5 +
 .../solrj/request/MultiContentWriterRequest.java   |     7 +-
 .../solr/client/solrj/request/QueryRequest.java    |     4 +
 .../solr/client/solrj/request/RequestWriter.java   |    13 +-
 .../apache/solr/client/solrj/request/SolrPing.java |     5 +
 .../solr/client/solrj/request/UpdateRequest.java   |     2 +-
 .../solr/client/solrj/request/V1toV2ApiMapper.java |     1 +
 .../solr/client/solrj/request/V2Request.java       |     5 +
 .../client/solrj/request/beans/PluginMeta.java     |    64 +
 .../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 +
 .../request/schema/AbstractSchemaRequest.java      |     4 +
 .../solrj/response/AnalysisResponseBase.java       |     3 +-
 .../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 +-
 .../solr/client/solrj/util/AsyncListener.java      |    33 +
 .../apache/solr/client/solrj/util/Cancellable.java |    22 +
 .../apache/solr/client/solrj/util/ClientUtils.java |     2 +
 .../java/org/apache/solr/cluster/api/ApiType.java  |    31 +
 .../apache/solr/cluster/api/CollectionConfig.java  |    27 +
 .../org/apache/solr/cluster/api/HashRange.java     |    42 +
 .../java/org/apache/solr/cluster/api/Resource.java |    41 +
 .../java/org/apache/solr/cluster/api/Router.java   |    25 +
 .../java/org/apache/solr/cluster/api/Shard.java    |    39 +
 .../org/apache/solr/cluster/api/ShardReplica.java  |    57 +
 .../org/apache/solr/cluster/api/SimpleMap.java     |    80 +
 .../org/apache/solr/cluster/api/SolrCluster.java   |    48 +
 .../apache/solr/cluster/api/SolrCollection.java    |    34 +
 .../java/org/apache/solr/cluster/api/SolrNode.java |    36 +
 .../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  |     7 +-
 .../org/apache/solr/common/SolrDocumentBase.java   |     1 +
 .../java/org/apache/solr/common/SolrException.java |    15 +-
 .../org/apache/solr/common/SolrInputDocument.java  |     1 +
 .../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       |     2 +-
 .../apache/solr/common/cloud/DocCollection.java    |    63 +-
 .../org/apache/solr/common/cloud/DocRouter.java    |     3 +-
 .../java/org/apache/solr/common/cloud/Replica.java |   193 +-
 .../java/org/apache/solr/common/cloud/Slice.java   |     3 +
 .../org/apache/solr/common/cloud/SolrZkClient.java |     7 +-
 .../apache/solr/common/cloud/SolrZooKeeper.java    |     1 +
 .../apache/solr/common/cloud/ZkDynamicConfig.java  |     3 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    31 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |    11 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   297 +-
 .../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/AutoScalingParams.java      |    76 -
 .../solr/common/params/CollectionAdminParams.java  |    11 +-
 .../solr/common/params/CollectionParams.java       |    37 +-
 .../apache/solr/common/params/CommonParams.java    |    27 +-
 .../org/apache/solr/common/params/FacetParams.java |     4 +-
 .../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  |    10 +-
 .../solr/common/util/FastJavaBinDecoder.java       |     3 +
 .../src/java/org/apache/solr/common/util/Hash.java |     2 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |    11 +-
 .../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    |    19 +-
 .../org/apache/solr/common/util/NamedList.java     |     8 +-
 .../src/java/org/apache/solr/common/util/Pair.java |     1 +
 .../java/org/apache/solr/common/util/PathTrie.java |    50 +-
 .../apache/solr/common/util/ReflectMapWriter.java  |    29 +-
 .../org/apache/solr/common/util/RetryUtil.java     |    11 +-
 .../org/apache/solr/common/util/TextWriter.java    |    21 +-
 .../java/org/apache/solr/common/util/Utils.java    |   183 +-
 .../apache/solr/common/util/ValidatingJsonMap.java |    19 +-
 .../apache/solr/common/util/XMLErrorLogger.java    |     2 +-
 solr/solrj/src/java/org/noggit/CharArr.java        |   262 +-
 solr/solrj/src/java/org/noggit/JSONParser.java     |     2 +-
 .../resources/apispec/autoscaling.Commands.json    |   199 -
 .../src/resources/apispec/autoscaling.history.json |    61 -
 .../src/resources/apispec/cluster.Commands.json    |    28 -
 .../resources/apispec/collections.Commands.json    |    15 -
 .../apispec/collections.collection.Commands.json   |     8 +-
 .../collections.collection.Commands.modify.json    |    15 -
 ...collections.collection.shards.shard.delete.json |     2 +-
 ...ons.collection.shards.shard.replica.delete.json |     2 +-
 solr/solrj/src/test-files/log4j2.xml               |    45 +-
 .../solr/autoscaling/testAddMissingReplica.json    |   123 -
 .../autoscaling/testAutoScalingHandlerFailure.json |   141 -
 ...testAutoscalingPreferencesUsedWithNoPolicy.json |    53 -
 .../autoscaling/testComputePlanAfterNodeAdded.json |    16 -
 .../solr/autoscaling/testCoresSuggestions.json     |    17 -
 .../testCreateCollectionWithEmptyPolicy.json       |    20 -
 .../solrj/solr/autoscaling/testDiskSpaceHint.json  |    16 -
 .../solr/autoscaling/testEmptyCollection.json      |    27 -
 .../solrj/solr/autoscaling/testEqualOnNonNode.json |    83 -
 .../solr/autoscaling/testFreeDiskDeviation.json    |    35 -
 .../solr/autoscaling/testFreeDiskSuggestions.json  |    27 -
 .../solr/autoscaling/testFreediskPercentage.json   |    25 -
 .../solrj/solr/autoscaling/testHostAttribute.json  |   119 -
 .../solrj/solr/autoscaling/testInfiniteLoop.json   | 13196 -------------------
 .../solr/autoscaling/testMoveReplicaSuggester.json |    15 -
 .../testMoveReplicasInMultipleCollections.json     |    88 -
 .../solrj/solr/autoscaling/testPolicy.json         |    41 -
 .../solr/autoscaling/testPortSuggestions.json      |    22 -
 .../autoscaling/testReplicaCountSuggestions.json   |    15 -
 .../solr/autoscaling/testReplicaPercentage.json    |    46 -
 .../autoscaling/testReplicaZonesPercentage.json    |    15 -
 .../autoscaling/testScheduledTriggerFailure.json   |    52 -
 .../solrj/solr/autoscaling/testSortError.json      |   225 -
 .../autoscaling/testSuggestionsRebalance2.json     |   131 -
 .../autoscaling/testSuggestionsRebalanceOnly.json  |   105 -
 .../solr/autoscaling/testSysPropSuggestions.json   |   127 -
 .../solr/autoscaling/testSyspropSuggestions1.json  |    24 -
 .../solr/autoscaling/testUnresolvedSuggestion.json |   212 -
 .../solr/autoscaling/testUtilizeNodeFailure.json   |    69 -
 .../solr/autoscaling/testUtilizeNodeFailure2.json  |    66 -
 .../solr/autoscaling/testViolationOutput.json      |    22 -
 .../solrj/solr/autoscaling/testWithCollection.json |    21 -
 .../autoscaling/testWithCollectionMoveReplica.json |    28 -
 .../testWithCollectionMoveVsAddSuggestions.json    |    49 -
 .../autoscaling/testWithCollectionSuggestions.json |    21 -
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |     0
 .../ref_guide_examples/JsonRequestApiTest.java     |     2 +-
 .../UsingSolrJRefGuideExamplesTest.java            |    59 +-
 .../solr/client/solrj/LargeVolumeTestBase.java     |     2 +-
 .../client/solrj/MergeIndexesExampleTestBase.java  |     3 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |    11 +-
 .../client/solrj/SolrSchemalessExampleTest.java    |     2 +
 .../solr/client/solrj/TestLBHttp2SolrClient.java   |     9 +-
 .../solr/client/solrj/TestLBHttpSolrClient.java    |     9 +-
 .../solrj/beans/TestDocumentObjectBinder.java      |     1 +
 .../solrj/cloud/autoscaling/ConditionTest.java     |    80 -
 .../autoscaling/MoveReplicaSuggesterTest.java      |   104 -
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  3121 -----
 .../solrj/cloud/autoscaling/TestPolicy2.java       |   505 -
 .../solrj/cloud/autoscaling/TestPolicy2Old.java    |    26 -
 .../solrj/cloud/autoscaling/TestPolicyOld.java     |    25 -
 .../solrj/embedded/SolrExampleJettyTest.java       |     1 +
 .../solrj/embedded/TestEmbeddedSolrServer.java     |     2 +-
 .../client/solrj/impl/BasicHttpSolrClientTest.java |     6 +-
 .../impl/CloudHttp2SolrClientBadInputTest.java     |     4 +-
 .../solrj/impl/CloudHttp2SolrClientRetryTest.java  |     1 +
 .../solrj/impl/CloudHttp2SolrClientTest.java       |    13 +-
 .../solrj/impl/CloudSolrClientBadInputTest.java    |     4 +-
 .../solrj/impl/CloudSolrClientBuilderTest.java     |     2 +-
 .../solrj/impl/CloudSolrClientCacheTest.java       |    15 +-
 .../solrj/impl/CloudSolrClientRetryTest.java       |     1 +
 .../client/solrj/impl/CloudSolrClientTest.java     |     9 +-
 ...oncurrentUpdateHttp2SolrClientBadInputTest.java |     4 +-
 .../ConcurrentUpdateSolrClientBadInputTest.java    |     4 +-
 .../ConcurrentUpdateSolrClientBuilderTest.java     |     2 +-
 .../client/solrj/impl/Http2SolrClientTest.java     |     3 +-
 .../solrj/impl/HttpSolrClientBadInputTest.java     |     4 +-
 .../solrj/impl/LBHttpSolrClientBadInputTest.java   |     4 +-
 .../solr/client/solrj/impl/LBSolrClientTest.java   |    90 +
 .../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       |     7 +-
 .../client/solrj/io/stream/JDBCStreamTest.java     |     4 +-
 .../client/solrj/io/stream/MathExpressionTest.java |   198 +-
 .../client/solrj/io/stream/RecordCountStream.java  |     2 +-
 .../solrj/io/stream/SelectWithEvaluatorsTest.java  |    10 +-
 .../solrj/io/stream/StreamDecoratorTest.java       |    16 +-
 .../solrj/io/stream/StreamExpressionTest.java      |   134 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |    15 +-
 .../solrj/io/stream/eval/AscEvaluatorTest.java     |     6 +
 .../io/stream/eval/ConversionEvaluatorsTest.java   |    27 +-
 .../solrj/io/stream/eval/ReverseEvaluatorTest.java |     1 +
 .../io/stream/eval/TemporalEvaluatorsTest.java     |     4 +-
 .../solrj/io/stream/ops/ConcatOperationTest.java   |     4 +-
 .../client/solrj/io/stream/ops/OperationsTest.java |     4 +-
 .../solr/client/solrj/request/SchemaTest.java      |     2 +
 .../solrj/request/TestConfigSetAdminRequest.java   |     3 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |    12 +-
 .../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 +-
 .../org/apache/solr/common/SolrDocumentTest.java   |     7 +-
 .../solr/common/TestToleratedUpdateError.java      |     2 +
 .../apache/solr/common/cloud/SolrZkClientTest.java |     1 -
 .../cloud/TestCloudCollectionsListeners.java       |   110 -
 .../common/cloud/TestCollectionStateWatchers.java  |    23 -
 .../common/cloud/TestDocCollectionWatcher.java     |    26 -
 .../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  |     9 +-
 .../solr/common/util/TestJsonRecordReader.java     |     5 +
 .../solr/common/util/TestNamedListCodec.java       |    15 +
 .../org/apache/solr/common/util/TestPathTrie.java  |    10 +
 .../solr/common/util/TestSolrJsonWriter.java       |   102 +-
 .../solr/common/util/TestValidatingJsonMap.java    |     1 +
 .../solr/common/util/TestZkMaintenanceUtils.java   |    55 +
 .../solr/common/util/Utf8CharSequenceTest.java     |     6 +
 solr/test-framework/ivy.xml                        |     2 +-
 .../apache/solr/BaseDistributedSearchTestCase.java |    20 +-
 .../src/java/org/apache/solr/JSONTestUtil.java     |     7 +
 .../org/apache/solr/SolrIgnoredThreadsFilter.java  |     5 +
 .../src/java/org/apache/solr/SolrTestCase.java     |    10 +
 .../src/java/org/apache/solr/SolrTestCaseHS.java   |    27 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |    62 +-
 .../solr/cloud/AbstractDistribZkTestBase.java      |     2 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |    52 +-
 .../org/apache/solr/cloud/CloudInspectUtil.java    |    17 +-
 .../java/org/apache/solr/cloud/ConfigRequest.java  |     6 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |     1 +
 .../apache/solr/cloud/MultiSolrCloudTestCase.java  |     5 +-
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |     4 +
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |     3 +
 .../java/org/apache/solr/cloud/ZkTestServer.java   |     9 +-
 .../apache/solr/core/MockTracerConfigurator.java   |     2 +-
 .../component/TrackingShardHandlerFactory.java     |    67 +-
 .../java/org/apache/solr/util/RandomizeSSL.java    |     4 +-
 .../src/java/org/apache/solr/util/TestHarness.java |    11 +-
 solr/webapp/web/css/angular/collections.css        |     2 +-
 solr/webapp/web/css/angular/dashboard.css          |     4 +-
 solr/webapp/web/css/angular/dataimport.css         |     3 +-
 solr/webapp/web/css/angular/index.css              |     4 +-
 solr/webapp/web/css/angular/menu.css               |     3 +-
 solr/webapp/web/css/angular/replication.css        |    10 +-
 solr/webapp/web/css/angular/suggestions.css        |    64 -
 .../img/ico/{node-slave.png => node-follower.png}  |   Bin
 .../img/ico/{node-master.png => node-leader.png}   |   Bin
 solr/webapp/web/index.html                         |    27 +-
 solr/webapp/web/js/angular/app.js                  |     4 -
 solr/webapp/web/js/angular/controllers/cloud.js    |     4 -
 .../js/angular/controllers/cluster-suggestions.js  |    62 -
 .../web/js/angular/controllers/collections.js      |     8 +-
 .../web/js/angular/controllers/core-overview.js    |     4 +-
 solr/webapp/web/js/angular/controllers/index.js    |     2 +-
 .../web/js/angular/controllers/replication.js      |   108 +-
 solr/webapp/web/partials/cluster_suggestions.html  |    49 -
 solr/webapp/web/partials/collection_overview.html  |     6 -
 solr/webapp/web/partials/collections.html          |    20 -
 solr/webapp/web/partials/core_overview.html        |    38 +-
 solr/webapp/web/partials/dataimport.html           |     1 +
 solr/webapp/web/partials/replication.html          |    62 +-
 versions.lock                                      |    40 +-
 versions.props                                     |    17 +-
 2282 files changed, 36848 insertions(+), 98929 deletions(-)

diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 4ba23c5,da95aab..423a8c4
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -230,10 -239,6 +240,8 @@@ public class CoreContainer 
  
    protected volatile MetricsCollectorHandler metricsCollectorHandler;
  
-   protected volatile AutoscalingHistoryHandler autoscalingHistoryHandler;
- 
 +  protected volatile ResourceManagerAPI resourceManagerApi;
 +
    private volatile SolrClientCache solrClientCache;
  
    private final ObjectCache objectCache = new ObjectCache();
@@@ -706,14 -730,6 +737,13 @@@
  
      createMetricsHistoryHandler();
  
 +    resourceManagerApi = new ResourceManagerAPI(this);
 +    containerHandlers.getApiBag().registerObject(resourceManagerApi.readPoolApi);
 +    containerHandlers.getApiBag().registerObject(resourceManagerApi.editPoolApi);
 +    containerHandlers.getApiBag().registerObject(resourceManagerApi.readComponentApi);
 +    containerHandlers.getApiBag().registerObject(resourceManagerApi.editComponentApi);
 +    resourceManagerApi.initializeMetrics(solrMetricsContext, "resourceMgr");
 +
-     autoscalingHistoryHandler = createHandler(AUTOSCALING_HISTORY_PATH, AutoscalingHistoryHandler.class.getName(), AutoscalingHistoryHandler.class);
      metricsCollectorHandler = createHandler(MetricsCollectorHandler.HANDLER_PATH, MetricsCollectorHandler.class.getName(), MetricsCollectorHandler.class);
      // may want to add some configuration here in the future
      metricsCollectorHandler.init(null);
diff --cc solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 2f83c46,1fcc183..0375685
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@@ -150,25 -151,25 +151,25 @@@ public abstract class RequestHandlerBas
  
    @Override
    public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
 -    this.solrMetricsContext = parentContext.getChildContext(this);
 -    numErrors = solrMetricsContext.meter("errors", getCategory().toString(), scope);
 -    numServerErrors = solrMetricsContext.meter("serverErrors", getCategory().toString(), scope);
 -    numClientErrors = solrMetricsContext.meter("clientErrors", getCategory().toString(), scope);
 -    numTimeouts = solrMetricsContext.meter("timeouts", getCategory().toString(), scope);
 -    requests = solrMetricsContext.counter("requests", getCategory().toString(), scope);
 +    this.solrMetricsContext = parentContext.getChildContext(this, scope);
 +    numErrors = solrMetricsContext.meter("errors", getCategory().toString());
 +    numServerErrors = solrMetricsContext.meter("serverErrors", getCategory().toString());
 +    numClientErrors = solrMetricsContext.meter("clientErrors", getCategory().toString());
 +    numTimeouts = solrMetricsContext.meter("timeouts", getCategory().toString());
 +    requests = solrMetricsContext.counter("requests", getCategory().toString());
      MetricsMap metricsMap = new MetricsMap((detail, map) ->
          shardPurposes.forEach((k, v) -> map.put(k, v.getCount())));
 -    solrMetricsContext.gauge(metricsMap, true, "shardRequests", getCategory().toString(), scope);
 -    requestTimes = solrMetricsContext.timer("requestTimes", getCategory().toString(), scope);
 -    distribRequestTimes = solrMetricsContext.timer("requestTimes", getCategory().toString(), scope, "distrib");
 -    localRequestTimes = solrMetricsContext.timer("requestTimes", getCategory().toString(), scope, "local");
 -    totalTime = solrMetricsContext.counter("totalTime", getCategory().toString(), scope);
 -    distribTotalTime = solrMetricsContext.counter("totalTime", getCategory().toString(), scope, "distrib");
 -    localTotalTime = solrMetricsContext.counter("totalTime", getCategory().toString(), scope, "local");
 -    solrMetricsContext.gauge(() -> handlerStart, true, "handlerStart", getCategory().toString(), scope);
 +    solrMetricsContext.gauge(metricsMap, true, "shardRequests", getCategory().toString());
 +    requestTimes = solrMetricsContext.timer("requestTimes", getCategory().toString());
 +    distribRequestTimes = solrMetricsContext.timer("distrib.requestTimes", getCategory().toString());
 +    localRequestTimes = solrMetricsContext.timer("local.requestTimes", getCategory().toString());
 +    totalTime = solrMetricsContext.counter("totalTime", getCategory().toString());
 +    distribTotalTime = solrMetricsContext.counter("distrib.totalTime", getCategory().toString());
 +    localTotalTime = solrMetricsContext.counter("local.totalTime", getCategory().toString());
 +    solrMetricsContext.gauge(() -> handlerStart, true, "handlerStart", getCategory().toString());
    }
  
-   public static SolrParams getSolrParamsFromNamedList(NamedList args, String key) {
+   public static SolrParams getSolrParamsFromNamedList(@SuppressWarnings({"rawtypes"})NamedList args, String key) {
      Object o = args.get(key);
      if (o != null && o instanceof NamedList) {
        return ((NamedList) o).toSolrParams();
diff --cc solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 082f121,3ebd43c..7e44815
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@@ -125,11 -127,11 +130,13 @@@ public class SolrIndexSearcher extends 
    private final SolrCache<String,UnInvertedField> fieldValueCache;
  
    // map of generic caches - not synchronized since it's read-only after the constructor.
+   @SuppressWarnings({"rawtypes"})
    private final Map<String,SolrCache> cacheMap;
  
 +  private final Map<String, List<SolrCache>> cacheByPool;
 +
    // list of all caches associated with this searcher.
+   @SuppressWarnings({"rawtypes"})
    private final SolrCache[] cacheList;
  
    private DirectoryFactory directoryFactory;
@@@ -457,21 -440,10 +465,21 @@@
        cache.setState(SolrCache.State.LIVE);
        infoRegistry.put(cache.name(), cache);
      }
 -    this.solrMetricsContext = core.getSolrMetricsContext().getChildContext(this);
 +    this.solrMetricsContext = core.getSolrMetricsContext().getChildContext(this, null);
-     for (SolrCache cache : cacheList) {
+     for (@SuppressWarnings({"rawtypes"})SolrCache cache : cacheList) {
        cache.initializeMetrics(solrMetricsContext, SolrMetricManager.mkName(cache.name(), STATISTICS_KEY));
      }
 +    // register caches in their respective resource pools
 +    ResourceManager resourceManager = core.getCoreContainer().getResourceManagerApi().getResourceManager();
 +    for (Map.Entry<String, List<SolrCache>> entry : cacheByPool.entrySet()) {
 +      for (SolrCache cache : entry.getValue()) {
 +        try {
 +          cache.initializeManagedComponent(resourceManager, entry.getKey());
 +        } catch (Exception e) {
 +          log.warn("Exception adding cache '" + cache.getManagedComponentId() + "' to the resource manager pool " + entry.getKey(), e);
 +        }
 +      }
 +    }
      initializeMetrics(solrMetricsContext, STATISTICS_KEY);
      registerTime = new Date();
    }
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java
index 235652b,6a5edc9..b260e14
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java
@@@ -49,10 -49,11 +49,11 @@@ public abstract class BaseHttpSolrClien
     * it sends a proper payload back to the client
     */
    public static class RemoteExecutionException extends RemoteSolrException {
+     @SuppressWarnings({"rawtypes"})
      private NamedList meta;
  
-     public RemoteExecutionException(String remoteHost, int code, String msg, NamedList meta) {
+     public RemoteExecutionException(String remoteHost, int code, String msg, @SuppressWarnings({"rawtypes"})NamedList meta) {
 -      super(remoteHost, code, msg, null);
 +      super(remoteHost, code, msg + (meta != null ? ": " + meta : ""), null);
        this.meta = meta;
      }
  
diff --cc solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 0fe24da,d49a39c..0b0ca60
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@@ -108,19 -103,16 +103,19 @@@ public class ZkStateReader implements S
    public static final String COLLECTIONS_ZKNODE = "/collections";
    public static final String LIVE_NODES_ZKNODE = "/live_nodes";
    public static final String ALIASES = "/aliases.json";
-   public static final String CLUSTER_STATE = "/clusterstate.json";
+   /**
+    * This ZooKeeper file is no longer used starting with Solr 9 but keeping the name around to check if it
+    * is still present and non empty (in case of upgrade from previous Solr version). It used to contain collection
+    * state for all collections in the cluster.
+    */
+   public static final String UNSUPPORTED_CLUSTER_STATE = "/clusterstate.json";
    public static final String CLUSTER_PROPS = "/clusterprops.json";
    public static final String COLLECTION_PROPS_ZKNODE = "collectionprops.json";
 +  public static final String RESOURCE_MANAGER_ZNODE = "/resourceMgr";
 +  public static final String RESOURCE_MANAGER_CONF_PATH = "/managerConfig.json";
 +  public static final String RESOURCE_MANAGER_POOL_CONF_PATH = "/poolConfigs.json";
    public static final String REJOIN_AT_HEAD_PROP = "rejoinAtHead";
    public static final String SOLR_SECURITY_CONF_PATH = "/security.json";
-   public static final String SOLR_AUTOSCALING_CONF_PATH = "/autoscaling.json";
-   public static final String SOLR_AUTOSCALING_EVENTS_PATH = "/autoscaling/events";
-   public static final String SOLR_AUTOSCALING_TRIGGER_STATE_PATH = "/autoscaling/triggerState";
-   public static final String SOLR_AUTOSCALING_NODE_ADDED_PATH = "/autoscaling/nodeAdded";
-   public static final String SOLR_AUTOSCALING_NODE_LOST_PATH = "/autoscaling/nodeLost";
    public static final String SOLR_PKGS_PATH = "/packages.json";
  
    public static final String DEFAULT_SHARD_PREFERENCES = "defaultShardPreferences";