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/07/01 20:45:54 UTC
[tika] branch main updated (c7fd0cb -> 17ed7e8)
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 c7fd0cb improve diffs in handling EOF in Java 8 vs Java 11 in the AIFFReader.
new cb94a90 fix java 11 compatibility -- need to create ArrayList to allow for .add()
new acaa2ff fix dependencies in tika-eval-app
new 17ed7e8 fix counting in tika-eval FileResourceConsumer
The 3 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:
.../apache/tika/batch/FileResourceConsumer.java | 4 +--
tika-eval/tika-eval-app/pom.xml | 34 +++++++++++++++++-----
.../java/org/apache/tika/eval/app/TikaEvalCLI.java | 2 +-
3 files changed, 29 insertions(+), 11 deletions(-)
[tika] 01/03: fix java 11 compatibility -- need to create ArrayList
to allow for .add()
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 cb94a90b48d8ec09b1aff73bcdb3c9ef714d51cb
Author: tallison <ta...@apache.org>
AuthorDate: Thu Jul 1 13:18:23 2021 -0400
fix java 11 compatibility -- need to create ArrayList to allow for .add()
---
.../src/main/java/org/apache/tika/eval/app/TikaEvalCLI.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/TikaEvalCLI.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/TikaEvalCLI.java
index 20e9db6..a6fa20d 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/TikaEvalCLI.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/TikaEvalCLI.java
@@ -82,7 +82,7 @@ public class TikaEvalCLI {
}
private void handleProfileFiles(String[] subsetArgs) throws Exception {
- List<String> argList = Arrays.asList(subsetArgs);
+ List<String> argList = new ArrayList<>(Arrays.asList(subsetArgs));
boolean containsBC = false;
String inputDir = null;
[tika] 03/03: fix counting in tika-eval FileResourceConsumer
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 17ed7e89fe9031be2f180341159bddc6f256baac
Author: tallison <ta...@apache.org>
AuthorDate: Thu Jul 1 16:45:37 2021 -0400
fix counting in tika-eval FileResourceConsumer
---
.../src/main/java/org/apache/tika/batch/FileResourceConsumer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
index 044e178..d38533b 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
@@ -66,8 +66,8 @@ public abstract class FileResourceConsumer implements Callable<IFileProcessorFut
//being processed. It is null if no file is currently being processed.
//no need for volatile because of lock for checkForStales
private FileStarted currentFile = null;
- private static final AtomicInteger numResourcesConsumed = new AtomicInteger(0);
- private static final AtomicInteger numHandledExceptions = new AtomicInteger(0);
+ private final AtomicInteger numResourcesConsumed = new AtomicInteger(0);
+ private final AtomicInteger numHandledExceptions = new AtomicInteger(0);
//after this has been set to ACTIVELY_CONSUMING,
//this should only be set by setEndedState.
private volatile STATE currentState = STATE.NOT_YET_STARTED;
[tika] 02/03: fix dependencies in tika-eval-app
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 acaa2ff060001a631c146c21bb955f3c7d95ef86
Author: tallison <ta...@apache.org>
AuthorDate: Thu Jul 1 16:45:08 2021 -0400
fix dependencies in tika-eval-app
---
tika-eval/tika-eval-app/pom.xml | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index 60de9ad..d5a9abb 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -34,12 +34,6 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-eval-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -62,6 +56,11 @@
<version>${log4j2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
@@ -121,8 +120,27 @@
<createDependencyReducedPom>
false
</createDependencyReducedPom>
- <!-- TODO: figure out why/fix shade including eval-core's uber jar _and_ the dependency jars -->
- <!-- <filters> -->
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.tika:tika-core:jar:</exclude>
+ <exclude>org.apache.tika:tika-serialization:jar:</exclude>
+ <exclude>org.apache.tika:tika-langdetect-opennlp:jar:</exclude>
+ <exclude>commons-io:commons-io:jar:</exclude>
+ <exclude>commons-codec:commons-codec:jar:</exclude>
+ <exclude>org.apache.commons:commons-lang3:jar:</exclude>
+ <exclude>org.apache.commons:commons-math3:jar:</exclude>
+ <exclude>org.apache.lucene:lucene-core:jar:</exclude>
+ <exclude>org.apache.lucene:lucene-analyzers-common:jar:</exclude>
+ <exclude>org.apache.lucene:lucene-analyzers-icu:jar:</exclude>
+ <exclude>org.ccil.cowan.tagsoup:tagsoup:jar:</exclude>
+ <exclude>com.ibm.icu:icu4j:jar:</exclude>
+ <exclude>com.fasterxml.jackson.core:jackson-core:jar:</exclude>
+ <exclude>com.fasterxml.jackson.core:jackson-databind:jar:</exclude>
+ <exclude>com.fasterxml.jackson.core:jackson-annotations:jar:</exclude>
+ <exclude>org.apache.opennlp:opennlp-tools:jar:</exclude>
+ <exclude>org.slf4j:slf4j-api:jar:</exclude>
+ </excludes>
+ </artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>