From 45a5f5295c611625cac700412630c16de2270b27 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 15 Nov 2016 22:49:49 -0500
Subject: [PATCH] NIFI-2374 This closes #712. updated to latest tika versions
where possible, updated doc, commented why cannot update media nar
---
.../nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-media-bundle/nifi-media-processors/pom.xml | 3 +++
.../nifi-standard-bundle/nifi-standard-processors/pom.xml | 2 +-
.../additionalDetails.html | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 55dd50f6d2..f05490470a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.7</version>
+ <version>1.14</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index 99ae4e67c5..3e2c0592e8 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -44,6 +44,9 @@
<artifactId>metadata-extractor</artifactId>
<version>2.8.0</version>
</dependency>
+ <!-- Would like a newer version of tika-core and tika-parsers but newer
+ tika-parser versions have cat-X json lib and other libraries that need to
+ have their license validated such as geoapis. -->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index f6786c6ffa..10b8b10865 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -155,7 +155,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.7</version>
+ <version>1.14</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
index e90868a71b..0f5ac76a8b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
@@ -56,7 +56,7 @@
<li>application/x-lzh</li>
</ul>
<p>For a complete list, please refer to
- <a href="https://git-wip-us.apache.org/repos/asf?p=tika.git;a=blob;f=tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml;h=49314cc5351c11cd2bd245501f66e8649d2a2742;hb=386b68b5ae87beafacfb63f33e0a9888dedb9c30">
+ <a href="https://git-wip-us.apache.org/repos/asf?p=tika.git;a=blob;f=tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml;h=fffb9bbca8f49d2265479da798c0c01ceb2060e2;hb=d647a234783bbc3f83d3691a1e1d5788c438d55d">
Apache Tika's source code</a>
</p>