From f20e2a1d7071637bf02b20ce9d44e9ad709219ab Mon Sep 17 00:00:00 2001
From: Aaron Hoffer <howard.hoffer@gmail.com>
Date: Wed, 3 Sep 2025 18:30:17 -0700
Subject: [PATCH] Tika upgrade

---
 .gitignore                                       |  3 ++-
 catalog/catalog-app/pom.xml                      | 16 ++++++++++++++++
 .../transformer/catalog-transformer-pdf/pom.xml  | 14 ++++++++++++++
 features/utilities/src/main/feature/feature.xml  |  2 +-
 pom.xml                                          |  2 +-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef281ca172f6..8030c5021a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,5 @@ buildNumber.properties
 .mvn/timing.properties
 coverage/
 .nyc_output
-**/.java-version
\ No newline at end of file
+**/.java-version
+.m2
diff --git a/catalog/catalog-app/pom.xml b/catalog/catalog-app/pom.xml
index c6c0af3ae9ef..be034a43d52c 100644
--- a/catalog/catalog-app/pom.xml
+++ b/catalog/catalog-app/pom.xml
@@ -281,6 +281,16 @@
             <groupId>ddf.catalog.transformer</groupId>
             <artifactId>tika-input-transformer</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcjmail-jdk18on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>ddf.catalog.transformer</groupId>
@@ -401,6 +411,12 @@
             <groupId>ddf.catalog.transformer</groupId>
             <artifactId>catalog-transformer-pptx</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>ddf.catalog.security</groupId>
diff --git a/catalog/transformer/catalog-transformer-pdf/pom.xml b/catalog/transformer/catalog-transformer-pdf/pom.xml
index 92dcd52a8e8d..21797db07c04 100644
--- a/catalog/transformer/catalog-transformer-pdf/pom.xml
+++ b/catalog/transformer/catalog-transformer-pdf/pom.xml
@@ -39,6 +39,20 @@
             <groupId>ddf.catalog.transformer</groupId>
             <artifactId>catalog-transformer-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcjmail-jdk18on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcmail-jdk18on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--External dependencies-->
diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
index b85281d9d7f0..6cc7787181f0 100644
--- a/features/utilities/src/main/feature/feature.xml
+++ b/features/utilities/src/main/feature/feature.xml
@@ -192,7 +192,7 @@
         <bundle>mvn:com.github.luben/zstd-jni/${zstd-jni.version}</bundle>
         <bundle>wrap:mvn:net.sf.jwordnet/jwnl/${jwnl.version}</bundle>
         <bundle>mvn:org.apache.tika/tika-core/${tika.version}</bundle>
-        <bundle>mvn:org.apache.tika/tika-bundle-standard/${tika.version}</bundle>
+        <bundle>mvn:org.apache.tika/tika-parsers-standard-package/${tika.version}</bundle>
     </feature>
 
     <feature name="io" version="${project.version}" description="I/O Utilities">
diff --git a/pom.xml b/pom.xml
index aef919d1499d..7a5ac6e9eb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@
         <spring.version>6.1.14</spring.version>
         <spring.feature.version>6.1.14_1</spring.feature.version>
         <spring-osgi-mock.version>1.2.1</spring-osgi-mock.version>
-        <tika.version>2.4.0</tika.version>
+        <tika.version>3.2.2</tika.version>
         <usng4j.version>0.4</usng4j.version>
         <validation.version>1.1.0.Final</validation.version>
         <woodstox.core.version>6.5.1</woodstox.core.version>