You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2018/08/03 15:40:05 UTC

[tika] branch master updated (6ef6672 -> 0e39bce)

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

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


    from 6ef6672  Merge branch 'GerardBouchar-TIKA-2673'
     add 536df9c  TIKA-2648 detect interpreted server-side script languages
     new 0e39bce  Merge pull request #236 from GerardBouchar/master

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:
 .../main/java/org/apache/tika/mime/MimeType.java   | 17 +++++++++
 .../main/java/org/apache/tika/mime/MimeTypes.java  | 16 ++++++---
 .../java/org/apache/tika/mime/MimeTypesReader.java |  3 ++
 .../apache/tika/mime/MimeTypesReaderMetKeys.java   |  2 ++
 .../org/apache/tika/mime/tika-mimetypes.xml        | 12 +++----
 .../org/apache/tika/mime/CustomReaderTest.java     |  2 ++
 .../org/apache/tika/mime/MimeDetectionTest.java    | 40 ++++++++++++++++------
 .../org/apache/tika/mime/custom-mimetypes2.xml     |  2 +-
 8 files changed, 72 insertions(+), 22 deletions(-)

[tika] 01/01: Merge pull request #236 from GerardBouchar/master

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

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

commit 0e39bceef4456eb391ace48fece2ebce52e0824d
Merge: 6ef6672 536df9c
Author: Tim Allison <ta...@apache.org>
AuthorDate: Fri Aug 3 11:40:01 2018 -0400

    Merge pull request #236 from GerardBouchar/master
    
    TIKA-2648 : detect interpreted server-side scripting languages

 .../main/java/org/apache/tika/mime/MimeType.java   | 17 +++++++++
 .../main/java/org/apache/tika/mime/MimeTypes.java  | 16 ++++++---
 .../java/org/apache/tika/mime/MimeTypesReader.java |  3 ++
 .../apache/tika/mime/MimeTypesReaderMetKeys.java   |  2 ++
 .../org/apache/tika/mime/tika-mimetypes.xml        | 12 +++----
 .../org/apache/tika/mime/CustomReaderTest.java     |  2 ++
 .../org/apache/tika/mime/MimeDetectionTest.java    | 40 ++++++++++++++++------
 .../org/apache/tika/mime/custom-mimetypes2.xml     |  2 +-
 8 files changed, 72 insertions(+), 22 deletions(-)