You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2019/12/20 23:14:33 UTC

[lucene-solr] branch jira/SOLR-13984 updated (7fbb3d5 -> 4cf8c1f)

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

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


    from 7fbb3d5  SOLR-13984: link to the jdk documentation for more info
     add 640ff96  SOLR-13662: Fixes to package manager
     add be0b963  SOLR-14071: Updating upgrade notice
     add 2f051a4  SOLR-14086: Tika ClassNotFound error due to commons-compress in solr-core dependency
     add d64c5c2  SOLR-14087: disable package store API if -Denable.packages not set to true
     add 479db61  SOLR-14087: changed the filestore location to .filestore instead of $filestore
     add 2db4831  SOLR-14072: Deprecate Blob API and runtimeLib (#1086)
     add b660bcd  SOLR-14094: Bad-apple TestSolrCachePerf.
     add 7dfea5f  SOLR-14087: Changing the filestore dir name back to filestore from .filestore
     add 83800c0  Fix an occasional test error caused by the maintenance trigger generating events.
     add ee0b066  SOLR-14096: Stopping -Denable.packages=true from leaking to other tests
     add b5a2cfb  SOLR-14094: Enable this test again in master.
     add dc35e57  LUCENE-9094: Ban ObjectInputStream and ObjectOutputStream in forbidden-apis
     add e6b5da5  SOLR-14099: work around @LogLevel bug in LoggingHandlerTest
     add db11e9e  SOLR-14081: re-implement FullSolrCloudDistribCmdsTest to extend SolrCloudTestCase
     add 17ef175  LUCENE-9055: Fix the detection of lines crossing triangles through edge points (#1020)
     add 079ddeb  SOLR-14104: Remove a truckload of unused licenses and notice files.
     add 0f7a046  SOLR-14104: clean up asm license.
     add 33e44b2  SOLR-13696: AwaitsFix RoutedAliasUpdateProcessorTest (and subclasses)
     add 6785650  Ref Guide: Upgrade notes for 8.4
     add 3d42460  Ref Guide: make section headings in Headline Case
     add 3e88727  Ref Guide: fix typos & standardize spellings
     add 8493cf1  Harden (Cloud)ExitableDirectoryReaderTest
     add 279a391  SOLR-14054 -- upgrade to Tika 1.23 (and its dependencies) (#1092)
     add cc4262a  SOLR-14099: Fixed @LogLevel annotation in test-framework to correctly 'unset' Loggers after test
     add 46e5e13  SOLR-13749  Cross collection join filter (XCJF) Squashed commit of the following:  commit ffa68a8adb9c5dc16578ab26f731da247533c980
     add b0e532b  SOLR-14051: removing Block Join Facet Component in favor of uniqueBlock(\_root_).
     add 71a5714  SOLR-14103: remove extra unused dependencies (jersey-core, jersey-server, netty-all).
     add 612cba3  SOLR-14110: sandbox javax.script usage in tests
     add 56839f6  SOLR-13983: remove or replace process execution in SystemInfoHandler
     add fc2fbb2  SOLR-13662: Improvements for Ref Guide package-manager.adoc
     add 1e5100d  SOLR-14091: Removing deprecated configuration of Jetty's soLingerTime option
     add d30f90e  SOLR-14099: expanded comment on static final variable based on followup questions in Jira from Dawid
     add 7490bfd  SOLR-14085: remove solr fork of lucene test securitymanager
     add cbfa781  SOLR-14108: Handle missing verify commands or missing default params in Package Manager
     add 868e41b  Minor improvements to the Solr changes.
     add b1c6d7c  Move changes entry to 8.4
     add 7cfa31b  SOLR-14042: Fix varargs precommit warnings
     add 2f7276f  Fix attribution
     add 907d114  LUCENE-9103: WANDScorer can miss some hits in some rare conditions.
     add a4c884a  LUCENE-9098 Report bad term for fuzzy query
     add 93585ba  SOLR-13190 Surface Fuzzy term errors in Solr
     add bc2770e  SOLR-14128: SystemCollectionCompatTest - increase logging to aid in debuging future (jenkins) failures
     add aab3c5f  SOLR-14106: Cleanup Jetty SslContextFactory usage
     add 1333bd1  SOLR-13190 Fix for failing test
     add b7b6b0f  SOLR-14112: do not display load average of -1.00 on windows in admin UI
     add e428628  SOLR-14107: Ensure bin/solr -q/-v args work with -e/example (#1093)
     add 5342346  Ref Guide: various little typos; clean up Solr CLI section on bin/solr export
     add c4f68bd  SOLR-14095: Let the overseer use javabin to store responses in ZooKeeper (#1095)
     new 4cf8c1f  Merge branch 'master' into jira/SOLR-13984

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


Summary of changes:
 lucene/CHANGES.txt                                 |   5 +
 .../analysis/cn/smart/hhmm/BigramDictionary.java   |   3 +
 .../analysis/cn/smart/hhmm/WordDictionary.java     |   3 +
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |  44 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |   8 +-
 .../java/org/apache/lucene/search/FuzzyQuery.java  |   9 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |  18 +-
 .../java/org/apache/lucene/search/WANDScorer.java  |  44 +-
 .../org/apache/lucene/search/TestFuzzyQuery.java   |  64 +-
 .../facet/taxonomy/writercache/CharBlockArray.java |   4 +
 lucene/ivy-versions.properties                     |  51 +-
 lucene/licenses/asm-5.1.jar.sha1                   |   1 -
 lucene/licenses/asm-7.2.jar.sha1                   |   1 +
 lucene/licenses/asm-commons-5.1.jar.sha1           |   1 -
 lucene/licenses/asm-commons-7.2.jar.sha1           |   1 +
 lucene/licenses/commons-codec-1.11.jar.sha1        |   1 -
 lucene/licenses/commons-codec-1.13.jar.sha1        |   1 +
 lucene/licenses/commons-compress-1.18.jar.sha1     |   1 -
 lucene/licenses/commons-compress-1.19.jar.sha1     |   1 +
 lucene/licenses/httpclient-4.5.10.jar.sha1         |   1 +
 lucene/licenses/httpclient-4.5.6.jar.sha1          |   1 -
 lucene/licenses/httpcore-4.4.10.jar.sha1           |   1 -
 lucene/licenses/httpcore-4.4.12.jar.sha1           |   1 +
 lucene/licenses/xercesImpl-2.12.0.jar.sha1         |   1 +
 lucene/licenses/xercesImpl-2.9.1.jar.sha1          |   1 -
 .../lucene/replicator/http/HttpClientBase.java     |   2 +
 .../lucene/replicator/http/ReplicationService.java |   2 +
 .../lucene/replicator/ReplicatorTestCase.java      |   2 +-
 .../src/java/org/apache/lucene/geo/Line2D.java     |   2 +-
 .../apache/lucene/document/TestLatLonShape.java    |  40 +
 lucene/tools/forbiddenApis/base.txt                |   4 +
 solr/CHANGES.txt                                   |  89 +-
 solr/bin/solr                                      |   2 +
 solr/bin/solr.cmd                                  |   2 +
 solr/common-build.xml                              |   5 -
 .../stream/AnalyticsShardResponseParser.java       |   2 +
 .../response/AnalyticsShardResponseWriter.java     |   2 +
 .../solr/handler/dataimport/ScriptTransformer.java |  33 +-
 .../handler/dataimport/TestScriptTransformer.java  |  22 +
 solr/contrib/extraction/ivy.xml                    |   1 +
 solr/core/ivy.xml                                  |   6 +-
 .../client/solrj/embedded/JettySolrRunner.java     |   4 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |  25 +-
 .../apache/solr/cloud/OverseerMessageHandler.java  |   3 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |  53 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   9 +-
 .../OverseerCollectionMessageHandler.java          |   4 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |   4 +
 .../java/org/apache/solr/handler/CatStream.java    |   2 +-
 .../solr/handler/admin/CollectionsHandler.java     |  46 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |   2 +-
 .../solr/handler/admin/SystemInfoHandler.java      |  45 -
 .../solr/handler/component/QueryComponent.java     |   7 +-
 .../packagemanager/DefaultPackageRepository.java   |   5 +-
 .../apache/solr/packagemanager/PackageManager.java | 127 ++-
 .../apache/solr/packagemanager/PackageUtils.java   |  13 +-
 .../solr/packagemanager/RepositoryManager.java     |  30 +-
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |   8 +-
 .../java/org/apache/solr/search/QParserPlugin.java |   4 +
 .../search/join/BlockJoinDocSetFacetComponent.java | 195 -----
 .../solr/search/join/BlockJoinFacetAccsHolder.java |  83 --
 .../solr/search/join/BlockJoinFacetComponent.java  |  23 -
 .../join/BlockJoinFacetComponentSupport.java       | 158 ----
 .../solr/search/join/BlockJoinFacetFilter.java     |  96 ---
 .../join/BlockJoinFieldFacetAccumulator.java       | 235 -----
 .../solr/search/join/BlockJoinParentQParser.java   |   1 +
 .../search/join/ChildFieldValueSourceParser.java   |   7 +-
 .../{BitSetSlice.java => HashRangeQParser.java}    |  38 +-
 ...itSetSlice.java => HashRangeQParserPlugin.java} |  37 +-
 .../apache/solr/search/join/HashRangeQuery.java    | 144 ++++
 .../apache/solr/search/join/ScoreModeParser.java   |   1 +
 .../org/apache/solr/search/join/XCJFQParser.java   |  90 ++
 .../apache/solr/search/join/XCJFQParserPlugin.java |  66 ++
 .../org/apache/solr/search/join/XCJFQuery.java     | 380 +++++++++
 .../StatelessScriptUpdateProcessorFactory.java     |  33 +-
 .../src/java/org/apache/solr/util/PackageTool.java |  18 +-
 .../src/test-files/solr/collection1/conf/evil.js   |  21 +
 .../conf/schema-blockjoinfacetcomponent.xml        |  40 -
 .../conf/solrconfig-blockjoinfacetcomponent.xml    |  58 --
 .../conf/solrconfig-script-updateprocessor.xml     |   6 +
 .../solr/configsets/xcjf/conf/schema.xml           |  32 +
 .../solr/configsets/xcjf/conf/solrconfig.xml       |  72 ++
 .../test/org/apache/hadoop/http/HttpServer2.java   |   2 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   | 946 ++++++++-------------
 .../OverseerCollectionConfigSetProcessorTest.java  |   2 +-
 .../solr/cloud/OverseerSolrResponseTest.java       |  79 ++
 ...verseerSolrResponseUnsafeSerializationTest.java |  61 ++
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |   5 +-
 .../apache/solr/cloud/PackageManagerCLITest.java   |   9 +-
 .../solr/cloud/SystemCollectionCompatTest.java     |  16 +-
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   4 +
 .../solr/filestore/TestDistribPackageStore.java    |  19 +-
 .../solr/handler/admin/LoggingHandlerTest.java     |  54 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |  13 +-
 .../org/apache/solr/rest/TestManagedResource.java  |   5 +
 .../solr/search/DelayingSearchComponent.java       |  31 +-
 .../org/apache/solr/search/FuzzySearchTest.java    |  67 ++
 .../org/apache/solr/search/QueryEqualityTest.java  | 244 +++---
 .../org/apache/solr/search/join/BJQParserTest.java |   6 +-
 .../search/join/BlockJoinFacetDistribTest.java     | 237 ------
 .../solr/search/join/BlockJoinFacetRandomTest.java | 637 --------------
 .../solr/search/join/BlockJoinFacetSimpleTest.java | 121 ---
 .../solr/search/join/TestScoreJoinQPNoScore.java   |   5 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |   4 +-
 .../org/apache/solr/search/join/XCJFQueryTest.java | 280 ++++++
 .../join/another/BJQFilterAccessibleTest.java      |   3 +-
 .../processor/RoutedAliasUpdateProcessorTest.java  |   1 +
 .../StatelessScriptUpdateProcessorFactoryTest.java |  10 +
 solr/licenses/apache-mime4j-core-0.8.2.jar.sha1    |   1 -
 solr/licenses/apache-mime4j-core-0.8.3.jar.sha1    |   1 +
 solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1     |   1 -
 solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1     |   1 +
 solr/licenses/asm-5.1.jar.sha1                     |   1 -
 solr/licenses/asm-7.2.jar.sha1                     |   1 +
 solr/licenses/asm-LICENSE-BSD.txt                  |   2 +-
 solr/licenses/asm-LICENSE-BSD_LIKE.txt             |  26 -
 solr/licenses/asm-commons-5.1.jar.sha1             |   1 -
 solr/licenses/asm-commons-7.2.jar.sha1             |   1 +
 solr/licenses/bcmail-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcmail-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/bcpkix-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcpkix-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/bcprov-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcprov-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/commons-codec-1.11.jar.sha1          |   1 -
 solr/licenses/commons-codec-1.13.jar.sha1          |   1 +
 solr/licenses/commons-compress-1.18.jar.sha1       |   1 -
 solr/licenses/commons-compress-1.19.jar.sha1       |   1 +
 .../licenses/commons-configuration-LICENSE-ASL.txt | 403 ---------
 solr/licenses/commons-configuration-NOTICE.txt     |   9 -
 solr/licenses/commons-csv-1.7.jar.sha1             |   1 +
 ...LICENSE-ASL.txt => commons-csv-LICENSE-ASL.txt} |   0
 ...-digester-NOTICE.txt => commons-csv-NOTICE.txt} |   8 +-
 solr/licenses/commons-digester-LICENSE-ASL.txt     | 202 -----
 solr/licenses/commons-io-2.5.jar.sha1              |   1 -
 solr/licenses/commons-io-2.6.jar.sha1              |   1 +
 solr/licenses/commons-lang3-3.8.1.jar.sha1         |   1 -
 solr/licenses/commons-lang3-3.9.jar.sha1           |   1 +
 solr/licenses/curvesapi-1.04.jar.sha1              |   1 -
 solr/licenses/curvesapi-1.06.jar.sha1              |   1 +
 solr/licenses/fontbox-2.0.12.jar.sha1              |   1 -
 solr/licenses/fontbox-2.0.17.jar.sha1              |   1 +
 solr/licenses/hadoop-common-tests-LICENSE-ASL.txt  | 244 ------
 solr/licenses/hadoop-common-tests-NOTICE.txt       |   2 -
 solr/licenses/hadoop-hdfs-tests-LICENSE-ASL.txt    | 244 ------
 solr/licenses/hadoop-hdfs-tests-NOTICE.txt         |   2 -
 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1    |   1 -
 solr/licenses/hadoop-minicluster-LICENSE-ASL.txt   | 244 ------
 solr/licenses/hadoop-minicluster-NOTICE.txt        |   2 -
 solr/licenses/httpclient-4.5.10.jar.sha1           |   1 +
 solr/licenses/httpclient-4.5.6.jar.sha1            |   1 -
 solr/licenses/httpcore-4.4.10.jar.sha1             |   1 -
 solr/licenses/httpcore-4.4.12.jar.sha1             |   1 +
 solr/licenses/httpmime-4.5.10.jar.sha1             |   1 +
 solr/licenses/httpmime-4.5.6.jar.sha1              |   1 -
 solr/licenses/jackcess-2.1.12.jar.sha1             |   1 -
 solr/licenses/jackcess-3.0.1.jar.sha1              |   1 +
 solr/licenses/jackcess-encrypt-2.1.4.jar.sha1      |   1 -
 solr/licenses/jackcess-encrypt-3.0.0.jar.sha1      |   1 +
 solr/licenses/jackson-annotations-2.10.0.jar.sha1  |   1 -
 solr/licenses/jackson-annotations-2.10.1.jar.sha1  |   1 +
 solr/licenses/jackson-core-2.10.0.jar.sha1         |   1 -
 solr/licenses/jackson-core-2.10.1.jar.sha1         |   1 +
 solr/licenses/jackson-core-asl-LICENSE-ASL.txt     | 202 -----
 solr/licenses/jackson-core-asl-NOTICE.txt          |   7 -
 solr/licenses/jackson-databind-2.10.0.jar.sha1     |   1 -
 solr/licenses/jackson-databind-2.10.1.jar.sha1     |   1 +
 .../jackson-dataformat-smile-2.10.0.jar.sha1       |   1 -
 .../jackson-dataformat-smile-2.10.1.jar.sha1       |   1 +
 solr/licenses/jackson-mapper-asl-LICENSE-ASL.txt   | 202 -----
 solr/licenses/jackson-mapper-asl-NOTICE.txt        |   7 -
 solr/licenses/jersey-core-1.19.jar.sha1            |   1 -
 solr/licenses/jersey-core-LICENSE-CDDL.txt         |  81 --
 solr/licenses/jersey-server-1.19.jar.sha1          |   1 -
 solr/licenses/jersey-server-LICENSE-CDDL.txt       |  85 --
 solr/licenses/jsoup-1.11.3.jar.sha1                |   1 -
 solr/licenses/jsoup-1.12.1.jar.sha1                |   1 +
 solr/licenses/metrics-json-LICENSE-ASL.txt         | 203 -----
 solr/licenses/metrics-json-NOTICE.txt              |  12 -
 solr/licenses/metrics-servlets-LICENSE-ASL.txt     | 203 -----
 solr/licenses/metrics-servlets-NOTICE.txt          |  12 -
 solr/licenses/mina-core-LICENSE-ASL.txt            | 341 --------
 solr/licenses/mina-core-NOTICE.txt                 |   7 -
 solr/licenses/netty-all-4.1.29.Final.jar.sha1      |   1 -
 solr/licenses/netty-all-LICENSE-ASL.txt            | 202 -----
 solr/licenses/netty-all-NOTICE.txt                 | 223 -----
 solr/licenses/parso-2.0.11.jar.sha1                |   1 +
 solr/licenses/parso-2.0.9.jar.sha1                 |   1 -
 solr/licenses/pdfbox-2.0.12.jar.sha1               |   1 -
 solr/licenses/pdfbox-2.0.17.jar.sha1               |   1 +
 solr/licenses/pdfbox-tools-2.0.12.jar.sha1         |   1 -
 solr/licenses/pdfbox-tools-2.0.17.jar.sha1         |   1 +
 solr/licenses/poi-4.0.0.jar.sha1                   |   1 -
 solr/licenses/poi-4.1.1.jar.sha1                   |   1 +
 solr/licenses/poi-ooxml-4.0.0.jar.sha1             |   1 -
 solr/licenses/poi-ooxml-4.1.1.jar.sha1             |   1 +
 solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1     |   1 -
 solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1     |   1 +
 solr/licenses/poi-scratchpad-4.0.0.jar.sha1        |   1 -
 solr/licenses/poi-scratchpad-4.1.1.jar.sha1        |   1 +
 solr/licenses/presto-parser-LICENSE-ASL.txt        | 202 -----
 solr/licenses/presto-parser-NOTICE.txt             |   0
 solr/licenses/protobuf-java-3.11.0.jar.sha1        |   1 +
 solr/licenses/protobuf-java-3.6.1.jar.sha1         |   1 -
 solr/licenses/rome-1.12.2.jar.sha1                 |   1 +
 solr/licenses/rome-1.5.1.jar.sha1                  |   1 -
 solr/licenses/rome-utils-1.12.2.jar.sha1           |   1 +
 solr/licenses/rome-utils-1.5.1.jar.sha1            |   1 -
 solr/licenses/servlet-api-LICENSE-CDDL.txt         | 126 ---
 solr/licenses/servlet-api-NOTICE.txt               |   2 -
 solr/licenses/slice-NOTICE.txt                     |   0
 solr/licenses/tika-core-1.19.1.jar.sha1            |   1 -
 solr/licenses/tika-core-1.23.jar.sha1              |   1 +
 solr/licenses/tika-java7-1.19.1.jar.sha1           |   1 -
 solr/licenses/tika-java7-1.23.jar.sha1             |   1 +
 solr/licenses/tika-parsers-1.19.1.jar.sha1         |   1 -
 solr/licenses/tika-parsers-1.23.jar.sha1           |   1 +
 solr/licenses/tika-xmp-1.19.1.jar.sha1             |   1 -
 solr/licenses/tika-xmp-1.23.jar.sha1               |   1 +
 solr/licenses/xercesImpl-2.12.0.jar.sha1           |   1 +
 solr/licenses/xercesImpl-2.9.1.jar.sha1            |   1 -
 solr/licenses/xmlbeans-3.0.1.jar.sha1              |   1 -
 solr/licenses/xmlbeans-3.1.0.jar.sha1              |   1 +
 solr/server/etc/jetty-http.xml                     |   3 +-
 solr/server/etc/jetty-https.xml                    |   7 +-
 solr/server/etc/jetty-https8.xml                   |   3 +-
 solr/server/etc/jetty-ssl.xml                      |   2 +-
 solr/server/etc/jetty.xml                          |   2 +-
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   6 +
 solr/solr-ref-guide/src/aliases.adoc               |   2 +-
 .../authentication-and-authorization-plugins.adoc  |   2 +-
 solr/solr-ref-guide/src/blockjoin-faceting.adoc    | 115 ---
 .../src/cluster-node-management.adoc               |   6 +-
 solr/solr-ref-guide/src/collection-management.adoc |  32 +-
 .../solr-ref-guide/src/command-line-utilities.adoc |   2 +-
 .../src/common-query-parameters.adoc               |   4 +-
 solr/solr-ref-guide/src/config-sets.adoc           |   4 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |   2 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |   4 +-
 .../src/defining-core-properties.adoc              |   2 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |   4 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   2 +-
 solr/solr-ref-guide/src/faceting.adoc              |   1 -
 .../src/field-type-definitions-and-properties.adoc |   4 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |   6 +-
 .../collections-core-admin/collection-admin.png    | Bin 60968 -> 153727 bytes
 .../src/implicit-requesthandlers.adoc              |   2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |   6 +-
 .../src/json-faceting-domain-changes.adoc          |   2 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc        |   2 +-
 .../src/jwt-authentication-plugin.adoc             |   2 +-
 .../src/major-changes-in-solr-7.adoc               |   4 +-
 .../src/major-changes-in-solr-8.adoc               |   2 +-
 .../src/making-and-restoring-backups.adoc          |   3 +-
 solr/solr-ref-guide/src/other-parsers.adoc         | 110 ++-
 .../src/package-manager-internals.adoc             |  43 +-
 solr/solr-ref-guide/src/package-manager.adoc       | 100 +--
 .../src/performance-statistics-reference.adoc      |   4 +-
 .../src/requestdispatcher-in-solrconfig.adoc       |   8 +-
 solr/solr-ref-guide/src/resource-loading.adoc      |   6 +-
 .../src/searching-nested-documents.adoc            |   2 +-
 solr/solr-ref-guide/src/securing-solr.adoc         |   4 +-
 .../src/solr-control-script-reference.adoc         |  45 +-
 .../src/solr-cores-and-solr-xml.adoc               |   2 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    | 134 ++-
 .../solrcloud-autoscaling-policy-preferences.adoc  |  18 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |   4 +-
 .../solrcloud-configuration-and-parameters.adoc    |   2 +-
 solr/solr-ref-guide/src/solrcloud.adoc             |   2 +-
 .../src/the-dismax-query-parser.adoc               |  15 +-
 .../src/the-extended-dismax-query-parser.adoc      |   3 +-
 .../src/updating-parts-of-documents.adoc           |   2 +-
 ...ng-zookeeper-to-manage-configuration-files.adoc |   2 +-
 .../org/apache/solr/client/solrj/SolrResponse.java |  15 +-
 .../solr/client/solrj/embedded/SSLConfig.java      |  21 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |   9 +-
 .../solr/client/solrj/io/eval/ConcatEvaluator.java |   2 +-
 .../solr/client/solrj/io/eval/DateEvaluator.java   |   2 +-
 .../solr/client/solrj/io/eval/DbscanEvaluator.java |   2 +-
 .../io/eval/EmpiricalDistributionEvaluator.java    |   2 +-
 .../client/solrj/io/eval/MatchesEvaluator.java     |   2 +-
 .../solr/client/solrj/io/eval/PivotEvaluator.java  |   2 +-
 .../java/org/apache/solr/common/util/Utils.java    |  63 +-
 .../apache/solr/client/solrj/SolrQueryTest.java    |   3 +
 .../apache/solr/client/solrj/StartSolrJetty.java   |  11 +-
 .../client/solrj/embedded/JettyWebappTest.java     |  17 +-
 .../src/java/org/apache/solr/util/LogLevel.java    |  33 +-
 .../java/org/apache/solr/util/SSLTestConfig.java   |   4 +-
 .../org/apache/solr/util/SolrSecurityManager.java  |  95 ---
 .../org/apache/solr/TestLogLevelAnnotations.java   | 131 ++-
 solr/webapp/web/js/angular/controllers/index.js    |  10 +-
 solr/webapp/web/partials/index.html                |   2 +-
 292 files changed, 3321 insertions(+), 7006 deletions(-)
 delete mode 100644 lucene/licenses/asm-5.1.jar.sha1
 create mode 100644 lucene/licenses/asm-7.2.jar.sha1
 delete mode 100644 lucene/licenses/asm-commons-5.1.jar.sha1
 create mode 100644 lucene/licenses/asm-commons-7.2.jar.sha1
 delete mode 100644 lucene/licenses/commons-codec-1.11.jar.sha1
 create mode 100644 lucene/licenses/commons-codec-1.13.jar.sha1
 delete mode 100644 lucene/licenses/commons-compress-1.18.jar.sha1
 create mode 100644 lucene/licenses/commons-compress-1.19.jar.sha1
 create mode 100644 lucene/licenses/httpclient-4.5.10.jar.sha1
 delete mode 100644 lucene/licenses/httpclient-4.5.6.jar.sha1
 delete mode 100644 lucene/licenses/httpcore-4.4.10.jar.sha1
 create mode 100644 lucene/licenses/httpcore-4.4.12.jar.sha1
 create mode 100644 lucene/licenses/xercesImpl-2.12.0.jar.sha1
 delete mode 100644 lucene/licenses/xercesImpl-2.9.1.jar.sha1
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinDocSetFacetComponent.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetAccsHolder.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponent.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponentSupport.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetFilter.java
 delete mode 100644 solr/core/src/java/org/apache/solr/search/join/BlockJoinFieldFacetAccumulator.java
 copy solr/core/src/java/org/apache/solr/search/join/{BitSetSlice.java => HashRangeQParser.java} (50%)
 rename solr/core/src/java/org/apache/solr/search/join/{BitSetSlice.java => HashRangeQParserPlugin.java} (53%)
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQParser.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQParserPlugin.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQuery.java
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/evil.js
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
 create mode 100644 solr/core/src/test-files/solr/configsets/xcjf/conf/schema.xml
 create mode 100644 solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/OverseerSolrResponseTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/OverseerSolrResponseUnsafeSerializationTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/FuzzySearchTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java
 delete mode 100644 solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
 create mode 100644 solr/licenses/apache-mime4j-core-0.8.3.jar.sha1
 delete mode 100644 solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
 create mode 100644 solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1
 delete mode 100644 solr/licenses/asm-5.1.jar.sha1
 create mode 100644 solr/licenses/asm-7.2.jar.sha1
 delete mode 100644 solr/licenses/asm-LICENSE-BSD_LIKE.txt
 delete mode 100644 solr/licenses/asm-commons-5.1.jar.sha1
 create mode 100644 solr/licenses/asm-commons-7.2.jar.sha1
 delete mode 100644 solr/licenses/bcmail-jdk15on-1.60.jar.sha1
 create mode 100644 solr/licenses/bcmail-jdk15on-1.64.jar.sha1
 delete mode 100644 solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
 create mode 100644 solr/licenses/bcpkix-jdk15on-1.64.jar.sha1
 delete mode 100644 solr/licenses/bcprov-jdk15on-1.60.jar.sha1
 create mode 100644 solr/licenses/bcprov-jdk15on-1.64.jar.sha1
 delete mode 100644 solr/licenses/commons-codec-1.11.jar.sha1
 create mode 100644 solr/licenses/commons-codec-1.13.jar.sha1
 delete mode 100644 solr/licenses/commons-compress-1.18.jar.sha1
 create mode 100644 solr/licenses/commons-compress-1.19.jar.sha1
 delete mode 100644 solr/licenses/commons-configuration-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/commons-configuration-NOTICE.txt
 create mode 100644 solr/licenses/commons-csv-1.7.jar.sha1
 rename solr/licenses/{slice-LICENSE-ASL.txt => commons-csv-LICENSE-ASL.txt} (100%)
 rename solr/licenses/{commons-digester-NOTICE.txt => commons-csv-NOTICE.txt} (54%)
 delete mode 100644 solr/licenses/commons-digester-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/commons-io-2.5.jar.sha1
 create mode 100644 solr/licenses/commons-io-2.6.jar.sha1
 delete mode 100644 solr/licenses/commons-lang3-3.8.1.jar.sha1
 create mode 100644 solr/licenses/commons-lang3-3.9.jar.sha1
 delete mode 100644 solr/licenses/curvesapi-1.04.jar.sha1
 create mode 100644 solr/licenses/curvesapi-1.06.jar.sha1
 delete mode 100644 solr/licenses/fontbox-2.0.12.jar.sha1
 create mode 100644 solr/licenses/fontbox-2.0.17.jar.sha1
 delete mode 100644 solr/licenses/hadoop-common-tests-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/hadoop-common-tests-NOTICE.txt
 delete mode 100644 solr/licenses/hadoop-hdfs-tests-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/hadoop-hdfs-tests-NOTICE.txt
 delete mode 100644 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/hadoop-minicluster-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/hadoop-minicluster-NOTICE.txt
 create mode 100644 solr/licenses/httpclient-4.5.10.jar.sha1
 delete mode 100644 solr/licenses/httpclient-4.5.6.jar.sha1
 delete mode 100644 solr/licenses/httpcore-4.4.10.jar.sha1
 create mode 100644 solr/licenses/httpcore-4.4.12.jar.sha1
 create mode 100644 solr/licenses/httpmime-4.5.10.jar.sha1
 delete mode 100644 solr/licenses/httpmime-4.5.6.jar.sha1
 delete mode 100644 solr/licenses/jackcess-2.1.12.jar.sha1
 create mode 100644 solr/licenses/jackcess-3.0.1.jar.sha1
 delete mode 100644 solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
 create mode 100644 solr/licenses/jackcess-encrypt-3.0.0.jar.sha1
 delete mode 100644 solr/licenses/jackson-annotations-2.10.0.jar.sha1
 create mode 100644 solr/licenses/jackson-annotations-2.10.1.jar.sha1
 delete mode 100644 solr/licenses/jackson-core-2.10.0.jar.sha1
 create mode 100644 solr/licenses/jackson-core-2.10.1.jar.sha1
 delete mode 100644 solr/licenses/jackson-core-asl-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/jackson-core-asl-NOTICE.txt
 delete mode 100644 solr/licenses/jackson-databind-2.10.0.jar.sha1
 create mode 100644 solr/licenses/jackson-databind-2.10.1.jar.sha1
 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1
 create mode 100644 solr/licenses/jackson-dataformat-smile-2.10.1.jar.sha1
 delete mode 100644 solr/licenses/jackson-mapper-asl-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/jackson-mapper-asl-NOTICE.txt
 delete mode 100644 solr/licenses/jersey-core-1.19.jar.sha1
 delete mode 100644 solr/licenses/jersey-core-LICENSE-CDDL.txt
 delete mode 100644 solr/licenses/jersey-server-1.19.jar.sha1
 delete mode 100644 solr/licenses/jersey-server-LICENSE-CDDL.txt
 delete mode 100644 solr/licenses/jsoup-1.11.3.jar.sha1
 create mode 100644 solr/licenses/jsoup-1.12.1.jar.sha1
 delete mode 100644 solr/licenses/metrics-json-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/metrics-json-NOTICE.txt
 delete mode 100644 solr/licenses/metrics-servlets-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/metrics-servlets-NOTICE.txt
 delete mode 100644 solr/licenses/mina-core-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/mina-core-NOTICE.txt
 delete mode 100644 solr/licenses/netty-all-4.1.29.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-all-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/netty-all-NOTICE.txt
 create mode 100644 solr/licenses/parso-2.0.11.jar.sha1
 delete mode 100644 solr/licenses/parso-2.0.9.jar.sha1
 delete mode 100644 solr/licenses/pdfbox-2.0.12.jar.sha1
 create mode 100644 solr/licenses/pdfbox-2.0.17.jar.sha1
 delete mode 100644 solr/licenses/pdfbox-tools-2.0.12.jar.sha1
 create mode 100644 solr/licenses/pdfbox-tools-2.0.17.jar.sha1
 delete mode 100644 solr/licenses/poi-4.0.0.jar.sha1
 create mode 100644 solr/licenses/poi-4.1.1.jar.sha1
 delete mode 100644 solr/licenses/poi-ooxml-4.0.0.jar.sha1
 create mode 100644 solr/licenses/poi-ooxml-4.1.1.jar.sha1
 delete mode 100644 solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
 create mode 100644 solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1
 delete mode 100644 solr/licenses/poi-scratchpad-4.0.0.jar.sha1
 create mode 100644 solr/licenses/poi-scratchpad-4.1.1.jar.sha1
 delete mode 100644 solr/licenses/presto-parser-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/presto-parser-NOTICE.txt
 create mode 100644 solr/licenses/protobuf-java-3.11.0.jar.sha1
 delete mode 100644 solr/licenses/protobuf-java-3.6.1.jar.sha1
 create mode 100644 solr/licenses/rome-1.12.2.jar.sha1
 delete mode 100644 solr/licenses/rome-1.5.1.jar.sha1
 create mode 100644 solr/licenses/rome-utils-1.12.2.jar.sha1
 delete mode 100644 solr/licenses/rome-utils-1.5.1.jar.sha1
 delete mode 100644 solr/licenses/servlet-api-LICENSE-CDDL.txt
 delete mode 100644 solr/licenses/servlet-api-NOTICE.txt
 delete mode 100644 solr/licenses/slice-NOTICE.txt
 delete mode 100644 solr/licenses/tika-core-1.19.1.jar.sha1
 create mode 100644 solr/licenses/tika-core-1.23.jar.sha1
 delete mode 100644 solr/licenses/tika-java7-1.19.1.jar.sha1
 create mode 100644 solr/licenses/tika-java7-1.23.jar.sha1
 delete mode 100644 solr/licenses/tika-parsers-1.19.1.jar.sha1
 create mode 100644 solr/licenses/tika-parsers-1.23.jar.sha1
 delete mode 100644 solr/licenses/tika-xmp-1.19.1.jar.sha1
 create mode 100644 solr/licenses/tika-xmp-1.23.jar.sha1
 create mode 100644 solr/licenses/xercesImpl-2.12.0.jar.sha1
 delete mode 100644 solr/licenses/xercesImpl-2.9.1.jar.sha1
 delete mode 100644 solr/licenses/xmlbeans-3.0.1.jar.sha1
 create mode 100644 solr/licenses/xmlbeans-3.1.0.jar.sha1
 delete mode 100644 solr/solr-ref-guide/src/blockjoin-faceting.adoc
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/util/SolrSecurityManager.java


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

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

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

commit 4cf8c1f9a892d40ba808db1793f1dd8ee2c2497f
Merge: 7fbb3d5 c4f68bd
Author: Robert Muir <rm...@apache.org>
AuthorDate: Fri Dec 20 18:14:13 2019 -0500

    Merge branch 'master' into jira/SOLR-13984

 lucene/CHANGES.txt                                 |   5 +
 .../analysis/cn/smart/hhmm/BigramDictionary.java   |   3 +
 .../analysis/cn/smart/hhmm/WordDictionary.java     |   3 +
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |  44 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |   8 +-
 .../java/org/apache/lucene/search/FuzzyQuery.java  |   9 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |  18 +-
 .../java/org/apache/lucene/search/WANDScorer.java  |  44 +-
 .../org/apache/lucene/search/TestFuzzyQuery.java   |  64 +-
 .../facet/taxonomy/writercache/CharBlockArray.java |   4 +
 lucene/ivy-versions.properties                     |  51 +-
 lucene/licenses/asm-5.1.jar.sha1                   |   1 -
 lucene/licenses/asm-7.2.jar.sha1                   |   1 +
 lucene/licenses/asm-commons-5.1.jar.sha1           |   1 -
 lucene/licenses/asm-commons-7.2.jar.sha1           |   1 +
 lucene/licenses/commons-codec-1.11.jar.sha1        |   1 -
 lucene/licenses/commons-codec-1.13.jar.sha1        |   1 +
 lucene/licenses/commons-compress-1.18.jar.sha1     |   1 -
 lucene/licenses/commons-compress-1.19.jar.sha1     |   1 +
 lucene/licenses/httpclient-4.5.10.jar.sha1         |   1 +
 lucene/licenses/httpclient-4.5.6.jar.sha1          |   1 -
 lucene/licenses/httpcore-4.4.10.jar.sha1           |   1 -
 lucene/licenses/httpcore-4.4.12.jar.sha1           |   1 +
 lucene/licenses/xercesImpl-2.12.0.jar.sha1         |   1 +
 lucene/licenses/xercesImpl-2.9.1.jar.sha1          |   1 -
 .../lucene/replicator/http/HttpClientBase.java     |   2 +
 .../lucene/replicator/http/ReplicationService.java |   2 +
 .../lucene/replicator/ReplicatorTestCase.java      |   2 +-
 .../src/java/org/apache/lucene/geo/Line2D.java     |   2 +-
 .../apache/lucene/document/TestLatLonShape.java    |  40 +
 lucene/tools/forbiddenApis/base.txt                |   4 +
 solr/CHANGES.txt                                   |  89 +-
 solr/bin/solr                                      |   2 +
 solr/bin/solr.cmd                                  |   2 +
 solr/common-build.xml                              |   5 -
 .../stream/AnalyticsShardResponseParser.java       |   2 +
 .../response/AnalyticsShardResponseWriter.java     |   2 +
 .../solr/handler/dataimport/ScriptTransformer.java |  33 +-
 .../handler/dataimport/TestScriptTransformer.java  |  22 +
 solr/contrib/extraction/ivy.xml                    |   1 +
 solr/core/ivy.xml                                  |   6 +-
 .../client/solrj/embedded/JettySolrRunner.java     |   4 +-
 .../cloud/OverseerConfigSetMessageHandler.java     |  25 +-
 .../apache/solr/cloud/OverseerMessageHandler.java  |   3 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |  53 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |   9 +-
 .../OverseerCollectionMessageHandler.java          |   4 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |   4 +
 .../java/org/apache/solr/handler/CatStream.java    |   2 +-
 .../solr/handler/admin/CollectionsHandler.java     |  46 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |   2 +-
 .../solr/handler/admin/SystemInfoHandler.java      |  45 -
 .../solr/handler/component/QueryComponent.java     |   7 +-
 .../packagemanager/DefaultPackageRepository.java   |   5 +-
 .../apache/solr/packagemanager/PackageManager.java | 127 ++-
 .../apache/solr/packagemanager/PackageUtils.java   |  13 +-
 .../solr/packagemanager/RepositoryManager.java     |  30 +-
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |   8 +-
 .../java/org/apache/solr/search/QParserPlugin.java |   4 +
 .../search/join/BlockJoinDocSetFacetComponent.java | 195 -----
 .../solr/search/join/BlockJoinFacetAccsHolder.java |  83 --
 .../solr/search/join/BlockJoinFacetComponent.java  |  23 -
 .../join/BlockJoinFacetComponentSupport.java       | 158 ----
 .../solr/search/join/BlockJoinFacetFilter.java     |  96 ---
 .../join/BlockJoinFieldFacetAccumulator.java       | 235 -----
 .../solr/search/join/BlockJoinParentQParser.java   |   1 +
 .../search/join/ChildFieldValueSourceParser.java   |   7 +-
 .../{BitSetSlice.java => HashRangeQParser.java}    |  38 +-
 ...itSetSlice.java => HashRangeQParserPlugin.java} |  37 +-
 .../apache/solr/search/join/HashRangeQuery.java    | 144 ++++
 .../apache/solr/search/join/ScoreModeParser.java   |   1 +
 .../org/apache/solr/search/join/XCJFQParser.java   |  90 ++
 .../apache/solr/search/join/XCJFQParserPlugin.java |  66 ++
 .../org/apache/solr/search/join/XCJFQuery.java     | 380 +++++++++
 .../StatelessScriptUpdateProcessorFactory.java     |  33 +-
 .../src/java/org/apache/solr/util/PackageTool.java |  18 +-
 .../src/test-files/solr/collection1/conf/evil.js   |  21 +
 .../conf/schema-blockjoinfacetcomponent.xml        |  40 -
 .../conf/solrconfig-blockjoinfacetcomponent.xml    |  58 --
 .../conf/solrconfig-script-updateprocessor.xml     |   6 +
 .../solr/configsets/xcjf/conf/schema.xml           |  32 +
 .../solr/configsets/xcjf/conf/solrconfig.xml       |  72 ++
 .../test/org/apache/hadoop/http/HttpServer2.java   |   2 +-
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   | 946 ++++++++-------------
 .../OverseerCollectionConfigSetProcessorTest.java  |   2 +-
 .../solr/cloud/OverseerSolrResponseTest.java       |  79 ++
 ...verseerSolrResponseUnsafeSerializationTest.java |  61 ++
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |   5 +-
 .../apache/solr/cloud/PackageManagerCLITest.java   |   9 +-
 .../solr/cloud/SystemCollectionCompatTest.java     |  16 +-
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   4 +
 .../solr/filestore/TestDistribPackageStore.java    |  19 +-
 .../solr/handler/admin/LoggingHandlerTest.java     |  54 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |  13 +-
 .../org/apache/solr/rest/TestManagedResource.java  |   5 +
 .../solr/search/DelayingSearchComponent.java       |  31 +-
 .../org/apache/solr/search/FuzzySearchTest.java    |  67 ++
 .../org/apache/solr/search/QueryEqualityTest.java  | 244 +++---
 .../org/apache/solr/search/join/BJQParserTest.java |   6 +-
 .../search/join/BlockJoinFacetDistribTest.java     | 237 ------
 .../solr/search/join/BlockJoinFacetRandomTest.java | 637 --------------
 .../solr/search/join/BlockJoinFacetSimpleTest.java | 121 ---
 .../solr/search/join/TestScoreJoinQPNoScore.java   |   5 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |   4 +-
 .../org/apache/solr/search/join/XCJFQueryTest.java | 280 ++++++
 .../join/another/BJQFilterAccessibleTest.java      |   3 +-
 .../processor/RoutedAliasUpdateProcessorTest.java  |   1 +
 .../StatelessScriptUpdateProcessorFactoryTest.java |  10 +
 solr/licenses/apache-mime4j-core-0.8.2.jar.sha1    |   1 -
 solr/licenses/apache-mime4j-core-0.8.3.jar.sha1    |   1 +
 solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1     |   1 -
 solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1     |   1 +
 solr/licenses/asm-5.1.jar.sha1                     |   1 -
 solr/licenses/asm-7.2.jar.sha1                     |   1 +
 solr/licenses/asm-LICENSE-BSD.txt                  |   2 +-
 solr/licenses/asm-LICENSE-BSD_LIKE.txt             |  26 -
 solr/licenses/asm-commons-5.1.jar.sha1             |   1 -
 solr/licenses/asm-commons-7.2.jar.sha1             |   1 +
 solr/licenses/bcmail-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcmail-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/bcpkix-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcpkix-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/bcprov-jdk15on-1.60.jar.sha1         |   1 -
 solr/licenses/bcprov-jdk15on-1.64.jar.sha1         |   1 +
 solr/licenses/commons-codec-1.11.jar.sha1          |   1 -
 solr/licenses/commons-codec-1.13.jar.sha1          |   1 +
 solr/licenses/commons-compress-1.18.jar.sha1       |   1 -
 solr/licenses/commons-compress-1.19.jar.sha1       |   1 +
 .../licenses/commons-configuration-LICENSE-ASL.txt | 403 ---------
 solr/licenses/commons-configuration-NOTICE.txt     |   9 -
 solr/licenses/commons-csv-1.7.jar.sha1             |   1 +
 ...LICENSE-ASL.txt => commons-csv-LICENSE-ASL.txt} |   0
 ...-digester-NOTICE.txt => commons-csv-NOTICE.txt} |   8 +-
 solr/licenses/commons-digester-LICENSE-ASL.txt     | 202 -----
 solr/licenses/commons-io-2.5.jar.sha1              |   1 -
 solr/licenses/commons-io-2.6.jar.sha1              |   1 +
 solr/licenses/commons-lang3-3.8.1.jar.sha1         |   1 -
 solr/licenses/commons-lang3-3.9.jar.sha1           |   1 +
 solr/licenses/curvesapi-1.04.jar.sha1              |   1 -
 solr/licenses/curvesapi-1.06.jar.sha1              |   1 +
 solr/licenses/fontbox-2.0.12.jar.sha1              |   1 -
 solr/licenses/fontbox-2.0.17.jar.sha1              |   1 +
 solr/licenses/hadoop-common-tests-LICENSE-ASL.txt  | 244 ------
 solr/licenses/hadoop-common-tests-NOTICE.txt       |   2 -
 solr/licenses/hadoop-hdfs-tests-LICENSE-ASL.txt    | 244 ------
 solr/licenses/hadoop-hdfs-tests-NOTICE.txt         |   2 -
 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1    |   1 -
 solr/licenses/hadoop-minicluster-LICENSE-ASL.txt   | 244 ------
 solr/licenses/hadoop-minicluster-NOTICE.txt        |   2 -
 solr/licenses/httpclient-4.5.10.jar.sha1           |   1 +
 solr/licenses/httpclient-4.5.6.jar.sha1            |   1 -
 solr/licenses/httpcore-4.4.10.jar.sha1             |   1 -
 solr/licenses/httpcore-4.4.12.jar.sha1             |   1 +
 solr/licenses/httpmime-4.5.10.jar.sha1             |   1 +
 solr/licenses/httpmime-4.5.6.jar.sha1              |   1 -
 solr/licenses/jackcess-2.1.12.jar.sha1             |   1 -
 solr/licenses/jackcess-3.0.1.jar.sha1              |   1 +
 solr/licenses/jackcess-encrypt-2.1.4.jar.sha1      |   1 -
 solr/licenses/jackcess-encrypt-3.0.0.jar.sha1      |   1 +
 solr/licenses/jackson-annotations-2.10.0.jar.sha1  |   1 -
 solr/licenses/jackson-annotations-2.10.1.jar.sha1  |   1 +
 solr/licenses/jackson-core-2.10.0.jar.sha1         |   1 -
 solr/licenses/jackson-core-2.10.1.jar.sha1         |   1 +
 solr/licenses/jackson-core-asl-LICENSE-ASL.txt     | 202 -----
 solr/licenses/jackson-core-asl-NOTICE.txt          |   7 -
 solr/licenses/jackson-databind-2.10.0.jar.sha1     |   1 -
 solr/licenses/jackson-databind-2.10.1.jar.sha1     |   1 +
 .../jackson-dataformat-smile-2.10.0.jar.sha1       |   1 -
 .../jackson-dataformat-smile-2.10.1.jar.sha1       |   1 +
 solr/licenses/jackson-mapper-asl-LICENSE-ASL.txt   | 202 -----
 solr/licenses/jackson-mapper-asl-NOTICE.txt        |   7 -
 solr/licenses/jersey-core-1.19.jar.sha1            |   1 -
 solr/licenses/jersey-core-LICENSE-CDDL.txt         |  81 --
 solr/licenses/jersey-server-1.19.jar.sha1          |   1 -
 solr/licenses/jersey-server-LICENSE-CDDL.txt       |  85 --
 solr/licenses/jsoup-1.11.3.jar.sha1                |   1 -
 solr/licenses/jsoup-1.12.1.jar.sha1                |   1 +
 solr/licenses/metrics-json-LICENSE-ASL.txt         | 203 -----
 solr/licenses/metrics-json-NOTICE.txt              |  12 -
 solr/licenses/metrics-servlets-LICENSE-ASL.txt     | 203 -----
 solr/licenses/metrics-servlets-NOTICE.txt          |  12 -
 solr/licenses/mina-core-LICENSE-ASL.txt            | 341 --------
 solr/licenses/mina-core-NOTICE.txt                 |   7 -
 solr/licenses/netty-all-4.1.29.Final.jar.sha1      |   1 -
 solr/licenses/netty-all-LICENSE-ASL.txt            | 202 -----
 solr/licenses/netty-all-NOTICE.txt                 | 223 -----
 solr/licenses/parso-2.0.11.jar.sha1                |   1 +
 solr/licenses/parso-2.0.9.jar.sha1                 |   1 -
 solr/licenses/pdfbox-2.0.12.jar.sha1               |   1 -
 solr/licenses/pdfbox-2.0.17.jar.sha1               |   1 +
 solr/licenses/pdfbox-tools-2.0.12.jar.sha1         |   1 -
 solr/licenses/pdfbox-tools-2.0.17.jar.sha1         |   1 +
 solr/licenses/poi-4.0.0.jar.sha1                   |   1 -
 solr/licenses/poi-4.1.1.jar.sha1                   |   1 +
 solr/licenses/poi-ooxml-4.0.0.jar.sha1             |   1 -
 solr/licenses/poi-ooxml-4.1.1.jar.sha1             |   1 +
 solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1     |   1 -
 solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1     |   1 +
 solr/licenses/poi-scratchpad-4.0.0.jar.sha1        |   1 -
 solr/licenses/poi-scratchpad-4.1.1.jar.sha1        |   1 +
 solr/licenses/presto-parser-LICENSE-ASL.txt        | 202 -----
 solr/licenses/presto-parser-NOTICE.txt             |   0
 solr/licenses/protobuf-java-3.11.0.jar.sha1        |   1 +
 solr/licenses/protobuf-java-3.6.1.jar.sha1         |   1 -
 solr/licenses/rome-1.12.2.jar.sha1                 |   1 +
 solr/licenses/rome-1.5.1.jar.sha1                  |   1 -
 solr/licenses/rome-utils-1.12.2.jar.sha1           |   1 +
 solr/licenses/rome-utils-1.5.1.jar.sha1            |   1 -
 solr/licenses/servlet-api-LICENSE-CDDL.txt         | 126 ---
 solr/licenses/servlet-api-NOTICE.txt               |   2 -
 solr/licenses/slice-NOTICE.txt                     |   0
 solr/licenses/tika-core-1.19.1.jar.sha1            |   1 -
 solr/licenses/tika-core-1.23.jar.sha1              |   1 +
 solr/licenses/tika-java7-1.19.1.jar.sha1           |   1 -
 solr/licenses/tika-java7-1.23.jar.sha1             |   1 +
 solr/licenses/tika-parsers-1.19.1.jar.sha1         |   1 -
 solr/licenses/tika-parsers-1.23.jar.sha1           |   1 +
 solr/licenses/tika-xmp-1.19.1.jar.sha1             |   1 -
 solr/licenses/tika-xmp-1.23.jar.sha1               |   1 +
 solr/licenses/xercesImpl-2.12.0.jar.sha1           |   1 +
 solr/licenses/xercesImpl-2.9.1.jar.sha1            |   1 -
 solr/licenses/xmlbeans-3.0.1.jar.sha1              |   1 -
 solr/licenses/xmlbeans-3.1.0.jar.sha1              |   1 +
 solr/server/etc/jetty-http.xml                     |   3 +-
 solr/server/etc/jetty-https.xml                    |   7 +-
 solr/server/etc/jetty-https8.xml                   |   3 +-
 solr/server/etc/jetty-ssl.xml                      |   2 +-
 solr/server/etc/jetty.xml                          |   2 +-
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   6 +
 solr/solr-ref-guide/src/aliases.adoc               |   2 +-
 .../authentication-and-authorization-plugins.adoc  |   2 +-
 solr/solr-ref-guide/src/blockjoin-faceting.adoc    | 115 ---
 .../src/cluster-node-management.adoc               |   6 +-
 solr/solr-ref-guide/src/collection-management.adoc |  32 +-
 .../solr-ref-guide/src/command-line-utilities.adoc |   2 +-
 .../src/common-query-parameters.adoc               |   4 +-
 solr/solr-ref-guide/src/config-sets.adoc           |   4 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |   2 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |   4 +-
 .../src/defining-core-properties.adoc              |   2 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |   4 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   2 +-
 solr/solr-ref-guide/src/faceting.adoc              |   1 -
 .../src/field-type-definitions-and-properties.adoc |   4 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |   6 +-
 .../collections-core-admin/collection-admin.png    | Bin 60968 -> 153727 bytes
 .../src/implicit-requesthandlers.adoc              |   2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |   6 +-
 .../src/json-faceting-domain-changes.adoc          |   2 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc        |   2 +-
 .../src/jwt-authentication-plugin.adoc             |   2 +-
 .../src/major-changes-in-solr-7.adoc               |   4 +-
 .../src/major-changes-in-solr-8.adoc               |   2 +-
 .../src/making-and-restoring-backups.adoc          |   3 +-
 solr/solr-ref-guide/src/other-parsers.adoc         | 110 ++-
 .../src/package-manager-internals.adoc             |  43 +-
 solr/solr-ref-guide/src/package-manager.adoc       | 100 +--
 .../src/performance-statistics-reference.adoc      |   4 +-
 .../src/requestdispatcher-in-solrconfig.adoc       |   8 +-
 solr/solr-ref-guide/src/resource-loading.adoc      |   6 +-
 .../src/searching-nested-documents.adoc            |   2 +-
 solr/solr-ref-guide/src/securing-solr.adoc         |   4 +-
 .../src/solr-control-script-reference.adoc         |  45 +-
 .../src/solr-cores-and-solr-xml.adoc               |   2 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    | 134 ++-
 .../solrcloud-autoscaling-policy-preferences.adoc  |  18 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |   4 +-
 .../solrcloud-configuration-and-parameters.adoc    |   2 +-
 solr/solr-ref-guide/src/solrcloud.adoc             |   2 +-
 .../src/the-dismax-query-parser.adoc               |  15 +-
 .../src/the-extended-dismax-query-parser.adoc      |   3 +-
 .../src/updating-parts-of-documents.adoc           |   2 +-
 ...ng-zookeeper-to-manage-configuration-files.adoc |   2 +-
 .../org/apache/solr/client/solrj/SolrResponse.java |  15 +-
 .../solr/client/solrj/embedded/SSLConfig.java      |  21 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |   9 +-
 .../solr/client/solrj/io/eval/ConcatEvaluator.java |   2 +-
 .../solr/client/solrj/io/eval/DateEvaluator.java   |   2 +-
 .../solr/client/solrj/io/eval/DbscanEvaluator.java |   2 +-
 .../io/eval/EmpiricalDistributionEvaluator.java    |   2 +-
 .../client/solrj/io/eval/MatchesEvaluator.java     |   2 +-
 .../solr/client/solrj/io/eval/PivotEvaluator.java  |   2 +-
 .../java/org/apache/solr/common/util/Utils.java    |  63 +-
 .../apache/solr/client/solrj/SolrQueryTest.java    |   3 +
 .../apache/solr/client/solrj/StartSolrJetty.java   |  11 +-
 .../client/solrj/embedded/JettyWebappTest.java     |  17 +-
 .../src/java/org/apache/solr/util/LogLevel.java    |  33 +-
 .../java/org/apache/solr/util/SSLTestConfig.java   |   4 +-
 .../org/apache/solr/util/SolrSecurityManager.java  |  95 ---
 .../org/apache/solr/TestLogLevelAnnotations.java   | 131 ++-
 solr/webapp/web/js/angular/controllers/index.js    |  10 +-
 solr/webapp/web/partials/index.html                |   2 +-
 292 files changed, 3321 insertions(+), 7006 deletions(-)