inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATS-969 Upgrade tika 1.x -> 2.x (#827)

Browse Source
This commit is contained in:
Piotr Żurek
2021-12-08 10:28:47 +01:00
committed by GitHub
parent 89de2e4677
commit 8dd6ce48dc
8 changed files with 34 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
data-model/pom.xml
View File

@@ -230,13 +230,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tika</groupId> <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId> <artifactId>tika-parsers-standard-package</artifactId>
<version>${dependency.tika.version}</version> <version>${dependency.tika.version}</version>
<exclusions> <exclusions>
<exclusion>
<groupId>com.tdunning</groupId>
<artifactId>json</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
@@ -245,39 +241,6 @@
<groupId>asm</groupId> <groupId>asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
</exclusion> </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 --> <!-- No longer needed -->
<exclusion> <exclusion>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
@@ -287,18 +250,10 @@
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId> <artifactId>pdfbox-tools</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.pdfbox</groupId>
<artifactId>preflight</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>jempbox</artifactId> <artifactId>jempbox</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.pdfbox</groupId>
<artifactId>xmpbox</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId> <artifactId>jbig2-imageio</artifactId>
@@ -306,6 +261,15 @@
</exclusions> </exclusions>
</dependency> </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 --> <!-- Test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

6
data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Data model classes * 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. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * 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.detect.Detector;
import org.apache.tika.io.TikaInputStream; import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MediaType;
import org.quartz.CronExpression; import org.quartz.CronExpression;
import org.springframework.extensions.config.Config; import org.springframework.extensions.config.Config;
@@ -938,7 +939,8 @@ public class MimetypeMap implements MimetypeService
Metadata metadata = new Metadata(); Metadata metadata = new Metadata();
if (filename != null) if (filename != null)
{ {
metadata.add(Metadata.RESOURCE_NAME_KEY, filename); //"resourceName"
metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
} }
InputStream inp = null; InputStream inp = null;

20
data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Data model classes * 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. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
@@ -26,7 +26,6 @@
package org.alfresco.repo.dictionary; package org.alfresco.repo.dictionary;
import static java.util.function.Function.identity; import static java.util.function.Function.identity;
import static java.util.stream.Collectors.averagingDouble;
import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toMap;
import static org.alfresco.repo.dictionary.M2ModelDiff.DIFF_CREATED; 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 static org.alfresco.repo.dictionary.M2ModelDiff.TYPE_TYPE;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; 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.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.NamespaceException;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.DynamicallySizedThreadPoolExecutor;
import org.alfresco.util.Pair; 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 public class DiffModelTest extends AbstractModelTest
{ {

7
pom.xml
View File

@@ -75,7 +75,7 @@
<dependency.slf4j.version>1.7.32</dependency.slf4j.version> <dependency.slf4j.version>1.7.32</dependency.slf4j.version>
<dependency.gytheio.version>0.12</dependency.gytheio.version> <dependency.gytheio.version>0.12</dependency.gytheio.version>
<dependency.groovy.version>3.0.9</dependency.groovy.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.spring-security.version>5.5.2</dependency.spring-security.version>
<dependency.truezip.version>7.7.10</dependency.truezip.version> <dependency.truezip.version>7.7.10</dependency.truezip.version>
<dependency.poi.version>4.1.2</dependency.poi.version> <dependency.poi.version>4.1.2</dependency.poi.version>
@@ -392,6 +392,11 @@
<artifactId>httpclient-cache</artifactId> <artifactId>httpclient-cache</artifactId>
<version>${dependency.httpclient.version}</version> <version>${dependency.httpclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${dependency.httpclient.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.xmlbeans</groupId> <groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId> <artifactId>xmlbeans</artifactId>

5
remote-api/pom.xml
View File

@@ -92,6 +92,11 @@
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-repository</artifactId> <artifactId>alfresco-repository</artifactId>

5
repository/pom.xml
View File

@@ -67,6 +67,11 @@
<artifactId>jakarta.mail</artifactId> <artifactId>jakarta.mail</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
<dependency> <dependency>
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>

4
repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2021 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * 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.RemoteConnectorResponse;
import org.alfresco.service.cmr.remoteconnector.RemoteConnectorService; import org.alfresco.service.cmr.remoteconnector.RemoteConnectorService;
import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.Header;
import org.apache.tika.io.IOUtils; import org.apache.commons.io.IOUtils;
/** /**

2
repository/src/main/resources/alfresco/tika/tika-config.xml
View File

@@ -2,5 +2,5 @@
<properties> <properties>
<!-- This property, when set, will hide the start up warnings of tika for libraries are missing. --> <!-- 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 --> <!-- See https://issues.apache.org/jira/browse/TIKA-2490 -->
<service-loader initializableProblemHandler="ignore"/> <service-loader loadErrorHandler="warn" initializableProblemHandler="ignore"/>
</properties> </properties>