This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 6d8968c NIFI-6520 update to tika 1.22
6d8968c is described below
commit 6d8968cc87668c30e46a9d3a0a49a790ad32a936
Author: Joe Witt <[email protected]>
AuthorDate: Thu Sep 19 23:41:51 2019 -0400
NIFI-6520 update to tika 1.22
This closes #3756
Signed-off-by: Mike Thomsen <[email protected]>
---
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml | 2 +-
.../org/apache/nifi/processors/media/TestExtractMediaMetadata.java | 6 ------
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 6d0999b..4bdb733 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -207,7 +207,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.20</version>
+ <version>1.22</version>
</dependency>
<dependency>
<groupId>commons-codec</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 a152ced..bc5bbe3 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
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.20</version>
+ <version>1.22</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git
a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
index e540705..b82228f 100644
---
a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
+++
b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
@@ -80,7 +80,6 @@ public class TestExtractMediaMetadata {
assertTrue(flowFile0.getAttribute("txt.Content-Type").startsWith("text/plain"));
flowFile0.assertAttributeExists("txt.X-Parsed-By");
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.DefaultParser"));
-
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.txt.TXTParser"));
flowFile0.assertAttributeExists("txt.Content-Encoding");
flowFile0.assertAttributeEquals("txt.Content-Encoding", "ISO-8859-1");
flowFile0.assertContentEquals("test1".getBytes("UTF-8"));
@@ -144,9 +143,7 @@ public class TestExtractMediaMetadata {
assertTrue(flowFile0.getAttribute("txt.Content-Type").startsWith("text/plain"));
flowFile0.assertAttributeExists("txt.X-Parsed-By");
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.DefaultParser"));
-
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.txt.TXTParser"));
flowFile0.assertAttributeExists("txt.Content-Encoding");
- flowFile0.assertAttributeEquals("txt.Content-Encoding", "ISO-8859-1");
flowFile0.assertContentEquals("This file is not an image and is used
for testing the image metadata extractor.".getBytes("UTF-8"));
}
@@ -172,9 +169,7 @@ public class TestExtractMediaMetadata {
assertTrue(flowFile0.getAttribute("txt.Content-Type").startsWith("text/plain"));
flowFile0.assertAttributeExists("txt.X-Parsed-By");
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.DefaultParser"));
-
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.txt.TXTParser"));
flowFile0.assertAttributeExists("txt.Content-Encoding");
- flowFile0.assertAttributeEquals("txt.Content-Encoding", "ISO-8859-1");
assertEquals(flowFile0.getSize(), textFile.length());
}
@@ -226,7 +221,6 @@ public class TestExtractMediaMetadata {
flowFile0.assertAttributeEquals("filename", "textFile.txt");
flowFile0.assertAttributeExists("txt.X-Parsed-By");
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.DefaultParser"));
-
assertTrue(flowFile0.getAttribute("txt.X-Parsed-By").contains("org.apache.tika.parser.txt.TXTParser"));
flowFile0.assertAttributeNotExists("txt.Content-Encoding");
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 64a347d..41ae9aa 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -270,7 +270,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.20</version>
+ <version>1.22</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
