You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/18 08:52:07 UTC

[lucene-solr] branch gradle-master updated (845b202 -> 2e453af)

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


[lucene-solr] 01/02: Merge with master.

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

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 28b19c2af276443e785e341b56b02ffed5b59f9d
Merge: 845b202 71a5714
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Dec 18 09:32:35 2019 +0100

    Merge with master.

 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 +
 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 +
 solr/licenses/commons-csv-LICENSE-ASL.txt          | 202 +++++++
 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 +++-
 171 files changed, 2088 insertions(+), 2406 deletions(-)


[lucene-solr] 02/02: Merge tika upgrade monster-patch. commons-csv excluded from gradle.

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

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 2e453afa28eba868d97a9b1df2a281e190ee1b9b
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Dec 18 09:51:57 2019 +0100

    Merge tika upgrade monster-patch. commons-csv excluded from gradle.
---
 lucene/expressions/build.gradle                    |  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 +
 versions.lock                                      | 78 +++++++++++-----------
 versions.props                                     | 46 ++++++-------
 79 files changed, 101 insertions(+), 100 deletions(-)

diff --git a/lucene/expressions/build.gradle b/lucene/expressions/build.gradle
index 9222bf0..bec0424 100644
--- a/lucene/expressions/build.gradle
+++ b/lucene/expressions/build.gradle
@@ -14,6 +14,7 @@ dependencies {
   implementation 'org.ow2.asm:asm'
   implementation('org.ow2.asm:asm-commons', {
     exclude group: "org.ow2.asm", module: "asm-tree"
+    exclude group: "org.ow2.asm", module: "asm-analysis"
   })
 
   testImplementation project(':lucene:test-framework')
diff --git a/solr/licenses-gradle/apache-mime4j-core-0.8.2.jar.sha1 b/solr/licenses-gradle/apache-mime4j-core-0.8.2.jar.sha1
deleted file mode 100644
index 6afc490..0000000
--- a/solr/licenses-gradle/apache-mime4j-core-0.8.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94919d81969c67c5894646338bf10fbc35f5a946
diff --git a/solr/licenses-gradle/apache-mime4j-core-0.8.3.jar.sha1 b/solr/licenses-gradle/apache-mime4j-core-0.8.3.jar.sha1
new file mode 100644
index 0000000..7fa45b6
--- /dev/null
+++ b/solr/licenses-gradle/apache-mime4j-core-0.8.3.jar.sha1
@@ -0,0 +1 @@
+1179b56c9919c1a8e20d3a528ee4c6cee19bcbe0
diff --git a/solr/licenses-gradle/apache-mime4j-dom-0.8.2.jar.sha1 b/solr/licenses-gradle/apache-mime4j-dom-0.8.2.jar.sha1
deleted file mode 100644
index 171a9d1..0000000
--- a/solr/licenses-gradle/apache-mime4j-dom-0.8.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-32c9a9afe84eca86a3b0b3c66a956ced249ceade
diff --git a/solr/licenses-gradle/apache-mime4j-dom-0.8.3.jar.sha1 b/solr/licenses-gradle/apache-mime4j-dom-0.8.3.jar.sha1
new file mode 100644
index 0000000..70163a5
--- /dev/null
+++ b/solr/licenses-gradle/apache-mime4j-dom-0.8.3.jar.sha1
@@ -0,0 +1 @@
+e80733714eb6a70895bfc74a9528c658504c2c83
diff --git a/solr/licenses-gradle/asm-5.1.jar.sha1 b/solr/licenses-gradle/asm-5.1.jar.sha1
deleted file mode 100644
index fc907c7..0000000
--- a/solr/licenses-gradle/asm-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45
diff --git a/solr/licenses-gradle/asm-7.2.jar.sha1 b/solr/licenses-gradle/asm-7.2.jar.sha1
new file mode 100644
index 0000000..ccb16fa
--- /dev/null
+++ b/solr/licenses-gradle/asm-7.2.jar.sha1
@@ -0,0 +1 @@
+fa637eb67eb7628c915d73762b681ae7ff0b9731
diff --git a/solr/licenses-gradle/asm-commons-5.1.jar.sha1 b/solr/licenses-gradle/asm-commons-5.1.jar.sha1
deleted file mode 100644
index 8b49593..0000000
--- a/solr/licenses-gradle/asm-commons-5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25d8a575034dd9cfcb375a39b5334f0ba9c8474e
diff --git a/solr/licenses-gradle/asm-commons-7.2.jar.sha1 b/solr/licenses-gradle/asm-commons-7.2.jar.sha1
new file mode 100644
index 0000000..3db5dac
--- /dev/null
+++ b/solr/licenses-gradle/asm-commons-7.2.jar.sha1
@@ -0,0 +1 @@
+ca2954e8d92a05bacc28ff465b25c70e0f512497
diff --git a/solr/licenses-gradle/bcmail-jdk15on-1.60.jar.sha1 b/solr/licenses-gradle/bcmail-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 9cb6092..0000000
--- a/solr/licenses-gradle/bcmail-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df0250131a6e85e546ec5b1bf964f7f2ff3a42fc
diff --git a/solr/licenses-gradle/bcmail-jdk15on-1.64.jar.sha1 b/solr/licenses-gradle/bcmail-jdk15on-1.64.jar.sha1
new file mode 100644
index 0000000..aa3ef0c
--- /dev/null
+++ b/solr/licenses-gradle/bcmail-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+7a2601f0a1d336966cca03edb04a69ba0f5f25d9
diff --git a/solr/licenses-gradle/bcpkix-jdk15on-1.60.jar.sha1 b/solr/licenses-gradle/bcpkix-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 45e955a..0000000
--- a/solr/licenses-gradle/bcpkix-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0c46320fbc07be3a24eb13a56cee4e3d38e0c75
diff --git a/solr/licenses-gradle/bcpkix-jdk15on-1.64.jar.sha1 b/solr/licenses-gradle/bcpkix-jdk15on-1.64.jar.sha1
new file mode 100644
index 0000000..e102196
--- /dev/null
+++ b/solr/licenses-gradle/bcpkix-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+3dac163e20110817d850d17e0444852a6d7d0bd7
diff --git a/solr/licenses-gradle/bcprov-jdk15on-1.60.jar.sha1 b/solr/licenses-gradle/bcprov-jdk15on-1.60.jar.sha1
deleted file mode 100644
index 3fc67c7..0000000
--- a/solr/licenses-gradle/bcprov-jdk15on-1.60.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd47ad3bd14b8e82595c7adaa143501e60842a84
diff --git a/solr/licenses-gradle/bcprov-jdk15on-1.64.jar.sha1 b/solr/licenses-gradle/bcprov-jdk15on-1.64.jar.sha1
new file mode 100644
index 0000000..7d87587
--- /dev/null
+++ b/solr/licenses-gradle/bcprov-jdk15on-1.64.jar.sha1
@@ -0,0 +1 @@
+1467dac1b787b5ad2a18201c0c281df69882259e
diff --git a/solr/licenses-gradle/commons-codec-1.11.jar.sha1 b/solr/licenses-gradle/commons-codec-1.11.jar.sha1
deleted file mode 100644
index 0ca9841..0000000
--- a/solr/licenses-gradle/commons-codec-1.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3acb4705652e16236558f0f4f2192cc33c3bd189
diff --git a/solr/licenses-gradle/commons-codec-1.13.jar.sha1 b/solr/licenses-gradle/commons-codec-1.13.jar.sha1
new file mode 100644
index 0000000..4d9344b
--- /dev/null
+++ b/solr/licenses-gradle/commons-codec-1.13.jar.sha1
@@ -0,0 +1 @@
+3f18e1aa31031d89db6f01ba05d501258ce69d2c
diff --git a/solr/licenses-gradle/commons-compress-1.18.jar.sha1 b/solr/licenses-gradle/commons-compress-1.18.jar.sha1
deleted file mode 100644
index 96fa373..0000000
--- a/solr/licenses-gradle/commons-compress-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5
diff --git a/solr/licenses-gradle/commons-compress-1.19.jar.sha1 b/solr/licenses-gradle/commons-compress-1.19.jar.sha1
new file mode 100644
index 0000000..54494ea
--- /dev/null
+++ b/solr/licenses-gradle/commons-compress-1.19.jar.sha1
@@ -0,0 +1 @@
+7e65777fb451ddab6a9c054beb879e521b7eab78
diff --git a/solr/licenses-gradle/commons-io-2.5.jar.sha1 b/solr/licenses-gradle/commons-io-2.5.jar.sha1
deleted file mode 100644
index 4c14fb6..0000000
--- a/solr/licenses-gradle/commons-io-2.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2852e6e05fbb95076fc091f6d1780f1f8fe35e0f
diff --git a/solr/licenses-gradle/commons-io-2.6.jar.sha1 b/solr/licenses-gradle/commons-io-2.6.jar.sha1
new file mode 100644
index 0000000..9fa55f5
--- /dev/null
+++ b/solr/licenses-gradle/commons-io-2.6.jar.sha1
@@ -0,0 +1 @@
+815893df5f31da2ece4040fe0a12fd44b577afaf
diff --git a/solr/licenses-gradle/commons-lang3-3.8.1.jar.sha1 b/solr/licenses-gradle/commons-lang3-3.8.1.jar.sha1
deleted file mode 100644
index bbed0fb..0000000
--- a/solr/licenses-gradle/commons-lang3-3.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6505a72a097d9270f7a9e7bf42c4238283247755
diff --git a/solr/licenses-gradle/commons-lang3-3.9.jar.sha1 b/solr/licenses-gradle/commons-lang3-3.9.jar.sha1
new file mode 100644
index 0000000..7875e43
--- /dev/null
+++ b/solr/licenses-gradle/commons-lang3-3.9.jar.sha1
@@ -0,0 +1 @@
+0122c7cee69b53ed4a7681c03d4ee4c0e2765da5
diff --git a/solr/licenses-gradle/curvesapi-1.04.jar.sha1 b/solr/licenses-gradle/curvesapi-1.04.jar.sha1
deleted file mode 100644
index 51c2626..0000000
--- a/solr/licenses-gradle/curvesapi-1.04.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3386abf821719bc89c7685f9eaafaf4a842f0199
diff --git a/solr/licenses-gradle/curvesapi-1.06.jar.sha1 b/solr/licenses-gradle/curvesapi-1.06.jar.sha1
new file mode 100644
index 0000000..e6cb5c3
--- /dev/null
+++ b/solr/licenses-gradle/curvesapi-1.06.jar.sha1
@@ -0,0 +1 @@
+159dd2e8956459a4eb0a9a6ecda9004d8d289708
diff --git a/solr/licenses-gradle/fontbox-2.0.12.jar.sha1 b/solr/licenses-gradle/fontbox-2.0.12.jar.sha1
deleted file mode 100644
index 8ded8ca..0000000
--- a/solr/licenses-gradle/fontbox-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-566fd1d6b25012bb82078da08b82e6d0ba8c884a
diff --git a/solr/licenses-gradle/fontbox-2.0.17.jar.sha1 b/solr/licenses-gradle/fontbox-2.0.17.jar.sha1
new file mode 100644
index 0000000..eab3309
--- /dev/null
+++ b/solr/licenses-gradle/fontbox-2.0.17.jar.sha1
@@ -0,0 +1 @@
+d42c5eda5b232866a230c36a26fc22ae6e966ffa
diff --git a/solr/licenses-gradle/httpclient-4.5.10.jar.sha1 b/solr/licenses-gradle/httpclient-4.5.10.jar.sha1
new file mode 100644
index 0000000..f507006
--- /dev/null
+++ b/solr/licenses-gradle/httpclient-4.5.10.jar.sha1
@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5
diff --git a/solr/licenses-gradle/httpclient-4.5.6.jar.sha1 b/solr/licenses-gradle/httpclient-4.5.6.jar.sha1
deleted file mode 100644
index 92b233e..0000000
--- a/solr/licenses-gradle/httpclient-4.5.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1afe5621985efe90a92d0fbc9be86271efbe796f
diff --git a/solr/licenses-gradle/httpcore-4.4.10.jar.sha1 b/solr/licenses-gradle/httpcore-4.4.10.jar.sha1
deleted file mode 100644
index 6f91546..0000000
--- a/solr/licenses-gradle/httpcore-4.4.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-acc54d9b28bdffe4bbde89ed2e4a1e86b5285e2b
diff --git a/solr/licenses-gradle/httpcore-4.4.12.jar.sha1 b/solr/licenses-gradle/httpcore-4.4.12.jar.sha1
new file mode 100644
index 0000000..2a062f3
--- /dev/null
+++ b/solr/licenses-gradle/httpcore-4.4.12.jar.sha1
@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132
diff --git a/solr/licenses-gradle/httpmime-4.5.10.jar.sha1 b/solr/licenses-gradle/httpmime-4.5.10.jar.sha1
new file mode 100644
index 0000000..473e660
--- /dev/null
+++ b/solr/licenses-gradle/httpmime-4.5.10.jar.sha1
@@ -0,0 +1 @@
+3513ca10d24d7aa962741c90e914fec650f0848c
diff --git a/solr/licenses-gradle/httpmime-4.5.6.jar.sha1 b/solr/licenses-gradle/httpmime-4.5.6.jar.sha1
deleted file mode 100644
index eba7d66..0000000
--- a/solr/licenses-gradle/httpmime-4.5.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-164343da11db817e81e24e0d9869527e069850c9
diff --git a/solr/licenses-gradle/jackcess-2.1.12.jar.sha1 b/solr/licenses-gradle/jackcess-2.1.12.jar.sha1
deleted file mode 100644
index 49fe421..0000000
--- a/solr/licenses-gradle/jackcess-2.1.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a422b016925475b2234b576a0f7ee3f55f1f9e2
diff --git a/solr/licenses-gradle/jackcess-3.0.1.jar.sha1 b/solr/licenses-gradle/jackcess-3.0.1.jar.sha1
new file mode 100644
index 0000000..6e3492e
--- /dev/null
+++ b/solr/licenses-gradle/jackcess-3.0.1.jar.sha1
@@ -0,0 +1 @@
+e753ed760d06a0b6849c02d3d4c603ae6c8e05c8
diff --git a/solr/licenses-gradle/jackcess-encrypt-2.1.4.jar.sha1 b/solr/licenses-gradle/jackcess-encrypt-2.1.4.jar.sha1
deleted file mode 100644
index b0153ec..0000000
--- a/solr/licenses-gradle/jackcess-encrypt-2.1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfe7134b759597276ff87b7acf662bef1c1c4fd8
diff --git a/solr/licenses-gradle/jackcess-encrypt-3.0.0.jar.sha1 b/solr/licenses-gradle/jackcess-encrypt-3.0.0.jar.sha1
new file mode 100644
index 0000000..2b1f23a
--- /dev/null
+++ b/solr/licenses-gradle/jackcess-encrypt-3.0.0.jar.sha1
@@ -0,0 +1 @@
+24ee9302d731e7c66e828049bb055ca710e29f03
diff --git a/solr/licenses-gradle/jackson-annotations-2.10.0.jar.sha1 b/solr/licenses-gradle/jackson-annotations-2.10.0.jar.sha1
deleted file mode 100644
index bbfd7ce..0000000
--- a/solr/licenses-gradle/jackson-annotations-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e01cfd93b80d6773b3f757c78e756c9755b47b81
diff --git a/solr/licenses-gradle/jackson-annotations-2.10.1.jar.sha1 b/solr/licenses-gradle/jackson-annotations-2.10.1.jar.sha1
new file mode 100644
index 0000000..c9a88a5
--- /dev/null
+++ b/solr/licenses-gradle/jackson-annotations-2.10.1.jar.sha1
@@ -0,0 +1 @@
+54d72475c0d6819f2d0e9a09d25c3ed876a4972f
diff --git a/solr/licenses-gradle/jackson-core-2.10.0.jar.sha1 b/solr/licenses-gradle/jackson-core-2.10.0.jar.sha1
deleted file mode 100644
index 6511c3a..0000000
--- a/solr/licenses-gradle/jackson-core-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e2c5fa04648ec9772c63e2101c53af6504e624e
diff --git a/solr/licenses-gradle/jackson-core-2.10.1.jar.sha1 b/solr/licenses-gradle/jackson-core-2.10.1.jar.sha1
new file mode 100644
index 0000000..f37bc69
--- /dev/null
+++ b/solr/licenses-gradle/jackson-core-2.10.1.jar.sha1
@@ -0,0 +1 @@
+2c8b5e26ba40e5f91eb37a24075a2028b402c5f9
diff --git a/solr/licenses-gradle/jackson-databind-2.10.0.jar.sha1 b/solr/licenses-gradle/jackson-databind-2.10.0.jar.sha1
deleted file mode 100644
index e7b7c74..0000000
--- a/solr/licenses-gradle/jackson-databind-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1127c9cf62f2bb3121a3a2a0a1351d251a602117
diff --git a/solr/licenses-gradle/jackson-databind-2.10.1.jar.sha1 b/solr/licenses-gradle/jackson-databind-2.10.1.jar.sha1
new file mode 100644
index 0000000..20ded48
--- /dev/null
+++ b/solr/licenses-gradle/jackson-databind-2.10.1.jar.sha1
@@ -0,0 +1 @@
+18eee15ffc662d27538d5b6ee84e4c92c0a9d03e
diff --git a/solr/licenses-gradle/jackson-dataformat-smile-2.10.0.jar.sha1 b/solr/licenses-gradle/jackson-dataformat-smile-2.10.0.jar.sha1
deleted file mode 100644
index 342621d..0000000
--- a/solr/licenses-gradle/jackson-dataformat-smile-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e761e9b93d2da05e5ea1bc4deff1d75cb13b106b
diff --git a/solr/licenses-gradle/jackson-dataformat-smile-2.10.1.jar.sha1 b/solr/licenses-gradle/jackson-dataformat-smile-2.10.1.jar.sha1
new file mode 100644
index 0000000..87329cb
--- /dev/null
+++ b/solr/licenses-gradle/jackson-dataformat-smile-2.10.1.jar.sha1
@@ -0,0 +1 @@
+25e686e7821de741d7ac80921be1eb0224b935ed
diff --git a/solr/licenses-gradle/parso-2.0.11.jar.sha1 b/solr/licenses-gradle/parso-2.0.11.jar.sha1
new file mode 100644
index 0000000..9f58258
--- /dev/null
+++ b/solr/licenses-gradle/parso-2.0.11.jar.sha1
@@ -0,0 +1 @@
+3cd3dde9ace470e102bb344e05467ce308108a8e
diff --git a/solr/licenses-gradle/parso-2.0.9.jar.sha1 b/solr/licenses-gradle/parso-2.0.9.jar.sha1
deleted file mode 100644
index d292e7e..0000000
--- a/solr/licenses-gradle/parso-2.0.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-615d910051b7c4695397e6686cf840caf6216e19
diff --git a/solr/licenses-gradle/pdfbox-2.0.12.jar.sha1 b/solr/licenses-gradle/pdfbox-2.0.12.jar.sha1
deleted file mode 100644
index d190b7e..0000000
--- a/solr/licenses-gradle/pdfbox-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7311cd267c19e1ba8154b076a63d29537154784
diff --git a/solr/licenses-gradle/pdfbox-2.0.17.jar.sha1 b/solr/licenses-gradle/pdfbox-2.0.17.jar.sha1
new file mode 100644
index 0000000..564aded
--- /dev/null
+++ b/solr/licenses-gradle/pdfbox-2.0.17.jar.sha1
@@ -0,0 +1 @@
+b5c8dff799bd967c70ccae75e6972327ae640d35
diff --git a/solr/licenses-gradle/pdfbox-tools-2.0.12.jar.sha1 b/solr/licenses-gradle/pdfbox-tools-2.0.12.jar.sha1
deleted file mode 100644
index 226084a..0000000
--- a/solr/licenses-gradle/pdfbox-tools-2.0.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e4569e8364f33be1c0af889f62b0f8f4dca7d45
diff --git a/solr/licenses-gradle/pdfbox-tools-2.0.17.jar.sha1 b/solr/licenses-gradle/pdfbox-tools-2.0.17.jar.sha1
new file mode 100644
index 0000000..1b34393
--- /dev/null
+++ b/solr/licenses-gradle/pdfbox-tools-2.0.17.jar.sha1
@@ -0,0 +1 @@
+bd30eb8fc24a7cf903044105ff2df4fb793a454e
diff --git a/solr/licenses-gradle/poi-4.0.0.jar.sha1 b/solr/licenses-gradle/poi-4.0.0.jar.sha1
deleted file mode 100644
index 503cc5b..0000000
--- a/solr/licenses-gradle/poi-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ddb9b983ed682c93a986e8bb596d5935b13086c
diff --git a/solr/licenses-gradle/poi-4.1.1.jar.sha1 b/solr/licenses-gradle/poi-4.1.1.jar.sha1
new file mode 100644
index 0000000..dd34cff
--- /dev/null
+++ b/solr/licenses-gradle/poi-4.1.1.jar.sha1
@@ -0,0 +1 @@
+c915f1a426213a8450fb473b5b3adb63f5ac1017
diff --git a/solr/licenses-gradle/poi-ooxml-4.0.0.jar.sha1 b/solr/licenses-gradle/poi-ooxml-4.0.0.jar.sha1
deleted file mode 100644
index 82f38e8..0000000
--- a/solr/licenses-gradle/poi-ooxml-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3fa9c2bd64eb3ec15378de960a07d077ae5b26d
diff --git a/solr/licenses-gradle/poi-ooxml-4.1.1.jar.sha1 b/solr/licenses-gradle/poi-ooxml-4.1.1.jar.sha1
new file mode 100644
index 0000000..b621003
--- /dev/null
+++ b/solr/licenses-gradle/poi-ooxml-4.1.1.jar.sha1
@@ -0,0 +1 @@
+216d8bb4c064c3a1079e77d693cd60346dd63f38
diff --git a/solr/licenses-gradle/poi-ooxml-schemas-4.0.0.jar.sha1 b/solr/licenses-gradle/poi-ooxml-schemas-4.0.0.jar.sha1
deleted file mode 100644
index 6edf823..0000000
--- a/solr/licenses-gradle/poi-ooxml-schemas-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-125f9ccd2cf652fa4169b1c30e9023362e23324f
diff --git a/solr/licenses-gradle/poi-ooxml-schemas-4.1.1.jar.sha1 b/solr/licenses-gradle/poi-ooxml-schemas-4.1.1.jar.sha1
new file mode 100644
index 0000000..2393403
--- /dev/null
+++ b/solr/licenses-gradle/poi-ooxml-schemas-4.1.1.jar.sha1
@@ -0,0 +1 @@
+7bb506f074a5bffce6b367f40ee0535fa7f73003
diff --git a/solr/licenses-gradle/poi-scratchpad-4.0.0.jar.sha1 b/solr/licenses-gradle/poi-scratchpad-4.0.0.jar.sha1
deleted file mode 100644
index ba817ee..0000000
--- a/solr/licenses-gradle/poi-scratchpad-4.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60
diff --git a/solr/licenses-gradle/poi-scratchpad-4.1.1.jar.sha1 b/solr/licenses-gradle/poi-scratchpad-4.1.1.jar.sha1
new file mode 100644
index 0000000..a4e8a6a
--- /dev/null
+++ b/solr/licenses-gradle/poi-scratchpad-4.1.1.jar.sha1
@@ -0,0 +1 @@
+11de428bf90a519b5a65046a5e629a33e0ffced2
diff --git a/solr/licenses-gradle/protobuf-java-3.11.0.jar.sha1 b/solr/licenses-gradle/protobuf-java-3.11.0.jar.sha1
new file mode 100644
index 0000000..8c1770e
--- /dev/null
+++ b/solr/licenses-gradle/protobuf-java-3.11.0.jar.sha1
@@ -0,0 +1 @@
+992c02b8fba83bdda5602c12b5eee31e468b3069
diff --git a/solr/licenses-gradle/protobuf-java-3.6.1.jar.sha1 b/solr/licenses-gradle/protobuf-java-3.6.1.jar.sha1
deleted file mode 100644
index 56a4ab9..0000000
--- a/solr/licenses-gradle/protobuf-java-3.6.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0d06d46ecfd92ec6d0f3b423b4cd81cb38d8b924
diff --git a/solr/licenses-gradle/rome-1.12.2.jar.sha1 b/solr/licenses-gradle/rome-1.12.2.jar.sha1
new file mode 100644
index 0000000..6ca87d3
--- /dev/null
+++ b/solr/licenses-gradle/rome-1.12.2.jar.sha1
@@ -0,0 +1 @@
+eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36
diff --git a/solr/licenses-gradle/rome-1.5.1.jar.sha1 b/solr/licenses-gradle/rome-1.5.1.jar.sha1
deleted file mode 100644
index f24eb2a..0000000
--- a/solr/licenses-gradle/rome-1.5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc3489f066749bede7fc81f4e80c0d8c9534a210
diff --git a/solr/licenses-gradle/rome-utils-1.12.2.jar.sha1 b/solr/licenses-gradle/rome-utils-1.12.2.jar.sha1
new file mode 100644
index 0000000..8d40833
--- /dev/null
+++ b/solr/licenses-gradle/rome-utils-1.12.2.jar.sha1
@@ -0,0 +1 @@
+240dc40fb9333ac872319e7d31178bffc63f7900
diff --git a/solr/licenses-gradle/rome-utils-1.5.1.jar.sha1 b/solr/licenses-gradle/rome-utils-1.5.1.jar.sha1
deleted file mode 100644
index bc388b9..0000000
--- a/solr/licenses-gradle/rome-utils-1.5.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a3d6473a2f5d55fb31bf6c269af963fdea13b54
diff --git a/solr/licenses-gradle/tika-core-1.19.1.jar.sha1 b/solr/licenses-gradle/tika-core-1.19.1.jar.sha1
deleted file mode 100644
index d144852..0000000
--- a/solr/licenses-gradle/tika-core-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c1f075aa01586c2c28a249ad60bcfb733b69b866
diff --git a/solr/licenses-gradle/tika-core-1.23.jar.sha1 b/solr/licenses-gradle/tika-core-1.23.jar.sha1
new file mode 100644
index 0000000..636d764
--- /dev/null
+++ b/solr/licenses-gradle/tika-core-1.23.jar.sha1
@@ -0,0 +1 @@
+9ae162fa4758b8f3da5d0651c000c5e5f9efca04
diff --git a/solr/licenses-gradle/tika-java7-1.19.1.jar.sha1 b/solr/licenses-gradle/tika-java7-1.19.1.jar.sha1
deleted file mode 100644
index a5459a9..0000000
--- a/solr/licenses-gradle/tika-java7-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02661fd12fd9f0223e522dca72c1296108561263
diff --git a/solr/licenses-gradle/tika-java7-1.23.jar.sha1 b/solr/licenses-gradle/tika-java7-1.23.jar.sha1
new file mode 100644
index 0000000..e250582
--- /dev/null
+++ b/solr/licenses-gradle/tika-java7-1.23.jar.sha1
@@ -0,0 +1 @@
+a9fad98d86348c028cc6287b4f47aba5ff070ca3
diff --git a/solr/licenses-gradle/tika-parsers-1.19.1.jar.sha1 b/solr/licenses-gradle/tika-parsers-1.19.1.jar.sha1
deleted file mode 100644
index 638428d..0000000
--- a/solr/licenses-gradle/tika-parsers-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06d45a8683a7479f0e0d9d252f834d0ae44abd6b
diff --git a/solr/licenses-gradle/tika-parsers-1.23.jar.sha1 b/solr/licenses-gradle/tika-parsers-1.23.jar.sha1
new file mode 100644
index 0000000..d7b00db
--- /dev/null
+++ b/solr/licenses-gradle/tika-parsers-1.23.jar.sha1
@@ -0,0 +1 @@
+9507a1123b6fbb3de7c99368589fac4184cbcfaa
diff --git a/solr/licenses-gradle/tika-xmp-1.19.1.jar.sha1 b/solr/licenses-gradle/tika-xmp-1.19.1.jar.sha1
deleted file mode 100644
index 80f2513..0000000
--- a/solr/licenses-gradle/tika-xmp-1.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b1bb7e00262813b3ef08b414fa0d5d06c45f2bb
diff --git a/solr/licenses-gradle/tika-xmp-1.23.jar.sha1 b/solr/licenses-gradle/tika-xmp-1.23.jar.sha1
new file mode 100644
index 0000000..0eac323
--- /dev/null
+++ b/solr/licenses-gradle/tika-xmp-1.23.jar.sha1
@@ -0,0 +1 @@
+8f9b23cbfee3f3025cc7bf623c85ba8356937f50
diff --git a/solr/licenses-gradle/xercesImpl-2.12.0.jar.sha1 b/solr/licenses-gradle/xercesImpl-2.12.0.jar.sha1
new file mode 100644
index 0000000..551df5c
--- /dev/null
+++ b/solr/licenses-gradle/xercesImpl-2.12.0.jar.sha1
@@ -0,0 +1 @@
+f02c844149fd306601f20e0b34853a670bef7fa2
diff --git a/solr/licenses-gradle/xercesImpl-2.9.1.jar.sha1 b/solr/licenses-gradle/xercesImpl-2.9.1.jar.sha1
deleted file mode 100644
index 86ebad9..0000000
--- a/solr/licenses-gradle/xercesImpl-2.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
diff --git a/solr/licenses-gradle/xmlbeans-3.0.1.jar.sha1 b/solr/licenses-gradle/xmlbeans-3.0.1.jar.sha1
deleted file mode 100644
index 5b1d358..0000000
--- a/solr/licenses-gradle/xmlbeans-3.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50d94da791ab1e799a11d6f82410fd7d49f402ca
diff --git a/solr/licenses-gradle/xmlbeans-3.1.0.jar.sha1 b/solr/licenses-gradle/xmlbeans-3.1.0.jar.sha1
new file mode 100644
index 0000000..0b898a51
--- /dev/null
+++ b/solr/licenses-gradle/xmlbeans-3.1.0.jar.sha1
@@ -0,0 +1 @@
+6dac1f897dfb3e3f17fc79b18a3353b2e51c464e
diff --git a/versions.lock b/versions.lock
index c199f37..1eae490 100644
--- a/versions.lock
+++ b/versions.lock
@@ -6,11 +6,11 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.5 (1 constraints
 com.carrotsearch.thirdparty:simple-xml-safe:2.7.1 (1 constraints: a60a82ca)
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b)
-com.epam:parso:2.0.9 (1 constraints: 0d05fe35)
-com.fasterxml.jackson.core:jackson-annotations:2.10.0 (2 constraints: 321dab4e)
-com.fasterxml.jackson.core:jackson-core:2.10.0 (3 constraints: 6135ffb6)
-com.fasterxml.jackson.core:jackson-databind:2.10.0 (3 constraints: 931a7796)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.10.0 (1 constraints: 35052f3b)
+com.epam:parso:2.0.11 (1 constraints: 36052c3b)
+com.fasterxml.jackson.core:jackson-annotations:2.10.1 (2 constraints: 331dcd4e)
+com.fasterxml.jackson.core:jackson-core:2.10.1 (3 constraints: 633586b7)
+com.fasterxml.jackson.core:jackson-databind:2.10.1 (3 constraints: 941aba96)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.10.1 (1 constraints: 3605303b)
 com.github.ben-manes.caffeine:caffeine:2.8.0 (1 constraints: 0c050d36)
 com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab)
 com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d)
@@ -18,13 +18,13 @@ com.github.jnr:jnr-enxio:0.19 (2 constraints: 2a167d08)
 com.github.jnr:jnr-netdb:1.1.6 (1 constraints: 7e0952a1)
 com.github.jnr:jnr-posix:3.0.49 (2 constraints: f0161b5b)
 com.github.jnr:jnr-unixsocket:0.20 (1 constraints: 4a09d497)
-com.github.virtuald:curvesapi:1.04 (1 constraints: d904f330)
+com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530)
 com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636)
 com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 170aecb4)
 com.google.errorprone:error_prone_annotations:2.1.3 (1 constraints: 180aebb4)
 com.google.guava:guava:25.1-jre (1 constraints: 4a06b047)
 com.google.j2objc:j2objc-annotations:1.1 (1 constraints: b609eba0)
-com.google.protobuf:protobuf-java:3.6.1 (1 constraints: 0c050d36)
+com.google.protobuf:protobuf-java:3.11.0 (1 constraints: 3705383b)
 com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 0605f335)
 com.googlecode.mp4parser:isoparser:1.1.22 (1 constraints: 38052d3b)
@@ -32,25 +32,25 @@ com.headius:backport9:1.1 (1 constraints: 1a098c8e)
 com.headius:invokebinder:1.11 (1 constraints: 4b09d797)
 com.headius:modulator:1.0 (1 constraints: 19098b8e)
 com.headius:options:1.4 (1 constraints: 1d098f8e)
-com.healthmarketscience.jackcess:jackcess:2.1.12 (1 constraints: 3805313b)
-com.healthmarketscience.jackcess:jackcess-encrypt:2.1.4 (1 constraints: 0905fc35)
+com.healthmarketscience.jackcess:jackcess:3.0.1 (1 constraints: 0605fb35)
+com.healthmarketscience.jackcess:jackcess-encrypt:3.0.0 (1 constraints: 0505fa35)
 com.ibm.icu:icu4j:62.1 (1 constraints: dd040c31)
 com.jayway.jsonpath:json-path:2.4.0 (1 constraints: 08050136)
 com.jcraft:jzlib:1.1.3 (1 constraints: 7b094fa1)
 com.lmax:disruptor:3.4.2 (1 constraints: 0b050836)
 com.martiansoftware:nailgun-server:0.9.1 (1 constraints: 800960a1)
 com.pff:java-libpst:0.8.1 (1 constraints: 0b050436)
-com.rometools:rome:1.5.1 (1 constraints: 09050036)
-com.rometools:rome-utils:1.5.1 (1 constraints: 09050036)
+com.rometools:rome:1.12.2 (1 constraints: 3805313b)
+com.rometools:rome-utils:1.12.2 (1 constraints: 3805313b)
 com.sun.mail:gimap:1.5.1 (1 constraints: 09050036)
 com.sun.mail:javax.mail:1.5.1 (2 constraints: 830d2844)
 com.tdunning:t-digest:3.1 (1 constraints: a804212c)
 com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 34092a9e)
 commons-cli:commons-cli:1.2 (1 constraints: a7041c2c)
-commons-codec:commons-codec:1.11 (1 constraints: d704f230)
+commons-codec:commons-codec:1.13 (1 constraints: d904f430)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
 commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
-commons-io:commons-io:2.5 (2 constraints: be142680)
+commons-io:commons-io:2.6 (2 constraints: bf145380)
 commons-logging:commons-logging:1.1.3 (2 constraints: c8149e7f)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
 io.dropwizard.metrics:metrics-core:4.1.2 (5 constraints: 1643c8bb)
@@ -90,10 +90,10 @@ org.apache.calcite:calcite-core:1.18.0 (1 constraints: 3c05413b)
 org.apache.calcite:calcite-linq4j:1.18.0 (1 constraints: 3c05413b)
 org.apache.calcite.avatica:avatica-core:1.13.0 (1 constraints: 3705323b)
 org.apache.commons:commons-collections4:4.2 (1 constraints: aa04252c)
-org.apache.commons:commons-compress:1.18 (1 constraints: de04f930)
+org.apache.commons:commons-compress:1.19 (1 constraints: df04fa30)
 org.apache.commons:commons-configuration2:2.1.1 (1 constraints: 0605f935)
 org.apache.commons:commons-exec:1.3 (1 constraints: a8041d2c)
-org.apache.commons:commons-lang3:3.8.1 (7 constraints: 33673f05)
+org.apache.commons:commons-lang3:3.9 (7 constraints: 36678708)
 org.apache.commons:commons-math3:3.6.1 (1 constraints: 0c050d36)
 org.apache.commons:commons-text:1.6 (1 constraints: ab04202c)
 org.apache.curator:curator-client:2.13.0 (1 constraints: 3805383b)
@@ -104,11 +104,11 @@ org.apache.hadoop:hadoop-auth:3.2.0 (1 constraints: 07050036)
 org.apache.hadoop:hadoop-common:3.2.0 (1 constraints: 07050036)
 org.apache.hadoop:hadoop-hdfs-client:3.2.0 (1 constraints: 07050036)
 org.apache.htrace:htrace-core4:4.1.0-incubating (1 constraints: 58090086)
-org.apache.httpcomponents:httpclient:4.5.6 (2 constraints: 6514987d)
-org.apache.httpcomponents:httpcore:4.4.10 (2 constraints: 9015d5cd)
-org.apache.httpcomponents:httpmime:4.5.6 (1 constraints: 11051436)
-org.apache.james:apache-mime4j-core:0.8.2 (1 constraints: 0c050536)
-org.apache.james:apache-mime4j-dom:0.8.2 (1 constraints: 0c050536)
+org.apache.httpcomponents:httpclient:4.5.10 (2 constraints: bb14be9e)
+org.apache.httpcomponents:httpcore:4.4.12 (2 constraints: 941535ce)
+org.apache.httpcomponents:httpmime:4.5.10 (1 constraints: 3c054b3b)
+org.apache.james:apache-mime4j-core:0.8.3 (1 constraints: 0d050636)
+org.apache.james:apache-mime4j-dom:0.8.3 (1 constraints: 0d050636)
 org.apache.kerby:kerb-core:1.0.1 (3 constraints: f11c583a)
 org.apache.kerby:kerb-crypto:1.0.1 (1 constraints: 860b05e6)
 org.apache.kerby:kerb-util:1.0.1 (1 constraints: 0405f135)
@@ -120,33 +120,33 @@ org.apache.logging.log4j:log4j-api:2.11.2 (4 constraints: c83394ae)
 org.apache.logging.log4j:log4j-core:2.11.2 (3 constraints: 102588ba)
 org.apache.logging.log4j:log4j-slf4j-impl:2.11.2 (1 constraints: 3805343b)
 org.apache.opennlp:opennlp-tools:1.9.1 (1 constraints: 0d050c36)
-org.apache.pdfbox:fontbox:2.0.12 (1 constraints: 37052d3b)
+org.apache.pdfbox:fontbox:2.0.17 (1 constraints: 3c05323b)
 org.apache.pdfbox:jempbox:1.8.16 (1 constraints: 42054b3b)
-org.apache.pdfbox:pdfbox:2.0.12 (1 constraints: 37052d3b)
-org.apache.pdfbox:pdfbox-tools:2.0.12 (1 constraints: 37052d3b)
-org.apache.poi:poi:4.0.0 (1 constraints: 0605ff35)
-org.apache.poi:poi-ooxml:4.0.0 (1 constraints: 0605ff35)
-org.apache.poi:poi-ooxml-schemas:4.0.0 (1 constraints: 0605ff35)
-org.apache.poi:poi-scratchpad:4.0.0 (1 constraints: 0605ff35)
+org.apache.pdfbox:pdfbox:2.0.17 (1 constraints: 3c05323b)
+org.apache.pdfbox:pdfbox-tools:2.0.17 (1 constraints: 3c05323b)
+org.apache.poi:poi:4.1.1 (1 constraints: 08050336)
+org.apache.poi:poi-ooxml:4.1.1 (1 constraints: 08050336)
+org.apache.poi:poi-ooxml-schemas:4.1.1 (1 constraints: 08050336)
+org.apache.poi:poi-scratchpad:4.1.1 (1 constraints: 08050336)
 org.apache.thrift:libthrift:0.12.0 (1 constraints: 8d0dfa33)
-org.apache.tika:tika-core:1.19.1 (1 constraints: 3e05453b)
-org.apache.tika:tika-java7:1.19.1 (1 constraints: 3e05453b)
-org.apache.tika:tika-parsers:1.19.1 (1 constraints: 3e05453b)
-org.apache.tika:tika-xmp:1.19.1 (1 constraints: 3e05453b)
+org.apache.tika:tika-core:1.23 (1 constraints: da04f630)
+org.apache.tika:tika-java7:1.23 (1 constraints: da04f630)
+org.apache.tika:tika-parsers:1.23 (1 constraints: da04f630)
+org.apache.tika:tika-xmp:1.23 (1 constraints: da04f630)
 org.apache.velocity:velocity-engine-core:2.0 (3 constraints: 973bcd79)
 org.apache.velocity.tools:velocity-tools-generic:3.0 (1 constraints: 00136415)
 org.apache.velocity.tools:velocity-tools-view:3.0 (1 constraints: 7a14126a)
 org.apache.velocity.tools:velocity-tools-view-jsp:3.0 (1 constraints: a704202c)
-org.apache.xmlbeans:xmlbeans:3.0.1 (1 constraints: 0605fb35)
+org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)
 org.apache.zookeeper:zookeeper:3.5.5 (1 constraints: 0f050e36)
 org.apache.zookeeper:zookeeper-jute:3.5.5 (1 constraints: 8d0d3928)
 org.asciidoctor:asciidoctorj:1.6.2 (1 constraints: 0b050436)
 org.asciidoctor:asciidoctorj-api:1.6.2 (1 constraints: e30cfb0d)
 org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)
 org.bitbucket.b_c:jose4j:0.6.5 (1 constraints: 0d050236)
-org.bouncycastle:bcmail-jdk15on:1.60 (1 constraints: db04fb30)
-org.bouncycastle:bcpkix-jdk15on:1.60 (1 constraints: db04fb30)
-org.bouncycastle:bcprov-jdk15on:1.60 (1 constraints: db04fb30)
+org.bouncycastle:bcmail-jdk15on:1.64 (1 constraints: df04ff30)
+org.bouncycastle:bcpkix-jdk15on:1.64 (1 constraints: df04ff30)
+org.bouncycastle:bcprov-jdk15on:1.64 (1 constraints: df04ff30)
 org.brotli:dec:0.1.2 (1 constraints: 0505f035)
 org.carrot2:carrot2-mini:3.16.2 (1 constraints: 3e05493b)
 org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836)
@@ -194,10 +194,10 @@ org.jruby:jruby-core:9.2.6.0 (1 constraints: 0f08b57d)
 org.jruby:jruby-stdlib:9.2.6.0 (1 constraints: 0f08b57d)
 org.jruby.jcodings:jcodings:1.0.41 (2 constraints: e3124361)
 org.jruby.joni:joni:2.1.25 (1 constraints: b00903ab)
-org.jsoup:jsoup:1.11.3 (1 constraints: 38052f3b)
+org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b)
 org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c)
-org.ow2.asm:asm:5.1 (1 constraints: aa04272c)
-org.ow2.asm:asm-commons:5.1 (1 constraints: aa04272c)
+org.ow2.asm:asm:7.2 (2 constraints: 900e3e5e)
+org.ow2.asm:asm-commons:7.2 (1 constraints: ad042e2c)
 org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
 org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
 org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
@@ -207,7 +207,7 @@ org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)
 org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
 org.tukaani:xz:1.8 (1 constraints: ad04222c)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
-xerces:xercesImpl:2.9.1 (2 constraints: f613d869)
+xerces:xercesImpl:2.12.0 (2 constraints: 1f14b675)
 
 [Test dependencies]
 com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30)
diff --git a/versions.props b/versions.props
index 3e35727..0b30119 100644
--- a/versions.props
+++ b/versions.props
@@ -3,34 +3,34 @@ com.carrotsearch.randomizedtesting:*=2.7.5
 com.carrotsearch:hppc=0.8.1
 com.cybozu.labs:langdetect=1.1-20120112
 com.drewnoakes:metadata-extractor=2.11.0
-com.epam:parso=2.0.9
-com.fasterxml.jackson*:*=2.10.0
+com.epam:parso=2.0.11
+com.fasterxml.jackson*:*=2.10.1
 com.fasterxml.woodstox:*=4.4.1
 com.github.ben-manes.caffeine:caffeine=2.8.0
-com.github.virtuald:curvesapi=1.04
+com.github.virtuald:curvesapi=1.06
 com.github.zafarkhaja:java-semver=0.9.0
 com.google.guava:guava=25.1-jre
-com.google.protobuf:protobuf-java=3.6.1
+com.google.protobuf:protobuf-java=3.11.0
 com.google.re2j:re2j=1.2
 com.googlecode.juniversalchardet:juniversalchardet=1.0.3
 com.googlecode.mp4parser:isoparser=1.1.22
-com.healthmarketscience.jackcess:jackcess-encrypt=2.1.4
-com.healthmarketscience.jackcess:jackcess=2.1.12
+com.healthmarketscience.jackcess:jackcess-encrypt=3.0.0
+com.healthmarketscience.jackcess:jackcess=3.0.1
 com.ibm.icu:icu4j=62.1
 com.jayway.jsonpath:json-path=2.4.0
 com.lmax:disruptor=3.4.2
 com.pff:java-libpst=0.8.1
-com.rometools:*=1.5.1
+com.rometools:*=1.12.2
 com.sun.jersey:*=1.19
 com.sun.mail:*=1.5.1
 com.tdunning:t-digest=3.1
 com.vaadin.external.google:android-json=0.0.20131108.vaadin1
 commons-beanutils:commons-beanutils=1.9.3
 commons-cli:commons-cli=1.2
-commons-codec:commons-codec=1.11
+commons-codec:commons-codec=1.13
 commons-collections:commons-collections=3.2.2
 commons-fileupload:commons-fileupload=1.3.3
-commons-io:commons-io=2.5
+commons-io:commons-io=2.6
 commons-logging:commons-logging=1.1.3
 de.l3s.boilerpipe:boilerpipe=1.1.0
 info.ganglia.gmetric4j:gmetric4j=1.0.7
@@ -52,35 +52,35 @@ org.antlr:antlr4-runtime=4.5.1-1
 org.apache.calcite.avatica:avatica-core=1.13.0
 org.apache.calcite:*=1.18.0
 org.apache.commons:commons-collections4:4.2
-org.apache.commons:commons-compress=1.18
+org.apache.commons:commons-compress=1.19
 org.apache.commons:commons-configuration2=2.1.1
 org.apache.commons:commons-exec=1.3
-org.apache.commons:commons-lang3=3.6
+org.apache.commons:commons-lang3=3.9
 org.apache.commons:commons-math3=3.6.1
 org.apache.commons:commons-text=1.6
 org.apache.curator:*=2.13.0
 org.apache.derby:derby=10.9.1.0
 org.apache.hadoop:*=3.2.0
 org.apache.htrace:htrace-core4=4.1.0-incubating
-org.apache.httpcomponents:httpclient=4.5.6
-org.apache.httpcomponents:httpcore=4.4.10
-org.apache.httpcomponents:httpmime=4.5.6
-org.apache.james:*=0.8.2
+org.apache.httpcomponents:httpclient=4.5.10
+org.apache.httpcomponents:httpcore=4.4.12
+org.apache.httpcomponents:httpmime=4.5.10
+org.apache.james:apache-mime4j*=0.8.3
 org.apache.kerby:*=1.0.1
 org.apache.logging.log4j:*=2.11.2
 org.apache.opennlp:opennlp-tools=1.9.1
-org.apache.pdfbox:*=2.0.12
+org.apache.pdfbox:*=2.0.17
 org.apache.pdfbox:jbig2-imageio=3.0.2
 org.apache.pdfbox:jempbox=1.8.16
-org.apache.poi:*=4.0.0
-org.apache.tika:*=1.19.1
+org.apache.poi:*=4.1.1
+org.apache.tika:*=1.23
 org.apache.velocity.tools:*=3.0
-org.apache.xmlbeans:xmlbeans=3.0.1
+org.apache.xmlbeans:xmlbeans=3.1.0
 org.apache.zookeeper:*=3.5.5
 org.asciidoctor:asciidoctorj=1.6.2
 org.aspectj:aspectjrt=1.8.0
 org.bitbucket.b_c:jose4j=0.6.5
-org.bouncycastle:*=1.60
+org.bouncycastle:*=1.64
 org.brotli:dec=0.1.2
 org.carrot2:carrot2-mini=3.16.2
 org.carrot2:morfologik-*=2.1.5
@@ -94,17 +94,17 @@ org.gagravarr:*=0.8
 org.hamcrest:*=1.3
 org.hsqldb:hsqldb=2.4.0
 org.jdom:jdom2=2.0.6
-org.jsoup:jsoup=1.11.3
+org.jsoup:jsoup=1.12.1
 org.locationtech.jts:jts-core=1.15.0
 org.locationtech.spatial4j:*=0.7
 org.mockito:mockito-core=2.23.4
 org.objenesis:objenesis=2.6
-org.ow2.asm:*=5.1
+org.ow2.asm:*=7.2
 org.restlet.jee:*=2.3.0
 org.rrd4j:rrd4j=3.5
 org.slf4j:*=1.7.24
 org.tallison:jmatio=1.5
 org.tukaani:xz=1.8
 ua.net.nlp:morfologik-ukrainian-search=3.9.0
-xerces:xercesImpl=2.9.1
+xerces:xercesImpl=2.12.0
 io.jaegertracing:*=0.35.5
\ No newline at end of file