diff --git a/data-model/pom.xml b/data-model/pom.xml
index 2a5ab55d14..5bb4f9367a 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -230,13 +230,9 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
-            <artifactId>tika-parsers</artifactId>
+            <artifactId>tika-parsers-standard-package</artifactId>
             <version>${dependency.tika.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>com.tdunning</groupId>
-                    <artifactId>json</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15on</artifactId>
@@ -245,39 +241,6 @@
                     <groupId>asm</groupId>
                     <artifactId>asm</artifactId>
                 </exclusion>
-                <!-- Duplicates classes from jakarta.jws:jakarta.jws-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.annotation:jakarta.annotation-api -->
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from com.sun.activation:jakarta.activation -->
-                <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>javax.activation</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta -->
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>javax.activation-api</artifactId>
-                </exclusion>
                 <!-- No longer needed -->
                 <exclusion>
                     <groupId>org.apache.pdfbox</groupId>
@@ -287,18 +250,10 @@
                     <groupId>org.apache.pdfbox</groupId>
                     <artifactId>pdfbox-tools</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.pdfbox</groupId>
-                    <artifactId>preflight</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.pdfbox</groupId>
                     <artifactId>jempbox</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.pdfbox</groupId>
-                    <artifactId>xmpbox</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.pdfbox</groupId>
                     <artifactId>jbig2-imageio</artifactId>
@@ -306,6 +261,15 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java b/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
index 3e801cfe1e..22a0bb1737 100644
--- a/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
+++ b/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -42,6 +42,7 @@ import org.apache.tika.detect.DefaultDetector;
 import org.apache.tika.detect.Detector;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.mime.MediaType;
 import org.quartz.CronExpression;
 import org.springframework.extensions.config.Config;
@@ -938,7 +939,8 @@ public class MimetypeMap implements MimetypeService
         Metadata metadata = new Metadata();
         if (filename != null)
         {
-            metadata.add(Metadata.RESOURCE_NAME_KEY, filename);
+            //"resourceName"
+            metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
         }
 
         InputStream inp = null;
diff --git a/data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java
index 10cd6c0ec1..5b88cd939f 100644
--- a/data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java
+++ b/data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -26,7 +26,6 @@
 package org.alfresco.repo.dictionary;
 
 import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.averagingDouble;
 import static java.util.stream.Collectors.toMap;
 
 import static org.alfresco.repo.dictionary.M2ModelDiff.DIFF_CREATED;
@@ -40,30 +39,13 @@ import static org.alfresco.repo.dictionary.M2ModelDiff.TYPE_PROPERTY;
 import static org.alfresco.repo.dictionary.M2ModelDiff.TYPE_TYPE;
 
 import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Maps;
-
-import junit.framework.TestCase;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.tenant.SingleTServiceImpl;
-import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.DynamicallySizedThreadPoolExecutor;
 import org.alfresco.util.Pair;
-import org.alfresco.util.TraceableThreadFactory;
-import org.alfresco.util.cache.DefaultAsynchronouslyRefreshedCacheRegistry;
-import org.apache.commons.collections4.map.UnmodifiableMap;
 
 public class DiffModelTest extends AbstractModelTest
 {
diff --git a/pom.xml b/pom.xml
index 27aadab0a8..b4795a02a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <dependency.slf4j.version>1.7.32</dependency.slf4j.version>
         <dependency.gytheio.version>0.12</dependency.gytheio.version>
         <dependency.groovy.version>3.0.9</dependency.groovy.version>
-        <dependency.tika.version>1.27</dependency.tika.version>
+        <dependency.tika.version>2.1.0</dependency.tika.version>
         <dependency.spring-security.version>5.5.2</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>4.1.2</dependency.poi.version>
@@ -392,6 +392,11 @@
                 <artifactId>httpclient-cache</artifactId>
                 <version>${dependency.httpclient.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+                <version>${dependency.httpclient.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 6cbfda3077..ac0f6993de 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -92,6 +92,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 9d9941d41a..bde6e926ec 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -67,6 +67,11 @@
             <artifactId>jakarta.mail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
diff --git a/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java b/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
index 59331d680c..d144d4a0e0 100644
--- a/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -33,7 +33,7 @@ import org.alfresco.service.cmr.remoteconnector.RemoteConnectorRequest;
 import org.alfresco.service.cmr.remoteconnector.RemoteConnectorResponse;
 import org.alfresco.service.cmr.remoteconnector.RemoteConnectorService;
 import org.apache.commons.httpclient.Header;
-import org.apache.tika.io.IOUtils;
+import org.apache.commons.io.IOUtils;
 
 
 /**
diff --git a/repository/src/main/resources/alfresco/tika/tika-config.xml b/repository/src/main/resources/alfresco/tika/tika-config.xml
index ef9f6df4a4..ff10db2294 100644
--- a/repository/src/main/resources/alfresco/tika/tika-config.xml
+++ b/repository/src/main/resources/alfresco/tika/tika-config.xml
@@ -2,5 +2,5 @@
 <properties>
     <!-- This property, when set, will hide the start up warnings of tika for libraries are missing. -->
     <!-- See https://issues.apache.org/jira/browse/TIKA-2490 -->
-    <service-loader initializableProblemHandler="ignore"/>
+    <service-loader loadErrorHandler="warn" initializableProblemHandler="ignore"/>
 </properties>