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/12/14 22:24:13 UTC
[tika] branch master updated: TIKA-2799 - revert jackcess based on
regression results
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new 27454e3 TIKA-2799 - revert jackcess based on regression results
27454e3 is described below
commit 27454e364525a67deee0673cf91dbb2f090b0b41
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Dec 14 17:24:01 2018 -0500
TIKA-2799 - revert jackcess based on regression results
---
tika-parsers/pom.xml | 56 +++++++++++-----------
.../tika/parser/microsoft/JackcessOleUtil.java | 1 -
.../tika/parser/microsoft/JackcessParserTest.java | 5 +-
3 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index bab2b8b..327dd7a 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -122,34 +122,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.healthmarketscience.jackcess</groupId>
- <artifactId>jackcess</artifactId>
- <version>2.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.healthmarketscience.jackcess</groupId>
- <artifactId>jackcess-encrypt</artifactId>
- <version>2.1.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <!-- to avoid maven-enforcer convergence error,
- let's make this explicit -->
- <exclusion>
- <groupId>com.healthmarketscience.jackcess</groupId>
- <artifactId>jackcess</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
@@ -282,6 +254,34 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.healthmarketscience.jackcess</groupId>
+ <artifactId>jackcess</artifactId>
+ <version>2.1.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.healthmarketscience.jackcess</groupId>
+ <artifactId>jackcess-encrypt</artifactId>
+ <version>2.1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <!-- to avoid maven-enforcer convergence error,
+ let's make this explicit -->
+ <exclusion>
+ <groupId>com.healthmarketscience.jackcess</groupId>
+ <artifactId>jackcess</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
<artifactId>tagsoup</artifactId>
<version>1.2.1</version>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessOleUtil.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessOleUtil.java
index 10a5ade..d93e6ab 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessOleUtil.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessOleUtil.java
@@ -37,7 +37,6 @@ import com.healthmarketscience.jackcess.util.OleBlob;
import static com.healthmarketscience.jackcess.util.OleBlob.*;
import com.healthmarketscience.jackcess.impl.ByteUtil;
-import com.healthmarketscience.jackcess.impl.CustomToStringStyle;
import com.healthmarketscience.jackcess.impl.PageChannel;
/**
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
index f39b961..0d2adc1 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
@@ -38,7 +38,6 @@ import org.apache.tika.parser.RecursiveParserWrapper;
import org.apache.tika.sax.BasicContentHandlerFactory;
import org.apache.tika.sax.RecursiveParserWrapperHandler;
import org.junit.Test;
-import org.xml.sax.helpers.DefaultHandler;
public class JackcessParserTest extends TikaTest {
@@ -66,7 +65,7 @@ public class JackcessParserTest extends TikaTest {
}
List<Metadata> list = handler.getMetadataList();
assertEquals(4, list.size());
- String mainContent = list.get(0).get(RecursiveParserWrapper.TIKA_CONTENT);
+ String mainContent = list.get(0).get(RecursiveParserWrapperHandler.TIKA_CONTENT);
//make sure there's a thead and tbody
assertContains("</thead><tbody>", mainContent);
@@ -86,7 +85,7 @@ public class JackcessParserTest extends TikaTest {
//test embedded document handling
assertContains("Test Document with embedded pdf",
- list.get(3).get(RecursiveParserWrapper.TIKA_CONTENT));
+ list.get(3).get(RecursiveParserWrapperHandler.TIKA_CONTENT));
}
}