-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ingest Attachment: Upgrade Tika to 1.18 #31252
Changes from 3 commits
8695e0e
393e705
4a6d0ae
5af2b3f
6388ee3
19d2e3c
5e37ee4
62c89b3
572a020
9e0ddaf
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ esplugin { | |
} | ||
|
||
versions << [ | ||
'tika': '1.17', | ||
'tika': '1.18', | ||
'pdfbox': '2.0.8', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we need to check if these have been bumped in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Jackson is at 2.9.5, but it seems like we're at 2.8.10? Is there anything I can/should do about this? For the others --
I only checked against the versions in the gradle file specifically for ingest-attachment. Are there any other places I need to check? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The Jackson one is tricky since we inherit the dependency from core and we are version locked there. I think that means we need to leave that one as-is for now. The rest look good to be but I think we should take Bouncy Castle to 1.54 since the Tika POM does not say 1.54+. I would rather play it safe. |
||
'bouncycastle': '1.55', | ||
'poi': '3.17', | ||
|
@@ -33,6 +33,7 @@ versions << [ | |
dependencies { | ||
// mandatory for tika | ||
compile "org.apache.tika:tika-core:${versions.tika}" | ||
// build against Jackson 2.9.5, but still works on our current version | ||
compile "org.apache.tika:tika-parsers:${versions.tika}" | ||
compile 'org.tukaani:xz:1.6' | ||
compile 'commons-io:commons-io:2.5' | ||
|
@@ -62,7 +63,7 @@ dependencies { | |
// MS Office | ||
compile "org.apache.poi:poi-scratchpad:${versions.poi}" | ||
// Apple iWork | ||
compile 'org.apache.commons:commons-compress:1.14' | ||
compile 'org.apache.commons:commons-compress:1.16' | ||
// Outlook documents | ||
compile "org.apache.james:apache-mime4j-core:${versions.mime4j}" | ||
compile "org.apache.james:apache-mime4j-dom:${versions.mime4j}" | ||
|
@@ -118,6 +119,10 @@ thirdPartyAudit.excludes = [ | |
'com.drew.metadata.jpeg.JpegDirectory', | ||
'com.github.junrar.Archive', | ||
'com.github.junrar.rarfile.FileHeader', | ||
'com.github.luben.zstd.ZstdInputStream', | ||
'com.github.luben.zstd.ZstdOutputStream', | ||
'com.github.openjson.JSONArray', | ||
'com.github.openjson.JSONObject', | ||
'com.google.common.reflect.TypeToken', | ||
'com.google.gson.Gson', | ||
'com.googlecode.mp4parser.DataSource', | ||
|
@@ -531,6 +536,7 @@ thirdPartyAudit.excludes = [ | |
'org.apache.commons.exec.PumpStreamHandler', | ||
'org.apache.commons.exec.environment.EnvironmentUtils', | ||
'org.apache.commons.lang.StringUtils', | ||
'org.apache.commons.lang.SystemUtils', | ||
'org.apache.ctakes.typesystem.type.refsem.UmlsConcept', | ||
'org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation', | ||
'org.apache.cxf.jaxrs.client.WebClient', | ||
|
@@ -635,8 +641,6 @@ thirdPartyAudit.excludes = [ | |
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1SignatureTimeStampList', | ||
'org.etsi.uri.x01903.v14.ValidationDataType$Factory', | ||
'org.etsi.uri.x01903.v14.ValidationDataType', | ||
'org.json.JSONArray', | ||
'org.json.JSONObject', | ||
'org.json.simple.JSONArray', | ||
'org.json.simple.JSONObject', | ||
'org.json.simple.parser.JSONParser', | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2d874b2ecf9de74437edcfbd5138b168e9ca0d14 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
69556697de96cf0b22df846e970dafd29866eee0 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
7d9b6dea91d783165f3313d320d3aaaa9a4dfc13 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we add a note here about the discrepancy between ES's dependency on jackson, and tika's?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added.