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 2021/03/05 18:55:03 UTC
[tika] 02/02: upgrade jackcess
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit c11cab676955577d9a7a693414d675422d10ac50
Author: tallison <ta...@apache.org>
AuthorDate: Fri Mar 5 13:54:50 2021 -0500
upgrade jackcess
---
tika-parent/pom.xml | 4 ++--
.../main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java | 4 +++-
.../main/java/org/apache/tika/parser/microsoft/JackcessParser.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 73eb653..deeae63 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -302,8 +302,8 @@
<httpcore.version>4.4.14</httpcore.version>
<imageio.version>1.4.0</imageio.version>
<isoparser.version>1.9.41.4</isoparser.version>
- <jackcess.version>3.5.1</jackcess.version>
- <jackcess.encrypt.version>3.0.0</jackcess.encrypt.version>
+ <jackcess.version>4.0.0</jackcess.version>
+ <jackcess.encrypt.version>4.0.1</jackcess.encrypt.version>
<jackrabbit.version>2.21.5</jackrabbit.version>
<jackson.version>2.12.1</jackson.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
index 90eb7c1..d8a72f2 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
@@ -140,10 +140,12 @@ class JackcessExtractor extends AbstractPOIFSExtractor {
toString(p.getValue(), p.getType()));
}
}
-
}
for (Table table : db.newIterable().setIncludeLinkedTables(false).setIncludeSystemTables(false)) {
+ if (table == null) {
+ break;
+ }
String tableName = table.getName();
List<? extends Column> columns = table.getColumns();
xhtml.startElement("table", "name", tableName);
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
index f8100d0..b5f1013 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.Locale;
import java.util.Set;
-import com.healthmarketscience.jackcess.CryptCodecProvider;
+import com.healthmarketscience.jackcess.crypt.CryptCodecProvider;
import com.healthmarketscience.jackcess.Database;
import com.healthmarketscience.jackcess.DatabaseBuilder;
import com.healthmarketscience.jackcess.util.LinkResolver;