.gitignore

@@ -7,5 +7,19 @@ target
 *.iml
 *.ipr
 *.iws
+*.bin
 nbactions.xml
 nb-configuration.xml
+*.DS_Store
+*.tmp-inception
+*.snap
+tika-deployment/tika-snap-app/parts/
+tika-deployment/tika-snap-app/prime/
+tika-deployment/tika-snap-app/snap/
+tika-deployment/tika-snap-app/stage/
+tika-deployment/tika-snap-app/test/
+tika-deployment/tika-snap-server/parts/
+tika-deployment/tika-snap-server/prime/
+tika-deployment/tika-snap-server/snap/
+tika-deployment/tika-snap-server/stage/
+

KEYS

@@ -342,3 +342,194 @@ JcWAy7md7XR9MiVgSQuw040wqSzcSA5M6RCFZ9gN+G0kP1CNZ5vDz+JktV4nJZzh
 JF8xV9E4P/Msl8hqmOOocZ4LDJdw/nt1UWlUmattMLBVWdSeuu0=
 =pYQ7
 -----END PGP PUBLIC KEY BLOCK-----
+pub   4096R/EF0CF38A 2017-05-16
+uid       [ultimate] Tim Allison (ASF signing key) <tallison@apache.org>
+sig 3        EF0CF38A 2017-05-16  Tim Allison (ASF signing key) <tallison@apache.org>
+sig          DE7B39EC 2017-05-17  [User ID not found]
+sig          13B86349 2017-05-18  Ismaël Mejía <iemejia@gmail.com>
+sig          5ECBB314 2017-05-17  Rob Tompkins <chtompki@apache.org>
+sig          00B6899D 2017-05-17  Christopher L Tubbs II (Christopher) <ctubbsii@gmail.com>
+sig          26518FEE 2017-05-18  Dale LaBossiere (CODE SIGNING KEY) <dlaboss@apache.org>
+sig 3        A400FD50 2017-05-16  Akira Ajisaka <aajisaka@apache.org>
+sig          9FCC82D0 2017-05-17  Benedikt Ritter (CODE SIGNING KEY) <britter@apache.org>
+sig          1AD84DFF 2017-05-26  Daniel Ruggeri (http://home.apache.org/~druggeri/) <druggeri@apache.org>
+sig          9C1750C5 2017-05-26  Coty Sutherland <csutherl@fedoraproject.org>
+sig          8BD1DCE8 2017-05-26  BigBlueHat <byoung@bigbluehat.com>
+sig          47085518 2017-05-26  Marcus Christie (CODE SIGNING KEY) <machristie@apache.org>
+sig 3        0FB52BC6 2017-05-24  Ashish Paliwal <apaliwal@apache.org>
+sub   4096R/B0007A00 2017-05-16
+sig          EF0CF38A 2017-05-16  Tim Allison (ASF signing key) <tallison@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+sgtLYRPuFHFHzap0YZCqEGM=
+=/R0q
+-----END PGP PUBLIC KEY BLOCK-----

LICENSE.txt

@@ -370,3 +370,41 @@ JUnRAR (https://github.com/edmund-wagner/junrar/)
 Sqlite (bundled in org.xerial's sqlite-jdbc)
     This product bundles Sqlite, which is in the Public Domain.  For details
     see: https://www.sqlite.org/copyright.html
+
+Sample DXF file testDXF.dxf (in tika-parsers/src/test/resources/test-documents)
+     Copyright 2012 Ho Thanh Tam, www.cadkit.net
+
+     Permission to use, copy, modify, and distribute this software and its 
+     documentation for any purpose is hereby granted without fee, provided 
+     that the above copyright notice, author statement appear in all copies 
+     of this software and related documentation.
+
+H2 Database in tika-eval
+    This software contains unmodified binary redistributions for
+    H2 database engine (http://www.h2database.com/),
+    which is dual licensed and available under the MPL 2.0
+    (Mozilla Public License) or under the EPL 1.0 (Eclipse Public License).
+    An original copy of the license agreement can be found at:
+    http://www.h2database.com/html/license.html
+
+org.brotli.dec dependency of commons-compress (MIT License)
+
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file

assembly.xml

@@ -26,6 +26,9 @@
       <excludes>
         <exclude>**/target/**</exclude>
         <exclude>**/.*/**</exclude>
+        <exclude>**/opennlp/*.bin</exclude>
+        <exclude>**/recognition/*.bin</exclude>
+        <exclude>**/*.releaseBackup</exclude>
       </excludes>
     </fileSet>
   </fileSets>

debian/changelog

+tika (1.18-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fixes CVE-2016-4434: XML External Entity vulnerability (Closes: #825501)
+    - Fixes CVE-2018-1339: Infinite loop in the CHM parser (Closes: #900000)
+    - Refreshed the patches
+    - Ignore the new dl, eval, langdetect and nlp modules
+    - New dependencies on libcommons-exec-java, libjackson2-annotations-java,
+      libjackson2-core-java, libjackson2-databind-java, libhttpmime-java,
+      libjsoup-java, libuima-core-java, libandroid-json-org-java
+      and libjson-simple-java
+    - Depend on libpdfbox2-java instead of libpdfbox-java
+    - Depend on librome-java (>= 1.6)
+    - Depend on libapache-mime4j-java (>= 0.8.1)
+    - Depend on libapache-poi-java (>= 3.17)
+    - Ignore the new parsers with missing dependencies
+  * Enabled the mp4 parser
+  * Fixed the build failure with Java 11
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 20 Jan 2019 00:08:04 +0100
+
 tika (1.8-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -7,24 +7,35 @@ Build-Depends:
  bnd (>= 2.1.0),
  debhelper (>= 11),
  default-jdk,
- libapache-mime4j-java (>= 0.7.2-3),
- libapache-poi-java (>= 3.11),
+ libandroid-json-org-java,
+ libapache-mime4j-java (>= 0.8.1),
+ libapache-poi-java (>= 3.17),
  libasm-java (>= 5.0),
  libbcmail-java,
  libboilerpipe-java,
  libcommons-cli-java,
  libcommons-compress-java,
  libcommons-csv-java,
+ libcommons-exec-java,
  libgoogle-gson-java,
+ libhttpmime-java,
+ libisoparser-java (>= 1.1.18),
+ libjackson2-annotations-java,
+ libjackson2-core-java,
+ libjackson2-databind-java,
+ libjaxb-api-java,
  libjempbox-java,
  libjhighlight-java,
+ libjson-simple-java,
+ libjsoup-java,
  libjuniversalchardet-java,
  libmaven-bundle-plugin-java,
  libmetadata-extractor-java (>= 2.8~),
- libpdfbox-java,
- librome-java,
+ libpdfbox2-java (>= 2.0.13-2~),
+ librome-java (>= 1.6),
  libslf4j-java,
  libtagsoup-java,
+ libuima-core-java,
  libvorbis-java (>= 0.8-3~),
  libxmpcore-java,
  maven-debian-helper (>= 2.0)

debian/libtika-java.poms

@@ -32,9 +32,13 @@ tika-parsers/pom.xml --has-package-version --java-lib
 tika-xmp/pom.xml --has-package-version --java-lib
 tika-app/pom.xml --ignore
 tika-bundle/pom.xml --ignore
+tika-eval/pom.xml --ignore
+tika-dl/pom.xml --ignore
 tika-server/pom.xml --ignore
 tika-java7/pom.xml --has-package-version --java-lib
 tika-serialization/pom.xml --has-package-version --java-lib
 tika-translate/pom.xml --ignore
 tika-batch/pom.xml --has-package-version --java-lib
 tika-example/pom.xml --ignore
+tika-langdetect/pom.xml --ignore
+tika-nlp/pom.xml --ignore

debian/maven.ignoreRules

 
+org.apache.ctakes ctakes-core * * * *
+org.apache.opennlp opennlp-tools * * * *
+org.apache.sis.core sis-utility * * * *
+org.apache.sis.storage sis-netcdf * * * *
+org.apache.sis.core sis-metadata * * * *
 org.apache.tika tika-core test-jar * * *
 org.apache.tika tika-parsers test-jar * * *
+org.brotli dec * * * *
+com.github.jai-imageio jai-imageio-core * * * *
+com.github.jai-imageio jai-imageio-jpeg2000 * * * *
 com.github.junrar junrar * * * *
-com.googlecode.mp4parser isoparser * * * *
+com.github.luben zstd-jni * * * *
+com.healthmarketscience.jackcess jackcess * * * *
+com.healthmarketscience.jackcess jackcess-encrypt * * * *
+com.levigo.jbig2 levigo-jbig2-imageio * * * *
 com.pff java-libpst * * * *
 de.thetaphi forbiddenapis * * * *
 edu.ucar cdm * * * *
 edu.ucar grib * * * *
 edu.ucar httpservices * * * *
 edu.ucar netcdf4 * * * *
+edu.usc.ir sentiment-analysis-parser * * * *
 junit junit * * * *
-net.sourceforge.jmatio jmatio * * * *
+org.tallison jmatio * * * *
+org.apache.cxf cxf-rt-rs-client * * * *
 org.apache.felix maven-scr-plugin * * * *
 org.apache.felix org.apache.felix.scr.annotations * * * *
 org.apache.geronimo.specs geronimo-stax-api_1.0_spec * * * *
 org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-failsafe-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
 org.apache.maven.plugins maven-site-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.maven.scm maven-scm-provider-gitexe * * * *
+org.apache.pdfbox jbig2-imageio * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.apache.tika tika-app * * * *
 org.apache.tika tika-bundle * * * *
 org.apache.tika tika-server * * * *
+org.apache.uima uimafit-core * * * *
+org.codehaus.gmaven groovy-maven-plugin * * * *
 org.codehaus.mojo clirr-maven-plugin * * * *
+org.opengis geoapi * * * *
 org.xerial sqlite-jdbc * * * *
 org.mockito * * * * *
+

debian/maven.rules

 
+com.fasterxml.jackson.core jackson-annotations * s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
+s/com.github.openjson/org.json/ s/openjson/json/ * s/.*/debian/ * *
 s/org.codelibs/com.uwyn/ jhighlight * s/.*/debian/ * *
 org.bouncycastle s/bcmail-jdk15/bcmail/ * s/.*/debian/ * *
 org.bouncycastle s/bcmail-jdk15on/bcmail/ * s/.*/debian/ * *
 org.bouncycastle s/bcprov-jdk15/bcprov/ * s/.*/debian/ * *
 org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * *
 s/biz.aQute/biz.aQute.bnd/ * * s/.*/debian/ * *
+org.apache.pdfbox pdfbox * s/.*/2.x/ * *
+org.apache.pdfbox pdfbox-tools * s/.*/2.x/ * *

debian/patches/06-optional-parser-dependencies.patch

@@ -3,18 +3,34 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/tika-parsers/pom.xml
 +++ b/tika-parsers/pom.xml
-@@ -76,6 +76,7 @@
+@@ -83,6 +83,7 @@
        <groupId>org.gagravarr</groupId>
        <artifactId>vorbis-java-tika</artifactId>
        <version>${vorbis.version}</version>
 +      <optional>true</optional>
-     </dependency>
- 
-     <!-- Optional OSGi dependencies, used only when running within OSGi -->
-@@ -90,37 +91,44 @@
-       <groupId>net.sourceforge.jmatio</groupId>
+       <exclusions>
+         <exclusion>
+           <groupId>org.apache.tika</groupId>
+@@ -94,6 +95,7 @@
+       <groupId>com.healthmarketscience.jackcess</groupId>
+       <artifactId>jackcess</artifactId>
+       <version>2.1.10</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>commons-logging</groupId>
+@@ -105,6 +107,7 @@
+       <groupId>com.healthmarketscience.jackcess</groupId>
+       <artifactId>jackcess-encrypt</artifactId>
+       <version>2.1.4</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>org.bouncycastle</groupId>
+@@ -131,31 +134,37 @@
+       <groupId>org.tallison</groupId>
        <artifactId>jmatio</artifactId>
-       <version>1.0</version>
+       <version>1.2</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
@@ -32,7 +48,7 @@ Forwarded: no
      <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-compress</artifactId>
-       <version>${compress.version}</version>
+       <version>${commons.compress.version}</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
@@ -41,8 +57,15 @@ Forwarded: no
        <version>${tukaani.version}</version>
 +      <optional>true</optional>
      </dependency>
- 
      <dependency>
+       <groupId>org.brotli</groupId>
+       <artifactId>dec</artifactId>
+       <version>${brotli.version}</version>
++      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>com.github.luben</groupId>
+@@ -168,11 +177,13 @@
        <groupId>commons-codec</groupId>
        <artifactId>commons-codec</artifactId>
        <version>${codec.version}</version>
@@ -52,20 +75,36 @@ Forwarded: no
        <groupId>org.apache.pdfbox</groupId>
        <artifactId>pdfbox</artifactId>
        <version>${pdfbox.version}</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>commons-logging</groupId>
+@@ -184,6 +195,7 @@
+       <groupId>org.apache.pdfbox</groupId>
+       <artifactId>pdfbox-tools</artifactId>
+       <version>${pdfbox.version}</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>commons-logging</groupId>
+@@ -199,6 +211,7 @@
+       <groupId>org.apache.pdfbox</groupId>
+       <artifactId>jempbox</artifactId>
+       <version>${jempbox.version}</version>
 +      <optional>true</optional>
      </dependency>
      <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
           as optional, but we prefer to have them always to avoid
-@@ -129,26 +137,31 @@
+@@ -207,26 +220,31 @@
        <groupId>org.bouncycastle</groupId>
        <artifactId>bcmail-jdk15on</artifactId>
-       <version>1.52</version>
+       <version>${bouncycastle.version}</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
        <groupId>org.bouncycastle</groupId>
        <artifactId>bcprov-jdk15on</artifactId>
-       <version>1.52</version>
+       <version>${bouncycastle.version}</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
@@ -88,7 +127,7 @@ Forwarded: no
        <exclusions>
          <exclusion>
            <groupId>stax</groupId>
-@@ -164,61 +177,74 @@
+@@ -242,31 +260,37 @@
        <groupId>org.ccil.cowan.tagsoup</groupId>
        <artifactId>tagsoup</artifactId>
        <version>1.2.1</version>
@@ -96,20 +135,20 @@ Forwarded: no
      </dependency>
      <dependency>
        <groupId>org.ow2.asm</groupId>
-       <artifactId>asm-debug-all</artifactId>
-       <version>4.1</version>
+       <artifactId>asm</artifactId>
+       <version>5.0.4</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
        <groupId>com.googlecode.mp4parser</groupId>
        <artifactId>isoparser</artifactId>
-       <version>1.0.2</version>
+       <version>1.1.18</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
        <groupId>com.drewnoakes</groupId>
        <artifactId>metadata-extractor</artifactId>
-       <version>2.8.0</version>
+       <version>2.10.1</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>
@@ -119,21 +158,17 @@ Forwarded: no
 +      <optional>true</optional>
      </dependency>
      <dependency>
-       <groupId>rome</groupId>
+       <groupId>com.rometools</groupId>
        <artifactId>rome</artifactId>
-       <version>1.0</version>
+       <version>1.5.1</version>
 +      <optional>true</optional>
-     </dependency>
-     <dependency>
+       <exclusions>
+         <exclusion>
+           <groupId>org.jdom</groupId>
+@@ -278,16 +302,19 @@
        <groupId>org.gagravarr</groupId>
        <artifactId>vorbis-java-core</artifactId>
        <version>${vorbis.version}</version>
-+      <optional>true</optional>
-     </dependency>
-     <dependency>
-         <groupId>org.xerial</groupId>
-         <artifactId>sqlite-jdbc</artifactId>
-         <version>3.8.6</version> <!-- 3.8.7 failed on Ubuntu -->
 +      <optional>true</optional>
      </dependency>
      <dependency>
@@ -148,27 +183,82 @@ Forwarded: no
        <version>1.0.2</version>
 +      <optional>true</optional>
      </dependency>
-     <dependency>
+     <!-- can't upgrade to java-libpst 0.9.3 because it requires Java 8
+          and is buggy with OST TIKA-2415 -->
+@@ -295,11 +322,13 @@
        <groupId>com.pff</groupId>
        <artifactId>java-libpst</artifactId>
        <version>0.8.1</version>
-+      <optional>true</optional>
 +      <optional>true</optional>
      </dependency>
      <dependency>
        <groupId>com.github.junrar</groupId>
        <artifactId>junrar</artifactId>
        <version>0.7</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>commons-logging</groupId>
+@@ -320,6 +349,7 @@
+       <groupId>org.apache.cxf</groupId>
+       <artifactId>cxf-rt-rs-client</artifactId>
+       <version>${cxf.version}</version>
++      <optional>true</optional>
+     </dependency>
+     <!-- TIKA-2021: Tesseract OCR Parser dependencies,
+     used for executing image processing script -->
+@@ -328,6 +358,7 @@
+       <artifactId>commons-exec</artifactId>
+       <version>${commonsexec.version}</version>
+       <scope>compile</scope>
++      <optional>true</optional>
+     </dependency>
+ 
+     <!-- Provided dependencies -->
+@@ -342,6 +373,7 @@
+       <groupId>org.apache.opennlp</groupId>
+       <artifactId>opennlp-tools</artifactId>
+       <version>1.8.4</version>
++      <optional>true</optional>
+     </dependency>
+ 
+     <dependency>
+@@ -354,6 +386,7 @@
+       <groupId>com.googlecode.json-simple</groupId>
+       <artifactId>json-simple</artifactId>
+       <version>1.1.1</version>
++      <optional>true</optional>
+       <exclusions>
+         <exclusion>
+           <groupId>junit</groupId>
+@@ -371,11 +404,13 @@
+       <groupId>com.github.openjson</groupId>
+       <artifactId>openjson</artifactId>
+       <version>1.0.10</version>
++      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>com.google.code.gson</groupId>
+       <artifactId>gson</artifactId>
+       <version>${gson.version}</version>
 +      <optional>true</optional>
      </dependency>
  
-     <!-- Test dependencies -->
+     <!-- logging dependencies -->
+@@ -520,6 +555,7 @@
+       <groupId>org.apache.commons</groupId>
+       <artifactId>commons-csv</artifactId>
+       <version>1.0</version>
++      <optional>true</optional>
+     </dependency>
+ 
+     <dependency>
 --- a/tika-xmp/pom.xml
 +++ b/tika-xmp/pom.xml
-@@ -86,6 +86,7 @@
+@@ -85,6 +85,7 @@
        <groupId>com.adobe.xmp</groupId>
        <artifactId>xmpcore</artifactId>
-       <version>5.1.2</version>
+       <version>5.1.3</version>
 +      <optional>true</optional>
      </dependency>
      <dependency>

debian/patches/09-ignore-unsupported-parsers.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/tika-parsers/pom.xml
 +++ b/tika-parsers/pom.xml
-@@ -345,6 +345,25 @@
+@@ -812,6 +812,40 @@
            </execution>
          </executions>
        </plugin>
@@ -12,17 +12,32 @@ Forwarded: not-needed
 +        <artifactId>maven-compiler-plugin</artifactId>
 +        <configuration>
 +          <excludes>
++            <exclude>**/ctakes/*</exclude>
++            <exclude>**/geoinfo/GeographicInformationParser.java</exclude>
++            <exclude>**/geo/topic/GeoParser.java</exclude>
++            <exclude>**/geo/topic/NameEntityExtractor.java</exclude>
++            <exclude>**/geo/topic/gazetteer/GeoGazetteerClient.java</exclude>
 +            <exclude>**/grib/GribParser.java</exclude>
 +            <exclude>**/hdf/HDFParser.java</exclude>
 +            <exclude>**/image/WebPParser.java</exclude>
++            <exclude>**/journal/GrobidRESTParser.java</exclude>
++            <exclude>**/journal/JournalParser.java</exclude>
++            <exclude>**/journal/TEIParser.java</exclude>
 +            <exclude>**/mat/MatParser.java</exclude>
 +            <exclude>**/mbox/OutlookPSTParser.java</exclude>
-+            <exclude>**/mp4/MP4Parser.java</exclude>
-+            <exclude>**/mp4/DirectFileReadDataSource.java</exclude>
++            <exclude>**/microsoft/JackcessExtractor.java</exclude>
++            <exclude>**/microsoft/JackcessParser.java</exclude>
 +            <exclude>**/netcdf/NetCDFParser.java</exclude>
++            <exclude>**/ner/NamedEntityParser.java</exclude>
++            <exclude>**/ner/grobid/GrobidNERecogniser.java</exclude>
++            <exclude>**/ner/opennlp/OpenNLPNameFinder.java</exclude>
++            <exclude>**/ner/opennlp/OpenNLPNERecogniser.java</exclude>
++            <exclude>**/ner/nltk/NLTKNERecogniser.java</exclude>
 +            <exclude>**/pkg/RarParser.java</exclude>
 +            <exclude>**/jdbc/SQLite3DBParser.java</exclude>
 +            <exclude>**/jdbc/SQLite3Parser.java</exclude>
++            <exclude>**/recognition/**</exclude>
++            <exclude>**/sentiment/SentimentAnalysisParser.java</exclude>
 +          </excludes>
 +        </configuration>
 +      </plugin>

debian/patches/11-java11-compatibility.patch

+Description: Fixes the build failure with Java 11
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/tika-core/pom.xml
++++ b/tika-core/pom.xml
+@@ -35,6 +35,13 @@
+   <url>http://tika.apache.org/</url>
+ 
+   <dependencies>
++    <dependency>
++      <groupId>javax.xml.bind</groupId>
++      <artifactId>jaxb-api</artifactId>
++      <version>debian</version>
++      <scope>provided</scope>
++      <optional>true</optional>
++    </dependency>
+     <!-- Optional OSGi dependencies, used only when running within OSGi -->
+     <dependency>
+       <groupId>org.osgi</groupId>

debian/patches/12-json-compatibility.patch

+Description: Keep using libandroid-json-org-java instead of openjson
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/tika-parsers/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
++++ b/tika-parsers/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
+@@ -29,8 +29,8 @@
+ 
+ import org.apache.tika.io.IOUtils;
+ import org.apache.tika.parser.ner.NERecogniser;
+-import com.github.openjson.JSONException;
+-import com.github.openjson.JSONObject;
++import org.json.JSONException;
++import org.json.JSONObject;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 

debian/patches/13-missing-dependencies.patch

+Description: Adds the missing dependencies
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/tika-parsers/pom.xml
++++ b/tika-parsers/pom.xml
+@@ -55,6 +55,17 @@
+   </properties>
+ 
+   <dependencies>
++    <dependency>
++      <groupId>commons-lang</groupId>
++      <artifactId>commons-lang</artifactId>
++      <version>debian</version>
++    </dependency>
++    <dependency>
++      <groupId>com.google.guava</groupId>
++      <artifactId>guava</artifactId>
++      <version>debian</version>
++    </dependency>
++
+     <!-- Optional OSGi dependency, used only when running within OSGi -->
+     <dependency>
+       <groupId>org.osgi</groupId>

debian/patches/series

@@ -3,3 +3,6 @@
 06-optional-parser-dependencies.patch
 09-ignore-unsupported-parsers.patch
 #10-metadata-extractor-compatibility.patch
+11-java11-compatibility.patch
+12-json-compatibility.patch
+13-missing-dependencies.patch

pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>1.8</version>
+    <version>1.18</version>
     <relativePath>tika-parent/pom.xml</relativePath>
   </parent>
 
@@ -34,16 +34,6 @@
   <name>Apache Tika</name>
   <url>http://tika.apache.org</url>
 
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.8-rc2
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.8-rc2
-    </developerConnection>
-    <url>http://svn.apache.org/viewvc/tika/tags/1.8-rc2</url>
-  </scm>
-
   <modules>
     <module>tika-parent</module>
     <module>tika-core</module>
@@ -55,7 +45,12 @@
     <module>tika-bundle</module>
     <module>tika-server</module>
     <module>tika-translate</module>
+    <module>tika-langdetect</module>
     <module>tika-example</module>
+    <module>tika-java7</module>
+    <module>tika-eval</module>
+    <module>tika-dl</module>
+    <module>tika-nlp</module>
   </modules>
 
   <profiles>
@@ -106,21 +101,16 @@
                         <include name="target/*-src.zip*" />
                         <include name="tika-app/target/tika-app-${project.version}.jar*" />
                         <include name="tika-server/target/tika-server-${project.version}.jar*" />
+                        <include name="tika-eval/target/tika-eval-${project.version}.jar*" />
                       </fileset>
                     </copy>
-                    <checksum algorithm="MD5" fileext=".md5">
-                      <fileset dir="${basedir}/target/${project.version}">
-                        <include name="*.zip" />
-                        <include name="*.?ar" />
-                      </fileset>
-                    </checksum>
-                    <checksum algorithm="SHA1" fileext=".sha">
+                    <checksum algorithm="SHA-512" fileext=".sha512">
                       <fileset dir="${basedir}/target/${project.version}">
                         <include name="*.zip" />
                         <include name="*.?ar" />
                       </fileset>
                     </checksum>
-                    <checksum file="${basedir}/target/${project.version}/tika-${project.version}-src.zip" algorithm="SHA1" property="checksum" />
+                    <checksum file="${basedir}/target/${project.version}/tika-${project.version}-src.zip" algorithm="SHA-512" property="checksum" />
                     <echo file="${basedir}/target/vote.txt">
 From: ${username}@apache.org
 To: dev@tika.apache.org
@@ -131,9 +121,9 @@ A candidate for the Tika ${project.version} release is available at:
   https://dist.apache.org/repos/dist/dev/tika/
 
 The release candidate is a zip archive of the sources in:
-  http://svn.apache.org/repos/asf/tika/tags/${project.version}-rcN/
+  https://github.com/apache/tika/tree/{project.version}-rcN/
 
-The SHA1 checksum of the archive is
+The SHA-512 checksum of the archive is
   ${checksum}.
 
 In addition, a staged maven repository is available here:
@@ -176,17 +166,21 @@ least three +1 Tika PMC votes are cast.
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>java7</id>
-      <activation>
-        <jdk>[1.7,]</jdk>
-      </activation>
-      <modules>
-        <module>tika-java7</module>
-      </modules>
-    </profile>
   </profiles>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>CHANGES.txt</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <description>The Apache Tika™ toolkit detects and extracts metadata and structured text content from various documents
     using existing parser libraries.
   </description>

tika-app/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>1.8</version>
+    <version>1.18</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 
@@ -42,16 +42,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-parsers</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-langdetect</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -69,33 +64,29 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>commons-io</artifactId>
       <groupId>commons-io</groupId>
-      <version>2.1</version>
-      <scope>test</scope>
+      <version>${commons.io.version}</version>
     </dependency>
   </dependencies>
 
@@ -162,6 +153,9 @@
                   <resource>META-INF/DEPENDENCIES</resource>
                   <file>target/classes/META-INF/DEPENDENCIES</file>
                 </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/cxf/bus-extensions.txt</resource>
+                </transformer>
               </transformers>
             </configuration>
           </execution>
@@ -178,6 +172,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/test/resources/test-data/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -256,11 +259,6 @@
     <name>The Apache Software Foundation</name>
     <url>http://www.apache.org</url>
   </organization>
-  <scm>
-    <url>http://svn.apache.org/viewvc/tika/tags/1.8-rc2/tika-app</url>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/tika/tags/1.8-rc2/tika-app</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/tags/1.8-rc2/tika-app</developerConnection>
-  </scm>
   <issueManagement>
     <system>JIRA</system>
     <url>https://issues.apache.org/jira/browse/TIKA</url>

tika-app/src/main/appended-resources/META-INF/LICENSE

@@ -896,229 +896,7 @@ juniversalchardet library (juniversalchardet)
          use the text of this Exhibit A rather than the text found in the
          Original Code Source Code for Your Modifications.]
 
-AspectJ runtime library (aspectjrt)
+Sqlite (included in the "provided" org.xerial's sqlite-jdbc)
+    Sqlite is in the Public Domain.  For details
+    see: https://www.sqlite.org/copyright.html
 
-    Eclipse Public License - v 1.0
-
-    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-    THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and
-       documentation distributed under this Agreement, and
-
-    b) in the case of each subsequent Contributor:
-
-       i) changes to the Program, and
-
-       ii) additions to the Program;
-
-       where such changes and/or additions to the Program originate from and
-       are distributed by that particular Contributor. A Contribution
-       'originates' from a Contributor if it was added to the Program by
-       such Contributor itself or anyone acting on such Contributor's behalf.
-       Contributions do not include additions to the Program which: (i) are
-       separate modules of software distributed in conjunction with the
-       Program under their own license agreement, and (ii) are not derivative
-       works of the Program.
-
-    "Contributor" means any person or entity that distributes the Program.
-
-    "Licensed Patents " mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone or
-    when combined with the Program.
-
-    "Program" means the Contributions distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement,
-    including all Contributors.
-
-    2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free copyright license to
-       reproduce, prepare derivative works of, publicly display, publicly
-       perform, distribute and sublicense the Contribution of such
-       Contributor, if any, and such derivative works, in source code and
-       object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free patent license under
-       Licensed Patents to make, use, sell, offer to sell, import and
-       otherwise transfer the Contribution of such Contributor, if any, in
-       source code and object code form. This patent license shall apply to
-       the combination of the Contribution and the Program if, at the time
-       the Contribution is added by the Contributor, such addition of the
-       Contribution causes such combination to be covered by the Licensed
-       Patents. The patent license shall not apply to any other combinations
-       which include the Contribution. No hardware per se is licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the
-       licenses to its Contributions set forth herein, no assurances are
-       provided by any Contributor that the Program does not infringe the
-       patent or other intellectual property rights of any other entity. Each
-       Contributor disclaims any liability to Recipient for claims brought by
-       any other entity based on infringement of intellectual property rights
-       or otherwise. As a condition to exercising the rights and licenses
-       granted hereunder, each Recipient hereby assumes sole responsibility
-       to secure any other intellectual property rights needed, if any. For
-       example, if a third party patent license is required to allow Recipient
-       to distribute the Program, it is Recipient's responsibility to acquire
-       that license before distributing the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-       copyright rights in its Contribution, if any, to grant the copyright
-       license set forth in this Agreement.
-
-    3. REQUIREMENTS
-
-    A Contributor may choose to distribute the Program in object code form
-    under its own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-       i)   effectively disclaims on behalf of all Contributors all warranties
-            and conditions, express and implied, including warranties or
-            conditions of title and non-infringement, and implied warranties
-            or conditions of merchantability and fitness for a particular
-            purpose;
-
-       ii)  effectively excludes on behalf of all Contributors all liability
-            for damages, including direct, indirect, special, incidental and
-            consequential damages, such as lost profits;
-
-       iii) states that any provisions which differ from this Agreement are
-            offered by that Contributor alone and not by any other party; and
-
-       iv)  states that source code for the Program is available from such
-            Contributor, and informs licensees how to obtain it in a
-            reasonable manner on or through a medium customarily used for
-            software exchange.
-
-    When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the
-       Program.
-
-    Contributors may not remove or alter any copyright notices contained
-    within the Program.
-
-    Each Contributor must identify itself as the originator of its
-    Contribution, if any, in a manner that reasonably allows subsequent
-    Recipients to identify the originator of the Contribution.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product offering
-    should do so in a manner which does not create potential liability for
-    other Contributors. Therefore, if a Contributor includes the Program in
-    a commercial product offering, such Contributor ("Commercial Contributor")
-    hereby agrees to defend and indemnify every other Contributor
-    ("Indemnified Contributor") against any losses, damages and costs
-    (collectively "Losses") arising from claims, lawsuits and other legal
-    actions brought by a third party against the Indemnified Contributor to
-    the extent caused by the acts or omissions of such Commercial Contributor
-    in connection with its distribution of the Program in a commercial
-    product offering. The obligations in this section do not apply to any
-    claims or Losses relating to any actual or alleged intellectual property
-    infringement. In order to qualify, an Indemnified Contributor must:
-    a) promptly notify the Commercial Contributor in writing of such claim,
-    and b) allow the Commercial Contributor to control, and cooperate with
-    the Commercial Contributor in, the defense and any related settlement
-    negotiations. The Indemnified Contributor may participate in any such
-    claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance claims,
-    or offers warranties related to Product X, those performance claims and
-    warranties are such Commercial Contributor's responsibility alone. Under
-    this section, the Commercial Contributor would have to defend claims
-    against the other Contributors related to those performance claims and
-    warranties, and if a court requires any other Contributor to pay any
-    damages as a result, the Commercial Contributor must pay those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
-    ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
-    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining
-    the appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement ,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs or
-    equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-    ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-    DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further action
-    by the parties hereto, such provision shall be reformed to the minimum
-    extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity (including
-    a cross-claim or counterclaim in a lawsuit) alleging that the Program
-    itself (excluding combinations of the Program with other software or
-    hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it fails
-    to comply with any of the material terms or conditions of this Agreement
-    and does not cure such failure in a reasonable period of time after
-    becoming aware of such noncompliance. If all Recipient's rights under
-    this Agreement terminate, Recipient agrees to cease use and distribution
-    of the Program as soon as reasonably practicable. However, Recipient's
-    obligations under this Agreement and any licenses granted by Recipient
-    relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and may
-    only be modified in the following manner. The Agreement Steward reserves
-    the right to publish new versions (including revisions) of this Agreement
-    from time to time. No one other than the Agreement Steward has the right
-    to modify this Agreement. The Eclipse Foundation is the initial Agreement
-    Steward. The Eclipse Foundation may assign the responsibility to serve as
-    the Agreement Steward to a suitable separate entity. Each new version of
-    the Agreement will be given a distinguishing version number. The Program
-    (including Contributions) may always be distributed subject to the version
-    of the Agreement under which it was received. In addition, after a new
-    version of the Agreement is published, Contributor may elect to distribute
-    the Program (including its Contributions) under the new version. Except as
-    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-    rights or licenses to the intellectual property of any Contributor under
-    this Agreement, whether expressly, by implication, estoppel or otherwise.
-    All rights in the Program not expressly granted under this Agreement
-    are reserved.
-
-    This Agreement is governed by the laws of the State of New York and the
-    intellectual property laws of the United States of America. No party to
-    this Agreement will bring a legal action under this Agreement more than
-    one year after the cause of action arose. Each party waives its rights to
-    a jury trial in any resulting litigation.

tika-app/src/main/java/org/apache/tika/batch/DigestingAutoDetectParserFactory.java

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tika.batch;
+
+import org.apache.tika.config.TikaConfig;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.DigestingParser;
+import org.apache.tika.parser.Parser;
+
+public class DigestingAutoDetectParserFactory extends ParserFactory {
+
+    private DigestingParser.Digester digester = null;
+
+
+    @Override
+    public Parser getParser(TikaConfig config) {
+        Parser p = new AutoDetectParser(config);
+        if (digester == null) {
+            return p;
+        }
+        DigestingParser d = new DigestingParser(p, digester);
+        return d;
+    }
+
+    public void setDigester(DigestingParser.Digester digester) {
+        this.digester = digester;
+    }
+}