[2.21.x] Upgrading Tika and ThirdParty versions (#5686)

codice · Dec 16, 2019 · c0a173c · c0a173c
1 parent e39f691
commit c0a173c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 11 deletions.
diff --git a/catalog/catalog-app/pom.xml b/catalog/catalog-app/pom.xml
@@ -610,6 +610,7 @@
         <dependency>
             <groupId>org.codice.thirdparty</groupId>
             <artifactId>tika-bundle</artifactId>
+            <version>${tika.thirdparty.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>ddf.catalog.plugin</groupId>

diff --git a/catalog/spatial/ogc/spatial-ogc-urlresourcereader/pom.xml b/catalog/spatial/ogc/spatial-ogc-urlresourcereader/pom.xml
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.codice.thirdparty</groupId>
             <artifactId>tika-bundle</artifactId>
+            <version>${tika.thirdparty.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>

diff --git a/...ormer-pptx/src/test/java/ddf/catalog/transformer/input/pptx/PptxInputTransformerTest.java b/...ormer-pptx/src/test/java/ddf/catalog/transformer/input/pptx/PptxInputTransformerTest.java
@@ -32,8 +32,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import org.apache.poi.openxml4j.util.Nullable;
 import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -163,7 +163,7 @@ public void testCreatedDate()
       ss.createSlide();
       Date d = createOneSecondPrecisionDate();
 
-      ss.getProperties().getCoreProperties().setCreated(new Nullable<>(d));
+      ss.getProperties().getCoreProperties().setCreated(Optional.ofNullable(d));
       try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
         ss.write(os);
 
@@ -184,7 +184,7 @@ public void testModifiedDate()
       ss.createSlide();
       Date d = createOneSecondPrecisionDate();
 
-      ss.getProperties().getCoreProperties().setModified(new Nullable<>(d));
+      ss.getProperties().getCoreProperties().setModified(Optional.ofNullable(d));
       try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
         ss.write(os);
 

diff --git a/catalog/transformer/catalog-transformer-tika-input/pom.xml b/catalog/transformer/catalog-transformer-tika-input/pom.xml
@@ -110,6 +110,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.opengis</groupId>
+            <artifactId>geoapi</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/catalog/transformer/catalog-transformer-video-input/pom.xml b/catalog/transformer/catalog-transformer-video-input/pom.xml
@@ -45,14 +45,15 @@
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>ddf.platform.util</groupId>
             <artifactId>platform-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -72,6 +73,14 @@
                             ddf.catalog.transformer.input.video,
                             ddf.catalog.data.impl.*
                         </Private-Package>
+                        <Import-Package>
+                            javax.activation;resolution:=optional,
+                            org.bouncycastle.crypto;resolution:=optional,
+                            org.bouncycastle.crypto.digests;resolution:=optional,
+                            org.bouncycastle.crypto.prng;resolution:=optional,
+                            org.bouncycastle.crypto.prng.drbg;resolution:=optional,
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/platform/metrics/platform-metrics-reporting/pom.xml b/platform/metrics/platform-metrics-reporting/pom.xml
@@ -113,6 +113,11 @@
                             com.sun.image.codec.jpeg;resolution:=optional,
                             org.apache.cxf.jaxrs.utils,
                             org.joda.convert;resolution:=optional,
+                            org.apache.commons.collections4;resolution:=optional,
+                            org.apache.commons.collections4.bidimap;resolution:=optional,
+                            org.apache.commons.math3.exception;resolution:=optional,
+                            org.apache.commons.math3.linear;resolution:=optional,
+                            org.apache.commons.math3.stat.regression;resolution:=optional,
                             *
                         </Import-Package>
                         <Export-Package />

diff --git a/...ics-reporting/src/main/java/ddf/metrics/reporting/internal/rrd4j/RrdMetricsRetriever.java b/...ics-reporting/src/main/java/ddf/metrics/reporting/internal/rrd4j/RrdMetricsRetriever.java
@@ -693,7 +693,7 @@ private void createSheet(
 
     CellStyle bannerStyle = wb.createCellStyle();
     bannerStyle.setFont(headerFont);
-    bannerStyle.setFillForegroundColor(HSSFColor.PALE_BLUE.index);
+    bannerStyle.setFillForegroundColor(HSSFColor.HSSFColorPredefined.PALE_BLUE.getIndex());
     bannerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
 
     int rowCount = 0;

diff --git a/pom.xml b/pom.xml
@@ -287,7 +287,7 @@
         <ogc-filter-v_1_1_0-schema.thirdparty.version>1.1.0_5</ogc-filter-v_1_1_0-schema.thirdparty.version>
         <pac4j.version>3.8.2</pac4j.version>
         <pdfbox.version>2.0.11</pdfbox.version>
-        <poi.version>3.17</poi.version>
+        <poi.version>4.0.1</poi.version>
         <protobuf.version>3.6.1</protobuf.version>
         <proton.version>0.31.0</proton.version>
         <qpid-jms.version>0.39.0</qpid-jms.version>
@@ -310,8 +310,8 @@
         <spatial4j.version>0.7</spatial4j.version>
         <spring.version>5.1.7.RELEASE</spring.version>
         <spring-osgi.version>1.2.1</spring-osgi.version>
-        <tika.thirdparty.bundle.version>1.18.0_6</tika.thirdparty.bundle.version>
-        <tika.version>1.18</tika.version>
+        <tika.thirdparty.bundle.version>1.22.0_1</tika.thirdparty.bundle.version>
+        <tika.version>1.22</tika.version>
         <usng4j.version>0.4</usng4j.version>
         <validation.version>1.1.0.Final</validation.version>
         <woodstox.core.version>5.3.0</woodstox.core.version>