You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/10/13 18:05:06 UTC

[8/9] lucene-solr:jira/solr-11285: SOLR-10335: Merge branch 'SOLR-10335' of https://github.com/tballison/lucene-solr

SOLR-10335: Merge branch 'SOLR-10335' of https://github.com/tballison/lucene-solr


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9d2f0cf2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9d2f0cf2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9d2f0cf2

Branch: refs/heads/jira/solr-11285
Commit: 9d2f0cf2547263e8c7472b694e7ed6e700f1399b
Parents: 926cc4d 605304d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Oct 13 20:24:25 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Fri Oct 13 20:24:25 2017 +0530

----------------------------------------------------------------------
 lucene/ivy-versions.properties                  |  23 ++-
 lucene/licenses/commons-compress-1.11.jar.sha1  |   1 -
 lucene/licenses/commons-compress-1.14.jar.sha1  |   1 +
 .../handler/dataimport/TikaEntityProcessor.java |   4 +
 .../src/test-files/dihextras/test_vsdx.vsdx     | Bin 0 -> 44426 bytes
 .../dataimport/TestTikaEntityProcessor.java     |  22 ++
 solr/contrib/extraction/ivy.xml                 |   6 +-
 solr/licenses/commons-collections4-4.1.jar.sha1 |   1 +
 .../commons-collections4-LICENSE-ASL.txt        | 202 +++++++++++++++++++
 solr/licenses/commons-collections4-NOTICE.txt   |   5 +
 solr/licenses/commons-compress-1.11.jar.sha1    |   1 -
 solr/licenses/commons-compress-1.14.jar.sha1    |   1 +
 solr/licenses/curvesapi-1.04.jar.sha1           |   1 +
 solr/licenses/curvesapi-LICENSE-BSD_LIKE.txt    |  28 +++
 solr/licenses/curvesapi-NOTICE.txt              |   2 +
 solr/licenses/fontbox-2.0.1.jar.sha1            |   1 -
 solr/licenses/fontbox-2.0.6.jar.sha1            |   1 +
 solr/licenses/jackcess-2.1.3.jar.sha1           |   1 -
 solr/licenses/jackcess-2.1.8.jar.sha1           |   1 +
 solr/licenses/jempbox-1.8.12.jar.sha1           |   1 -
 solr/licenses/jempbox-1.8.13.jar.sha1           |   1 +
 solr/licenses/jmatio-1.0.jar.sha1               |   1 -
 solr/licenses/jmatio-1.2.jar.sha1               |   1 +
 solr/licenses/metadata-extractor-2.8.1.jar.sha1 |   1 -
 solr/licenses/metadata-extractor-2.9.1.jar.sha1 |   1 +
 solr/licenses/pdfbox-2.0.1.jar.sha1             |   1 -
 solr/licenses/pdfbox-2.0.6.jar.sha1             |   1 +
 solr/licenses/pdfbox-tools-2.0.1.jar.sha1       |   1 -
 solr/licenses/pdfbox-tools-2.0.6.jar.sha1       |   1 +
 solr/licenses/poi-3.15-beta1.jar.sha1           |   1 -
 solr/licenses/poi-3.17-beta1.jar.sha1           |   1 +
 solr/licenses/poi-ooxml-3.15-beta1.jar.sha1     |   1 -
 solr/licenses/poi-ooxml-3.17-beta1.jar.sha1     |   1 +
 .../poi-ooxml-schemas-3.15-beta1.jar.sha1       |   1 -
 .../poi-ooxml-schemas-3.17-beta1.jar.sha1       |   1 +
 .../licenses/poi-scratchpad-3.15-beta1.jar.sha1 |   1 -
 .../licenses/poi-scratchpad-3.17-beta1.jar.sha1 |   1 +
 solr/licenses/rome-1.0.jar.sha1                 |   1 -
 solr/licenses/rome-1.5.1.jar.sha1               |   1 +
 solr/licenses/tika-core-1.13.jar.sha1           |   1 -
 solr/licenses/tika-core-1.16.jar.sha1           |   1 +
 solr/licenses/tika-java7-1.13.jar.sha1          |   1 -
 solr/licenses/tika-java7-1.16.jar.sha1          |   1 +
 solr/licenses/tika-parsers-1.13.jar.sha1        |   1 -
 solr/licenses/tika-parsers-1.16.jar.sha1        |   1 +
 solr/licenses/tika-xmp-1.13.jar.sha1            |   1 -
 solr/licenses/tika-xmp-1.16.jar.sha1            |   1 +
 solr/licenses/xz-1.5.jar.sha1                   |   1 -
 solr/licenses/xz-1.6.jar.sha1                   |   1 +
 49 files changed, 301 insertions(+), 31 deletions(-)
----------------------------------------------------------------------