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/03/07 00:54:29 UTC

[tika] branch branch_1x updated (4eb8ae1 -> cf0348d)

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

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


    from 4eb8ae1  Merge branch 'branch_1x' of https://github.com/apache/tika into branch_1x
     new be6e95d  TIKA-2576 -- Upgrade commons compress and add detection and parsing of zstd (if user provides com.github.luben:zstd-jni... via Andreas Meier
     new cf0348d  TIKA-2598 -- unbreak the build (sorry!), fix problems after tika-app

The 2 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:
 CHANGES.txt                                        |   3 +
 tika-batch/pom.xml                                 |   2 +-
 tika-bundle/pom.xml                                |  23 ++++
 .../org/apache/tika/mime/tika-mimetypes.xml        |   9 +-
 tika-dl/pom.xml                                    |  63 ++++++++++
 tika-example/pom.xml                               |  30 ++++-
 tika-nlp/pom.xml                                   | 127 ++++++++++++++++++++-
 tika-parent/pom.xml                                |   2 +-
 tika-parsers/pom.xml                               |   8 +-
 .../apache/tika/parser/pkg/CompressorParser.java   |   8 +-
 .../java/org/apache/tika/mime/TestMimeTypes.java   |   2 +
 .../tika/parser/pkg/CompressorParserTest.java      |   7 ++
 .../test/resources/test-documents/testZSTD.zstd    | Bin 0 -> 143 bytes
 tika-translate/pom.xml                             |  11 ++
 14 files changed, 287 insertions(+), 8 deletions(-)
 create mode 100644 tika-parsers/src/test/resources/test-documents/testZSTD.zstd

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.

[tika] 01/02: TIKA-2576 -- Upgrade commons compress and add detection and parsing of zstd (if user provides com.github.luben:zstd-jni... via Andreas Meier

Posted by ta...@apache.org.
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 be6e95d45bdfc40f35e93b26e45533d0a78ebd48
Author: tballison <ta...@mitre.org>
AuthorDate: Tue Mar 6 15:50:06 2018 -0500

    TIKA-2576 -- Upgrade commons compress and add detection and parsing of zstd (if user provides com.github.luben:zstd-jni... via Andreas Meier
---
 CHANGES.txt                                               |   3 +++
 .../resources/org/apache/tika/mime/tika-mimetypes.xml     |   9 ++++++++-
 tika-parent/pom.xml                                       |   2 +-
 tika-parsers/pom.xml                                      |   8 +++++++-
 .../java/org/apache/tika/parser/pkg/CompressorParser.java |   8 +++++++-
 .../src/test/java/org/apache/tika/mime/TestMimeTypes.java |   2 ++
 .../org/apache/tika/parser/pkg/CompressorParserTest.java  |   7 +++++++
 .../src/test/resources/test-documents/testZSTD.zstd       | Bin 0 -> 143 bytes
 8 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7b78929..d553961 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 Release 1.18 - ???
 
+   * Add detection and parsing of zstd (if user provides
+     com.github.luben:zstd-jni) via Andreas Meier (TIKA-2576)
+
    * Allow for RFC822 detection for files starting with "dkim-"
      and/or "x-" via Andreas Meier (TIKA-2578 and TIKA-2587)
 
diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 7432a56..f6a8844 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -3453,7 +3453,14 @@
     <glob pattern="*.tgz" />
     <glob pattern="*-gz" />
   </mime-type>
-
+  <mime-type type="application/zstd">
+    <_comment>https://en.wikipedia.org/wiki/Zstandard</_comment>
+    <_comment>https://tools.ietf.org/id/draft-kucherawy-dispatch-zstd-01.html</_comment>
+    <magic priority="50">
+      <match value="0xFD2FB528" type="little32" offset="0"/>
+    </magic>
+    <glob pattern="*.zstd"/>
+  </mime-type>
   <mime-type type="application/x-hdf">
     <_comment>Hierarchical Data Format File</_comment>
     <magic priority="50">
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 2cbcf4e..03c8ea0 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -306,7 +306,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
     <!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
-    <commons.compress.version>1.14</commons.compress.version>
+    <commons.compress.version>1.16.1</commons.compress.version>
     <commons.io.version>2.6</commons.io.version>
     <gson.version>2.8.1</gson.version>
     <cxf.version>3.0.16</cxf.version>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 271ec07..35787cb 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -39,7 +39,7 @@
     <!-- NOTE: sync codec version with POI -->
     <codec.version>1.10</codec.version>
     <!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
-    <tukaani.version>1.6</tukaani.version>
+    <tukaani.version>1.8</tukaani.version>
     <mime4j.version>0.8.1</mime4j.version>
     <vorbis.version>0.8</vorbis.version>
     <pdfbox.version>2.0.8</pdfbox.version>
@@ -150,6 +150,12 @@
       <artifactId>xz</artifactId>
       <version>${tukaani.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.luben</groupId>
+      <artifactId>zstd-jni</artifactId>
+      <version>1.3.3-3</version>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>commons-codec</groupId>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
index 48f8bec..ada7ec9 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
@@ -75,10 +75,12 @@ public class CompressorParser extends AbstractParser {
     private static final MediaType ZLIB = MediaType.application("zlib");
     private static final MediaType LZMA = MediaType.application("x-lzma");
     private static final MediaType LZ4_FRAMED = MediaType.application("x-lz4");
+    private static final MediaType ZSTD = MediaType.application("zstd");
+    private static final MediaType DEFLATE64= MediaType.application("deflate64");
 
     private static final Set<MediaType> SUPPORTED_TYPES =
             MediaType.set(BZIP, BZIP2, GZIP, GZIP_ALT, LZ4_FRAMED, COMPRESS,
-                    XZ, PACK, SNAPPY_FRAMED, ZLIB, LZMA);
+                    XZ, PACK, SNAPPY_FRAMED, ZLIB, LZMA, ZSTD);
 
     private int memoryLimitInKb = 100000;//100MB
 
@@ -141,6 +143,10 @@ public class CompressorParser extends AbstractParser {
             return SNAPPY_RAW;
         } else if (CompressorStreamFactory.LZMA.equals(name)) {
             return LZMA;
+        } else if (CompressorStreamFactory.ZSTANDARD.equals(name)) {
+            return ZSTD;
+        } else if (CompressorStreamFactory.DEFLATE64.equals(name)) {
+            return DEFLATE64;
         } else {
             return MediaType.OCTET_STREAM;
         }
diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index e76a7d5..bbb25e5 100644
--- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -379,6 +379,8 @@ public class TestMimeTypes {
        // For spanned zip files, the .zip file doesn't have the header, it's the other parts
        assertTypeByData("application/octet-stream", "test-documents-spanned.zip");
        assertTypeByData("application/zip",          "test-documents-spanned.z01");
+
+       assertTypeDetection("testZSTD.zstd", "application/zstd");
     }
     
     @Test
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
index 444afc7..26552eb 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
@@ -42,6 +42,7 @@ public class CompressorParserTest extends TikaTest {
         NOT_COVERED.add(MediaType.application("x-brotli"));
         NOT_COVERED.add(MediaType.application("x-lz4-block"));
         NOT_COVERED.add(MediaType.application("x-snappy-raw"));
+        NOT_COVERED.add(MediaType.application("deflate64"));
     }
 
     @Test
@@ -61,6 +62,12 @@ public class CompressorParserTest extends TikaTest {
     }
 
     @Test
+    public void testZstd() throws Exception {
+        XMLResult r = getXML("testZSTD.zstd");
+        assertContains("0123456789", r.xml);
+    }
+
+    @Test
     public void testCoverage() throws Exception {
         //test that the package parser covers all inputstreams handled
         //by CompressorStreamFactory.  When we update commons-compress, and they add
diff --git a/tika-parsers/src/test/resources/test-documents/testZSTD.zstd b/tika-parsers/src/test/resources/test-documents/testZSTD.zstd
new file mode 100644
index 0000000..f594f1a
Binary files /dev/null and b/tika-parsers/src/test/resources/test-documents/testZSTD.zstd differ

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.

[tika] 02/02: TIKA-2598 -- unbreak the build (sorry!), fix problems after tika-app

Posted by ta...@apache.org.
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 cf0348d7fee819296628281e50cec117d5a74471
Author: tballison <ta...@mitre.org>
AuthorDate: Tue Mar 6 19:52:39 2018 -0500

    TIKA-2598 -- unbreak the build (sorry!), fix problems after tika-app
---
 tika-batch/pom.xml     |   2 +-
 tika-bundle/pom.xml    |  23 +++++++++
 tika-dl/pom.xml        |  63 ++++++++++++++++++++++++
 tika-example/pom.xml   |  30 +++++++++++-
 tika-nlp/pom.xml       | 127 ++++++++++++++++++++++++++++++++++++++++++++++++-
 tika-translate/pom.xml |  11 +++++
 6 files changed, 252 insertions(+), 4 deletions(-)

diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index dd883e0..e71320b 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -35,7 +35,7 @@
   <url>http://tika.apache.org/</url>
 
   <properties>
-    <cli.version>1.3.1</cli.version>
+    <cli.version>1.4</cli.version>
   </properties>
 
   <dependencies>
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 6ba9338..e16b5b0 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -72,6 +72,28 @@
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-native</artifactId>
       <version>${pax.exam.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.ops4j.base</groupId>
+          <artifactId>ops4j-base-util-property</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.ops4j.base</groupId>
+          <artifactId>ops4j-base-lang</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.base</groupId>
+      <artifactId>ops4j-base-util-property</artifactId>
+      <version>1.5.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.base</groupId>
+      <artifactId>ops4j-base-lang</artifactId>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -206,6 +228,7 @@
               android.util;resolution:=optional,
               com.adobe.xmp;resolution:=optional,
               com.adobe.xmp.properties;resolution:=optional,
+              com.github.luben.zstd;resolution:=optional,
               com.github.openjson;resolution:=optional,
               com.google.protobuf;resolution:=optional,
               com.ibm.icu.text;resolution:=optional,
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index ee20ef5..29f8542 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -46,6 +46,12 @@
       <artifactId>tika-parsers</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -64,9 +70,34 @@
           <groupId>org.json</groupId>
           <artifactId>json</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.deeplearning4j</groupId>
+          <artifactId>deeplearning4j-modelimport</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-math3</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+      <version>3.4.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.deeplearning4j</groupId>
       <artifactId>deeplearning4j-modelimport</artifactId>
       <version>${dl4j.model.version}</version>
@@ -75,17 +106,49 @@
             <groupId>org.deeplearning4j</groupId>
             <artifactId>deeplearning4j-keras</artifactId>
          </exclusion>
+        <exclusion>
+          <groupId>org.bytedeco</groupId>
+          <artifactId>javacpp</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.datavec</groupId>
       <artifactId>datavec-data-image</artifactId>
       <version>${dl4j.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bytedeco</groupId>
+          <artifactId>javacpp</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-math3</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.nd4j</groupId>
       <artifactId>nd4j-native-platform</artifactId>
       <version>${dl4j.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bytedeco</groupId>
+          <artifactId>javacpp</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
         <groupId>org.apache.commons</groupId>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index aa2c208..be2b6ac 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -90,11 +90,39 @@
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-server</artifactId>
       <version>2.3.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tika</groupId>
+          <artifactId>tika-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>2.3.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tika</groupId>
+          <artifactId>tika-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -109,7 +137,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.2.RELEASE</version>
+      <version>3.2.16.RELEASE</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index f0a6059..7b59e25 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -64,8 +64,131 @@
       <groupId>edu.usc.ir</groupId>
       <artifactId>age-predictor-api</artifactId>
       <version>1.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-compress</groupId>
+          <artifactId>commons-compress</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.xerial.snappy</groupId>
+          <artifactId>snappy-java</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.paranamer</groupId>
+          <artifactId>paranamer</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-net</groupId>
+          <artifactId>commons-net</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-reflect</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scalamacros</groupId>
+          <artifactId>quasiquotes_2.10</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-core-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.scalamacros</groupId>
+      <artifactId>quasiquotes_2.10</artifactId>
+      <version>2.0.0-M8</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-reflect</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>2.10.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-reflect</artifactId>
+      <version>2.10.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.paranamer</groupId>
+      <artifactId>paranamer</artifactId>
+      <version>2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+      <version>1.1.2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.9.13</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.6.5</version>
     </dependency>
-    
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -74,7 +197,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.7</version>
+      <version>2.15.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index c6aa7e5..b8e6919 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -50,6 +50,17 @@
       <artifactId>microsoft-translator-java-api</artifactId>
       <version>0.6.2</version>
       <type>jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>com.googlecode.json-simple</groupId>
+          <artifactId>json-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.