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/13 14:03:56 UTC
[tika] branch main updated (9672e76 -> 020430f)
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 9672e76 update changes for 1.27 release
new aab9d17 TIKA-3475 -- general upgrades for 2.x
new 9eb056f TIKA-3473 -- upgrade opensearch to 1.0 GA
new 020430f TIKA-3474 -- handle 1.x container exception key
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:
.../src/main/java/org/apache/tika/eval/app/AbstractProfiler.java | 8 ++++++++
.../tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java | 2 +-
tika-parent/pom.xml | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
[tika] 02/03: TIKA-3473 -- upgrade opensearch to 1.0 GA
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 9eb056f414b0860914679e6964701f9fa32a5428
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 13 10:02:17 2021 -0400
TIKA-3473 -- upgrade opensearch to 1.0 GA
---
.../org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
index 94ea829..0081349 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
@@ -57,7 +57,7 @@ public class TikaPipesOpenSearchTest {
.withEnv("discovery.type", "single-node");
private String getOpenSearchImageName() {
- return "opensearchproject/opensearch:1.0.0-rc1";
+ return "opensearchproject/opensearch:1.0.0";
}
@Before
[tika] 03/03: TIKA-3474 -- handle 1.x container exception key
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 020430f80665aba8ea2d4c7f7efcda8bd4dca34a
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 13 10:03:39 2021 -0400
TIKA-3474 -- handle 1.x container exception key
---
.../src/main/java/org/apache/tika/eval/app/AbstractProfiler.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
index 5e5756e..71616fb 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
@@ -72,11 +72,16 @@ import org.apache.tika.exception.TikaException;
import org.apache.tika.language.detect.LanguageResult;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.PagedText;
+import org.apache.tika.metadata.Property;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.sax.ToXMLContentHandler;
public abstract class AbstractProfiler extends FileResourceConsumer {
+ //Container exception key from the 1.x branch
+ private static final Property CONTAINER_EXCEPTION_1X = Property.externalText("X-TIKA" +
+ ":EXCEPTION:runtime");
+
public static final String TRUE = Boolean.toString(true);
public static final String FALSE = Boolean.toString(false);
protected static final AtomicInteger ID = new AtomicInteger();
@@ -558,6 +563,9 @@ public abstract class AbstractProfiler extends FileResourceConsumer {
void getExceptionStrings(Metadata metadata, Map<Cols, String> data) {
String fullTrace = metadata.get(TikaCoreProperties.CONTAINER_EXCEPTION);
+ if (fullTrace == null) {
+ fullTrace = metadata.get(CONTAINER_EXCEPTION_1X);
+ }
if (fullTrace == null) {
fullTrace = metadata.get(TikaCoreProperties.EMBEDDED_EXCEPTION);
[tika] 01/03: TIKA-3475 -- general upgrades for 2.x
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 aab9d170239efc72cbb1fd04a8d4411fa8a4af21
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 13 09:52:18 2021 -0400
TIKA-3475 -- general upgrades for 2.x
---
tika-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 58beae2..5183d87 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -331,7 +331,7 @@
<lucene.version>8.9.0</lucene.version>
<metadata.extractor.version>2.16.0</metadata.extractor.version>
<microsoft.translator.version>0.6.2</microsoft.translator.version>
- <mime4j.version>0.8.4</mime4j.version>
+ <mime4j.version>0.8.5</mime4j.version>
<mockito.version>3.11.2</mockito.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
<opencsv.version>2.3</opencsv.version>