This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new cc2cdddd49 NIFI-13910 Upgraded Apache Tika from 2.9.2 to 3.0.0 This
closes #9427
cc2cdddd49 is described below
commit cc2cdddd495e5141aecf20ffdc69b5baa407e6c3
Author: exceptionfactory <[email protected]>
AuthorDate: Mon Oct 21 09:00:05 2024 -0500
NIFI-13910 Upgraded Apache Tika from 2.9.2 to 3.0.0
This closes #9427
- Removed unused dependency from nifi-framework-bundle
- Aligned custom-mimetypes.xml location with Tika 3 default location
Signed-off-by: Joseph Witt <[email protected]>
---
.../nifi-media-bundle/nifi-media-processors/pom.xml | 2 +-
.../java/org/apache/nifi/processors/standard/IdentifyMimeType.java | 2 +-
.../main/resources/{org/apache/tika/mime => }/custom-mimetypes.xml | 0
nifi-extension-bundles/nifi-standard-bundle/pom.xml | 2 +-
nifi-framework-bundle/pom.xml | 6 ------
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index 22be2c44e7..295fea4d99 100644
--- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<properties>
- <tika.version>2.9.2</tika.version>
+ <tika.version>3.0.0</tika.version>
</properties>
<dependencyManagement>
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
index aef117d93a..8d064fb421 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
@@ -185,7 +185,7 @@ public class IdentifyMimeType extends AbstractProcessor {
if (configStrategy.equals(REPLACE.getValue())) {
this.detector = MimeTypesFactory.create(customInputStream);
} else {
- try (final InputStream nifiInputStream =
getClass().getClassLoader().getResourceAsStream("org/apache/tika/mime/custom-mimetypes.xml");
+ try (final InputStream nifiInputStream =
getClass().getClassLoader().getResourceAsStream("custom-mimetypes.xml");
final InputStream tikaInputStream =
MimeTypes.class.getClassLoader().getResourceAsStream("org/apache/tika/mime/tika-mimetypes.xml"))
{
this.detector = MimeTypesFactory.create(customInputStream,
nifiInputStream, tikaInputStream);
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/custom-mimetypes.xml
similarity index 100%
rename from
nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
rename to
nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/custom-mimetypes.xml
diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
index 546b58f213..0bbf589356 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
@@ -35,7 +35,7 @@
</modules>
<properties>
<org.apache.sshd.version>2.14.0</org.apache.sshd.version>
- <tika.version>2.9.2</tika.version>
+ <tika.version>3.0.0</tika.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/nifi-framework-bundle/pom.xml b/nifi-framework-bundle/pom.xml
index 167a6a722f..65df0cd2ed 100644
--- a/nifi-framework-bundle/pom.xml
+++ b/nifi-framework-bundle/pom.xml
@@ -26,7 +26,6 @@
<properties>
<curator.version>5.7.1</curator.version>
<guava.version>33.3.1-jre</guava.version>
- <tika.version>2.9.2</tika.version>
<org.opensaml.version>4.3.2</org.opensaml.version>
</properties>
<modules>
@@ -104,11 +103,6 @@
<artifactId>icu4j</artifactId>
<version>75.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${tika.version}</version>
- </dependency>
<!-- open id connect - override transitive dependency version
ranges -->
<dependency>
