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 2022/05/23 13:07:13 UTC

[tika] 02/03: Merge remote-tracking branch 'origin/branch_1x' into branch_1x

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

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

commit fb721d6d87d062b663a497531642da3544f01647
Merge: 9e70418b7 9a5afd26f
Author: tallison <ta...@apache.org>
AuthorDate: Mon May 23 08:59:09 2022 -0400

    Merge remote-tracking branch 'origin/branch_1x' into branch_1x
    
    # Conflicts:
    #       tika-parent/pom.xml

 tika-bundle/pom.xml                                |    2 +-
 tika-parent/pom.xml                                |   31 +-
 tika-parsers/pom.xml                               |    7 +-
 .../apache/tika/parser/mail/RFC822ParserTest.java  | 1422 ++++++++++----------
 4 files changed, 734 insertions(+), 728 deletions(-)