1
0
Эх сурвалжийг харах

[WIP] Ingest Attachement: Upgrade tika to v1.19.1 (#33896)

Upgrades Tika to 1.19.1 and relevant transitive dependencies

Resolves: #31456, #31305
Ioannis Kakavas 7 жил өмнө
parent
commit
080ddd5d9c
29 өөрчлөгдсөн 181 нэмэгдсэн , 177 устгасан
  1. 166 160
      plugins/ingest-attachment/build.gradle
  2. 0 1
      plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.1.jar.sha1
  3. 1 0
      plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.2.jar.sha1
  4. 0 1
      plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.1.jar.sha1
  5. 1 0
      plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.2.jar.sha1
  6. 0 1
      plugins/ingest-attachment/licenses/commons-compress-1.16.1.jar.sha1
  7. 1 0
      plugins/ingest-attachment/licenses/commons-compress-1.18.jar.sha1
  8. 1 0
      plugins/ingest-attachment/licenses/fontbox-2.0.12.jar.sha1
  9. 0 1
      plugins/ingest-attachment/licenses/fontbox-2.0.9.jar.sha1
  10. 0 1
      plugins/ingest-attachment/licenses/jempbox-1.8.13.jar.sha1
  11. 1 0
      plugins/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1
  12. 1 0
      plugins/ingest-attachment/licenses/pdfbox-2.0.12.jar.sha1
  13. 0 1
      plugins/ingest-attachment/licenses/pdfbox-2.0.9.jar.sha1
  14. 0 1
      plugins/ingest-attachment/licenses/poi-3.17.jar.sha1
  15. 1 0
      plugins/ingest-attachment/licenses/poi-4.0.0.jar.sha1
  16. 0 1
      plugins/ingest-attachment/licenses/poi-ooxml-3.17.jar.sha1
  17. 1 0
      plugins/ingest-attachment/licenses/poi-ooxml-4.0.0.jar.sha1
  18. 0 1
      plugins/ingest-attachment/licenses/poi-ooxml-schemas-3.17.jar.sha1
  19. 1 0
      plugins/ingest-attachment/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
  20. 0 1
      plugins/ingest-attachment/licenses/poi-scratchpad-3.17.jar.sha1
  21. 1 0
      plugins/ingest-attachment/licenses/poi-scratchpad-4.0.0.jar.sha1
  22. 0 1
      plugins/ingest-attachment/licenses/tika-core-1.18.jar.sha1
  23. 1 0
      plugins/ingest-attachment/licenses/tika-core-1.19.1.jar.sha1
  24. 0 1
      plugins/ingest-attachment/licenses/tika-parsers-1.18.jar.sha1
  25. 1 0
      plugins/ingest-attachment/licenses/tika-parsers-1.19.1.jar.sha1
  26. 0 1
      plugins/ingest-attachment/licenses/xmlbeans-2.6.0.jar.sha1
  27. 1 0
      plugins/ingest-attachment/licenses/xmlbeans-3.0.1.jar.sha1
  28. 0 2
      plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java
  29. 2 2
      qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash

+ 166 - 160
plugins/ingest-attachment/build.gradle

@@ -23,23 +23,13 @@ esplugin {
 }
 
 versions << [
-  'tika': '1.18',
-  'pdfbox': '2.0.9',
+  'tika': '1.19.1',
+  'pdfbox': '2.0.12',
   'bouncycastle': '1.59',
-  'poi': '3.17',
-  'mime4j': '0.8.1'
+  'poi': '4.0.0',
+  'mime4j': '0.8.2'
 ]
 
-if (rootProject.ext.compilerJavaVersion.isJava11()) {
-  // disabled until https://github.com/elastic/elasticsearch/issues/31456 is fixed.
-  integTestRunner {
-    systemProperty 'tests.rest.blacklist', [
-            'ingest_attachment/20_attachment_processor/Test indexed chars are configurable',
-            'ingest_attachment/20_attachment_processor/Test indexed chars are configurable per document'
-    ].join(',')
-  }
-}
-
 dependencies {
   // mandatory for tika
   compile "org.apache.tika:tika-core:${versions.tika}"
@@ -58,7 +48,7 @@ dependencies {
   // Adobe PDF
   compile "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
   compile "org.apache.pdfbox:fontbox:${versions.pdfbox}"
-  compile "org.apache.pdfbox:jempbox:1.8.13"
+  compile "org.apache.pdfbox:jempbox:1.8.16"
   compile "commons-logging:commons-logging:${versions.commonslogging}"
   compile "org.bouncycastle:bcmail-jdk15on:${versions.bouncycastle}"
   compile "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
@@ -68,12 +58,12 @@ dependencies {
   compile "org.apache.poi:poi:${versions.poi}"
   compile "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
   compile "commons-codec:commons-codec:${versions.commonscodec}"
-  compile 'org.apache.xmlbeans:xmlbeans:2.6.0'
+  compile 'org.apache.xmlbeans:xmlbeans:3.0.1'
   compile 'org.apache.commons:commons-collections4:4.1'
   // MS Office
   compile "org.apache.poi:poi-scratchpad:${versions.poi}"
   // Apple iWork
-  compile 'org.apache.commons:commons-compress:1.16.1'
+  compile 'org.apache.commons:commons-compress:1.18'
   // Outlook documents
   compile "org.apache.james:apache-mime4j-core:${versions.mime4j}"
   compile "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
@@ -127,7 +117,13 @@ thirdPartyAudit.excludes = [
   'com.drew.metadata.iptc.IptcDirectory',
   'com.drew.metadata.jpeg.JpegCommentDirectory',
   'com.drew.metadata.jpeg.JpegDirectory',
+  'com.epam.parso.Column',
+  'com.epam.parso.DataWriterUtil',
+  'com.epam.parso.SasFileProperties',
+  'com.epam.parso.SasFileReader',
+  'com.epam.parso.impl.SasFileReaderImpl',
   'com.github.junrar.Archive',
+  'com.github.junrar.impl.FileVolumeManager',
   'com.github.junrar.rarfile.FileHeader',
   'com.github.luben.zstd.ZstdInputStream',
   'com.github.luben.zstd.ZstdOutputStream',
@@ -158,27 +154,37 @@ thirdPartyAudit.excludes = [
   'com.graphbuilder.geom.PointFactory',
   'com.healthmarketscience.jackcess.Column',
   'com.healthmarketscience.jackcess.CryptCodecProvider',
-  'com.healthmarketscience.jackcess.DataType',
   'com.healthmarketscience.jackcess.Database',
   'com.healthmarketscience.jackcess.DatabaseBuilder',
-  'com.healthmarketscience.jackcess.PropertyMap$Property',
+  'com.healthmarketscience.jackcess.DataType',
+  'com.healthmarketscience.jackcess.impl.ByteUtil',
+  'com.healthmarketscience.jackcess.impl.CustomToStringStyle',
+  'com.healthmarketscience.jackcess.impl.PageChannel',
   'com.healthmarketscience.jackcess.PropertyMap',
+  'com.healthmarketscience.jackcess.PropertyMap$Property',
+  'com.healthmarketscience.jackcess.query.Query',
   'com.healthmarketscience.jackcess.Row',
+  'com.healthmarketscience.jackcess.RuntimeIOException',
   'com.healthmarketscience.jackcess.Table',
-  'com.healthmarketscience.jackcess.query.Query',
   'com.healthmarketscience.jackcess.util.LinkResolver',
+  'com.healthmarketscience.jackcess.util.MemFileChannel',
+  'com.healthmarketscience.jackcess.util.OleBlob',
+  'com.healthmarketscience.jackcess.util.OleBlob$Builder',
   'com.healthmarketscience.jackcess.util.OleBlob$CompoundContent',
+  'com.healthmarketscience.jackcess.util.OleBlob$CompoundContent$Entry',
   'com.healthmarketscience.jackcess.util.OleBlob$Content',
   'com.healthmarketscience.jackcess.util.OleBlob$ContentType',
+  'com.healthmarketscience.jackcess.util.OleBlob$EmbeddedContent',
   'com.healthmarketscience.jackcess.util.OleBlob$LinkContent',
   'com.healthmarketscience.jackcess.util.OleBlob$OtherContent',
+  'com.healthmarketscience.jackcess.util.OleBlob$PackageContent',
   'com.healthmarketscience.jackcess.util.OleBlob$SimplePackageContent',
-  'com.healthmarketscience.jackcess.util.OleBlob',
   'com.healthmarketscience.jackcess.util.TableIterableBuilder',
   'com.jmatio.io.MatFileHeader',
   'com.jmatio.io.MatFileReader',
   'com.jmatio.types.MLArray',
   'com.jmatio.types.MLStructure',
+  'com.microsoft.schemas.compatibility.impl.AlternateContentDocumentImpl$AlternateContentImpl$1ChoiceList',
   'com.microsoft.schemas.office.excel.STCF',
   'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1Accel2List',
   'com.microsoft.schemas.office.excel.impl.CTClientDataImpl$1AccelList',
@@ -384,7 +390,6 @@ thirdPartyAudit.excludes = [
   'com.microsoft.schemas.office.word.CTBorder',
   'com.microsoft.schemas.office.word.CTWrap',
   'com.microsoft.schemas.office.x2006.digsig.STPositiveInteger',
-  'com.microsoft.schemas.office.x2006.digsig.STSignatureComments',
   'com.microsoft.schemas.office.x2006.digsig.STSignatureProviderUrl',
   'com.microsoft.schemas.office.x2006.digsig.STSignatureText',
   'com.microsoft.schemas.office.x2006.digsig.STSignatureType',
@@ -530,7 +535,6 @@ thirdPartyAudit.excludes = [
   'javax.servlet.ServletContextListener',
   'javax.ws.rs.core.Response',
   'javax.ws.rs.core.UriBuilder',
-  'junit.framework.TestCase',
   'opennlp.tools.namefind.NameFinderME',
   'opennlp.tools.namefind.TokenNameFinderModel',
   'opennlp.tools.sentiment.SentimentME',
@@ -545,8 +549,14 @@ thirdPartyAudit.excludes = [
   'org.apache.commons.exec.ExecuteWatchdog',
   'org.apache.commons.exec.PumpStreamHandler',
   'org.apache.commons.exec.environment.EnvironmentUtils',
+  'org.apache.commons.lang.builder.ToStringBuilder',
+  'org.apache.commons.lang.NotImplementedException',
   'org.apache.commons.lang.StringUtils',
   'org.apache.commons.lang.SystemUtils',
+  'org.apache.commons.math3.linear.Array2DRowRealMatrix',
+  'org.apache.commons.math3.linear.LUDecomposition',
+  'org.apache.commons.math3.linear.MatrixUtils',
+  'org.apache.commons.math3.linear.RealMatrix',
   'org.apache.ctakes.typesystem.type.refsem.UmlsConcept',
   'org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation',
   'org.apache.cxf.jaxrs.client.WebClient',
@@ -563,10 +573,10 @@ thirdPartyAudit.excludes = [
   'org.apache.http.entity.ByteArrayEntity',
   'org.apache.http.impl.client.DefaultHttpClient',
   'org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData',
-  'org.apache.jcp.xml.dsig.internal.dom.DOMDigestMethod',
   'org.apache.jcp.xml.dsig.internal.dom.DOMKeyInfo',
   'org.apache.jcp.xml.dsig.internal.dom.DOMReference',
   'org.apache.jcp.xml.dsig.internal.dom.DOMSignedInfo',
+  'org.apache.jcp.xml.dsig.internal.dom.DOMSubTreeData',
   'org.apache.log.Hierarchy',
   'org.apache.log.Logger',
   'org.apache.pdfbox.tools.imageio.ImageIOUtil',
@@ -606,10 +616,9 @@ thirdPartyAudit.excludes = [
   'org.apache.xml.security.Init',
   'org.apache.xml.security.c14n.Canonicalizer',
   'org.apache.xml.security.signature.XMLSignatureInput',
-  'org.apache.xml.security.utils.Base64',
+  'org.apache.xml.security.utils.XMLUtils',
   'org.brotli.dec.BrotliInputStream',
-  'org.etsi.uri.x01903.v13.AnyType',
-  'org.etsi.uri.x01903.v13.ClaimedRolesListType',
+  'org.etsi.uri.x01903.v13.CertifiedRolesListType',
   'org.etsi.uri.x01903.v13.CounterSignatureType',
   'org.etsi.uri.x01903.v13.DataObjectFormatType$Factory',
   'org.etsi.uri.x01903.v13.DataObjectFormatType',
@@ -623,8 +632,8 @@ thirdPartyAudit.excludes = [
   'org.etsi.uri.x01903.v13.SignaturePolicyIdType',
   'org.etsi.uri.x01903.v13.SignatureProductionPlaceType',
   'org.etsi.uri.x01903.v13.SignedDataObjectPropertiesType',
-  'org.etsi.uri.x01903.v13.SignerRoleType',
   'org.etsi.uri.x01903.v13.UnsignedDataObjectPropertiesType',
+  'org.etsi.uri.x01903.v13.impl.ClaimedRolesListTypeImpl$1ClaimedRoleList',
   'org.etsi.uri.x01903.v13.impl.CRLRefsTypeImpl$1CRLRefList',
   'org.etsi.uri.x01903.v13.impl.CRLValuesTypeImpl$1EncapsulatedCRLValueList',
   'org.etsi.uri.x01903.v13.impl.CertIDListTypeImpl$1CertList',
@@ -654,10 +663,6 @@ thirdPartyAudit.excludes = [
   'org.json.simple.JSONArray',
   'org.json.simple.JSONObject',
   'org.json.simple.parser.JSONParser',
-  'org.junit.Test',
-  'org.junit.internal.TextListener',
-  'org.junit.runner.JUnitCore',
-  'org.junit.runner.Result',
   'org.objectweb.asm.AnnotationVisitor',
   'org.objectweb.asm.Attribute',
   'org.objectweb.asm.ClassReader',
@@ -696,40 +701,32 @@ thirdPartyAudit.excludes = [
   // http://poi.apache.org/faq.html#faq-N10025
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTArea3DChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTAreaChart',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTAxisUnit',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTBar3DChart',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTBarChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTBubbleChart',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTChartLines',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDLbls',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDPt',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDTable',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTDispBlanksAs',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTDispUnits',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDLbl',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDLblPos',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTDoughnutChart',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDPt',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTDTable',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTErrBars',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTExtensionList',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTExternalData',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTExtension',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTFirstSliceAng',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTGrouping',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTLblAlgn',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTLblOffset',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTLegendEntry',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTLine3DChart',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTMarkerSize',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTMultiLvlStrRef',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTOfPieChart',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTOverlap',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTPictureOptions',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTPie3DChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTPivotFmts',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTPivotSource',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTProtection',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTRadarChart',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTRelId',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTSerAx',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.CTShape',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTSkip',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTStockChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTStyle',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.CTSurface',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTSurface3DChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTSurfaceChart',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTTextLanguageID',
@@ -737,14 +734,19 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTTrendline',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTUpDownBars',
   'org.openxmlformats.schemas.drawingml.x2006.chart.CTView3D',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.STPageSetupOrientation',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.STAxisUnit',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.STMarkerSize',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTBarChartImpl$1AxIdList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTBarChartImpl$1SerLinesList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTBarSerImpl$1DPtList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTBarSerImpl$1TrendlineList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTDLblsImpl$1DLblList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTExtensionListImpl$1ExtList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTLegendImpl$1LegendEntryList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTLineChartImpl$1AxIdList',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTLineChartImpl$1SerList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTLineSerImpl$1DPtList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTLineSerImpl$1TrendlineList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTNumDataImpl$1PtList',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPieChartImpl$1SerList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPieSerImpl$1DPtList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPlotAreaImpl$1Area3DChartList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPlotAreaImpl$1AreaChartList',
@@ -766,35 +768,41 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPlotAreaImpl$1Surface3DChartList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPlotAreaImpl$1SurfaceChartList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTPlotAreaImpl$1ValAxList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTRadarChartImpl$1AxIdList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTRadarSerImpl$1DPtList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTScatterChartImpl$1AxIdList',
-  'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTScatterChartImpl$1SerList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTScatterSerImpl$1DPtList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTScatterSerImpl$1ErrBarsList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTScatterSerImpl$1TrendlineList',
   'org.openxmlformats.schemas.drawingml.x2006.chart.impl.CTStrDataImpl$1PtList',
+  'org.openxmlformats.schemas.drawingml.x2006.chart.STPageSetupOrientation',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaBiLevelEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaCeilingEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaFloorEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaInverseEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaModulateEffect',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaOutsetEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAlphaReplaceEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAngle',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAudioCD',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTAudioFile',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTBackdrop',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTBevel',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTBiLevelEffect',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTBlendEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTBlurEffect',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTCamera',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTCell3D',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTColorChangeEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTColorReplaceEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTColorSchemeList',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTComplementTransform',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTConnectionSite',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTConnectorLocking',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTCustomColorList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTDashStopList',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTDuotoneEffect',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTEffectContainer',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTEffectReference',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTEmbeddedWAVAudioFile',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTFillEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTFillOverlayEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTFlatText',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTGammaTransform',
@@ -806,49 +814,27 @@ thirdPartyAudit.excludes = [
   '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.CTLightRig',
   '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.CTPolarAdjustHandle',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveFixedAngle',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTPresetShadowEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTPresetTextShape',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTQuickTimeFile',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTReflectionEffect',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTScene3D',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTShape3D',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTRelativeOffsetEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTShapeLocking',
   '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.CTTableCellBorderStyle',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyleTextStyle',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBlipBullet',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletColorFollowText',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletSizeFollowText',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletTypefaceFollowText',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTTextUnderlineFillFollowText',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTTextUnderlineFillGroupWrapper',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTTextUnderlineLineFollowText',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTTileInfoProperties',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTTintEffect',
+  'org.openxmlformats.schemas.drawingml.x2006.main.CTTransformEffect',
   'org.openxmlformats.schemas.drawingml.x2006.main.CTVideoFile',
-  'org.openxmlformats.schemas.drawingml.x2006.main.CTXYAdjustHandle',
-  '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.STOnOffStyleType$Enum',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STPanose',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STPathFillMode',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STPresetPatternVal$Enum',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STPresetPatternVal',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STRectAlignment',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STTextColumnCount',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STTextNonNegativePoint',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STTextTabAlignType',
-  'org.openxmlformats.schemas.drawingml.x2006.main.STTileFlipMode',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTAdjustHandleListImpl$1AhPolarList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTAdjustHandleListImpl$1AhXYList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTBackgroundFillStyleListImpl$1BlipFillList',
@@ -875,6 +861,37 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTBlipImpl$1LumList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTBlipImpl$1TintList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTConnectionSiteListImpl$1CxnList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTDashStopListImpl$1DsList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaBiLevelList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaCeilingList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaFloorList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaInvList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaModFixList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaOutsetList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1AlphaReplList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1BiLevelList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1BlendList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1BlurList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1ClrChangeList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1ClrReplList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1ContList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1DuotoneList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1EffectList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1FillList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1FillOverlayList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1GlowList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1GraysclList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1HslList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1InnerShdwList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1LumList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1OuterShdwList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1PrstShdwList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1ReflectionList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1RelOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1SoftEdgeList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1TintList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectContainerImpl$1XfrmList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTEffectStyleListImpl$1EffectStyleList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTFillStyleListImpl$1BlipFillList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTFillStyleListImpl$1GradFillList',
@@ -951,62 +968,6 @@ 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.CTSRgbColorImpl$1AlphaList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1AlphaModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1AlphaOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1CompList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GammaList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GrayList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1InvGammaList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1InvList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatModList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatOffList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1ShadeList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$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.CTSchemeColorImpl$1AlphaList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSchemeColorImpl$1AlphaModList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSchemeColorImpl$1AlphaOffList',
@@ -1035,6 +996,62 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSchemeColorImpl$1SatOffList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSchemeColorImpl$1ShadeList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSchemeColorImpl$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',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1BlueOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1CompList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GammaList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GrayList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1GreenOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1HueOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1InvGammaList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1InvList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1LumOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1RedOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatModList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1SatOffList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1ShadeList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSRgbColorImpl$1TintList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSystemColorImpl$1AlphaList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSystemColorImpl$1AlphaModList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSystemColorImpl$1AlphaOffList',
@@ -1064,14 +1081,21 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSystemColorImpl$1ShadeList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTSystemColorImpl$1TintList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTableGridImpl$1GridColList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTableImpl$1TrList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTableRowImpl$1TcList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTableStyleListImpl$1TblStyleList',
-  'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTextBodyImpl$1PList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTextParagraphImpl$1BrList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTextParagraphImpl$1FldList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTextParagraphImpl$1RList',
   'org.openxmlformats.schemas.drawingml.x2006.main.impl.CTTextTabStopListImpl$1TabList',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STAdjAngle',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STBlipCompression',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STEffectContainerType',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STFixedAngle',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STPanose',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STPathFillMode',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STPresetMaterialType',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STShapeID',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STTextColumnCount',
+  'org.openxmlformats.schemas.drawingml.x2006.main.STTextNonNegativePoint',
   'org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl.CTDrawingImpl$1AbsoluteAnchorList',
   'org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl.CTDrawingImpl$1OneCellAnchorList',
   'org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl.CTDrawingImpl$1TwoCellAnchorList',
@@ -1166,9 +1190,10 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.presentationml.x2006.main.CTExtensionList',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTExtensionListModify',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTHandoutMasterIdList',
-  'org.openxmlformats.schemas.presentationml.x2006.main.CTHeaderFooter',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTKinsoku',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTModifyVerifier',
+  'org.openxmlformats.schemas.presentationml.x2006.main.CTOleObjectEmbed',
+  'org.openxmlformats.schemas.presentationml.x2006.main.CTOleObjectLink',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTPhotoAlbum',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTSlideLayoutIdList',
   'org.openxmlformats.schemas.presentationml.x2006.main.CTSlideTiming',
@@ -1177,7 +1202,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.presentationml.x2006.main.STBookmarkIdSeed',
   'org.openxmlformats.schemas.presentationml.x2006.main.STDirection',
   'org.openxmlformats.schemas.presentationml.x2006.main.STIndex',
-  'org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderSize',
   'org.openxmlformats.schemas.presentationml.x2006.main.STSlideSizeType',
   'org.openxmlformats.schemas.presentationml.x2006.main.impl.CTCommentAuthorListImpl$1CmAuthorList',
   'org.openxmlformats.schemas.presentationml.x2006.main.impl.CTCommentListImpl$1CmList',
@@ -1228,7 +1252,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleLink',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTOleSize',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPCDKPIs',
-  'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPhoneticRun',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotFilters',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotHierarchies',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotSelection',
@@ -1337,14 +1360,12 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRowFieldsImpl$1FieldList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRowImpl$1CList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRstImpl$1RList',
-  'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRstImpl$1RPhList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1BList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1DList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1EList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1MList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1NList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSharedItemsImpl$1SList',
-  'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetDataImpl$1RowList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewImpl$1PivotSelectionList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewImpl$1SelectionList',
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTSheetViewsImpl$1SheetViewList',
@@ -1358,7 +1379,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTWorksheetImpl$1ConditionalFormattingList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAltChunk',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAttr',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBackground',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTCaptions',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTCellMergeTrackChange',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTCharacterSpacing',
@@ -1379,7 +1399,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEastAsianLayout',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEdnDocProps',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEdnProps',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEm',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFFDDList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFFHelpText',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFFName',
@@ -1422,10 +1441,8 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectType',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShapeDefaults',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShortHexNumber',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSignedTwipsMeasure',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSmartTagType',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblGridChange',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblOverlap',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPPr',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPrChange',
@@ -1435,7 +1452,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPrChange',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextDirection',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextEffect',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextScale',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextboxTightWrap',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrPrChange',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrackChangeNumbering',
@@ -1446,7 +1462,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.CTWritingStyle',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STDateTime',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STDisplacedByCustomXml',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.STHeightRule',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STHint',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STPTabAlignment',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STPTabLeader',
@@ -1454,7 +1469,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STProofErr',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STRubyAlign',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STShortHexNumber',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.STThemeColor',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STUcharHexNumber',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.STZoom',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTAbstractNumImpl$1LvlList',
@@ -1521,7 +1535,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTCommentsImpl$1CommentList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTDrawingImpl$1AnchorList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTDrawingImpl$1InlineList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTEndnotesImpl$1EndnoteList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1CalcOnExitList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1DdListList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1EnabledList',
@@ -1531,7 +1544,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1NameList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1StatusTextList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFFDataImpl$1TextInputList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFootnotesImpl$1FootnoteList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFtnEdnImpl$1AltChunkList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFtnEdnImpl$1BookmarkEndList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTFtnEdnImpl$1BookmarkStartList',
@@ -1670,11 +1682,7 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1DelInstrTextList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1DelTextList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1DrawingList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1EndnoteRefList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1EndnoteReferenceList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1FldCharList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1FootnoteRefList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1FootnoteReferenceList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1InstrTextList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1LastRenderedPageBreakList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRImpl$1MonthLongList',
@@ -1719,7 +1727,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRowImpl$1PermStartList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRowImpl$1ProofErrList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRowImpl$1SdtList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRowImpl$1TcList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRubyContentImpl$1BookmarkEndList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRubyContentImpl$1BookmarkStartList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTRubyContentImpl$1CommentRangeEndList',
@@ -2007,7 +2014,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTblImpl$1PermStartList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTblImpl$1ProofErrList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTblImpl$1SdtList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTblImpl$1TrList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1AltChunkList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1BookmarkEndList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1BookmarkStartList',
@@ -2032,7 +2038,6 @@ thirdPartyAudit.excludes = [
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1MoveToRangeStartList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1OMathList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1OMathParaList',
-  'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1PList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1PermEndList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1PermStartList',
   'org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTTcImpl$1ProofErrList',
@@ -2092,6 +2097,7 @@ thirdPartyAudit.excludes = [
   'org.sqlite.SQLiteConfig',
   'org.w3.x2000.x09.xmldsig.KeyInfoType',
   'org.w3.x2000.x09.xmldsig.SignatureMethodType',
+  'org.w3.x2000.x09.xmldsig.SignatureValueType',
   'org.w3.x2000.x09.xmldsig.TransformsType',
   'org.w3.x2000.x09.xmldsig.impl.SignatureTypeImpl$1ObjectList',
   'org.w3.x2000.x09.xmldsig.impl.SignedInfoTypeImpl$1ReferenceList',

+ 0 - 1
plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.1.jar.sha1

@@ -1 +0,0 @@
-c62dfe18a3b827a2c626ade0ffba44562ddf3f61

+ 1 - 0
plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.2.jar.sha1

@@ -0,0 +1 @@
+94919d81969c67c5894646338bf10fbc35f5a946

+ 0 - 1
plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.1.jar.sha1

@@ -1 +0,0 @@
-f2d653c617004193f3350330d907f77b60c88c56

+ 1 - 0
plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.2.jar.sha1

@@ -0,0 +1 @@
+32c9a9afe84eca86a3b0b3c66a956ced249ceade

+ 0 - 1
plugins/ingest-attachment/licenses/commons-compress-1.16.1.jar.sha1

@@ -1 +0,0 @@
-7b5cdabadb4cf12f5ee0f801399e70635583193f

+ 1 - 0
plugins/ingest-attachment/licenses/commons-compress-1.18.jar.sha1

@@ -0,0 +1 @@
+1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5

+ 1 - 0
plugins/ingest-attachment/licenses/fontbox-2.0.12.jar.sha1

@@ -0,0 +1 @@
+566fd1d6b25012bb82078da08b82e6d0ba8c884a

+ 0 - 1
plugins/ingest-attachment/licenses/fontbox-2.0.9.jar.sha1

@@ -1 +0,0 @@
-f961f17ebdbc307e9055e3cf7c0e207f0895ae55

+ 0 - 1
plugins/ingest-attachment/licenses/jempbox-1.8.13.jar.sha1

@@ -1 +0,0 @@
-a874cef0ed0e2a8c4cc5ed52c23ba3e6d78eca4e

+ 1 - 0
plugins/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1

@@ -0,0 +1 @@
+1f41de81768ef84ca2d8cda4cb79e9272c8ee966

+ 1 - 0
plugins/ingest-attachment/licenses/pdfbox-2.0.12.jar.sha1

@@ -0,0 +1 @@
+a7311cd267c19e1ba8154b076a63d29537154784

+ 0 - 1
plugins/ingest-attachment/licenses/pdfbox-2.0.9.jar.sha1

@@ -1 +0,0 @@
-d0425578218624388f2ec84a0b3a11efd55df0f5

+ 0 - 1
plugins/ingest-attachment/licenses/poi-3.17.jar.sha1

@@ -1 +0,0 @@
-0ae92292a2043888b40d418da97dc0b669fde326

+ 1 - 0
plugins/ingest-attachment/licenses/poi-4.0.0.jar.sha1

@@ -0,0 +1 @@
+7ddb9b983ed682c93a986e8bb596d5935b13086c

+ 0 - 1
plugins/ingest-attachment/licenses/poi-ooxml-3.17.jar.sha1

@@ -1 +0,0 @@
-07d8c44407178b73246462842bf1e206e99c8e0a

+ 1 - 0
plugins/ingest-attachment/licenses/poi-ooxml-4.0.0.jar.sha1

@@ -0,0 +1 @@
+f3fa9c2bd64eb3ec15378de960a07d077ae5b26d

+ 0 - 1
plugins/ingest-attachment/licenses/poi-ooxml-schemas-3.17.jar.sha1

@@ -1 +0,0 @@
-890114bfa82f5b6380ea0e9b0bf49b0af797b414

+ 1 - 0
plugins/ingest-attachment/licenses/poi-ooxml-schemas-4.0.0.jar.sha1

@@ -0,0 +1 @@
+125f9ccd2cf652fa4169b1c30e9023362e23324f

+ 0 - 1
plugins/ingest-attachment/licenses/poi-scratchpad-3.17.jar.sha1

@@ -1 +0,0 @@
-85d86a0e26c7f5c0db4ee63e8c7728e51c5d64ce

+ 1 - 0
plugins/ingest-attachment/licenses/poi-scratchpad-4.0.0.jar.sha1

@@ -0,0 +1 @@
+1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60

+ 0 - 1
plugins/ingest-attachment/licenses/tika-core-1.18.jar.sha1

@@ -1 +0,0 @@
-69556697de96cf0b22df846e970dafd29866eee0

+ 1 - 0
plugins/ingest-attachment/licenses/tika-core-1.19.1.jar.sha1

@@ -0,0 +1 @@
+c1f075aa01586c2c28a249ad60bcfb733b69b866

+ 0 - 1
plugins/ingest-attachment/licenses/tika-parsers-1.18.jar.sha1

@@ -1 +0,0 @@
-7d9b6dea91d783165f3313d320d3aaaa9a4dfc13

+ 1 - 0
plugins/ingest-attachment/licenses/tika-parsers-1.19.1.jar.sha1

@@ -0,0 +1 @@
+06d45a8683a7479f0e0d9d252f834d0ae44abd6b

+ 0 - 1
plugins/ingest-attachment/licenses/xmlbeans-2.6.0.jar.sha1

@@ -1 +0,0 @@
-29e80d2dd51f9dcdef8f9ffaee0d4dc1c9bbfc87

+ 1 - 0
plugins/ingest-attachment/licenses/xmlbeans-3.0.1.jar.sha1

@@ -0,0 +1 @@
+50d94da791ab1e799a11d6f82410fd7d49f402ca

+ 0 - 2
plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java

@@ -21,7 +21,6 @@ package org.elasticsearch.ingest.attachment;
 
 import org.apache.commons.io.IOUtils;
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.bootstrap.JavaVersion;
 import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.ingest.RandomDocumentPicks;
@@ -297,7 +296,6 @@ public class AttachmentProcessorTests extends ESTestCase {
     }
 
     public void testIndexedChars() throws Exception {
-        assumeFalse("https://github.com/elastic/elasticsearch/issues/31305", JavaVersion.current().equals(JavaVersion.parse("11")));
         processor = new AttachmentProcessor(randomAlphaOfLength(10), "source_field",
             "target_field", EnumSet.allOf(AttachmentProcessor.Property.class), 19, false, null);
 

+ 2 - 2
qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash

@@ -225,10 +225,10 @@ fi
 }
 
 @test "[$GROUP] install ingest-attachment plugin" {
-    # we specify the version on the poi-3.17.jar so that the test does
+    # we specify the version on the poi-4.0.0.jar so that the test does
     # not spuriously pass if the jar is missing but the other poi jars
     # are present
-    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
+    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
 }
 
 @test "[$GROUP] install ingest-geoip plugin" {