Skip to content

Commit

Permalink
Update to Tika 1.14
Browse files Browse the repository at this point in the history
Related to elastic#21591 for mapper attachments plugin in 5.x branch
Also backported elastic#20710 for mapper attachments plugin in 5.x branch
  • Loading branch information
dadoonet committed Nov 18, 2016
1 parent e06113a commit 37b9752
Show file tree
Hide file tree
Showing 23 changed files with 53 additions and 23 deletions.
54 changes: 42 additions & 12 deletions plugins/mapper-attachments/build.gradle
Expand Up @@ -23,10 +23,10 @@ esplugin {
}

versions << [
'tika': '1.13',
'pdfbox': '2.0.1',
'bouncycastle': '1.54',
'poi': '3.15-beta1'
'tika': '1.14',
'pdfbox': '2.0.3',
'bouncycastle': '1.55',
'poi': '3.15'
]

dependencies {
Expand Down Expand Up @@ -216,7 +216,6 @@ thirdPartyAudit.excludes = [
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1VTEditList',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1ValList',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1ValidIdsList',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1VisibleList',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1WidthMinList',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$2Accel2List',
'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$2AccelList',
Expand Down Expand Up @@ -506,6 +505,8 @@ thirdPartyAudit.excludes = [
'opennlp.tools.namefind.TokenNameFinderModel',
'opennlp.tools.util.Span',
'org.apache.avalon.framework.logger.Logger',
'org.apache.commons.collections4.ListValuedMap',
'org.apache.commons.collections4.multimap.ArrayListValuedHashMap',
'org.apache.commons.csv.CSVFormat',
'org.apache.commons.csv.CSVParser',
'org.apache.commons.csv.CSVRecord',
Expand All @@ -525,7 +526,9 @@ thirdPartyAudit.excludes = [
'org.apache.http.StatusLine',
'org.apache.http.client.HttpClient',
'org.apache.http.client.methods.HttpGet',
'org.apache.http.client.methods.HttpPost',
'org.apache.http.client.utils.URIBuilder',
'org.apache.http.entity.ByteArrayEntity',
'org.apache.http.impl.client.DefaultHttpClient',
'org.apache.james.mime4j.MimeException',
'org.apache.james.mime4j.codec.DecodeMonitor',
Expand Down Expand Up @@ -630,8 +633,6 @@ thirdPartyAudit.excludes = [
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1RevocationValuesList',
'org.etsi.uri.x01903.v13.impl.UnsignedSignaturePropertiesTypeImpl$1SigAndRefsTimeStampList',
'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.XML',
Expand Down Expand Up @@ -785,17 +786,16 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.drawingml.x2006.main.CTGlowEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTGrayscaleEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTGrayscaleTransform',
'org.openxmlformats.schemas.drawingml.x2006.main.CTGroupFillProperties',
'org.openxmlformats.schemas.drawingml.x2006.main.CTGroupLocking',
'org.openxmlformats.schemas.drawingml.x2006.main.CTHSLEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTInnerShadowEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTInverseGammaTransform',
'org.openxmlformats.schemas.drawingml.x2006.main.CTInverseTransform',
'org.openxmlformats.schemas.drawingml.x2006.main.CTLineJoinBevel',
'org.openxmlformats.schemas.drawingml.x2006.main.CTLineJoinMiterProperties',
'org.openxmlformats.schemas.drawingml.x2006.main.CTLuminanceEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTObjectStyleDefaults',
'org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DArcTo',
'org.openxmlformats.schemas.drawingml.x2006.main.CTPatternFillProperties',
'org.openxmlformats.schemas.drawingml.x2006.main.CTPolarAdjustHandle',
'org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveFixedAngle',
'org.openxmlformats.schemas.drawingml.x2006.main.CTPresetShadowEffect',
Expand All @@ -808,7 +808,7 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.drawingml.x2006.main.CTSoftEdgesEffect',
'org.openxmlformats.schemas.drawingml.x2006.main.CTSupplementalFont',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTableBackgroundStyle',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTablePartStyle',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTableCellBorderStyle',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBlipBullet',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletColorFollowText',
'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletSizeFollowText',
Expand All @@ -823,9 +823,10 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.drawingml.x2006.main.STBlackWhiteMode',
'org.openxmlformats.schemas.drawingml.x2006.main.STBlipCompression',
'org.openxmlformats.schemas.drawingml.x2006.main.STFixedAngle',
'org.openxmlformats.schemas.drawingml.x2006.main.STGuid',
'org.openxmlformats.schemas.drawingml.x2006.main.STPanose',
'org.openxmlformats.schemas.drawingml.x2006.main.STPathFillMode',
'org.openxmlformats.schemas.drawingml.x2006.main.STPresetPatternVal',
'org.openxmlformats.schemas.drawingml.x2006.main.STPresetPatternVal$Enum',
'org.openxmlformats.schemas.drawingml.x2006.main.STRectAlignment',
'org.openxmlformats.schemas.drawingml.x2006.main.STTextColumnCount',
'org.openxmlformats.schemas.drawingml.x2006.main.STTextNonNegativePoint',
Expand Down Expand Up @@ -933,6 +934,34 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTPresetColorImpl$1SatOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTPresetColorImpl$1ShadeList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTPresetColorImpl$1TintList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1AlphaList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1AlphaModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1AlphaOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1BlueList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1BlueModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1BlueOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1CompList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1GammaList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1GrayList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1GreenList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1GreenModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1GreenOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1HueList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1HueModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1HueOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1InvGammaList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1InvList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1LumList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1LumModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1LumOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1RedList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1RedModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1RedOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1SatList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1SatModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1SatOffList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1ShadeList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTScRgbColorImpl$1TintList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1AlphaList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1AlphaModList',
'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1AlphaOffList',
Expand Down Expand Up @@ -1184,6 +1213,8 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleObjects',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleSize',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPCDKPIs',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageField',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageFields',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPhoneticRun',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotFilters',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotHierarchies',
Expand Down Expand Up @@ -1269,7 +1300,6 @@ thirdPartyAudit.excludes = [
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTMergeCellsImpl$1MergeCellList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTNumFmtsImpl$1NumFmtList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPageBreakImpl$1BrkList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPageFieldsImpl$1PageFieldList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotCacheRecordsImpl$1RList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotCachesImpl$1PivotCacheList',
'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTPivotFieldsImpl$1PivotFieldList',
Expand Down

This file was deleted.

@@ -0,0 +1 @@
5cea2dada69b98698ea975a5c1dd3c91ac8ffbb6

This file was deleted.

@@ -0,0 +1 @@
6392d8cba22b722c6570d660ca0b3921ff1bae4f

This file was deleted.

@@ -0,0 +1 @@
935f2e57a00ec2c489cbd2ad830d4a399708f979
1 change: 0 additions & 1 deletion plugins/mapper-attachments/licenses/fontbox-2.0.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/mapper-attachments/licenses/fontbox-2.0.3.jar.sha1
@@ -0,0 +1 @@
448ee588d0136121cf5c4dd397384cccb9db1ad7
1 change: 0 additions & 1 deletion plugins/mapper-attachments/licenses/pdfbox-2.0.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/mapper-attachments/licenses/pdfbox-2.0.3.jar.sha1
@@ -0,0 +1 @@
be7b09de93f7c7795c57f4fbf14db60ab93806b4

This file was deleted.

1 change: 1 addition & 0 deletions plugins/mapper-attachments/licenses/poi-3.15.jar.sha1
@@ -0,0 +1 @@
965bba8899988008bb2341e300347de62aad5391

This file was deleted.

@@ -0,0 +1 @@
e2800856735b07b8edd417aee07685470216a00f

This file was deleted.

@@ -0,0 +1 @@
de4a50ca39de48a19606b35644ecadb2f733c479

This file was deleted.

@@ -0,0 +1 @@
f1db76ae4a9389fa4339dc3b7f8208aa82c72b04

This file was deleted.

@@ -0,0 +1 @@
afff8f1774994aa973ef90bc8d38ddf089b9d6d9

This file was deleted.

@@ -0,0 +1 @@
d26c10a9e7d116366562aa260013a30a55ff4e8f

0 comments on commit 37b9752

Please sign in to comment.