From commits-return-112072-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Wed Dec 18 08:52:09 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 72C9B18065B for ; Wed, 18 Dec 2019 09:52:09 +0100 (CET) Received: (qmail 86815 invoked by uid 500); 18 Dec 2019 08:52:08 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 86805 invoked by uid 99); 18 Dec 2019 08:52:08 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2019 08:52:08 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0B1088D80D; Wed, 18 Dec 2019 08:52:08 +0000 (UTC) Date: Wed, 18 Dec 2019 08:52:07 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] branch gradle-master updated (845b202 -> 2e453af) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157665912750.6791.9807418360124020661@gitbox.apache.org> From: dweiss@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-solr X-Git-Refname: refs/heads/gradle-master X-Git-Reftype: branch X-Git-Oldrev: 845b20224dc933ac56bc72654fb20c84bde6b7dd X-Git-Newrev: 2e453afa28eba868d97a9b1df2a281e190ee1b9b X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dweiss pushed a change to branch gradle-master in repository https://gitbox.apache.org/repos/asf/lucene-solr.git. from 845b202 SOLR-14103: follow up 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). new 28b19c2 Merge with master. new 2e453af Merge tika upgrade monster-patch. commons-csv excluded from gradle. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lucene/expressions/build.gradle | 1 + lucene/ivy-versions.properties | 47 +- 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 - solr/CHANGES.txt | 28 +- solr/contrib/extraction/ivy.xml | 1 + .../java/org/apache/solr/handler/CatStream.java | 2 +- .../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 ++++++++++++ .../conf/schema-blockjoinfacetcomponent.xml | 40 -- .../conf/solrconfig-blockjoinfacetcomponent.xml | 58 -- .../solr/configsets/xcjf/conf/schema.xml | 32 ++ .../solr/configsets/xcjf/conf/solrconfig.xml | 72 +++ .../solr/handler/admin/LoggingHandlerTest.java | 59 +- .../solr/search/DelayingSearchComponent.java | 31 +- .../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 + .../apache-mime4j-core-0.8.2.jar.sha1 | 1 - .../apache-mime4j-core-0.8.3.jar.sha1 | 1 + .../apache-mime4j-dom-0.8.2.jar.sha1 | 1 - .../apache-mime4j-dom-0.8.3.jar.sha1 | 1 + solr/licenses-gradle/asm-5.1.jar.sha1 | 1 - solr/licenses-gradle/asm-7.2.jar.sha1 | 1 + solr/licenses-gradle/asm-commons-5.1.jar.sha1 | 1 - solr/licenses-gradle/asm-commons-7.2.jar.sha1 | 1 + solr/licenses-gradle/bcmail-jdk15on-1.60.jar.sha1 | 1 - solr/licenses-gradle/bcmail-jdk15on-1.64.jar.sha1 | 1 + solr/licenses-gradle/bcpkix-jdk15on-1.60.jar.sha1 | 1 - solr/licenses-gradle/bcpkix-jdk15on-1.64.jar.sha1 | 1 + solr/licenses-gradle/bcprov-jdk15on-1.60.jar.sha1 | 1 - solr/licenses-gradle/bcprov-jdk15on-1.64.jar.sha1 | 1 + solr/licenses-gradle/commons-codec-1.11.jar.sha1 | 1 - solr/licenses-gradle/commons-codec-1.13.jar.sha1 | 1 + .../licenses-gradle/commons-compress-1.18.jar.sha1 | 1 - .../licenses-gradle/commons-compress-1.19.jar.sha1 | 1 + solr/licenses-gradle/commons-io-2.5.jar.sha1 | 1 - solr/licenses-gradle/commons-io-2.6.jar.sha1 | 1 + solr/licenses-gradle/commons-lang3-3.8.1.jar.sha1 | 1 - solr/licenses-gradle/commons-lang3-3.9.jar.sha1 | 1 + solr/licenses-gradle/curvesapi-1.04.jar.sha1 | 1 - solr/licenses-gradle/curvesapi-1.06.jar.sha1 | 1 + solr/licenses-gradle/fontbox-2.0.12.jar.sha1 | 1 - solr/licenses-gradle/fontbox-2.0.17.jar.sha1 | 1 + solr/licenses-gradle/httpclient-4.5.10.jar.sha1 | 1 + solr/licenses-gradle/httpclient-4.5.6.jar.sha1 | 1 - solr/licenses-gradle/httpcore-4.4.10.jar.sha1 | 1 - solr/licenses-gradle/httpcore-4.4.12.jar.sha1 | 1 + solr/licenses-gradle/httpmime-4.5.10.jar.sha1 | 1 + solr/licenses-gradle/httpmime-4.5.6.jar.sha1 | 1 - solr/licenses-gradle/jackcess-2.1.12.jar.sha1 | 1 - solr/licenses-gradle/jackcess-3.0.1.jar.sha1 | 1 + .../jackcess-encrypt-2.1.4.jar.sha1 | 1 - .../jackcess-encrypt-3.0.0.jar.sha1 | 1 + .../jackson-annotations-2.10.0.jar.sha1 | 1 - .../jackson-annotations-2.10.1.jar.sha1 | 1 + solr/licenses-gradle/jackson-core-2.10.0.jar.sha1 | 1 - solr/licenses-gradle/jackson-core-2.10.1.jar.sha1 | 1 + .../jackson-databind-2.10.0.jar.sha1 | 1 - .../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-gradle/parso-2.0.11.jar.sha1 | 1 + solr/licenses-gradle/parso-2.0.9.jar.sha1 | 1 - solr/licenses-gradle/pdfbox-2.0.12.jar.sha1 | 1 - solr/licenses-gradle/pdfbox-2.0.17.jar.sha1 | 1 + solr/licenses-gradle/pdfbox-tools-2.0.12.jar.sha1 | 1 - solr/licenses-gradle/pdfbox-tools-2.0.17.jar.sha1 | 1 + solr/licenses-gradle/poi-4.0.0.jar.sha1 | 1 - solr/licenses-gradle/poi-4.1.1.jar.sha1 | 1 + solr/licenses-gradle/poi-ooxml-4.0.0.jar.sha1 | 1 - solr/licenses-gradle/poi-ooxml-4.1.1.jar.sha1 | 1 + .../poi-ooxml-schemas-4.0.0.jar.sha1 | 1 - .../poi-ooxml-schemas-4.1.1.jar.sha1 | 1 + solr/licenses-gradle/poi-scratchpad-4.0.0.jar.sha1 | 1 - solr/licenses-gradle/poi-scratchpad-4.1.1.jar.sha1 | 1 + solr/licenses-gradle/protobuf-java-3.11.0.jar.sha1 | 1 + solr/licenses-gradle/protobuf-java-3.6.1.jar.sha1 | 1 - solr/licenses-gradle/rome-1.12.2.jar.sha1 | 1 + solr/licenses-gradle/rome-1.5.1.jar.sha1 | 1 - solr/licenses-gradle/rome-utils-1.12.2.jar.sha1 | 1 + solr/licenses-gradle/rome-utils-1.5.1.jar.sha1 | 1 - solr/licenses-gradle/tika-core-1.19.1.jar.sha1 | 1 - solr/licenses-gradle/tika-core-1.23.jar.sha1 | 1 + solr/licenses-gradle/tika-java7-1.19.1.jar.sha1 | 1 - solr/licenses-gradle/tika-java7-1.23.jar.sha1 | 1 + solr/licenses-gradle/tika-parsers-1.19.1.jar.sha1 | 1 - solr/licenses-gradle/tika-parsers-1.23.jar.sha1 | 1 + solr/licenses-gradle/tika-xmp-1.19.1.jar.sha1 | 1 - solr/licenses-gradle/tika-xmp-1.23.jar.sha1 | 1 + solr/licenses-gradle/xercesImpl-2.12.0.jar.sha1 | 1 + solr/licenses-gradle/xercesImpl-2.9.1.jar.sha1 | 1 - solr/licenses-gradle/xmlbeans-3.0.1.jar.sha1 | 1 - solr/licenses-gradle/xmlbeans-3.1.0.jar.sha1 | 1 + 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-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 + solr/licenses/commons-csv-1.7.jar.sha1 | 1 + .../commons-csv-LICENSE-ASL.txt} | 0 solr/licenses/commons-csv-NOTICE.txt | 9 + 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/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-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/jsoup-1.11.3.jar.sha1 | 1 - solr/licenses/jsoup-1.12.1.jar.sha1 | 1 + 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/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/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/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 - solr/solr-ref-guide/src/format-of-solr-xml.adoc | 6 +- .../src/implicit-requesthandlers.adoc | 2 +- .../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 +- solr/solr-ref-guide/src/other-parsers.adoc | 104 ++++ .../src/package-manager-internals.adoc | 43 +- solr/solr-ref-guide/src/package-manager.adoc | 31 +- .../src/performance-statistics-reference.adoc | 4 +- 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 | 4 +- .../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 | 12 +- .../src/updating-parts-of-documents.adoc | 2 +- ...ng-zookeeper-to-manage-configuration-files.adoc | 2 +- .../src/java/org/apache/solr/util/LogLevel.java | 33 +- .../org/apache/solr/TestLogLevelAnnotations.java | 113 +++- versions.lock | 78 +-- versions.props | 46 +- 250 files changed, 1987 insertions(+), 2506 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 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 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-gradle/apache-mime4j-core-0.8.2.jar.sha1 create mode 100644 solr/licenses-gradle/apache-mime4j-core-0.8.3.jar.sha1 delete mode 100644 solr/licenses-gradle/apache-mime4j-dom-0.8.2.jar.sha1 create mode 100644 solr/licenses-gradle/apache-mime4j-dom-0.8.3.jar.sha1 delete mode 100644 solr/licenses-gradle/asm-5.1.jar.sha1 create mode 100644 solr/licenses-gradle/asm-7.2.jar.sha1 delete mode 100644 solr/licenses-gradle/asm-commons-5.1.jar.sha1 create mode 100644 solr/licenses-gradle/asm-commons-7.2.jar.sha1 delete mode 100644 solr/licenses-gradle/bcmail-jdk15on-1.60.jar.sha1 create mode 100644 solr/licenses-gradle/bcmail-jdk15on-1.64.jar.sha1 delete mode 100644 solr/licenses-gradle/bcpkix-jdk15on-1.60.jar.sha1 create mode 100644 solr/licenses-gradle/bcpkix-jdk15on-1.64.jar.sha1 delete mode 100644 solr/licenses-gradle/bcprov-jdk15on-1.60.jar.sha1 create mode 100644 solr/licenses-gradle/bcprov-jdk15on-1.64.jar.sha1 delete mode 100644 solr/licenses-gradle/commons-codec-1.11.jar.sha1 create mode 100644 solr/licenses-gradle/commons-codec-1.13.jar.sha1 delete mode 100644 solr/licenses-gradle/commons-compress-1.18.jar.sha1 create mode 100644 solr/licenses-gradle/commons-compress-1.19.jar.sha1 delete mode 100644 solr/licenses-gradle/commons-io-2.5.jar.sha1 create mode 100644 solr/licenses-gradle/commons-io-2.6.jar.sha1 delete mode 100644 solr/licenses-gradle/commons-lang3-3.8.1.jar.sha1 create mode 100644 solr/licenses-gradle/commons-lang3-3.9.jar.sha1 delete mode 100644 solr/licenses-gradle/curvesapi-1.04.jar.sha1 create mode 100644 solr/licenses-gradle/curvesapi-1.06.jar.sha1 delete mode 100644 solr/licenses-gradle/fontbox-2.0.12.jar.sha1 create mode 100644 solr/licenses-gradle/fontbox-2.0.17.jar.sha1 create mode 100644 solr/licenses-gradle/httpclient-4.5.10.jar.sha1 delete mode 100644 solr/licenses-gradle/httpclient-4.5.6.jar.sha1 delete mode 100644 solr/licenses-gradle/httpcore-4.4.10.jar.sha1 create mode 100644 solr/licenses-gradle/httpcore-4.4.12.jar.sha1 create mode 100644 solr/licenses-gradle/httpmime-4.5.10.jar.sha1 delete mode 100644 solr/licenses-gradle/httpmime-4.5.6.jar.sha1 delete mode 100644 solr/licenses-gradle/jackcess-2.1.12.jar.sha1 create mode 100644 solr/licenses-gradle/jackcess-3.0.1.jar.sha1 delete mode 100644 solr/licenses-gradle/jackcess-encrypt-2.1.4.jar.sha1 create mode 100644 solr/licenses-gradle/jackcess-encrypt-3.0.0.jar.sha1 delete mode 100644 solr/licenses-gradle/jackson-annotations-2.10.0.jar.sha1 create mode 100644 solr/licenses-gradle/jackson-annotations-2.10.1.jar.sha1 delete mode 100644 solr/licenses-gradle/jackson-core-2.10.0.jar.sha1 create mode 100644 solr/licenses-gradle/jackson-core-2.10.1.jar.sha1 delete mode 100644 solr/licenses-gradle/jackson-databind-2.10.0.jar.sha1 create mode 100644 solr/licenses-gradle/jackson-databind-2.10.1.jar.sha1 delete mode 100644 solr/licenses-gradle/jackson-dataformat-smile-2.10.0.jar.sha1 create mode 100644 solr/licenses-gradle/jackson-dataformat-smile-2.10.1.jar.sha1 create mode 100644 solr/licenses-gradle/parso-2.0.11.jar.sha1 delete mode 100644 solr/licenses-gradle/parso-2.0.9.jar.sha1 delete mode 100644 solr/licenses-gradle/pdfbox-2.0.12.jar.sha1 create mode 100644 solr/licenses-gradle/pdfbox-2.0.17.jar.sha1 delete mode 100644 solr/licenses-gradle/pdfbox-tools-2.0.12.jar.sha1 create mode 100644 solr/licenses-gradle/pdfbox-tools-2.0.17.jar.sha1 delete mode 100644 solr/licenses-gradle/poi-4.0.0.jar.sha1 create mode 100644 solr/licenses-gradle/poi-4.1.1.jar.sha1 delete mode 100644 solr/licenses-gradle/poi-ooxml-4.0.0.jar.sha1 create mode 100644 solr/licenses-gradle/poi-ooxml-4.1.1.jar.sha1 delete mode 100644 solr/licenses-gradle/poi-ooxml-schemas-4.0.0.jar.sha1 create mode 100644 solr/licenses-gradle/poi-ooxml-schemas-4.1.1.jar.sha1 delete mode 100644 solr/licenses-gradle/poi-scratchpad-4.0.0.jar.sha1 create mode 100644 solr/licenses-gradle/poi-scratchpad-4.1.1.jar.sha1 create mode 100644 solr/licenses-gradle/protobuf-java-3.11.0.jar.sha1 delete mode 100644 solr/licenses-gradle/protobuf-java-3.6.1.jar.sha1 create mode 100644 solr/licenses-gradle/rome-1.12.2.jar.sha1 delete mode 100644 solr/licenses-gradle/rome-1.5.1.jar.sha1 create mode 100644 solr/licenses-gradle/rome-utils-1.12.2.jar.sha1 delete mode 100644 solr/licenses-gradle/rome-utils-1.5.1.jar.sha1 delete mode 100644 solr/licenses-gradle/tika-core-1.19.1.jar.sha1 create mode 100644 solr/licenses-gradle/tika-core-1.23.jar.sha1 delete mode 100644 solr/licenses-gradle/tika-java7-1.19.1.jar.sha1 create mode 100644 solr/licenses-gradle/tika-java7-1.23.jar.sha1 delete mode 100644 solr/licenses-gradle/tika-parsers-1.19.1.jar.sha1 create mode 100644 solr/licenses-gradle/tika-parsers-1.23.jar.sha1 delete mode 100644 solr/licenses-gradle/tika-xmp-1.19.1.jar.sha1 create mode 100644 solr/licenses-gradle/tika-xmp-1.23.jar.sha1 create mode 100644 solr/licenses-gradle/xercesImpl-2.12.0.jar.sha1 delete mode 100644 solr/licenses-gradle/xercesImpl-2.9.1.jar.sha1 delete mode 100644 solr/licenses-gradle/xmlbeans-3.0.1.jar.sha1 create mode 100644 solr/licenses-gradle/xmlbeans-3.1.0.jar.sha1 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-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 create mode 100644 solr/licenses/commons-csv-1.7.jar.sha1 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-csv-LICENSE-ASL.txt} (100%) mode change 100755 => 100644 create mode 100644 solr/licenses/commons-csv-NOTICE.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 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-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/jsoup-1.11.3.jar.sha1 create mode 100644 solr/licenses/jsoup-1.12.1.jar.sha1 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 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/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