Skip to content

Commit 080ddd5

Browse files
jkakavasjkakavas
authored
[WIP] Ingest Attachement: Upgrade tika to v1.19.1 (#33896)
Upgrades Tika to 1.19.1 and relevant transitive dependencies Resolves: #31456, #31305
1 parent 7ba320d commit 080ddd5

29 files changed

+181
-177
lines changed

‎plugins/ingest-attachment/build.gradle

+166-160
Large diffs are not rendered by default.

‎plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.1.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.2.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
94919d81969c67c5894646338bf10fbc35f5a946

‎plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.1.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.2.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
32c9a9afe84eca86a3b0b3c66a956ced249ceade

‎plugins/ingest-attachment/licenses/commons-compress-1.16.1.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/commons-compress-1.18.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5

‎plugins/ingest-attachment/licenses/fontbox-2.0.12.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
566fd1d6b25012bb82078da08b82e6d0ba8c884a

‎plugins/ingest-attachment/licenses/fontbox-2.0.9.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/jempbox-1.8.13.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1f41de81768ef84ca2d8cda4cb79e9272c8ee966

‎plugins/ingest-attachment/licenses/pdfbox-2.0.12.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a7311cd267c19e1ba8154b076a63d29537154784

‎plugins/ingest-attachment/licenses/pdfbox-2.0.9.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/poi-3.17.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/poi-4.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7ddb9b983ed682c93a986e8bb596d5935b13086c

‎plugins/ingest-attachment/licenses/poi-ooxml-3.17.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/poi-ooxml-4.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f3fa9c2bd64eb3ec15378de960a07d077ae5b26d

‎plugins/ingest-attachment/licenses/poi-ooxml-schemas-3.17.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/poi-ooxml-schemas-4.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
125f9ccd2cf652fa4169b1c30e9023362e23324f

‎plugins/ingest-attachment/licenses/poi-scratchpad-3.17.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/poi-scratchpad-4.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60

‎plugins/ingest-attachment/licenses/tika-core-1.18.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/tika-core-1.19.1.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c1f075aa01586c2c28a249ad60bcfb733b69b866

‎plugins/ingest-attachment/licenses/tika-parsers-1.18.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/tika-parsers-1.19.1.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
06d45a8683a7479f0e0d9d252f834d0ae44abd6b

‎plugins/ingest-attachment/licenses/xmlbeans-2.6.0.jar.sha1

-1
This file was deleted.

‎plugins/ingest-attachment/licenses/xmlbeans-3.0.1.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
50d94da791ab1e799a11d6f82410fd7d49f402ca

‎plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.apache.commons.io.IOUtils;
2323
import org.elasticsearch.ElasticsearchParseException;
24-
import org.elasticsearch.bootstrap.JavaVersion;
2524
import org.elasticsearch.ingest.IngestDocument;
2625
import org.elasticsearch.ingest.Processor;
2726
import org.elasticsearch.ingest.RandomDocumentPicks;
@@ -297,7 +296,6 @@ private Map<String, Object> parseDocument(String file, AttachmentProcessor proce
297296
}
298297

299298
public void testIndexedChars() throws Exception {
300-
assumeFalse("https://github.com/elastic/elasticsearch/issues/31305", JavaVersion.current().equals(JavaVersion.parse("11")));
301299
processor = new AttachmentProcessor(randomAlphaOfLength(10), "source_field",
302300
"target_field", EnumSet.allOf(AttachmentProcessor.Property.class), 19, false, null);
303301

‎qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ fi
225225
}
226226

227227
@test "[$GROUP] install ingest-attachment plugin" {
228-
# we specify the version on the poi-3.17.jar so that the test does
228+
# we specify the version on the poi-4.0.0.jar so that the test does
229229
# not spuriously pass if the jar is missing but the other poi jars
230230
# are present
231-
install_and_check_plugin ingest attachment bcprov-jdk15on-*.jar tika-core-*.jar pdfbox-*.jar poi-3.17.jar poi-ooxml-3.17.jar poi-ooxml-schemas-*.jar poi-scratchpad-*.jar
231+
install_and_check_plugin ingest attachment bcprov-jdk15on-*.jar tika-core-*.jar pdfbox-*.jar poi-4.0.0.jar poi-ooxml-4.0.0.jar poi-ooxml-schemas-*.jar poi-scratchpad-*.jar
232232
}
233233

234234
@test "[$GROUP] install ingest-geoip plugin" {

0 commit comments

Comments
 (0)