From a22ce2abfa502f316e38364ff106037be7cf99ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 21:10:30 +0000 Subject: [PATCH 1/3] Bump spring-boot-starter-parent from 2.7.0 to 2.7.1 Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.0...v2.7.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58b749a5..e51db99d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0 + 2.7.1 From 95a4027ed0d1cd434dd26960b8f6d8ba5a8e9fde Mon Sep 17 00:00:00 2001 From: mikolajbrzezinski <86791239+mikolajbrzezinski@users.noreply.github.com> Date: Thu, 30 Jun 2022 13:12:32 +0200 Subject: [PATCH 2/3] ACS-2556 Bump Apache POI, Apache Tika, and PDFBox (#640) Bump Apache POI to 5.2.2, Apache Tika to 2.4.1 and PDFBox to 2.0.26 --- alfresco-transform-misc/alfresco-transform-misc/pom.xml | 2 +- .../transformer/executors/TikaOfficeDetectParser.java | 7 ++----- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml index bae2b5b4..14c5460d 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml @@ -40,7 +40,7 @@ org.apache.pdfbox pdfbox-tools - 2.0.25 + 2.0.26 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java index 6600e472..658f6745 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java @@ -32,7 +32,7 @@ import java.io.PushbackInputStream; import java.util.HashSet; 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.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; @@ -95,10 +95,7 @@ public class TikaOfficeDetectParser implements Parser } // Which is it? - if (initial4[0] == POIFSConstants.OOXML_FILE_HEADER[0] && - initial4[1] == POIFSConstants.OOXML_FILE_HEADER[1] && - initial4[2] == POIFSConstants.OOXML_FILE_HEADER[2] && - initial4[3] == POIFSConstants.OOXML_FILE_HEADER[3]) + if (FileMagic.valueOf(initial4) == FileMagic.OOXML) { ooxmlParser.parse(wrapped, handler, metadata, parseContext); } diff --git a/pom.xml b/pom.xml index 58b749a5..bb0245d6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 latest - 2.0.25 + 2.0.26 3.0.1.12 ${project.version} 5.16.4 @@ -27,8 +27,8 @@ 2.13.3 4.13.2 3.5.2 - 2.2.1 - 4.1.2 + 2.4.1 + 5.2.2 1.4 false From c73148084ad708d54be39336e61d4d9786cd1fd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 11:17:30 +0100 Subject: [PATCH 3/3] Bump dependency.cxf.version from 3.5.2 to 3.5.3 (#639) Bumps `dependency.cxf.version` from 3.5.2 to 3.5.3. Updates `cxf-core` from 3.5.2 to 3.5.3 Updates `cxf-rt-rs-client` from 3.5.2 to 3.5.3 Updates `cxf-rt-frontend-jaxws` from 3.5.2 to 3.5.3 Updates `cxf-rt-transports-http` from 3.5.2 to 3.5.3 Updates `cxf-rt-ws-policy` from 3.5.2 to 3.5.3 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-rs-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-ws-policy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb0245d6..0025489e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 2.13.3 2.13.3 4.13.2 - 3.5.2 + 3.5.3 2.4.1 5.2.2 1.4