Skip to content

Commit ac5fd6a

Browse files
gleflochjasontedor
glefloch
authored and
jasontedor
committed
Update Tika version to 1.15
This commit upgrades the Tika dependency to version 1.15. Relates elastic#25003
1 parent 66bef26 commit ac5fd6a

25 files changed

+284
-39
lines changed

‎plugins/ingest-attachment/build.gradle

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,20 @@ esplugin {
2323
}
2424

2525
versions << [
26-
'tika': '1.14',
26+
'tika': '1.15',
2727
'pdfbox': '2.0.3',
2828
'bouncycastle': '1.55',
29-
'poi': '3.15',
29+
'poi': '3.16',
3030
'mime4j': '0.7.2'
3131
]
3232

3333
dependencies {
3434
// mandatory for tika
3535
compile "org.apache.tika:tika-core:${versions.tika}"
3636
compile "org.apache.tika:tika-parsers:${versions.tika}"
37+
compile 'org.tukaani:xz:1.6'
3738
compile 'commons-io:commons-io:2.4'
39+
compile "org.slf4j:slf4j-api:${versions.slf4j}"
3840

3941
// character set detection
4042
compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
@@ -56,10 +58,11 @@ dependencies {
5658
compile "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
5759
compile "commons-codec:commons-codec:${versions.commonscodec}"
5860
compile 'org.apache.xmlbeans:xmlbeans:2.6.0'
61+
compile 'org.apache.commons:commons-collections4:4.1'
5962
// MS Office
6063
compile "org.apache.poi:poi-scratchpad:${versions.poi}"
6164
// Apple iWork
62-
compile 'org.apache.commons:commons-compress:1.10'
65+
compile 'org.apache.commons:commons-compress:1.14'
6366
// Outlook documents
6467
compile "org.apache.james:apache-mime4j-core:${versions.mime4j}"
6568
compile "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
@@ -317,8 +320,6 @@ thirdPartyAudit.excludes = [
317320
'com.microsoft.schemas.office.powerpoint.CTRel',
318321
'com.microsoft.schemas.office.visio.x2012.main.AttachedToolbarsType',
319322
'com.microsoft.schemas.office.visio.x2012.main.ColorsType',
320-
'com.microsoft.schemas.office.visio.x2012.main.ConnectType',
321-
'com.microsoft.schemas.office.visio.x2012.main.ConnectsType',
322323
'com.microsoft.schemas.office.visio.x2012.main.CpType',
323324
'com.microsoft.schemas.office.visio.x2012.main.CustomMenusFileType',
324325
'com.microsoft.schemas.office.visio.x2012.main.CustomToolbarsFileType',
@@ -346,6 +347,7 @@ thirdPartyAudit.excludes = [
346347
'com.microsoft.schemas.office.visio.x2012.main.TpType',
347348
'com.microsoft.schemas.office.visio.x2012.main.TriggerType',
348349
'com.microsoft.schemas.office.visio.x2012.main.impl.CellTypeImpl$1RefByList',
350+
'com.microsoft.schemas.office.visio.x2012.main.impl.ConnectsTypeImpl$1ConnectList',
349351
'com.microsoft.schemas.office.visio.x2012.main.impl.MastersTypeImpl$1MasterList',
350352
'com.microsoft.schemas.office.visio.x2012.main.impl.MastersTypeImpl$1MasterShortcutList',
351353
'com.microsoft.schemas.office.visio.x2012.main.impl.PagesTypeImpl$1PageList',
@@ -481,6 +483,7 @@ thirdPartyAudit.excludes = [
481483
'com.pff.PSTFile',
482484
'com.pff.PSTFolder',
483485
'com.pff.PSTMessage',
486+
'com.pff.PSTRecipient',
484487
'com.rometools.rome.feed.synd.SyndContent',
485488
'com.rometools.rome.feed.synd.SyndEntry',
486489
'com.rometools.rome.feed.synd.SyndFeed',
@@ -511,13 +514,14 @@ thirdPartyAudit.excludes = [
511514
'javax.servlet.ServletContextEvent',
512515
'javax.servlet.ServletContextListener',
513516
'javax.ws.rs.core.Response',
517+
'javax.ws.rs.core.UriBuilder',
514518
'junit.framework.TestCase',
515519
'opennlp.tools.namefind.NameFinderME',
516520
'opennlp.tools.namefind.TokenNameFinderModel',
521+
'opennlp.tools.sentiment.SentimentME',
522+
'opennlp.tools.sentiment.SentimentModel',
517523
'opennlp.tools.util.Span',
518524
'org.apache.avalon.framework.logger.Logger',
519-
'org.apache.commons.collections4.ListValuedMap',
520-
'org.apache.commons.collections4.multimap.ArrayListValuedHashMap',
521525
'org.apache.commons.csv.CSVFormat',
522526
'org.apache.commons.csv.CSVParser',
523527
'org.apache.commons.csv.CSVRecord',
@@ -526,6 +530,7 @@ thirdPartyAudit.excludes = [
526530
'org.apache.commons.exec.ExecuteWatchdog',
527531
'org.apache.commons.exec.PumpStreamHandler',
528532
'org.apache.commons.exec.environment.EnvironmentUtils',
533+
'org.apache.commons.lang.StringUtils',
529534
'org.apache.ctakes.typesystem.type.refsem.UmlsConcept',
530535
'org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation',
531536
'org.apache.cxf.jaxrs.client.WebClient',
@@ -584,6 +589,7 @@ thirdPartyAudit.excludes = [
584589
'org.apache.xml.security.Init',
585590
'org.apache.xml.security.c14n.Canonicalizer',
586591
'org.apache.xml.security.utils.Base64',
592+
'org.brotli.dec.BrotliInputStream',
587593
'org.etsi.uri.x01903.v13.AnyType',
588594
'org.etsi.uri.x01903.v13.ClaimedRolesListType',
589595
'org.etsi.uri.x01903.v13.CounterSignatureType',
@@ -625,12 +631,15 @@ thirdPartyAudit.excludes = [
625631
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1RevocationValuesList',
626632
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1SigAndRefsTimeStampList',
627633
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1SignatureTimeStampList',
634+
'org.etsi.uri.x01903.v14.ValidationDataType$Factory',
635+
'org.etsi.uri.x01903.v14.ValidationDataType',
628636
'org.json.JSONArray',
629637
'org.json.JSONObject',
630638
'org.json.XML',
631639
'org.json.simple.JSONArray',
632640
'org.json.simple.JSONObject',
633641
'org.json.simple.parser.JSONParser',
642+
'org.junit.Assert',
634643
'org.junit.Test',
635644
'org.junit.internal.TextListener',
636645
'org.junit.runner.JUnitCore',
@@ -801,6 +810,7 @@ thirdPartyAudit.excludes = [
801810
'org.openxmlformats.schemas.drawingml.x2006.main.CTSupplementalFont',
802811
'org.openxmlformats.schemas.drawingml.x2006.main.CTTableBackgroundStyle',
803812
'org.openxmlformats.schemas.drawingml.x2006.main.CTTableCellBorderStyle',
813+
'org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyleTextStyle',
804814
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBlipBullet',
805815
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletColorFollowText',
806816
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletSizeFollowText',
@@ -815,6 +825,7 @@ thirdPartyAudit.excludes = [
815825
'org.openxmlformats.schemas.drawingml.x2006.main.STBlackWhiteMode',
816826
'org.openxmlformats.schemas.drawingml.x2006.main.STBlipCompression',
817827
'org.openxmlformats.schemas.drawingml.x2006.main.STFixedAngle',
828+
'org.openxmlformats.schemas.drawingml.x2006.main.STOnOffStyleType$Enum',
818829
'org.openxmlformats.schemas.drawingml.x2006.main.STPanose',
819830
'org.openxmlformats.schemas.drawingml.x2006.main.STPathFillMode',
820831
'org.openxmlformats.schemas.drawingml.x2006.main.STPresetPatternVal',
@@ -1202,11 +1213,8 @@ thirdPartyAudit.excludes = [
12021213
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMissing',
12031214
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTNumber',
12041215
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleLink',
1205-
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleObjects',
12061216
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleSize',
12071217
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPCDKPIs',
1208-
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageField',
1209-
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageFields',
12101218
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPhoneticRun',
12111219
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotFilters',
12121220
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotHierarchies',
@@ -1231,9 +1239,11 @@ thirdPartyAudit.excludes = [
12311239
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTX',
12321240
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellSpans',
12331241
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationImeMode',
1242+
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STDvAspect',
12341243
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STFieldSortType',
12351244
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STGuid',
12361245
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STObjects',
1246+
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STOleUpdate',
12371247
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STPhoneticAlignment',
12381248
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STPhoneticType',
12391249
'org.openxmlformats.schemas.spreadsheetml.x2006.main.STPrintError',
@@ -1291,7 +1301,9 @@ thirdPartyAudit.excludes = [
12911301
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTMapInfoImpl$1SchemaList',
12921302
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTMergeCellsImpl$1MergeCellList',
12931303
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTNumFmtsImpl$1NumFmtList',
1304+
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTOleObjectsImpl$1OleObjectList',
12941305
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPageBreakImpl$1BrkList',
1306+
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPageFieldsImpl$1PageFieldList',
12951307
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotCacheRecordsImpl$1RList',
12961308
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotCachesImpl$1PivotCacheList',
12971309
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotFieldsImpl$1PivotFieldList',
@@ -1321,6 +1333,7 @@ thirdPartyAudit.excludes = [
13211333
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1NList',
13221334
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1SList',
13231335
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetDataImpl$1RowList',
1336+
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetsImpl$1SheetList',
13241337
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewImpl$1PivotSelectionList',
13251338
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewImpl$1SelectionList',
13261339
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewsImpl$1SheetViewList',
@@ -2035,26 +2048,10 @@ thirdPartyAudit.excludes = [
20352048
'org.osgi.framework.ServiceRegistration',
20362049
'org.osgi.util.tracker.ServiceTracker',
20372050
'org.osgi.util.tracker.ServiceTrackerCustomizer',
2038-
'org.slf4j.Logger',
2039-
'org.slf4j.LoggerFactory',
2051+
'org.slf4j.impl.StaticLoggerBinder',
2052+
'org.slf4j.impl.StaticMDCBinder',
2053+
'org.slf4j.impl.StaticMarkerBinder',
20402054
'org.sqlite.SQLiteConfig',
2041-
'org.tukaani.xz.ARMOptions',
2042-
'org.tukaani.xz.ARMThumbOptions',
2043-
'org.tukaani.xz.DeltaOptions',
2044-
'org.tukaani.xz.FilterOptions',
2045-
'org.tukaani.xz.FinishableWrapperOutputStream',
2046-
'org.tukaani.xz.IA64Options',
2047-
'org.tukaani.xz.LZMA2InputStream',
2048-
'org.tukaani.xz.LZMA2Options',
2049-
'org.tukaani.xz.LZMAInputStream',
2050-
'org.tukaani.xz.PowerPCOptions',
2051-
'org.tukaani.xz.SPARCOptions',
2052-
'org.tukaani.xz.SingleXZInputStream',
2053-
'org.tukaani.xz.UnsupportedOptionsException',
2054-
'org.tukaani.xz.X86Options',
2055-
'org.tukaani.xz.XZ',
2056-
'org.tukaani.xz.XZInputStream',
2057-
'org.tukaani.xz.XZOutputStream',
20582055
'org.w3.x2000.x09.xmldsig.KeyInfoType',
20592056
'org.w3.x2000.x09.xmldsig.SignatureMethodType',
20602057
'org.w3.x2000.x09.xmldsig.SignatureValueType',

‎plugins/ingest-attachment/licenses/commons-collections4-4.1.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a4cf4688fe1c7e3a63aa636cc96d013af537768e

0 commit comments

Comments
 (0)