inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ATS-0000_refactor_packages [skip ci]

Browse Source 
# Conflicts:
#	alfresco-transform-misc/alfresco-transform-misc/pom.xml
This commit is contained in:
alandavis
2022-07-12 10:38:28 +01:00
parent 6bac1c4287 7f292b92ec
commit cb3aacc103
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engines/misc/pom.xml
View File

@@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId> <artifactId>pdfbox-tools</artifactId>
<version>2.0.25</version> <version>${dependency.pdfbox.version}</version>
</dependency> </dependency>
<!-- OOXMLThumbnailContentTransformer --> <!-- OOXMLThumbnailContentTransformer -->

7
engines/tika/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java
View File

@@ -32,7 +32,7 @@ import java.io.PushbackInputStream;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.filesystem.FileMagic;
import org.apache.poi.util.IOUtils; import org.apache.poi.util.IOUtils;
import org.apache.tika.exception.TikaException; import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Metadata;
@@ -95,10 +95,7 @@ public class TikaOfficeDetectParser implements Parser
} }
// Which is it? // Which is it?
if (initial4[0] == POIFSConstants.OOXML_FILE_HEADER[0] && if (FileMagic.valueOf(initial4) == FileMagic.OOXML)
initial4[1] == POIFSConstants.OOXML_FILE_HEADER[1] &&
initial4[2] == POIFSConstants.OOXML_FILE_HEADER[2] &&
initial4[3] == POIFSConstants.OOXML_FILE_HEADER[3])
{ {
ooxmlParser.parse(wrapped, handler, metadata, parseContext); ooxmlParser.parse(wrapped, handler, metadata, parseContext);
} }

10
pom.xml
View File

@@ -10,7 +10,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.0</version> <version>2.7.1</version>
<relativePath /> <relativePath />
</parent> </parent>
@@ -20,16 +20,16 @@
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<image.tag>latest</image.tag> <image.tag>latest</image.tag>
<dependency.pdfbox.version>2.0.25</dependency.pdfbox.version> <dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
<dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version> <dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version>
<env.project_version>${project.version}</env.project_version> <env.project_version>${project.version}</env.project_version>
<dependency.activemq.version>5.16.4</dependency.activemq.version> <dependency.activemq.version>5.16.4</dependency.activemq.version>
<dependency.jackson.version>2.13.3</dependency.jackson.version> <dependency.jackson.version>2.13.3</dependency.jackson.version>
<dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version> <dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
<dependency.junit.version>4.13.2</dependency.junit.version> <dependency.junit.version>4.13.2</dependency.junit.version>
<dependency.cxf.version>3.5.2</dependency.cxf.version> <dependency.cxf.version>3.5.3</dependency.cxf.version>
<dependency.tika.version>2.2.1</dependency.tika.version> <dependency.tika.version>2.4.1</dependency.tika.version>
<dependency.poi.version>4.1.2</dependency.poi.version> <dependency.poi.version>5.2.2</dependency.poi.version>
<dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version> <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
<parent.core.deploy.skip>false</parent.core.deploy.skip> <parent.core.deploy.skip>false</parent.core.deploy.skip>