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/23 20:21:22 UTC
[tika] branch branch_1x updated: TIKA-2535 -- but get it right...
in tika-bundle and tika-java7
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 fe97b16 TIKA-2535 -- but get it right... in tika-bundle and tika-java7
fe97b16 is described below
commit fe97b16c5e93f16eb4ee00671d2b76e4e5a3bb6d
Author: tballison <ta...@mitre.org>
AuthorDate: Tue Jan 23 15:21:10 2018 -0500
TIKA-2535 -- but get it right... in tika-bundle and tika-java7
---
tika-bundle/pom.xml | 7 ++++++-
.../apache/tika/filetypedetector/TikaFileTypeDetectorTest.java | 10 ++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index e5a77f6..924123e 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -168,9 +168,9 @@
sis-netcdf|
sis-utility|
sis-storage|
+ unit-api|
apache-mime4j-core|
apache-mime4j-dom|
- jsr-275|
jhighlight|
java-libpst|
netcdf4|
@@ -254,7 +254,12 @@
org.apache.pdfbox.debugger;resolution:=optional,
org.apache.sis;resolution:=optional,
org.apache.sis.distance;resolution:=optional,
+ org.apache.sis.feature;resolution:=optional,
org.apache.sis.geometry;resolution:=optional,
+ org.apache.sis.internal.feature;resolution:=optional,
+ org.apache.sis.internal.referencing;resolution:=optional,
+ org.apache.sis.parameter;resolution:=optional,
+ org.apache.sis.referencing;resolution:=optional,
org.apache.tools.ant;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
diff --git a/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java b/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
index 6dd72a7..ff22171 100644
--- a/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
+++ b/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
@@ -82,11 +82,17 @@ public class TikaFileTypeDetectorTest {
Iterator<FileTypeDetector> iterator = serviceLoader.iterator();
assertTrue(iterator.hasNext());
-
+
+ boolean foundTika = false;
while(iterator.hasNext()) {
FileTypeDetector fileTypeDetector = iterator.next();
assertNotNull(fileTypeDetector);
- assertTrue(fileTypeDetector instanceof TikaFileTypeDetector);
+ if (fileTypeDetector instanceof TikaFileTypeDetector) {
+ foundTika = true;
+ }
}
+ //o.a.sis.internal.storage.StoreTypeDetector appears with latest upgrade
+ //check that TikaFileTypeDetector appears at all
+ assertTrue(foundTika);
}
}
--
To stop receiving notification emails like this one, please contact
tallison@apache.org.