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 2023/09/26 12:30:47 UTC

[tika] 01/01: Merge remote-tracking branch 'origin/main' into TIKA-4135

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

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

commit ab1ca5356a9039f7eb7c1c7fc9ea0475a20deab5
Merge: d6d13b3d3 960fba53d
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 26 08:29:53 2023 -0400

    Merge remote-tracking branch 'origin/main' into TIKA-4135

 .github/workflows/main-jdk21-build.yml             | 38 +++++++++++
 CHANGES.txt                                        |  5 ++
 pom.xml                                            |  1 +
 tika-app/pom.xml                                   |  2 +-
 tika-bom/pom.xml                                   |  2 +-
 tika-bundles/tika-bundle-standard/pom.xml          |  2 +-
 tika-handlers/README.md                            |  2 +
 .../pom.xml                                        | 33 +++++-----
 .../tika-handler-boilerpipe/pom.xml                | 26 ++++++--
 .../sax/boilerpipe/BoilerpipeContentHandler.java   |  0
 tika-langdetect/tika-langdetect-optimaize/pom.xml  | 13 +++-
 tika-parent/pom.xml                                |  8 +--
 .../tika-parsers-ml/tika-age-recogniser/pom.xml    |  2 +-
 .../tika-parsers-standard-modules/pom.xml          |  1 -
 .../tika-parser-html-commons/pom.xml               | 74 ----------------------
 .../tika-parsers-standard-package/pom.xml          |  2 +-
 tika-server/tika-server-core/pom.xml               |  2 +-
 .../tika/server/core/resource/TikaResource.java    |  1 +
 tika-server/tika-server-standard/pom.xml           |  6 +-
 19 files changed, 108 insertions(+), 112 deletions(-)

diff --cc tika-parent/pom.xml
index 3b147da00,437a0ff84..6c5017bc5
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@@ -926,8 -927,13 +926,8 @@@
        <dependency>
          <groupId>org.xerial.snappy</groupId>
          <artifactId>snappy-java</artifactId>
-         <version>1.1.10.3</version>
+         <version>1.1.10.4</version>
        </dependency>
 -      <dependency>
 -        <groupId>xerces</groupId>
 -        <artifactId>xercesImpl</artifactId>
 -        <version>${xerces.version}</version>
 -      </dependency>
        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>