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/01/31 14:52:20 UTC
[tika] branch branch_1x updated: TIKA-2556: Swap out
com.tdunning:json for com.github.openjson:openjson to avoid jar conflicts.
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
The following commit(s) were added to refs/heads/branch_1x by this push:
new 54bce08 TIKA-2556: Swap out com.tdunning:json for com.github.openjson:openjson to avoid jar conflicts.
54bce08 is described below
commit 54bce0877c565721ec679b54711b0690012d0a3f
Author: tballison <ta...@mitre.org>
AuthorDate: Wed Jan 31 09:29:29 2018 -0500
TIKA-2556: Swap out com.tdunning:json for com.github.openjson:openjson to avoid jar conflicts.
---
CHANGES.txt | 6 +++++-
tika-bundle/pom.xml | 2 +-
tika-parsers/pom.xml | 7 ++++++-
.../org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java | 4 ++--
.../tika/parser/recognition/tf/TensorflowRESTRecogniser.java | 4 ++--
.../tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java | 4 ++--
6 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 251d7fe..1399520 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,17 @@
Release 1.18 - ???
+ * Swap out com.tdunning:json for com.github.openjson:openjson to avoid
+ jar conflicts (TIKA-2556).
* Add a parser for XPS (TIKA-2524).
+ * Mime magic for Dolby Digital AC3 and EAC3 files
+
* Fixed bug where TesseractOCRParser ignores configured ImageMagickPath,
and set rotation script to ignore Python warnings (TIKA-2509)
* Upgrade geo-apis to 3.0.1 (TIKA-2535).
-Release 1.17 - December 8, 2017
+Release 1.17 - 12/8/2017
***NOTE: THIS IS THE LAST VERSION OF TIKA THAT WILL RUN
ON Java 7. The next versions will require Java 8***
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 924123e..6ba9338 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -206,6 +206,7 @@
android.util;resolution:=optional,
com.adobe.xmp;resolution:=optional,
com.adobe.xmp.properties;resolution:=optional,
+ com.github.openjson;resolution:=optional,
com.google.protobuf;resolution:=optional,
com.ibm.icu.text;resolution:=optional,
com.sleepycat.je;resolution:=optional,
@@ -300,7 +301,6 @@
org.jdom2.output;resolution:=optional,
org.jdom2.filter;resolution:=optional,
org.json.simple;resolution:=optional,
- org.json;resolution:=optional,
org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
org.osgi.framework;resolution:=optional,
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index a214f39..14f46b4 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -337,10 +337,15 @@
</exclusions>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>com.tdunning</groupId>
<artifactId>json</artifactId>
<version>1.8</version>
+ </dependency> -->
+ <dependency>
+ <groupId>com.github.openjson</groupId>
+ <artifactId>openjson</artifactId>
+ <version>1.0.10</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git 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
index 6e9e854..05ef89f 100644
--- 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 java.util.Set;
import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.ner.NERecogniser;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.github.openjson.JSONException;
+import com.github.openjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
index c83ea1e..41e2d00 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
@@ -46,8 +46,8 @@ import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.recognition.ObjectRecogniser;
import org.apache.tika.parser.recognition.RecognisedObject;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import com.github.openjson.JSONArray;
+import com.github.openjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
index 2e7b1f1..6b1ad86 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
@@ -47,8 +47,8 @@ import org.apache.tika.mime.MimeType;
import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.recognition.RecognisedObject;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import com.github.openjson.JSONArray;
+import com.github.openjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
--
To stop receiving notification emails like this one, please contact
tallison@apache.org.