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:01 UTC
[tika] branch main updated (e47f625 -> c11cab6)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from e47f625 TIKA-3309 Add convenience constructors to RereadableInputStream (#408)
new 7f684d7 fix setter in ByteFlipper
new c11cab6 upgrade jackcess
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java | 2 +-
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 +-
4 files changed, 7 insertions(+), 5 deletions(-)
[tika] 01/02: fix setter in ByteFlipper
Posted by ta...@apache.org.
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 7f684d7a04ff5a8b15cb7dd8da3220f5edd45a33
Author: tallison <ta...@apache.org>
AuthorDate: Fri Mar 5 13:48:03 2021 -0500
fix setter in ByteFlipper
---
.../src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java
index 74e9b5f..f4a906d 100644
--- a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java
+++ b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/ByteFlipper.java
@@ -62,6 +62,6 @@ public class ByteFlipper implements Transformer {
}
public void setPercentCorrupt(float percentCorrupt) {
- percentCorrupt = percentCorrupt;
+ this.percentCorrupt = percentCorrupt;
}
}
[tika] 02/02: upgrade jackcess
Posted by ta...@apache.org.
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;