[tika] branch branch_1x updated (c272430 -> 1f1673b)

[ta...@apache.org]

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

tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from c272430  Acquire read lock before entering try block in XMLReaderUtils
     new 9a7e364  Ensure dependecy convergence
     new 12296d2  TIKA-2840 -- make .bat "magic" detection case-insensitive
     new 1f1673b  Merge branch 'branch_1x' of https://github.com/apache/tika into branch_1x

The 4389 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:
 .../resources/org/apache/tika/mime/tika-mimetypes.xml    |  5 ++---
 tika-parent/pom.xml                                      | 16 ++++++++++++++++
 .../test/java/org/apache/tika/mime/TestMimeTypes.java    |  1 +
 .../test-documents/{testBAT.bat => testBATUpper.bat}     |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)
 copy tika-parsers/src/test/resources/test-documents/{testBAT.bat => testBATUpper.bat} (98%)