You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2020/09/02 00:27:24 UTC

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

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

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

commit 34da84c238f3aff57cd7bba8040ccf6f6d94cf15
Merge: 5d29327 8bd79ec
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Tue Sep 1 16:39:03 2020 -0700

    Merge branch 'master' into jira/SOLR-14383

 .github/PULL_REQUEST_TEMPLATE.md                   |    2 +-
 .github/workflows/ant.yml                          |   22 -
 README.md                                          |   74 +-
 build.gradle                                       |   40 +-
 build.xml                                          |  697 ----
 dev-tools/README.txt                               |    6 +-
 dev-tools/doap/lucene.rdf                          |   14 +
 dev-tools/doap/solr.rdf                            |   14 +
 dev-tools/idea/.idea/ant.xml                       |   57 -
 dev-tools/idea/.idea/codeStyleSettings.xml         |  102 -
 dev-tools/idea/.idea/compiler.xml                  |   13 -
 .../.idea/copyright/Apache_Software_Foundation.xml |    9 -
 .../idea/.idea/copyright/profiles_settings.xml     |   26 -
 dev-tools/idea/.idea/libraries/Derby.xml           |    9 -
 dev-tools/idea/.idea/libraries/HSQLDB.xml          |    9 -
 dev-tools/idea/.idea/libraries/ICU_library.xml     |   10 -
 dev-tools/idea/.idea/libraries/Ivy.xml             |    9 -
 dev-tools/idea/.idea/libraries/JUnit.xml           |   10 -
 .../idea/.idea/libraries/Morfologik_library.xml    |   10 -
 .../idea/.idea/libraries/Solr_DIH_core_library.xml |   10 -
 .../.idea/libraries/Solr_DIH_extras_library.xml    |   10 -
 .../idea/.idea/libraries/Solr_DIH_test_library.xml |   10 -
 .../idea/.idea/libraries/Solr_core_library.xml     |   10 -
 .../.idea/libraries/Solr_core_test_library.xml     |   10 -
 .../idea/.idea/libraries/Solr_example_library.xml  |   10 -
 .../.idea/libraries/Solr_extraction_library.xml    |   10 -
 .../Solr_jaeger_tracer_configurator_library.xml    |   10 -
 .../libraries/Solr_prometheus_exporter_library.xml |   10 -
 .../libraries/Solr_test_framework_library.xml      |   10 -
 .../idea/.idea/libraries/Solr_velocity_library.xml |   10 -
 dev-tools/idea/.idea/libraries/Solrj_library.xml   |   10 -
 dev-tools/idea/.idea/misc.xml                      |    5 -
 dev-tools/idea/.idea/modules.xml                   |   67 -
 dev-tools/idea/.idea/projectCodeStyle.xml          |   69 -
 dev-tools/idea/.idea/vcs.xml                       |   14 -
 dev-tools/idea/.idea/workspace.xml                 |  388 --
 dev-tools/idea/dev-tools/scripts/scripts.iml       |    9 -
 .../lucene/analysis/common/analysis-common.iml     |   19 -
 dev-tools/idea/lucene/analysis/icu/icu.iml         |   31 -
 .../idea/lucene/analysis/kuromoji/kuromoji.iml     |   22 -
 .../idea/lucene/analysis/morfologik/morfologik.iml |   29 -
 dev-tools/idea/lucene/analysis/nori/nori.iml       |   22 -
 dev-tools/idea/lucene/analysis/opennlp/opennlp.iml |   30 -
 .../idea/lucene/analysis/phonetic/phonetic.iml     |   29 -
 dev-tools/idea/lucene/analysis/smartcn/smartcn.iml |   19 -
 dev-tools/idea/lucene/analysis/stempel/stempel.iml |   19 -
 .../lucene/backward-codecs/backward-codecs.iml     |   18 -
 .../idea/lucene/benchmark/conf/benchmark-conf.iml  |   13 -
 dev-tools/idea/lucene/benchmark/src/benchmark.iml  |   39 -
 .../idea/lucene/classification/classification.iml  |   23 -
 dev-tools/idea/lucene/codecs/src/codecs.iml        |   14 -
 .../idea/lucene/codecs/src/test/codecs-tests.iml   |   17 -
 dev-tools/idea/lucene/core/src/lucene-core.iml     |   14 -
 .../lucene/core/src/test/lucene-core-tests.iml     |   17 -
 dev-tools/idea/lucene/demo/demo.iml                |   32 -
 dev-tools/idea/lucene/expressions/expressions.iml  |   30 -
 dev-tools/idea/lucene/facet/facet.iml              |   31 -
 dev-tools/idea/lucene/grouping/grouping.iml        |   18 -
 dev-tools/idea/lucene/highlighter/highlighter.iml  |   23 -
 dev-tools/idea/lucene/join/join.iml                |   19 -
 dev-tools/idea/lucene/luke/luke.iml                |   33 -
 dev-tools/idea/lucene/memory/memory.iml            |   19 -
 dev-tools/idea/lucene/misc/misc.iml                |   17 -
 dev-tools/idea/lucene/monitor/monitor.iml          |   32 -
 dev-tools/idea/lucene/queries/queries.iml          |   19 -
 dev-tools/idea/lucene/queryparser/queryparser.iml  |   21 -
 dev-tools/idea/lucene/replicator/replicator.iml    |   28 -
 dev-tools/idea/lucene/sandbox/sandbox.iml          |   28 -
 .../idea/lucene/spatial-extras/spatial-extras.iml  |   30 -
 dev-tools/idea/lucene/spatial3d/spatial3d.iml      |   17 -
 dev-tools/idea/lucene/suggest/suggest.iml          |   19 -
 .../test-framework/lucene-test-framework.iml       |   18 -
 dev-tools/idea/lucene/tools/tools.iml              |   24 -
 dev-tools/idea/parent.iml                          |   19 -
 .../contrib/analysis-extras/analysis-extras.iml    |   42 -
 .../idea/solr/contrib/analytics/analytics.iml      |   27 -
 .../idea/solr/contrib/clustering/clustering.iml    |   39 -
 .../dataimporthandler-extras.iml                   |   29 -
 .../dataimporthandler/dataimporthandler.iml        |   31 -
 .../idea/solr/contrib/extraction/extraction.iml    |   26 -
 .../jaegertracer-configurator.iml                  |   37 -
 dev-tools/idea/solr/contrib/langid/langid.iml      |   36 -
 dev-tools/idea/solr/contrib/ltr/ltr.iml            |   37 -
 .../prometheus-exporter/prometheus-exporter.iml    |   37 -
 dev-tools/idea/solr/contrib/velocity/velocity.iml  |   28 -
 dev-tools/idea/solr/core/src/java/solr-core.iml    |   38 -
 dev-tools/idea/solr/core/src/solr-core-tests.iml   |   37 -
 dev-tools/idea/solr/server/server.iml              |   19 -
 dev-tools/idea/solr/solrj/src/java/solrj.iml       |   16 -
 dev-tools/idea/solr/solrj/src/solrj-tests.iml      |   33 -
 .../solr/test-framework/solr-test-framework.iml    |   26 -
 dev-tools/maven/README.maven                       |  159 -
 .../maven/lucene/analysis/common/pom.xml.template  |   86 -
 .../maven/lucene/analysis/icu/pom.xml.template     |   76 -
 .../lucene/analysis/kuromoji/pom.xml.template      |   75 -
 .../lucene/analysis/morfologik/pom.xml.template    |   78 -
 .../maven/lucene/analysis/nori/pom.xml.template    |   75 -
 .../maven/lucene/analysis/opennlp/pom.xml.template |   78 -
 .../lucene/analysis/phonetic/pom.xml.template      |   75 -
 dev-tools/maven/lucene/analysis/pom.xml.template   |   55 -
 .../maven/lucene/analysis/smartcn/pom.xml.template |   73 -
 .../maven/lucene/analysis/stempel/pom.xml.template |   73 -
 .../maven/lucene/backward-codecs/pom.xml.template  |   88 -
 dev-tools/maven/lucene/benchmark/pom.xml.template  |   86 -
 .../maven/lucene/classification/pom.xml.template   |   68 -
 dev-tools/maven/lucene/codecs/pom.xml.template     |   48 -
 .../maven/lucene/codecs/src/java/pom.xml.template  |   85 -
 .../maven/lucene/codecs/src/test/pom.xml.template  |   84 -
 dev-tools/maven/lucene/core/pom.xml.template       |   48 -
 .../maven/lucene/core/src/java/pom.xml.template    |   79 -
 .../maven/lucene/core/src/test/pom.xml.template    |   84 -
 dev-tools/maven/lucene/demo/pom.xml.template       |   85 -
 .../maven/lucene/expressions/pom.xml.template      |   62 -
 dev-tools/maven/lucene/facet/pom.xml.template      |   75 -
 dev-tools/maven/lucene/grouping/pom.xml.template   |   68 -
 .../maven/lucene/highlighter/pom.xml.template      |   70 -
 dev-tools/maven/lucene/join/pom.xml.template       |   68 -
 dev-tools/maven/lucene/memory/pom.xml.template     |   70 -
 dev-tools/maven/lucene/misc/pom.xml.template       |   68 -
 dev-tools/maven/lucene/monitor/pom.xml.template    |   70 -
 dev-tools/maven/lucene/pom.xml.template            |  127 -
 dev-tools/maven/lucene/queries/pom.xml.template    |   68 -
 .../maven/lucene/queryparser/pom.xml.template      |   86 -
 dev-tools/maven/lucene/replicator/pom.xml.template |   74 -
 dev-tools/maven/lucene/sandbox/pom.xml.template    |   73 -
 .../maven/lucene/spatial-extras/pom.xml.template   |   69 -
 dev-tools/maven/lucene/spatial3d/pom.xml.template  |   70 -
 dev-tools/maven/lucene/suggest/pom.xml.template    |   73 -
 .../maven/lucene/test-framework/pom.xml.template   |  109 -
 dev-tools/maven/pom.xml.template                   |  475 ---
 .../solr/contrib/analysis-extras/pom.xml.template  |   85 -
 .../maven/solr/contrib/analytics/pom.xml.template  |   80 -
 .../maven/solr/contrib/clustering/pom.xml.template |   78 -
 .../dataimporthandler-extras/pom.xml.template      |   85 -
 .../contrib/dataimporthandler/pom.xml.template     |   91 -
 .../maven/solr/contrib/extraction/pom.xml.template |   81 -
 .../jaegertracer-configurator/pom.xml.template     |   80 -
 .../maven/solr/contrib/langid/pom.xml.template     |   87 -
 dev-tools/maven/solr/contrib/ltr/pom.xml.template  |   80 -
 dev-tools/maven/solr/contrib/pom.xml.template      |   57 -
 .../contrib/prometheus-exporter/pom.xml.template   |   80 -
 .../maven/solr/contrib/velocity/pom.xml.template   |   89 -
 dev-tools/maven/solr/core/pom.xml.template         |   48 -
 .../maven/solr/core/src/java/pom.xml.template      |   84 -
 .../maven/solr/core/src/test/pom.xml.template      |  155 -
 dev-tools/maven/solr/maven.testlogging.properties  |    2 -
 dev-tools/maven/solr/pom.xml.template              |  186 -
 dev-tools/maven/solr/solrj/pom.xml.template        |   48 -
 .../maven/solr/solrj/src/java/pom.xml.template     |   78 -
 .../maven/solr/solrj/src/test/pom.xml.template     |  122 -
 .../maven/solr/test-framework/pom.xml.template     |   95 -
 dev-tools/netbeans/nb-project.xsl                  |  165 -
 dev-tools/netbeans/nbproject/project.properties    |    9 -
 dev-tools/scripts/SOLR-2452.patch.hack.pl          |  215 --
 dev-tools/scripts/buildAndPushRelease.py           |    4 +-
 dev-tools/scripts/jenkins.build.ref.guide.sh       |   73 -
 dev-tools/scripts/releaseWizard.py                 |    4 +
 dev-tools/scripts/releaseWizard.yaml               |   63 +-
 dev-tools/scripts/smokeTestRelease.py              |   15 +-
 .../ant-compat/forbidden-api-rules-in-sync.gradle  |   54 -
 gradle/ant-compat/jar-checks.gradle                |   26 -
 gradle/ant-compat/test-classes-cross-deps.gradle   |   12 +-
 gradle/defaults-java.gradle                        |    7 +-
 gradle/defaults.gradle                             |   18 +
 gradle/documentation/changes-to-html.gradle        |    2 +-
 gradle/documentation/render-javadoc.gradle         |   26 +-
 .../render-javadoc}/java11/package-list            |    0
 .../render-javadoc}/junit/package-list             |    0
 .../render-javadoc}/prettify/inject-javadocs.js    |    0
 .../render-javadoc}/prettify/prettify.css          |    0
 .../render-javadoc}/prettify/prettify.js           |    0
 .../render-javadoc}/table_padding.css              |    0
 gradle/generation/jflex.gradle                     |    2 +-
 gradle/generation/kuromoji.gradle                  |    2 +-
 gradle/generation/snowball.gradle                  |    6 +
 gradle/generation/util.gradle                      |    4 +-
 .../hacks/gradle.gradle                            |   51 +-
 .../hacks/hashmapAssertions.gradle                 |   24 +-
 gradle/help.gradle                                 |    1 +
 gradle/ide/eclipse.gradle                          |  104 +
 .../ide}/eclipse/dot.classpath.xsl                 |    0
 {dev-tools => gradle/ide}/eclipse/dot.project      |    0
 .../dot.settings/org.eclipse.core.resources.prefs  |    0
 .../dot.settings/org.eclipse.jdt.core.prefs        |    0
 .../eclipse/dot.settings/org.eclipse.jdt.ui.prefs  |    0
 .../ide}/eclipse/run-solr-cloud.launch             |    0
 {dev-tools => gradle/ide}/eclipse/run-solr.launch  |    0
 .../ide}/eclipse/run-test-cases.launch             |    0
 gradle/maven/defaults-maven.gradle                 |    2 -
 .../resolve.gradle => solr/packaging.gradle}       |   29 +-
 .../solr-forbidden-apis.gradle                     |    2 +-
 gradle/testing/alternative-jdk-support.gradle      |    4 +
 gradle/testing/beasting.gradle                     |   92 +
 gradle/testing/defaults-tests.gradle               |   59 +-
 .../testing/defaults-tests}/logging.properties     |    0
 gradle/testing/fail-on-no-tests.gradle             |    2 +-
 gradle/testing/profiling.gradle                    |   50 +-
 gradle/testing/randomization.gradle                |   92 +-
 .../policies}/replicator-tests.policy              |    0
 .../{ => randomization}/policies/solr-tests.policy |    4 +-
 .../testing/randomization/policies}/tests.policy   |    0
 gradle/validation/check-broken-links.gradle        |   11 +-
 gradle/validation/config-file-sanity.gradle        |    2 +-
 gradle/validation/ecj-lint.gradle                  |    4 +-
 .../validation/ecj-lint}/ecj.javadocs.prefs        |    0
 gradle/validation/forbidden-apis.gradle            |   18 +-
 gradle/validation/missing-docs-check.gradle        |   18 +-
 gradle/validation/owasp-dependency-check.gradle    |    4 +-
 .../owasp-dependency-check/exclusions.xml          |   24 -
 gradle/validation/validate-source-patterns.gradle  |  240 +-
 gradlew                                            |   13 +-
 gradlew.bat                                        |    7 +-
 help/IDEs.txt                                      |   20 +
 help/tests.txt                                     |   15 +
 lucene/BUILD.md                                    |   81 +-
 lucene/CHANGES.txt                                 |   41 +-
 lucene/analysis/analysis-module-build.xml          |   44 -
 lucene/analysis/build.xml                          |  172 -
 lucene/analysis/common/build.xml                   |  125 -
 lucene/analysis/common/ivy.xml                     |   21 -
 .../apache/lucene/analysis/sr/SerbianAnalyzer.java |  129 +
 .../org/apache/lucene/collation/package-info.java  |    2 +-
 .../org/apache/lucene/analysis/sr/stopwords.txt    |  156 +
 .../lucene/analysis/sr/TestSerbianAnalyzer.java    |   65 +
 lucene/analysis/icu/build.xml                      |  118 -
 lucene/analysis/icu/ivy.xml                        |   28 -
 lucene/analysis/kuromoji/build.xml                 |   98 -
 lucene/analysis/kuromoji/ivy.xml                   |   37 -
 lucene/analysis/morfologik/build.xml               |   40 -
 lucene/analysis/morfologik/ivy.xml                 |   31 -
 lucene/analysis/nori/build.xml                     |   84 -
 lucene/analysis/nori/ivy.xml                       |   33 -
 lucene/analysis/opennlp/build.xml                  |  118 -
 lucene/analysis/opennlp/ivy.xml                    |   28 -
 lucene/analysis/phonetic/build.xml                 |   35 -
 lucene/analysis/phonetic/ivy.xml                   |   28 -
 lucene/analysis/smartcn/build.xml                  |   34 -
 lucene/analysis/smartcn/ivy.xml                    |   21 -
 lucene/analysis/stempel/build.xml                  |   34 -
 lucene/analysis/stempel/ivy.xml                    |   21 -
 lucene/backward-codecs/build.xml                   |   26 -
 lucene/backward-codecs/ivy.xml                     |   21 -
 .../lucene50/Lucene50StoredFieldsFormat.java       |   11 +-
 .../lucene/codecs/lucene84/Lucene84Codec.java      |    2 +-
 .../lucene/codecs/lucene86/Lucene86Codec.java      |    2 +-
 .../apache/lucene/codecs/lucene86}/package.html    |    6 +-
 .../services/org.apache.lucene.codecs.Codec        |    1 +
 .../lucene50/Lucene50RWStoredFieldsFormat.java     |   51 +
 .../lucene50/TestLucene50StoredFieldsFormat.java   |    4 +-
 ...tLucene50StoredFieldsFormatHighCompression.java |    8 +-
 ...estLucene50StoredFieldsFormatMergeInstance.java |    0
 .../lucene70/TestLucene70SegmentInfoFormat.java    |   10 +-
 .../lucene/codecs/lucene84/Lucene84RWCodec.java    |    7 +
 .../lucene/codecs/lucene86/Lucene86RWCodec.java    |   35 +-
 .../lucene/index/TestBackwardsCompatibility.java   |   10 +-
 .../org/apache/lucene/index/index.8.6.1-cfs.zip    |  Bin 0 -> 16384 bytes
 .../org/apache/lucene/index/index.8.6.1-nocfs.zip  |  Bin 0 -> 16379 bytes
 .../org/apache/lucene/index/index.8.6.2-cfs.zip    |  Bin 0 -> 16338 bytes
 .../org/apache/lucene/index/index.8.6.2-nocfs.zip  |  Bin 0 -> 16341 bytes
 .../test/org/apache/lucene/index/sorted.8.6.1.zip  |  Bin 0 -> 132476 bytes
 .../test/org/apache/lucene/index/sorted.8.6.2.zip  |  Bin 0 -> 140426 bytes
 lucene/benchmark/build.xml                         |  289 --
 lucene/benchmark/ivy.xml                           |   32 -
 .../benchmark/byTask/tasks/CreateIndexTask.java    |    4 +-
 lucene/build.xml                                   |  586 ---
 lucene/classification/build.xml                    |   55 -
 lucene/classification/ivy.xml                      |   21 -
 lucene/codecs/build.xml                            |   28 -
 lucene/codecs/ivy.xml                              |   21 -
 lucene/common-build.xml                            | 2605 -------------
 lucene/core/build.xml                              |  235 --
 lucene/core/ivy.xml                                |   21 -
 .../java/org/apache/lucene/analysis/Analyzer.java  |   16 +-
 .../org/apache/lucene/analysis/package-info.java   |    8 +-
 .../src/java/org/apache/lucene/codecs/Codec.java   |    2 +-
 .../compressing/CompressingStoredFieldsReader.java |   50 +-
 .../compressing/CompressingStoredFieldsWriter.java |   33 +-
 .../compressing/CompressingTermVectorsReader.java  |   65 +-
 .../compressing/CompressingTermVectorsWriter.java  |   32 +-
 .../codecs/compressing/FieldsIndexReader.java      |   33 +-
 .../codecs/compressing/FieldsIndexWriter.java      |   14 +-
 .../codecs/lucene50/Lucene50TermVectorsFormat.java |    3 +-
 .../lucene/codecs/lucene86/package-info.java       |    6 +-
 .../Lucene87Codec.java}                            |   21 +-
 .../lucene87/Lucene87StoredFieldsFormat.java       |  378 ++
 .../{lucene86 => lucene87}/package-info.java       |   10 +-
 .../lucene/index/DocumentsWriterDeleteQueue.java   |    8 +-
 .../lucene/index/DocumentsWriterFlushControl.java  |    6 +-
 .../lucene/index/DocumentsWriterPerThreadPool.java |   14 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |  313 +-
 .../org/apache/lucene/index/IndexWriterConfig.java |   15 +-
 .../apache/lucene/index/LiveIndexWriterConfig.java |   10 +-
 .../java/org/apache/lucene/index/MergePolicy.java  |   17 +-
 .../java/org/apache/lucene/index/MergeTrigger.java |    4 +
 .../java/org/apache/lucene/index/ReaderPool.java   |    2 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |   17 +-
 .../lucene/index/StandardDirectoryReader.java      |   24 +-
 .../org/apache/lucene/search/BooleanQuery.java     |   12 +-
 .../lucene/search/DisjunctionMatchesIterator.java  |    3 +-
 .../java/org/apache/lucene/search/FuzzyQuery.java  |    6 +-
 .../search/MultiTermQueryConstantScoreWrapper.java |    3 -
 .../org/apache/lucene/search/SynonymQuery.java     |    2 +-
 .../java/org/apache/lucene/search/TermQuery.java   |    3 -
 .../src/java/org/apache/lucene/util/Version.java   |   14 +
 lucene/core/src/java/overview.html                 |    4 +-
 .../services/org.apache.lucene.codecs.Codec        |    2 +-
 .../codecs/lucene80/TestLucene80NormsFormat.java   |    4 +-
 .../codecs/lucene86/TestLucene86PointsFormat.java  |    2 +-
 .../TestLucene87StoredFieldsFormat.java}           |    5 +-
 ...Lucene87StoredFieldsFormatHighCompression.java} |   18 +-
 ...stLucene87StoredFieldsFormatMergeInstance.java} |    4 +-
 .../index/TestDocumentsWriterDeleteQueue.java      |   21 +
 .../index/TestDocumentsWriterPerThreadPool.java    |   96 +
 .../apache/lucene/index/TestForTooMuchCloning.java |    5 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |    4 +-
 .../apache/lucene/index/TestIndexWriterDelete.java |    7 +-
 .../lucene/index/TestIndexWriterExceptions.java    |  104 +
 .../lucene/index/TestIndexWriterMergePolicy.java   |  232 +-
 .../lucene/index/TestIndexWriterOnVMError.java     |    4 +-
 .../apache/lucene/index/TestIndexWriterReader.java |   33 +-
 .../lucene/index/TestIndexWriterWithThreads.java   |    1 -
 .../org/apache/lucene/index/TestPointValues.java   |    4 +-
 .../index/TestSoftDeletesRetentionMergePolicy.java |    2 +-
 .../apache/lucene/search/MultiCollectorTest.java   |  338 --
 .../org/apache/lucene/search/TestBoolean2.java     |    9 +-
 .../apache/lucene/search/TestBooleanRewrites.java  |   18 +-
 .../apache/lucene/search/TestMatchesIterator.java  |   93 +-
 .../apache/lucene/search/TestMultiCollector.java   |  309 ++
 .../test/org/apache/lucene/util/TestVersion.java   |    2 +-
 lucene/default-nested-ivy-settings.xml             |   56 -
 lucene/demo/build.xml                              |   61 -
 lucene/demo/ivy.xml                                |   21 -
 lucene/demo/src/java/overview.html                 |    2 +-
 lucene/expressions/build.xml                       |  120 -
 lucene/expressions/ivy.xml                         |   30 -
 lucene/facet/build.xml                             |   47 -
 lucene/facet/ivy.xml                               |   27 -
 lucene/grouping/build.xml                          |   49 -
 lucene/grouping/ivy.xml                            |   21 -
 lucene/highlighter/build.gradle                    |    1 +
 lucene/highlighter/build.xml                       |   54 -
 lucene/highlighter/ivy.xml                         |   21 -
 .../BreakIteratorShrinkingAdjuster.java            |   86 +
 .../matchhighlight/CharSequenceIterator.java       |  104 +
 .../matchhighlight/MatchRegionRetriever.java       |  304 ++
 .../lucene/search/matchhighlight/OffsetRange.java  |   65 +
 .../matchhighlight/OffsetsFromMatchIterator.java   |   49 +
 .../matchhighlight/OffsetsFromPositions.java       |  154 +
 .../search/matchhighlight/OffsetsFromTokens.java   |   97 +
 .../search/matchhighlight/OffsetsFromValues.java   |   74 +
 .../matchhighlight/OffsetsRetrievalStrategy.java   |   43 +-
 .../OffsetsRetrievalStrategySupplier.java          |   11 +-
 .../lucene/search/matchhighlight/Passage.java      |   28 +-
 .../search/matchhighlight/PassageAdjuster.java     |   22 +-
 .../search/matchhighlight/PassageFormatter.java    |  214 ++
 .../search/matchhighlight/PassageSelector.java     |  273 ++
 .../lucene/search/matchhighlight/package-info.java |   23 +-
 .../matchhighlight/AsciiMatchRangeHighlighter.java |   81 +
 .../search/matchhighlight/MissingAnalyzer.java     |   35 +-
 .../matchhighlight/TestMatchRegionRetriever.java   |  767 ++++
 .../search/matchhighlight/TestPassageSelector.java |  284 ++
 .../uhighlight/TestUnifiedHighlighterMTQ.java      |   11 +-
 lucene/ivy-ignore-conflicts.properties             |   14 -
 lucene/ivy-versions.properties                     |    9 +-
 lucene/join/build.xml                              |   27 -
 lucene/join/ivy.xml                                |   21 -
 lucene/licenses/ant-1.8.2.jar.sha1                 |    1 -
 lucene/licenses/ant-LICENSE-ASL.txt                |  272 --
 lucene/licenses/ant-NOTICE.txt                     |   26 -
 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/hamcrest-core-NOTICE.txt           |    0
 lucene/licenses/ivy-2.4.0.jar.sha1                 |    1 -
 lucene/licenses/ivy-LICENSE-ASL.txt                |  258 --
 lucene/licenses/ivy-NOTICE.txt                     |   16 -
 lucene/luke/build.gradle                           |  132 +-
 lucene/luke/build.xml                              |   82 -
 lucene/luke/ivy.xml                                |   34 -
 lucene/luke/src/distribution/README.md             |    8 +
 .../luke/models/commits/CommitsImplTest.java       |    2 +-
 lucene/memory/build.xml                            |   34 -
 lucene/memory/ivy.xml                              |   21 -
 lucene/misc/build.xml                              |   52 -
 lucene/misc/ivy.xml                                |   21 -
 lucene/module-build.xml                            |  721 ----
 lucene/monitor/build.xml                           |   53 -
 lucene/monitor/ivy.xml                             |   21 -
 lucene/queries/build.xml                           |   32 -
 lucene/queries/ivy.xml                             |   21 -
 .../queries/function/FunctionMatchQuery.java       |   19 +-
 .../queries/function/TestFunctionMatchQuery.java   |   26 +-
 lucene/queryparser/build.xml                       |  178 -
 lucene/queryparser/ivy.xml                         |   21 -
 lucene/queryparser/xmldtddocbuild.xml              |   53 -
 lucene/replicator/build.xml                        |   53 -
 lucene/replicator/ivy.xml                          |   47 -
 lucene/sandbox/build.xml                           |   26 -
 lucene/sandbox/ivy.xml                             |   21 -
 .../document/TestFloatPointNearestNeighbor.java    |    3 +-
 .../test/org/apache/lucene/search/TestNearest.java |    3 +-
 lucene/spatial-extras/build.xml                    |   62 -
 lucene/spatial-extras/ivy.xml                      |   40 -
 lucene/spatial3d/build.xml                         |   30 -
 lucene/spatial3d/ivy.xml                           |   21 -
 lucene/suggest/build.xml                           |   47 -
 lucene/suggest/ivy.xml                             |   21 -
 .../apache/lucene/search/spell/SuggestWord.java    |    5 +
 .../search/suggest/document/TestSuggestField.java  |    4 +-
 lucene/test-framework/build.gradle                 |   10 +-
 lucene/test-framework/build.xml                    |   82 -
 lucene/test-framework/ivy.xml                      |   33 -
 .../codecs/compressing/CompressingCodec.java       |    4 +-
 .../DeflateWithPresetCompressingCodec.java}        |   27 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |    4 +-
 .../org/apache/lucene/geo/BaseXYPointTestCase.java |    4 +-
 .../apache/lucene/store/MockDirectoryWrapper.java  |    2 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |    2 +-
 .../util/TestRuleSetupAndRestoreClassEnv.java      |    8 +-
 .../src/java/org/apache/lucene/util/TestUtil.java  |    4 +-
 .../services/org.apache.lucene.codecs.Codec        |    1 +
 lucene/tools/build.xml                             |   64 -
 lucene/tools/custom-tasks.xml                      |  149 -
 lucene/tools/forbiddenApis/base.txt                |   64 -
 lucene/tools/forbiddenApis/lucene.txt              |   49 -
 lucene/tools/forbiddenApis/servlet-api.txt         |   43 -
 lucene/tools/forbiddenApis/solr.txt                |   61 -
 lucene/tools/forbiddenApis/tests.txt               |   29 -
 lucene/tools/ivy.xml                               |   29 -
 lucene/tools/junit4/cached-timehints.txt           |    0
 .../tools/src/groovy/check-source-patterns.groovy  |  229 --
 lucene/tools/src/groovy/check-working-copy.groovy  |   61 -
 .../src/groovy/install-markdown-filter.groovy      |   61 -
 lucene/tools/src/groovy/run-beaster.groovy         |  121 -
 lucene/tools/src/groovy/run-maven-build.groovy     |   50 -
 lucene/tools/src/java/lucene-solr.antlib.xml       |   27 -
 .../dependencies/GetMavenDependenciesTask.java     |  920 -----
 .../dependencies/InterpolatedProperties.java       |  162 -
 .../lucene/validation/LibVersionsCheckTask.java    |  903 -----
 .../apache/lucene/validation/LicenseCheckTask.java |  352 --
 .../org/apache/lucene/validation/LicenseType.java  |   75 -
 .../lucene/validation/ivyde/IvyNodeElement.java    |  178 -
 .../validation/ivyde/IvyNodeElementAdapter.java    |  135 -
 lucene/top-level-ivy-settings.xml                  |   24 -
 lucene/version.properties                          |   10 -
 settings.gradle                                    |    2 -
 solr/.gitignore                                    |    5 -
 solr/CHANGES.txt                                   |   76 +-
 solr/README.md                                     |   36 +-
 solr/bin/solr                                      |    3 +-
 solr/bin/solr.cmd                                  |   61 +-
 solr/build.xml                                     |  813 -----
 solr/common-build.xml                              |  551 ---
 solr/contrib/analysis-extras/build.xml             |   92 -
 solr/contrib/analysis-extras/ivy.xml               |   41 -
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |    8 +-
 solr/contrib/analytics/build.xml                   |   28 -
 solr/contrib/analytics/ivy.xml                     |   29 -
 .../org/apache/solr/handler/AnalyticsHandler.java  |    7 +-
 solr/contrib/clustering/build.xml                  |   28 -
 solr/contrib/clustering/ivy.xml                    |   41 -
 solr/contrib/contrib-build.xml                     |   57 -
 solr/contrib/dataimporthandler-extras/build.gradle |   33 -
 solr/contrib/dataimporthandler-extras/build.xml    |   96 -
 solr/contrib/dataimporthandler-extras/ivy.xml      |   40 -
 .../handler/dataimport/MailEntityProcessor.java    |  901 -----
 .../handler/dataimport/TikaEntityProcessor.java    |  253 --
 .../src/java/overview.html                         |   21 -
 .../src/resources/solr-default-tika-config.xml     |   20 -
 .../src/test-files/dihextras/bad.doc               |  Bin 116222 -> 0 bytes
 .../src/test-files/dihextras/solr-word.pdf         |  Bin 21052 -> 0 bytes
 .../conf/dataimport-schema-no-unique-key.xml       |  205 --
 .../collection1/conf/dataimport-solrconfig.xml     |  277 --
 .../src/test-files/dihextras/structured.html       |   29 -
 .../src/test-files/dihextras/test_jpeg.jpg         |  Bin 12924 -> 0 bytes
 .../dihextras/test_recursive_embedded.docx         |  Bin 27082 -> 0 bytes
 .../src/test-files/dihextras/test_vsdx.vsdx        |  Bin 44426 -> 0 bytes
 .../dataimport/TestMailEntityProcessor.java        |  199 -
 .../dataimport/TestTikaEntityProcessor.java        |  221 --
 solr/contrib/dataimporthandler/README.md           |   26 -
 solr/contrib/dataimporthandler/build.xml           |   32 -
 solr/contrib/dataimporthandler/ivy.xml             |   34 -
 .../dataimport/BinContentStreamDataSource.java     |   70 -
 .../solr/handler/dataimport/BinFileDataSource.java |   64 -
 .../solr/handler/dataimport/BinURLDataSource.java  |  104 -
 .../solr/handler/dataimport/CachePropertyUtil.java |   48 -
 .../solr/handler/dataimport/ClobTransformer.java   |   85 -
 .../solr/handler/dataimport/ConfigParseUtil.java   |   73 -
 .../dataimport/ContentStreamDataSource.java        |   69 -
 .../apache/solr/handler/dataimport/Context.java    |  221 --
 .../solr/handler/dataimport/ContextImpl.java       |  264 --
 .../apache/solr/handler/dataimport/DIHCache.java   |  103 -
 .../solr/handler/dataimport/DIHCacheSupport.java   |  279 --
 .../solr/handler/dataimport/DIHProperties.java     |   45 -
 .../apache/solr/handler/dataimport/DIHWriter.java  |   99 -
 .../solr/handler/dataimport/DataImportHandler.java |  318 --
 .../dataimport/DataImportHandlerException.java     |   75 -
 .../solr/handler/dataimport/DataImporter.java      |  628 ----
 .../apache/solr/handler/dataimport/DataSource.java |   65 -
 .../handler/dataimport/DateFormatEvaluator.java    |  180 -
 .../handler/dataimport/DateFormatTransformer.java  |  106 -
 .../apache/solr/handler/dataimport/DebugInfo.java  |   66 -
 .../solr/handler/dataimport/DebugLogger.java       |  295 --
 .../apache/solr/handler/dataimport/DocBuilder.java | 1004 ------
 .../solr/handler/dataimport/EntityProcessor.java   |  113 -
 .../handler/dataimport/EntityProcessorBase.java    |  174 -
 .../handler/dataimport/EntityProcessorWrapper.java |  357 --
 .../apache/solr/handler/dataimport/Evaluator.java  |  140 -
 .../handler/dataimport/FieldReaderDataSource.java  |  122 -
 .../handler/dataimport/FieldStreamDataSource.java  |   85 -
 .../solr/handler/dataimport/FileDataSource.java    |  155 -
 .../dataimport/FileListEntityProcessor.java        |  305 --
 .../handler/dataimport/HTMLStripTransformer.java   |   96 -
 .../solr/handler/dataimport/JdbcDataSource.java    |  583 ---
 .../handler/dataimport/LineEntityProcessor.java    |  164 -
 .../solr/handler/dataimport/LogTransformer.java    |   67 -
 .../solr/handler/dataimport/MockDataSource.java    |   61 -
 .../dataimport/NumberFormatTransformer.java        |  134 -
 .../dataimport/PlainTextEntityProcessor.java       |   78 -
 .../solr/handler/dataimport/RegexTransformer.java  |  200 -
 .../solr/handler/dataimport/RequestInfo.java       |  177 -
 .../solr/handler/dataimport/ScriptTransformer.java |  131 -
 .../handler/dataimport/SimplePropertiesWriter.java |  247 --
 .../handler/dataimport/SolrEntityProcessor.java    |  321 --
 .../apache/solr/handler/dataimport/SolrWriter.java |  175 -
 .../handler/dataimport/SortedMapBackedCache.java   |  238 --
 .../handler/dataimport/SqlEntityProcessor.java     |  173 -
 .../handler/dataimport/SqlEscapingEvaluator.java   |   41 -
 .../handler/dataimport/TemplateTransformer.java    |  115 -
 .../solr/handler/dataimport/Transformer.java       |   50 -
 .../solr/handler/dataimport/URLDataSource.java     |  154 -
 .../solr/handler/dataimport/UrlEvaluator.java      |   46 -
 .../solr/handler/dataimport/VariableResolver.java  |  211 --
 .../handler/dataimport/XPathEntityProcessor.java   |  555 ---
 .../solr/handler/dataimport/XPathRecordReader.java |  670 ----
 .../handler/dataimport/ZKPropertiesWriter.java     |   95 -
 .../org/apache/solr/handler/dataimport/Zipper.java |  115 -
 .../dataimport/config/ConfigNameConstants.java     |   59 -
 .../handler/dataimport/config/ConfigParseUtil.java |   72 -
 .../dataimport/config/DIHConfiguration.java        |  199 -
 .../solr/handler/dataimport/config/Entity.java     |  228 --
 .../handler/dataimport/config/EntityField.java     |  102 -
 .../solr/handler/dataimport/config/Field.java      |  108 -
 .../solr/handler/dataimport/config/Script.java     |   41 -
 .../dataimporthandler/src/java/overview.html       |   21 -
 .../collection1/conf/contentstream-solrconfig.xml  |  287 --
 .../collection1/conf/data-config-end-to-end.xml    |   41 -
 .../conf/data-config-with-datasource.xml           |    9 -
 .../conf/data-config-with-transformer.xml          |   10 -
 .../collection1/conf/dataconfig-contentstream.xml  |   10 -
 .../conf/dataimport-nodatasource-solrconfig.xml    |  279 --
 .../solr/collection1/conf/dataimport-schema.xml    |   70 -
 .../collection1/conf/dataimport-solr_id-schema.xml |  313 --
 .../collection1/conf/dataimport-solrconfig.xml     |  287 --
 .../dih/solr/collection1/conf/protwords.txt        |   20 -
 .../collection1/conf/single-entity-data-config.xml |    9 -
 .../dih/solr/collection1/conf/stopwords.txt        |   16 -
 .../dih/solr/collection1/conf/synonyms.txt         |   22 -
 .../src/test-files/dih/solr/solr.xml               |   27 -
 .../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       |  235 --
 .../dataimport/AbstractDIHJdbcTestCase.java        |  198 -
 .../AbstractDataImportHandlerTestCase.java         |  379 --
 .../AbstractSqlEntityProcessorTestCase.java        |  848 -----
 .../handler/dataimport/AddAColumnTransformer.java  |   31 -
 .../dataimport/MockInitialContextFactory.java      |   52 -
 .../dataimport/MockSolrEntityProcessor.java        |   76 -
 .../handler/dataimport/TestBuiltInEvaluators.java  |  188 -
 .../handler/dataimport/TestClobTransformer.java    |   64 -
 .../dataimport/TestContentStreamDataSource.java    |  196 -
 .../solr/handler/dataimport/TestContextImpl.java   |   69 -
 .../solr/handler/dataimport/TestDataConfig.java    |   77 -
 .../dataimport/TestDateFormatTransformer.java      |   89 -
 .../solr/handler/dataimport/TestDocBuilder.java    |  341 --
 .../solr/handler/dataimport/TestDocBuilder2.java   |  445 ---
 .../dataimport/TestEntityProcessorBase.java        |   84 -
 .../handler/dataimport/TestEphemeralCache.java     |  143 -
 .../solr/handler/dataimport/TestErrorHandling.java |  210 --
 .../solr/handler/dataimport/TestFieldReader.java   |   66 -
 .../dataimport/TestFileListEntityProcessor.java    |  194 -
 .../TestFileListWithLineEntityProcessor.java       |   64 -
 .../dataimport/TestHierarchicalDocBuilder.java     |  483 ---
 .../handler/dataimport/TestJdbcDataSource.java     |  663 ----
 .../dataimport/TestJdbcDataSourceConvertType.java  |   76 -
 .../dataimport/TestLineEntityProcessor.java        |  259 --
 .../handler/dataimport/TestNestedChildren.java     |   65 -
 .../dataimport/TestNonWritablePersistFile.java     |  102 -
 .../dataimport/TestNumberFormatTransformer.java    |  160 -
 .../dataimport/TestPlainTextEntityProcessor.java   |  182 -
 .../handler/dataimport/TestRegexTransformer.java   |  213 --
 .../handler/dataimport/TestScriptTransformer.java  |  173 -
 .../dataimport/TestSimplePropertiesWriter.java     |  135 -
 .../TestSolrEntityProcessorEndToEnd.java           |  374 --
 .../dataimport/TestSolrEntityProcessorUnit.java    |  188 -
 .../dataimport/TestSortedMapBackedCache.java       |  192 -
 .../handler/dataimport/TestSqlEntityProcessor.java |  115 -
 .../dataimport/TestSqlEntityProcessorDelta.java    |  209 --
 .../dataimport/TestTemplateTransformer.java        |  115 -
 .../solr/handler/dataimport/TestURLDataSource.java |   45 -
 .../handler/dataimport/TestVariableResolver.java   |  173 -
 .../dataimport/TestVariableResolverEndToEnd.java   |  141 -
 .../solr/handler/dataimport/TestWriterImpl.java    |   83 -
 .../dataimport/TestXPathEntityProcessor.java       |  506 ---
 .../handler/dataimport/TestXPathRecordReader.java  |  591 ---
 .../handler/dataimport/TestZKPropertiesWriter.java |  279 --
 .../dataimport/TripleThreatTransformer.java        |   75 -
 solr/contrib/extraction/build.xml                  |   28 -
 solr/contrib/extraction/ivy.xml                    |   80 -
 solr/contrib/jaegertracer-configurator/build.xml   |   34 -
 solr/contrib/jaegertracer-configurator/ivy.xml     |   32 -
 solr/contrib/langid/build.xml                      |  102 -
 solr/contrib/langid/ivy.xml                        |   32 -
 .../LanguageIdentifierUpdateProcessor.java         |    4 +-
 solr/contrib/ltr/build.xml                         |   35 -
 solr/contrib/ltr/ivy.xml                           |   33 -
 solr/contrib/prometheus-exporter/build.xml         |   64 -
 .../conf/solr-exporter-config.xml                  |    8 +-
 solr/contrib/prometheus-exporter/ivy.xml           |   41 -
 .../collector/MetricsCollectorFactory.java         |    6 +-
 .../collector/SchedulerMetricsCollector.java       |   52 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |   61 -
 .../solr/prometheus/scraper/SolrCloudScraper.java  |    4 +-
 .../solr/prometheus/scraper/SolrScraper.java       |   43 +-
 .../prometheus/scraper/SolrStandaloneScraper.java  |    4 +-
 ...theus-solr-exporter-integration-test-config.xml |    8 +-
 .../apache/solr/prometheus/scraper/AsyncTest.java  |   78 -
 solr/contrib/velocity/build.xml                    |   28 -
 solr/contrib/velocity/ivy.xml                      |   36 -
 solr/core/build.xml                                |  131 -
 solr/core/ivy.xml                                  |  148 -
 .../apache/solr/cloud/OverseerTaskProcessor.java   |    3 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |   11 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |   10 +-
 .../cloud/api/collections/DeleteCollectionCmd.java |   28 +
 .../cloud/api/collections/DeleteReplicaCmd.java    |    1 -
 .../org/apache/solr/core/ConfigSetService.java     |    5 +-
 .../java/org/apache/solr/core/CoreContainer.java   |    7 +-
 .../java/org/apache/solr/core/MemClassLoader.java  |  203 --
 .../src/java/org/apache/solr/core/PluginBag.java   |  208 +-
 .../org/apache/solr/core/SchemaCodecFactory.java   |    6 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |   33 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   33 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |   14 +-
 .../apache/solr/filestore/DistribPackageStore.java |    5 +-
 .../org/apache/solr/handler/CdcrBufferManager.java |   71 -
 .../solr/handler/CdcrBufferStateManager.java       |  178 -
 .../solr/handler/CdcrLeaderStateManager.java       |  162 -
 .../java/org/apache/solr/handler/CdcrParams.java   |  256 --
 .../solr/handler/CdcrProcessStateManager.java      |  178 -
 .../org/apache/solr/handler/CdcrReplicator.java    |  258 --
 .../apache/solr/handler/CdcrReplicatorManager.java |  441 ---
 .../solr/handler/CdcrReplicatorScheduler.java      |  116 -
 .../apache/solr/handler/CdcrReplicatorState.java   |  299 --
 .../apache/solr/handler/CdcrRequestHandler.java    |  880 -----
 .../solr/handler/CdcrUpdateLogSynchronizer.java    |  192 -
 .../java/org/apache/solr/handler/IndexFetcher.java |  232 +-
 .../apache/solr/handler/MoreLikeThisHandler.java   |    5 +-
 .../apache/solr/handler/ReplicationHandler.java    |  284 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   23 +-
 .../org/apache/solr/handler/StreamHandler.java     |    2 +-
 .../solr/handler/admin/ConfigSetsHandlerApi.java   |    4 +
 .../solr/handler/admin/HealthCheckHandler.java     |    3 -
 .../org/apache/solr/handler/admin/InfoHandler.java |    5 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |    4 +-
 .../solr/handler/component/FacetComponent.java     |    6 +-
 .../solr/handler/component/HttpShardHandler.java   |    4 +-
 .../handler/component/RealTimeGetComponent.java    |   25 +-
 .../solr/handler/component/SearchHandler.java      |    7 +-
 .../solr/handler/component/StatsValuesFactory.java |    2 +-
 .../apache/solr/packagemanager/PackageManager.java |  106 +-
 .../solr/packagemanager/SolrPackageInstance.java   |    4 +-
 .../solr/pkg/PackageListeningClassLoader.java      |    2 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |    2 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |    4 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |    5 +
 .../java/org/apache/solr/schema/SchemaManager.java |    4 +-
 .../apache/solr/search/ExtendedDismaxQParser.java  |    6 +
 .../org/apache/solr/search/JoinQParserPlugin.java  |   50 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   29 +-
 .../apache/solr/search/SolrQueryTimeoutImpl.java   |   36 +-
 .../org/apache/solr/search/facet/FacetRequest.java |   35 +-
 .../solr/search/join/ScoreJoinQParserPlugin.java   |   14 +
 .../similarities/BooleanSimilarityFactory.java}    |   31 +-
 .../solr/search/stats/ExactSharedStatsCache.java   |    2 +-
 .../apache/solr/search/stats/LRUStatsCache.java    |    2 +-
 .../org/apache/solr/search/stats/StatsCache.java   |    2 +-
 .../solr/security/JWTVerificationkeyResolver.java  |    2 +-
 .../org/apache/solr/servlet/QueryRateLimiter.java  |   55 +
 .../org/apache/solr/servlet/RateLimitManager.java  |  181 +
 .../apache/solr/servlet/RequestRateLimiter.java    |  168 +
 .../apache/solr/servlet/SolrDispatchFilter.java    |   37 +-
 .../org/apache/solr/update/CdcrTransactionLog.java |  401 --
 .../java/org/apache/solr/update/CdcrUpdateLog.java |  796 ----
 .../apache/solr/update/DefaultSolrCoreState.java   |   41 -
 .../src/java/org/apache/solr/update/PeerSync.java  |   68 +-
 .../org/apache/solr/update/PeerSyncWithLeader.java |   25 +-
 .../java/org/apache/solr/update/SolrCoreState.java |   17 -
 .../org/apache/solr/update/SolrIndexConfig.java    |   22 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |    3 +-
 .../solr/update/processor/CdcrUpdateProcessor.java |  132 -
 .../src/java/org/apache/solr/util/PackageTool.java |   10 +
 .../src/java/org/apache/solr/util/SolrCLI.java     |   24 +-
 .../java/org/apache/solr/util/TestInjection.java   |   12 +-
 .../util/circuitbreaker/CPUCircuitBreaker.java     |  115 +
 .../solr/util/circuitbreaker/CircuitBreaker.java   |   55 +-
 .../util/circuitbreaker/CircuitBreakerManager.java |   68 +-
 .../util/circuitbreaker/MemoryCircuitBreaker.java  |   25 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |    2 +-
 .../resources/EditableSolrConfigAttributes.json    |    5 -
 solr/core/src/resources/ImplicitPlugins.json       |    4 -
 .../conf/schema-booleansimilarity.xml}             |   26 +-
 .../solr/collection1/conf/solrconfig-cdcr.xml      |   77 -
 .../collection1/conf/solrconfig-cdcrupdatelog.xml  |   49 -
 ...olrconfig-slave.xml => solrconfig-follower.xml} |    4 +-
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |    0
 ...rottled.xml => solrconfig-leader-throttled.xml} |    0
 ...solrconfig-master.xml => solrconfig-leader.xml} |    2 +-
 ...up.xml => solrconfig-leader1-keepOneBackup.xml} |    2 +-
 ...lrconfig-master1.xml => solrconfig-leader1.xml} |    2 +-
 ...lrconfig-master2.xml => solrconfig-leader2.xml} |    2 +-
 ...lrconfig-master3.xml => solrconfig-leader3.xml} |    2 +-
 .../conf/solrconfig-memory-circuitbreaker.xml      |   11 +-
 .../solr/collection1/conf/solrconfig-repeater.xml  |    6 +-
 ...slave.xml => solrconfig-replication-legacy.xml} |    3 +
 .../solr/collection1/conf/solrconfig-tlog.xml      |    4 -
 .../conf/solrconfig.snippet.randomindexconfig.xml  |    1 +
 .../configsets/cdcr-cluster1/conf/managed-schema   |   29 -
 .../configsets/cdcr-cluster1/conf/solrconfig.xml   |   80 -
 .../configsets/cdcr-cluster2/conf/managed-schema   |   29 -
 .../configsets/cdcr-cluster2/conf/solrconfig.xml   |   80 -
 .../cdcr-source-disabled/conf/solrconfig.xml       |   60 -
 .../solr/configsets/cdcr-source/conf/schema.xml    |   29 -
 .../configsets/cdcr-source/conf/solrconfig.xml     |   75 -
 .../solr/configsets/cdcr-target/conf/schema.xml    |   29 -
 .../configsets/cdcr-target/conf/solrconfig.xml     |   62 -
 .../upload/dih-script-transformer/managed-schema   |   25 -
 .../upload/dih-script-transformer/solrconfig.xml   |   61 -
 .../solr/analysis/TestDeprecatedFilters.java       |    2 +-
 .../TestEmbeddedSolrServerAdminHandler.java        |    5 +
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    6 +-
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |  209 --
 .../org/apache/solr/cloud/TestLazySolrCluster.java |   97 +
 .../SimpleCollectionCreateDeleteTest.java          |  198 +-
 .../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java |  906 -----
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java     |  244 --
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |  373 --
 .../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java  |  332 --
 .../cloud/cdcr/CdcrReplicationHandlerTest.java     |  332 --
 .../solr/cloud/cdcr/CdcrRequestHandlerTest.java    |  183 -
 .../org/apache/solr/cloud/cdcr/CdcrTestsUtil.java  |  274 --
 .../cloud/cdcr/CdcrVersionReplicationTest.java     |  307 --
 .../solr/cloud/cdcr/CdcrWithNodesRestartsTest.java |  359 --
 .../solr/core/BlobRepositoryMockingTest.java       |    2 +-
 .../test/org/apache/solr/core/SolrCoreTest.java    |    3 -
 .../org/apache/solr/core/TestCodecSupport.java     |    8 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |    2 +
 .../org/apache/solr/core/TestConfigOverlay.java    |    2 -
 .../org/apache/solr/core/TestDynamicLoading.java   |  290 --
 .../apache/solr/core/TestDynamicLoadingUrl.java    |  128 -
 .../test/org/apache/solr/core/TestDynamicURP.java  |  111 -
 .../apache/solr/core/TestSolrConfigHandler.java    |   57 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |   22 +-
 .../solr/filestore/TestDistribPackageStore.java    |    2 +-
 .../apache/solr/handler/BackupRestoreUtils.java    |   20 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |   14 +-
 .../solr/handler/TestReplicationHandler.java       | 1238 ++++---
 .../solr/handler/TestReplicationHandlerBackup.java |   68 +-
 .../TestReplicationHandlerDiskOverFlow.java        |   76 +-
 .../org/apache/solr/handler/TestRestoreCore.java   |   78 +-
 .../handler/admin/ZookeeperStatusHandlerTest.java  |   35 +
 .../solr/handler/export/TestExportWriter.java      |   16 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |    9 +-
 .../solr/search/TestExtendedDismaxParser.java      |  146 +-
 .../org/apache/solr/search/TestRealTimeGet.java    |    1 -
 .../test/org/apache/solr/search/TestRecovery.java  |    1 -
 .../org/apache/solr/search/TestStressRecovery.java |    1 -
 .../search/facet/TestCloudJSONFacetJoinDomain.java |   38 +-
 .../TestBooleanSimilarityFactory.java}             |   36 +-
 .../solr/security/BasicAuthStandaloneTest.java     |    2 +-
 .../solr/servlet/TestRequestRateLimiter.java       |  235 ++
 .../org/apache/solr/update/CdcrUpdateLogTest.java  |  783 ----
 .../solr/update/DirectUpdateHandlerTest.java       |   18 +-
 .../apache/solr/update/SolrIndexConfigTest.java    |   19 +
 .../solr/update/TestInPlaceUpdatesDistrib.java     |    2 -
 .../apache/solr/update/processor/RuntimeUrp.java   |   40 -
 .../processor/TestNamedUpdateProcessors.java       |  163 -
 .../org/apache/solr/util/TestCircuitBreaker.java   |  146 +-
 solr/example/README.md                             |    9 +-
 solr/example/build.gradle                          |    8 -
 solr/example/example-DIH/.gitignore                |    1 -
 solr/example/example-DIH/README.md                 |   55 -
 solr/example/example-DIH/build.xml                 |   42 -
 solr/example/example-DIH/hsqldb/.gitignore         |    5 -
 solr/example/example-DIH/hsqldb/ex.script          |  165 -
 solr/example/example-DIH/ivy.xml                   |   29 -
 .../solr/atom/conf/atom-data-config.xml            |   35 -
 .../solr/atom/conf/lang/stopwords_en.txt           |   54 -
 .../example-DIH/solr/atom/conf/managed-schema      |  106 -
 .../example-DIH/solr/atom/conf/protwords.txt       |   17 -
 .../example-DIH/solr/atom/conf/solrconfig.xml      |   64 -
 .../example-DIH/solr/atom/conf/synonyms.txt        |   29 -
 .../example-DIH/solr/atom/conf/url_types.txt       |    1 -
 solr/example/example-DIH/solr/atom/core.properties |    0
 .../conf/clustering/carrot2/kmeans-attributes.xml  |   19 -
 .../conf/clustering/carrot2/lingo-attributes.xml   |   24 -
 .../db/conf/clustering/carrot2/stc-attributes.xml  |   19 -
 solr/example/example-DIH/solr/db/conf/currency.xml |   67 -
 .../example-DIH/solr/db/conf/db-data-config.xml    |   29 -
 solr/example/example-DIH/solr/db/conf/elevate.xml  |   42 -
 .../solr/db/conf/lang/contractions_ca.txt          |    8 -
 .../solr/db/conf/lang/contractions_fr.txt          |   15 -
 .../solr/db/conf/lang/contractions_ga.txt          |    5 -
 .../solr/db/conf/lang/contractions_it.txt          |   23 -
 .../solr/db/conf/lang/hyphenations_ga.txt          |    5 -
 .../example-DIH/solr/db/conf/lang/stemdict_nl.txt  |    6 -
 .../example-DIH/solr/db/conf/lang/stoptags_ja.txt  |  420 ---
 .../example-DIH/solr/db/conf/lang/stopwords_ar.txt |  125 -
 .../example-DIH/solr/db/conf/lang/stopwords_bg.txt |  193 -
 .../example-DIH/solr/db/conf/lang/stopwords_ca.txt |  220 --
 .../solr/db/conf/lang/stopwords_ckb.txt            |  136 -
 .../example-DIH/solr/db/conf/lang/stopwords_cz.txt |  172 -
 .../example-DIH/solr/db/conf/lang/stopwords_da.txt |  110 -
 .../example-DIH/solr/db/conf/lang/stopwords_de.txt |  294 --
 .../example-DIH/solr/db/conf/lang/stopwords_el.txt |   78 -
 .../example-DIH/solr/db/conf/lang/stopwords_en.txt |   54 -
 .../example-DIH/solr/db/conf/lang/stopwords_es.txt |  356 --
 .../example-DIH/solr/db/conf/lang/stopwords_eu.txt |   99 -
 .../example-DIH/solr/db/conf/lang/stopwords_fa.txt |  313 --
 .../example-DIH/solr/db/conf/lang/stopwords_fi.txt |   97 -
 .../example-DIH/solr/db/conf/lang/stopwords_fr.txt |  186 -
 .../example-DIH/solr/db/conf/lang/stopwords_ga.txt |  110 -
 .../example-DIH/solr/db/conf/lang/stopwords_gl.txt |  161 -
 .../example-DIH/solr/db/conf/lang/stopwords_hi.txt |  235 --
 .../example-DIH/solr/db/conf/lang/stopwords_hu.txt |  211 --
 .../example-DIH/solr/db/conf/lang/stopwords_hy.txt |   46 -
 .../example-DIH/solr/db/conf/lang/stopwords_id.txt |  359 --
 .../example-DIH/solr/db/conf/lang/stopwords_it.txt |  303 --
 .../example-DIH/solr/db/conf/lang/stopwords_ja.txt |  127 -
 .../example-DIH/solr/db/conf/lang/stopwords_lv.txt |  172 -
 .../example-DIH/solr/db/conf/lang/stopwords_nl.txt |  119 -
 .../example-DIH/solr/db/conf/lang/stopwords_no.txt |  194 -
 .../example-DIH/solr/db/conf/lang/stopwords_pt.txt |  253 --
 .../example-DIH/solr/db/conf/lang/stopwords_ro.txt |  233 --
 .../example-DIH/solr/db/conf/lang/stopwords_ru.txt |  243 --
 .../example-DIH/solr/db/conf/lang/stopwords_sv.txt |  133 -
 .../example-DIH/solr/db/conf/lang/stopwords_th.txt |  119 -
 .../example-DIH/solr/db/conf/lang/stopwords_tr.txt |  212 --
 .../example-DIH/solr/db/conf/lang/userdict_ja.txt  |   29 -
 .../example-DIH/solr/db/conf/managed-schema        | 1143 ------
 .../solr/db/conf/mapping-FoldToASCII.txt           | 3813 --------------------
 .../solr/db/conf/mapping-ISOLatin1Accent.txt       |  246 --
 .../example/example-DIH/solr/db/conf/protwords.txt |   21 -
 .../example-DIH/solr/db/conf/solrconfig.xml        | 1342 -------
 .../example/example-DIH/solr/db/conf/spellings.txt |    2 -
 .../example/example-DIH/solr/db/conf/stopwords.txt |   14 -
 solr/example/example-DIH/solr/db/conf/synonyms.txt |   29 -
 .../example-DIH/solr/db/conf/update-script.js      |   53 -
 .../example-DIH/solr/db/conf/xslt/example.xsl      |  132 -
 .../example-DIH/solr/db/conf/xslt/example_atom.xsl |   67 -
 .../example-DIH/solr/db/conf/xslt/example_rss.xsl  |   66 -
 .../example/example-DIH/solr/db/conf/xslt/luke.xsl |  337 --
 .../example-DIH/solr/db/conf/xslt/updateXml.xsl    |   70 -
 solr/example/example-DIH/solr/db/core.properties   |    0
 .../conf/clustering/carrot2/kmeans-attributes.xml  |   19 -
 .../conf/clustering/carrot2/lingo-attributes.xml   |   24 -
 .../conf/clustering/carrot2/stc-attributes.xml     |   19 -
 .../example-DIH/solr/mail/conf/currency.xml        |   67 -
 .../example/example-DIH/solr/mail/conf/elevate.xml |   42 -
 .../solr/mail/conf/lang/contractions_ca.txt        |    8 -
 .../solr/mail/conf/lang/contractions_fr.txt        |   15 -
 .../solr/mail/conf/lang/contractions_ga.txt        |    5 -
 .../solr/mail/conf/lang/contractions_it.txt        |   23 -
 .../solr/mail/conf/lang/hyphenations_ga.txt        |    5 -
 .../solr/mail/conf/lang/stemdict_nl.txt            |    6 -
 .../solr/mail/conf/lang/stoptags_ja.txt            |  420 ---
 .../solr/mail/conf/lang/stopwords_ar.txt           |  125 -
 .../solr/mail/conf/lang/stopwords_bg.txt           |  193 -
 .../solr/mail/conf/lang/stopwords_ca.txt           |  220 --
 .../solr/mail/conf/lang/stopwords_ckb.txt          |  136 -
 .../solr/mail/conf/lang/stopwords_cz.txt           |  172 -
 .../solr/mail/conf/lang/stopwords_da.txt           |  110 -
 .../solr/mail/conf/lang/stopwords_de.txt           |  294 --
 .../solr/mail/conf/lang/stopwords_el.txt           |   78 -
 .../solr/mail/conf/lang/stopwords_en.txt           |   54 -
 .../solr/mail/conf/lang/stopwords_es.txt           |  356 --
 .../solr/mail/conf/lang/stopwords_eu.txt           |   99 -
 .../solr/mail/conf/lang/stopwords_fa.txt           |  313 --
 .../solr/mail/conf/lang/stopwords_fi.txt           |   97 -
 .../solr/mail/conf/lang/stopwords_fr.txt           |  186 -
 .../solr/mail/conf/lang/stopwords_ga.txt           |  110 -
 .../solr/mail/conf/lang/stopwords_gl.txt           |  161 -
 .../solr/mail/conf/lang/stopwords_hi.txt           |  235 --
 .../solr/mail/conf/lang/stopwords_hu.txt           |  211 --
 .../solr/mail/conf/lang/stopwords_hy.txt           |   46 -
 .../solr/mail/conf/lang/stopwords_id.txt           |  359 --
 .../solr/mail/conf/lang/stopwords_it.txt           |  303 --
 .../solr/mail/conf/lang/stopwords_ja.txt           |  127 -
 .../solr/mail/conf/lang/stopwords_lv.txt           |  172 -
 .../solr/mail/conf/lang/stopwords_nl.txt           |  119 -
 .../solr/mail/conf/lang/stopwords_no.txt           |  194 -
 .../solr/mail/conf/lang/stopwords_pt.txt           |  253 --
 .../solr/mail/conf/lang/stopwords_ro.txt           |  233 --
 .../solr/mail/conf/lang/stopwords_ru.txt           |  243 --
 .../solr/mail/conf/lang/stopwords_sv.txt           |  133 -
 .../solr/mail/conf/lang/stopwords_th.txt           |  119 -
 .../solr/mail/conf/lang/stopwords_tr.txt           |  212 --
 .../solr/mail/conf/lang/userdict_ja.txt            |   29 -
 .../solr/mail/conf/mail-data-config.xml            |   12 -
 .../example-DIH/solr/mail/conf/managed-schema      | 1062 ------
 .../solr/mail/conf/mapping-FoldToASCII.txt         | 3813 --------------------
 .../solr/mail/conf/mapping-ISOLatin1Accent.txt     |  246 --
 .../example-DIH/solr/mail/conf/protwords.txt       |   21 -
 .../example-DIH/solr/mail/conf/solrconfig.xml      | 1345 -------
 .../example-DIH/solr/mail/conf/spellings.txt       |    2 -
 .../example-DIH/solr/mail/conf/stopwords.txt       |   14 -
 .../example-DIH/solr/mail/conf/synonyms.txt        |   29 -
 .../example-DIH/solr/mail/conf/update-script.js    |   53 -
 .../example-DIH/solr/mail/conf/xslt/example.xsl    |  132 -
 .../solr/mail/conf/xslt/example_atom.xsl           |   67 -
 .../solr/mail/conf/xslt/example_rss.xsl            |   66 -
 .../example-DIH/solr/mail/conf/xslt/luke.xsl       |  337 --
 .../example-DIH/solr/mail/conf/xslt/updateXml.xsl  |   70 -
 solr/example/example-DIH/solr/mail/core.properties |    0
 solr/example/example-DIH/solr/solr.xml             |    2 -
 .../conf/clustering/carrot2/kmeans-attributes.xml  |   19 -
 .../conf/clustering/carrot2/lingo-attributes.xml   |   24 -
 .../conf/clustering/carrot2/stc-attributes.xml     |   19 -
 .../example-DIH/solr/solr/conf/currency.xml        |   67 -
 .../example/example-DIH/solr/solr/conf/elevate.xml |   42 -
 .../solr/solr/conf/lang/contractions_ca.txt        |    8 -
 .../solr/solr/conf/lang/contractions_fr.txt        |   15 -
 .../solr/solr/conf/lang/contractions_ga.txt        |    5 -
 .../solr/solr/conf/lang/contractions_it.txt        |   23 -
 .../solr/solr/conf/lang/hyphenations_ga.txt        |    5 -
 .../solr/solr/conf/lang/stemdict_nl.txt            |    6 -
 .../solr/solr/conf/lang/stoptags_ja.txt            |  420 ---
 .../solr/solr/conf/lang/stopwords_ar.txt           |  125 -
 .../solr/solr/conf/lang/stopwords_bg.txt           |  193 -
 .../solr/solr/conf/lang/stopwords_ca.txt           |  220 --
 .../solr/solr/conf/lang/stopwords_ckb.txt          |  136 -
 .../solr/solr/conf/lang/stopwords_cz.txt           |  172 -
 .../solr/solr/conf/lang/stopwords_da.txt           |  110 -
 .../solr/solr/conf/lang/stopwords_de.txt           |  294 --
 .../solr/solr/conf/lang/stopwords_el.txt           |   78 -
 .../solr/solr/conf/lang/stopwords_en.txt           |   54 -
 .../solr/solr/conf/lang/stopwords_es.txt           |  356 --
 .../solr/solr/conf/lang/stopwords_eu.txt           |   99 -
 .../solr/solr/conf/lang/stopwords_fa.txt           |  313 --
 .../solr/solr/conf/lang/stopwords_fi.txt           |   97 -
 .../solr/solr/conf/lang/stopwords_fr.txt           |  186 -
 .../solr/solr/conf/lang/stopwords_ga.txt           |  110 -
 .../solr/solr/conf/lang/stopwords_gl.txt           |  161 -
 .../solr/solr/conf/lang/stopwords_hi.txt           |  235 --
 .../solr/solr/conf/lang/stopwords_hu.txt           |  211 --
 .../solr/solr/conf/lang/stopwords_hy.txt           |   46 -
 .../solr/solr/conf/lang/stopwords_id.txt           |  359 --
 .../solr/solr/conf/lang/stopwords_it.txt           |  303 --
 .../solr/solr/conf/lang/stopwords_ja.txt           |  127 -
 .../solr/solr/conf/lang/stopwords_lv.txt           |  172 -
 .../solr/solr/conf/lang/stopwords_nl.txt           |  119 -
 .../solr/solr/conf/lang/stopwords_no.txt           |  194 -
 .../solr/solr/conf/lang/stopwords_pt.txt           |  253 --
 .../solr/solr/conf/lang/stopwords_ro.txt           |  233 --
 .../solr/solr/conf/lang/stopwords_ru.txt           |  243 --
 .../solr/solr/conf/lang/stopwords_sv.txt           |  133 -
 .../solr/solr/conf/lang/stopwords_th.txt           |  119 -
 .../solr/solr/conf/lang/stopwords_tr.txt           |  212 --
 .../solr/solr/conf/lang/userdict_ja.txt            |   29 -
 .../example-DIH/solr/solr/conf/managed-schema      | 1143 ------
 .../solr/solr/conf/mapping-FoldToASCII.txt         | 3813 --------------------
 .../solr/solr/conf/mapping-ISOLatin1Accent.txt     |  246 --
 .../example-DIH/solr/solr/conf/protwords.txt       |   21 -
 .../solr/solr/conf/solr-data-config.xml            |   25 -
 .../example-DIH/solr/solr/conf/solrconfig.xml      | 1340 -------
 .../example-DIH/solr/solr/conf/spellings.txt       |    2 -
 .../example-DIH/solr/solr/conf/stopwords.txt       |   14 -
 .../example-DIH/solr/solr/conf/synonyms.txt        |   29 -
 .../example-DIH/solr/solr/conf/update-script.js    |   53 -
 .../example-DIH/solr/solr/conf/xslt/example.xsl    |  132 -
 .../solr/solr/conf/xslt/example_atom.xsl           |   67 -
 .../solr/solr/conf/xslt/example_rss.xsl            |   66 -
 .../example-DIH/solr/solr/conf/xslt/luke.xsl       |  337 --
 .../example-DIH/solr/solr/conf/xslt/updateXml.xsl  |   70 -
 solr/example/example-DIH/solr/solr/core.properties |    0
 .../example-DIH/solr/tika/conf/managed-schema      |   54 -
 .../example-DIH/solr/tika/conf/solrconfig.xml      |   61 -
 .../solr/tika/conf/tika-data-config.xml            |   26 -
 solr/example/files/conf/solrconfig.xml             |   24 +-
 solr/licenses/activation-1.1.1.jar.sha1            |    1 -
 solr/licenses/activation-LICENSE-CDDL.txt          |  119 -
 solr/licenses/ant-1.8.2.jar.sha1                   |    1 -
 solr/licenses/ant-LICENSE-ASL.txt                  |  272 --
 solr/licenses/ant-NOTICE.txt                       |   26 -
 solr/licenses/asciidoctor-ant-1.6.2.jar.sha1       |    1 -
 solr/licenses/asciidoctor-ant-LICENSE-ASL.txt      |  202 --
 solr/licenses/asciidoctor-ant-NOTICE.txt           |    5 -
 solr/licenses/derby-10.9.1.0.jar.sha1              |    1 -
 solr/licenses/derby-LICENSE-ASL.txt                |  202 --
 solr/licenses/derby-NOTICE.txt                     |  182 -
 solr/licenses/gimap-1.5.1.jar.sha1                 |    1 -
 solr/licenses/gimap-LICENSE-CDDL.txt               |  135 -
 solr/licenses/hamcrest-2.2.jar.sha1                |    1 +
 .../licenses/hamcrest-LICENSE-BSD.txt              |    0
 .../hamcrest-NOTICE.txt}                           |    0
 solr/licenses/hamcrest-core-1.3.jar.sha1           |    1 -
 solr/licenses/javax.mail-1.5.1.jar.sha1            |    1 -
 solr/licenses/javax.mail-LICENSE-CDDL.txt          |  135 -
 solr/licenses/junit4-ant-2.7.6.jar.sha1            |    1 -
 solr/licenses/junit4-ant-LICENSE-ASL.txt           |  202 --
 solr/licenses/junit4-ant-NOTICE.txt                |   12 -
 solr/packaging/build.gradle                        |    2 -
 solr/server/README.md                              |    4 +-
 solr/server/build.xml                              |   54 -
 solr/server/etc/security.policy                    |    2 +-
 solr/server/ivy.xml                                |   74 -
 .../solr/configsets/_default/conf/solrconfig.xml   |   40 +-
 solr/solr-ref-guide/README.adoc                    |   20 +-
 solr/solr-ref-guide/build.gradle                   |    2 -
 solr/solr-ref-guide/build.xml                      |  305 --
 solr/solr-ref-guide/ivy.xml                        |   35 -
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |  333 --
 solr/solr-ref-guide/src/aliases.adoc               |    2 -
 solr/solr-ref-guide/src/cdcr-api.adoc              |  321 --
 solr/solr-ref-guide/src/cdcr-architecture.adoc     |  167 -
 solr/solr-ref-guide/src/cdcr-config.adoc           |  376 --
 solr/solr-ref-guide/src/cdcr-operations.adoc       |   49 -
 solr/solr-ref-guide/src/circuit-breakers.adoc      |   61 +-
 solr/solr-ref-guide/src/cloud-screens.adoc         |    2 +-
 .../src/collection-specific-tools.adoc             |    5 +-
 .../combining-distribution-and-replication.adoc    |   12 +-
 solr/solr-ref-guide/src/config-api.adoc            |    3 -
 solr/solr-ref-guide/src/config-sets.adoc           |    2 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |    3 +-
 .../src/configuring-solrconfig-xml.adoc            |   13 +-
 solr/solr-ref-guide/src/core-specific-tools.adoc   |    1 -
 solr/solr-ref-guide/src/coreadmin-api.adoc         |    2 +-
 .../src/cross-data-center-replication-cdcr.adoc    |   63 -
 solr/solr-ref-guide/src/dataimport-screen.adoc     |   28 -
 .../distributed-search-with-index-sharding.adoc    |    2 +-
 .../src/documents-fields-and-schema-design.adoc    |    2 +-
 .../src/images/dataimport-screen/dataimport.png    |  Bin 126440 -> 0 bytes
 .../src/implicit-requesthandlers.adoc              |    8 +-
 solr/solr-ref-guide/src/index-replication.adoc     |  156 +-
 solr/solr-ref-guide/src/index.adoc                 |    3 +
 .../src/indexconfig-in-solrconfig.adoc             |   10 +
 .../src/indexing-and-basic-data-operations.adoc    |    3 -
 solr/solr-ref-guide/src/installing-solr.adoc       |    5 +-
 .../src/json-faceting-domain-changes.adoc          |    8 +-
 solr/solr-ref-guide/src/luke-request-handler.adoc  |   77 +
 .../src/major-changes-from-solr-5-to-solr-6.adoc   |    2 +-
 .../src/major-changes-in-solr-8.adoc               |    4 +-
 .../src/major-changes-in-solr-9.adoc               |    7 +
 .../src/meta-docs/asciidoc-syntax.adoc             |    2 +-
 solr/solr-ref-guide/src/meta-docs/jekyll.adoc      |    6 +-
 solr/solr-ref-guide/src/meta-docs/publish.adoc     |    6 +-
 .../src/near-real-time-searching.adoc              |    2 +-
 solr/solr-ref-guide/src/package-manager.adoc       |    9 +
 .../src/query-settings-in-solrconfig.adoc          |   39 +-
 solr/solr-ref-guide/src/rate-limiters.adoc         |  131 +
 solr/solr-ref-guide/src/replication-screen.adoc    |    8 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |    2 +-
 solr/solr-ref-guide/src/schema-browser-screen.adoc |    2 +
 .../src/shards-and-indexing-data-in-solrcloud.adoc |    4 +-
 .../src/solr-control-script-reference.adoc         |    6 -
 solr/solr-ref-guide/src/solr-glossary.adoc         |    2 +-
 solr/solr-ref-guide/src/solr-plugins.adoc          |    9 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    5 -
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |    2 -
 solr/solr-ref-guide/src/solrcloud.adoc             |    7 +-
 .../src/updatehandlers-in-solrconfig.adoc          |    2 +-
 .../src/uploading-data-with-index-handlers.adoc    |    2 +-
 ...ta-store-data-with-the-data-import-handler.adoc | 1077 ------
 ...ing-the-solr-administration-user-interface.adoc |    1 -
 .../tools/CustomizedAsciidoctorAntTask.java        |   34 -
 solr/solr-ref-guide/tools/asciidoctor-antlib.xml   |   22 -
 solr/solrj/build.xml                               |   88 -
 solr/solrj/ivy.xml                                 |   77 -
 .../org/apache/solr/client/solrj/SolrClient.java   |    8 +
 .../org/apache/solr/client/solrj/SolrRequest.java  |   19 +
 .../solr/client/solrj/impl/HttpSolrClient.java     |   52 +-
 .../solr/client/solrj/impl/LBHttp2SolrClient.java  |    4 +-
 .../solr/client/solrj/impl/LBHttpSolrClient.java   |    4 +-
 .../solr/client/solrj/impl/LBSolrClient.java       |    3 +-
 .../solr/client/solrj/io/stream/TupleStream.java   |   38 +-
 .../solrj/request/AbstractUpdateRequest.java       |    5 +
 .../solrj/request/CollectionAdminRequest.java      |    5 +
 .../solrj/request/ConfigSetAdminRequest.java       |    5 +
 .../client/solrj/request/CoreAdminRequest.java     |    5 +
 .../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 +-
 .../solr/client/solrj/request/LukeRequest.java     |    5 +
 .../solr/client/solrj/request/QueryRequest.java    |    4 +
 .../apache/solr/client/solrj/request/SolrPing.java |    5 +
 .../solr/client/solrj/request/V2Request.java       |    5 +
 .../request/schema/AbstractSchemaRequest.java      |    4 +
 .../java/org/apache/solr/cluster/api/ApiType.java} |   17 +-
 .../apache/solr/cluster/api/CollectionConfig.java} |   12 +-
 .../org/apache/solr/cluster/api/HashRange.java     |   25 +-
 .../org/apache/solr/cluster/api/Resource.java}     |   51 +-
 .../java/org/apache/solr/cluster/api/Router.java}  |   11 +-
 .../java/org/apache/solr/cluster/api/Shard.java}   |   27 +-
 .../org/apache/solr/cluster/api/ShardReplica.java  |   57 +
 .../org/apache/solr/cluster/api/SimpleMap.java     |   80 +
 .../org/apache/solr/cluster/api/SolrCluster.java}  |   46 +-
 .../apache/solr/cluster/api/SolrCollection.java    |   27 +-
 .../org/apache/solr/cluster/api/SolrNode.java}     |   27 +-
 .../org/apache/solr/cluster/api}/package-info.java |    7 +-
 .../org/apache/solr/common/LazySolrCluster.java    |  446 +++
 .../java/org/apache/solr/common/SimpleZkMap.java   |  139 +
 .../java/org/apache/solr/common/SolrException.java |    1 +
 ...lrSingleThreaded.java => SolrThreadUnsafe.java} |    2 +-
 .../java/org/apache/solr/common/cloud/Aliases.java |    8 +
 .../org/apache/solr/common/cloud/ClusterState.java |    4 +
 .../org/apache/solr/common/cloud/DocRouter.java    |   13 +-
 .../apache/solr/common/cloud}/SolrClassLoader.java |    2 +-
 .../org/apache/solr/common/cloud/SolrZkClient.java |    3 +
 .../apache/solr/common/cloud/ZkStateReader.java    |   10 +-
 .../apache/solr/common/params/CommonParams.java    |    6 +-
 .../solr/common/util/LinkedSimpleHashMap.java      |   27 +-
 .../org/apache/solr/common/util/NamedList.java     |   39 +-
 .../java/org/apache/solr/common/util/Utils.java    |   47 +-
 .../apache/solr/common/util/WrappedSimpleMap.java} |   47 +-
 solr/solrj/src/resources/apispec/node.Info.json    |    2 +-
 ...rconfig-slave1.xml => solrconfig-follower1.xml} |    0
 .../solr/client/solrj/TestLBHttp2SolrClient.java   |    2 +-
 .../solr/client/solrj/TestLBHttpSolrClient.java    |    2 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |    7 +
 solr/test-framework/build.xml                      |  121 -
 solr/test-framework/ivy.xml                        |   42 -
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   16 -
 .../java/org/apache/solr/cloud/ConfigRequest.java  |    5 +
 solr/webapp/build.xml                              |   69 -
 solr/webapp/web/css/angular/collections.css        |    2 +-
 solr/webapp/web/css/angular/dashboard.css          |    4 +-
 solr/webapp/web/css/angular/dataimport.css         |  371 --
 solr/webapp/web/css/angular/menu.css               |    3 +-
 solr/webapp/web/css/angular/replication.css        |   10 +-
 .../img/ico/{node-slave.png => node-follower.png}  |  Bin
 .../img/ico/{node-master.png => node-leader.png}   |  Bin
 solr/webapp/web/index.html                         |    4 -
 solr/webapp/web/js/angular/app.js                  |   16 -
 .../web/js/angular/controllers/core-overview.js    |    4 +-
 .../web/js/angular/controllers/dataimport.js       |  302 --
 .../web/js/angular/controllers/replication.js      |  108 +-
 solr/webapp/web/js/angular/services.js             |   15 -
 solr/webapp/web/partials/core_overview.html        |   38 +-
 solr/webapp/web/partials/dataimport.html           |  210 --
 solr/webapp/web/partials/replication.html          |   62 +-
 versions.lock                                      |    8 +-
 versions.props                                     |    5 +-
 1160 files changed, 11210 insertions(+), 110174 deletions(-)