(tika) branch main updated (cd6ccb681 -> 04d7628b0)

[ti...@apache.org]

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

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


    from cd6ccb681 Merge pull request #1862 from apache/dependabot/maven/com.github.luben-zstd-jni-1.5.6-4
     add 008970406 [TIKA-4283] - Implemented support for JKS Java Keystore format
     add 95124a6f9 Merge branch 'apache:main' into main
     new 04d7628b0 Merge pull request #1861 from Lonzak/main

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


Summary of changes:
 .../resources/org/apache/tika/mime/tika-mimetypes.xml    |   9 +++++++++
 .../test/java/org/apache/tika/mime/TestMimeTypes.java    |   1 +
 .../src/test/resources/test-documents/KeyStore.jks       | Bin 0 -> 2249 bytes
 3 files changed, 10 insertions(+)
 create mode 100644 tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks

(tika) 01/01: Merge pull request #1861 from Lonzak/main

[ti...@apache.org]

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

tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 04d7628b0a037dfa8009869a9f694bdba95f11c3
Merge: cd6ccb681 95124a6f9
Author: Tilman Hausherr <ti...@snafu.de>
AuthorDate: Wed Jul 24 11:26:11 2024 +0200

    Merge pull request #1861 from Lonzak/main
    
    [TIKA-4283] - Implemented support for JKS Java Keystore format

 .../resources/org/apache/tika/mime/tika-mimetypes.xml    |   9 +++++++++
 .../test/java/org/apache/tika/mime/TestMimeTypes.java    |   1 +
 .../src/test/resources/test-documents/KeyStore.jks       | Bin 0 -> 2249 bytes
 3 files changed, 10 insertions(+)