From 0e8f597c57f7e95bc2ad2bc21a5ec7d851a95c63 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Sat, 13 Nov 2021 12:10:38 +0000 Subject: [PATCH 01/25] [maven-release-plugin][skip ci] prepare for next development iteration --- .../alfresco-transform-core-aio-boot/pom.xml | 2 +- .../alfresco-transform-core-aio/pom.xml | 2 +- .../alfresco-transform-imagemagick-boot/pom.xml | 2 +- .../alfresco-transform-imagemagick/pom.xml | 2 +- .../alfresco-transform-libreoffice-boot/pom.xml | 2 +- .../alfresco-transform-libreoffice/pom.xml | 2 +- alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml | 2 +- alfresco-transform-misc/alfresco-transform-misc/pom.xml | 2 +- .../alfresco-transform-pdf-renderer-boot/pom.xml | 2 +- .../alfresco-transform-pdf-renderer/pom.xml | 2 +- alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml | 2 +- alfresco-transform-tika/alfresco-transform-tika/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml index 2c548dec..8835dc02 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml index e28b96cd..62d7d308 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml @@ -8,7 +8,7 @@ alfresco-transform-core org.alfresco - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml index 6bcf7089..59042f09 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml index 00c98f5a..fa7ead45 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml @@ -8,7 +8,7 @@ alfresco-transform-core org.alfresco - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml index 3febb40b..b9464bfc 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml index 1b6ad67f..4a627526 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml @@ -8,7 +8,7 @@ alfresco-transform-core org.alfresco - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml index e075c4ab..52e9cba0 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml index 86da9a9a..c19bed81 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml @@ -9,7 +9,7 @@ alfresco-transform-core org.alfresco - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml index 9b37f1d3..b04a3372 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml index db441785..d4e190da 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml index 6389f3fd..887b6524 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml index 1b59b1ef..e613c745 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml +++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml @@ -8,7 +8,7 @@ alfresco-transform-core org.alfresco - 2.5.4 + 2.5.5-SNAPSHOT ../../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 9fad2075..0ffd154e 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT ../pom.xml alfresco-transformer-base - 2.5.4 + 2.5.5-SNAPSHOT false diff --git a/pom.xml b/pom.xml index af0666e8..d5e9199f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco alfresco-transform-core - 2.5.4 + 2.5.5-SNAPSHOT pom @@ -117,7 +117,7 @@ scm:git:https://github.com/Alfresco/alfresco-transform-core.git scm:git:https://github.com/Alfresco/alfresco-transform-core.git https://github.com/Alfresco/alfresco-transform-core - 2.5.4 + HEAD From 51b90202cea13cd9cea099a2e8b75745f4ee4b3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 11:49:19 +0000 Subject: [PATCH 02/25] Bump docker-maven-plugin from 0.37.0 to 0.38.0 (#483) Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.37.0 to 0.38.0. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.37.0...v0.38.0) --- updated-dependencies: - dependency-name: io.fabric8:docker-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... 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 d5e9199f..78b3c3ea 100644 --- a/pom.xml +++ b/pom.xml @@ -399,7 +399,7 @@ io.fabric8 docker-maven-plugin - 0.37.0 + 0.38.0 true From fa69e48e5241df4da0b677cacf0d51aeb94ab522 Mon Sep 17 00:00:00 2001 From: alandavis Date: Thu, 18 Nov 2021 14:05:14 +0000 Subject: [PATCH 03/25] ACS-2270 Read T-Engine config in alphabetical order * T-Engines config need to be combined in the same predefined order in the all-in-one transformer, T-Router and the Content Repository with individual T-Engines. --- .../alfresco/transformer/AIOCustomConfig.java | 31 +++++++++-- .../transformer/AIOCustomConfigTest.java | 53 +++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java index 9bf7201d..bdad260d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java @@ -31,12 +31,19 @@ import org.alfresco.transformer.executors.ImageMagickCommandExecutor; import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; import org.alfresco.transformer.executors.PdfRendererCommandExecutor; import org.alfresco.transformer.executors.TikaJavaExecutor; +import org.alfresco.transformer.executors.Transformer; import org.alfresco.transformer.transformers.SelectingTransformer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + @Configuration public class AIOCustomConfig { @@ -88,12 +95,26 @@ public class AIOCustomConfig public TransformServiceRegistry aioTransformRegistry() throws Exception { AIOTransformRegistry aioTransformRegistry = new AIOTransformRegistry(); - aioTransformRegistry.registerTransformer(new SelectingTransformer()); - aioTransformRegistry.registerTransformer(new TikaJavaExecutor(notExtractBookmarksTextDefault)); - aioTransformRegistry.registerTransformer(new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath)); - aioTransformRegistry.registerTransformer(new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled)); - aioTransformRegistry.registerTransformer(new PdfRendererCommandExecutor(pdfRendererPath)); + + // T-Engines are sorted by name so they are combined in the same order as in the T-Router + // and Content Repository with individual T-Engines. See TransformersConfigRegistry#retrieveRemoteConfig and + // LocalTransformServiceRegistry#getTEngineUrlsSortedByName. + for (Transformer tEngine : getTEnginesSortedByName()) + { + aioTransformRegistry.registerTransformer(tEngine); // now a poor name - should be combinedTransformers + } aioTransformRegistry.registerCombinedTransformers(); return aioTransformRegistry; } + + List getTEnginesSortedByName() + { + return Stream.of(new SelectingTransformer(), + new TikaJavaExecutor(notExtractBookmarksTextDefault), + new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath), + new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled), + new PdfRendererCommandExecutor(pdfRendererPath)) + .sorted(Comparator.comparing(Transformer::getTransformerId)) + .collect(Collectors.toList()); + } } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java new file mode 100644 index 00000000..849d88db --- /dev/null +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java @@ -0,0 +1,53 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * 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 + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transformer; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; + +import java.util.StringJoiner; + +import static org.junit.jupiter.api.Assertions.*; + +@WebMvcTest(AIOController.class) +@Import(AIOCustomConfig.class) +class AIOCustomConfigTest +{ + @Autowired + AIOCustomConfig aioCustomConfig; + + @Test + void testGetTEnginesSortedByName() + { + // T-Engine config must be read in a predictable order (alphabetically on T-Engine name) as they may override each other. + StringJoiner sortedTEngines = new StringJoiner(","); + aioCustomConfig.getTEnginesSortedByName().stream().forEach(tEngine -> sortedTEngines.add(tEngine.getTransformerId())); + assertEquals("imagemagick,libreoffice,misc,pdfrenderer,tika", sortedTEngines.toString()); + } +} \ No newline at end of file From 90a0d5138fb3ed09c9f735138d27eabc37428cf4 Mon Sep 17 00:00:00 2001 From: alandavis Date: Thu, 18 Nov 2021 14:07:13 +0000 Subject: [PATCH 04/25] Revert "ACS-2270 Read T-Engine config in alphabetical order" Wrong branch [skip ci] This reverts commit fa69e48e5241df4da0b677cacf0d51aeb94ab522. --- .../alfresco/transformer/AIOCustomConfig.java | 31 ++--------- .../transformer/AIOCustomConfigTest.java | 53 ------------------- 2 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java index bdad260d..9bf7201d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java @@ -31,19 +31,12 @@ import org.alfresco.transformer.executors.ImageMagickCommandExecutor; import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; import org.alfresco.transformer.executors.PdfRendererCommandExecutor; import org.alfresco.transformer.executors.TikaJavaExecutor; -import org.alfresco.transformer.executors.Transformer; import org.alfresco.transformer.transformers.SelectingTransformer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - @Configuration public class AIOCustomConfig { @@ -95,26 +88,12 @@ public class AIOCustomConfig public TransformServiceRegistry aioTransformRegistry() throws Exception { AIOTransformRegistry aioTransformRegistry = new AIOTransformRegistry(); - - // T-Engines are sorted by name so they are combined in the same order as in the T-Router - // and Content Repository with individual T-Engines. See TransformersConfigRegistry#retrieveRemoteConfig and - // LocalTransformServiceRegistry#getTEngineUrlsSortedByName. - for (Transformer tEngine : getTEnginesSortedByName()) - { - aioTransformRegistry.registerTransformer(tEngine); // now a poor name - should be combinedTransformers - } + aioTransformRegistry.registerTransformer(new SelectingTransformer()); + aioTransformRegistry.registerTransformer(new TikaJavaExecutor(notExtractBookmarksTextDefault)); + aioTransformRegistry.registerTransformer(new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath)); + aioTransformRegistry.registerTransformer(new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled)); + aioTransformRegistry.registerTransformer(new PdfRendererCommandExecutor(pdfRendererPath)); aioTransformRegistry.registerCombinedTransformers(); return aioTransformRegistry; } - - List getTEnginesSortedByName() - { - return Stream.of(new SelectingTransformer(), - new TikaJavaExecutor(notExtractBookmarksTextDefault), - new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath), - new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled), - new PdfRendererCommandExecutor(pdfRendererPath)) - .sorted(Comparator.comparing(Transformer::getTransformerId)) - .collect(Collectors.toList()); - } } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java deleted file mode 100644 index 849d88db..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * 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 - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transformer; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; - -import java.util.StringJoiner; - -import static org.junit.jupiter.api.Assertions.*; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -class AIOCustomConfigTest -{ - @Autowired - AIOCustomConfig aioCustomConfig; - - @Test - void testGetTEnginesSortedByName() - { - // T-Engine config must be read in a predictable order (alphabetically on T-Engine name) as they may override each other. - StringJoiner sortedTEngines = new StringJoiner(","); - aioCustomConfig.getTEnginesSortedByName().stream().forEach(tEngine -> sortedTEngines.add(tEngine.getTransformerId())); - assertEquals("imagemagick,libreoffice,misc,pdfrenderer,tika", sortedTEngines.toString()); - } -} \ No newline at end of file From 0c5b497a532e0c210e04c39e77352d5d04612149 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 22 Nov 2021 12:59:09 +0000 Subject: [PATCH 05/25] ACS-2270 Read T-Engine config in alphabetical order (#485) * T-Engines config need to be combined in the same predefined order in the all-in-one transformer, T-Router and the Content Repository with individual T-Engines. --- .../alfresco/transformer/AIOCustomConfig.java | 30 +++++++++-- .../transformer/AIOCustomConfigTest.java | 53 +++++++++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java index 9bf7201d..fb5ceb67 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java @@ -31,12 +31,18 @@ import org.alfresco.transformer.executors.ImageMagickCommandExecutor; import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; import org.alfresco.transformer.executors.PdfRendererCommandExecutor; import org.alfresco.transformer.executors.TikaJavaExecutor; +import org.alfresco.transformer.executors.Transformer; import org.alfresco.transformer.transformers.SelectingTransformer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + @Configuration public class AIOCustomConfig { @@ -88,12 +94,26 @@ public class AIOCustomConfig public TransformServiceRegistry aioTransformRegistry() throws Exception { AIOTransformRegistry aioTransformRegistry = new AIOTransformRegistry(); - aioTransformRegistry.registerTransformer(new SelectingTransformer()); - aioTransformRegistry.registerTransformer(new TikaJavaExecutor(notExtractBookmarksTextDefault)); - aioTransformRegistry.registerTransformer(new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath)); - aioTransformRegistry.registerTransformer(new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled)); - aioTransformRegistry.registerTransformer(new PdfRendererCommandExecutor(pdfRendererPath)); + + // T-Engines are sorted by name so they are combined in the same order as in the T-Router + // and Content Repository with individual T-Engines. See TransformersConfigRegistry#retrieveRemoteConfig and + // LocalTransformServiceRegistry#getTEngineUrlsSortedByName. + for (Transformer tEngine : getTEnginesSortedByName()) + { + aioTransformRegistry.registerTransformer(tEngine); // now a poor name - should be combinedTransformers + } aioTransformRegistry.registerCombinedTransformers(); return aioTransformRegistry; } + + List getTEnginesSortedByName() + { + return Stream.of(new SelectingTransformer(), + new TikaJavaExecutor(notExtractBookmarksTextDefault), + new ImageMagickCommandExecutor(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath), + new LibreOfficeJavaExecutor(libreofficePath, libreofficeMaxTasksPerProcess, libreofficeTimeout, libreofficePortNumbers, libreofficeTemplateProfileDir, libreofficeIsEnabled), + new PdfRendererCommandExecutor(pdfRendererPath)) + .sorted(Comparator.comparing(Transformer::getTransformerId)) + .collect(Collectors.toList()); + } } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java new file mode 100644 index 00000000..2865c1df --- /dev/null +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOCustomConfigTest.java @@ -0,0 +1,53 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * 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 + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transformer; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; + +import java.util.StringJoiner; + +import static org.junit.jupiter.api.Assertions.*; + +@WebMvcTest(AIOController.class) +@Import(AIOCustomConfig.class) +class AIOCustomConfigTest +{ + @Autowired + AIOCustomConfig aioCustomConfig; + + @Test + void testGetTEnginesSortedByName() + { + // T-Engine config must be read in a predictable order (alphabetically on T-Engine name) as they may override each other. + StringJoiner sortedTEngines = new StringJoiner(","); + aioCustomConfig.getTEnginesSortedByName().stream().forEach(tEngine -> sortedTEngines.add(tEngine.getTransformerId())); + assertEquals("imagemagick,libreoffice,misc,pdfrenderer,tika", sortedTEngines.toString()); + } +} From 4c8ef3d646ebdedc31b77eceb806fd27fd3b541d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 22:12:51 +0000 Subject: [PATCH 06/25] Bump spring-boot-starter-parent from 2.5.6 to 2.6.0 Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.5.6 to 2.6.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.6...v2.6.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78b3c3ea..2e4495ef 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.6 + 2.6.0 From f2854119b6c8dbe559e4f47fea919b9da386c97e Mon Sep 17 00:00:00 2001 From: David Edwards Date: Mon, 29 Nov 2021 15:20:21 +0000 Subject: [PATCH 07/25] Update travis linux dist to Focal (#478) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 711b8cf6..9448b7d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ --- language: java jdk: openjdk11 -dist: xenial +os: linux +dist: focal git: depth: false From 7597664f230accc33139cd33bc1ea625de0f79f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Wed, 8 Dec 2021 10:25:19 +0100 Subject: [PATCH 08/25] ACS-1983 CentOS 7 base image for the ImageMagic transformer (#489) --- .../Dockerfile | 16 +- .../3rd-party/ImageMagick-license.txt | 217 +++++++++--------- .../README.md | 16 ++ .../scripts/build-rpms.sh | 38 +++ 4 files changed, 167 insertions(+), 120 deletions(-) create mode 100644 alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md create mode 100644 alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile index cdf322e3..65d4c00a 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile @@ -2,12 +2,12 @@ # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa -ARG IMAGEMAGICK_VERSION=7.0.10-59 +ARG IMAGEMAGICK_VERSION=7.1.0-16 -ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm -ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm +ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-centos7.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-centos7.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm ENV JAVA_OPTS="" @@ -20,12 +20,8 @@ ARG USERID=33002 COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ - curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \ - curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \ - curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \ - yum localinstall -y imagemagick-epel-dep.rpm && \ - yum localinstall -y imagemagick-distribution-*linux.rpm && \ - rm -f imagemagick-distribution-*.rpm && \ + yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ + yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ yum clean all ADD target/generated-resources/licenses /licenses diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt index f16ade13..588997c7 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt @@ -1,110 +1,107 @@ -The authoritative ImageMagick license can be found at -http://www.imagemagick.org/script/license.php and ImageMagick notices at -http://www.imagemagick.org/www/Notice.html. - -Before we get to the text of the license, lets just review what the license says in simple terms: - -It allows you to: - - * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes; - * use ImageMagick software in packages or distributions that you create; - * link against a library under a different license; - * link code under a different license against a library under this license; - * merge code into a work under a different license; - * extend patent grants to any code using code under this license; - *and extend patent protection. - -It forbids you to: - - * redistribute any piece of ImageMagick-originated software without proper attribution; - * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that ImageMagick Studio LLC endorses your distribution; - * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that you created the ImageMagick software in question. - -It requires you to: - - * include a copy of the license in any redistribution you may make that includes ImageMagick software; - * provide clear attribution to ImageMagick Studio LLC for any distributions that include ImageMagick software. - -It does not require you to: - - * include the source of the ImageMagick software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it; - * submit changes that you make to the software back to the ImageMagick Studio LLC (though such feedback is encouraged). - -A few other clarifications include: - * ImageMagick is freely available without charge; - * you may include ImageMagick on any digital media as long as you comply with the terms of the license; - * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software; - * the license is compatible with the GPL V3. - * when exporting the ImageMagick software, review its export classification. - -Terms and Conditions for Use, Reproduction, and Distribution - -The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow: - -Copyright © 1999-2018 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - a. You must give any other recipients of the Work or Derivative Works a copy of this License; and - - b. You must cause any modified files to carry prominent notices stating that You changed the files; and - - c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - -You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -How to Apply the License to your Work - -To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the ImageMagick License (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy - of the License at - - https://www.imagemagick.org/script/license.php - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. \ No newline at end of file +The authoritative ImageMagick license can be found at +https://imagemagick.org/script/license.php and ImageMagick notices at +https://raw.githubusercontent.com/ImageMagick/ImageMagick/main/NOTICE. + +Before we get to the text of the license, lets just review what the license says in simple terms: + +It allows you to: + + * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes; + * use ImageMagick software in packages or distributions that you create; + * link against a library under a different license; + * link code under a different license against a library under this license; + * merge code into a work under a different license; + * extend patent grants to any code using code under this license; + * and extend patent protection. + +It forbids you to: + + * redistribute any piece of ImageMagick-originated software without proper attribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that ImageMagick Studio LLC endorses your distribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that you created the ImageMagick software in question. + +It requires you to: + + * include a copy of the license in any redistribution you may make that includes ImageMagick software; + * provide clear attribution to ImageMagick Studio LLC for any distributions that include ImageMagick software. + +It does not require you to: + + * include the source of the ImageMagick software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it; + * submit changes that you make to the software back to the ImageMagick Studio LLC (though such feedback is encouraged). + +A few other clarifications include: + + * ImageMagick is freely available without charge; + * you may include ImageMagick on a DVD as long as you comply with the terms of the license; + * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software; + * the license is compatible with the GPL V3. + * when exporting the ImageMagick software, review its export classification. + +Terms and Conditions for Use, Reproduction, and Distribution + +The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow: + +Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. + +1. Definitions. + +License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License. + +Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution. + +Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + * You must give any other recipients of the Work or Derivative Works a copy of this License; and + * You must cause any modified files to carry prominent notices stating that You changed the files; and + * You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + * If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +How to Apply the License to your Work + +To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the ImageMagick License (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy + of the License at + + https://imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and limitations + under the License. diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md new file mode 100644 index 00000000..09b2feab --- /dev/null +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md @@ -0,0 +1,16 @@ +# How to create ImageMagick RPM packages for CentOS 7 +1. `cd` to this directory +2. Use CentOS 7 base image and execute the [build-rpms.sh](scripts/build-rpms.sh) script + +```bash +docker run -it --rm -v `pwd`:/opt/alfresco/imagemagick alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa /bin/bash /opt/alfresco/imagemagick/scripts/build-rpms.sh +``` + +> **Note:** If you want to know more details or need to upgrade the ImageMagick version please check the comments in the [build-rpms.sh](scripts/build-rpms.sh) file + +3. RPMs will be created in the `rpms` directory + +```bash +bash-3.2$ ls rpms +ImageMagick-7.0.10-59.x86_64.centos7.rpm ImageMagick-libs-7.0.10-59.x86_64.centos7.rpm +``` \ No newline at end of file diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh new file mode 100644 index 00000000..ac00910e --- /dev/null +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +set -e + +IMAGEMAGICK_VERSION=7.1.0-16 + +#Installing SRPM package. For future proof builds the SRPM package is uploaded to Alfresco's nexus repository. +rpm -i https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/$IMAGEMAGICK_VERSION/imagemagick-distribution-$IMAGEMAGICK_VERSION-src.rpm + +#liblqr is not available on CentOS 7. Removing it from the spec. +sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec + +#We need some libraries from the epel repo. +yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + +#We are going to compile the imagemagick so we need development tools. +yum -y group install "Development Tools" + +#We are building the imagemagick from the official SRPM package. It allows us to be as compatible with the official RPM packages as possible. +# Installing direct build time dependencies (excluding liblqr-1-devel) +yum -y install bzip2-devel freetype-devel libjpeg-devel libpng-devel libtiff-devel giflib-devel \ + zlib-devel perl-devel perl-generators ghostscript-devel djvulibre-devel libwmf-devel jasper-devel \ + libtool-ltdl-devel libX11-devel libXext-devel libXt-devel lcms2-devel libxml2-devel librsvg2-devel \ + fftw-devel ilmbase-devel OpenEXR-devel libwebp-devel jbigkit-devel openjpeg2-devel graphviz-devel \ + libraqm-devel LibRaw-devel +# Installing indirect dependencies +# ImageMagick tests requite non default fonts +yum groupinstall -y "fonts" +# ImageMagick spec requires ldconfig_scriptlets macro +yum -y install epel-rpm-macros + +#Building binary RPM packages +rpmbuild -bb ~/rpmbuild/SPECS/ImageMagick.spec + +#Copy RPMs to well known directory. +mkdir -p /opt/alfresco/imagemagick/rpms +cp ~/rpmbuild/RPMS/x86_64/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.centos7.rpm +cp ~/rpmbuild/RPMS/x86_64/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.centos7.rpm \ No newline at end of file From 0e0fe677982efe170bbb9255ea7a8f02bac64cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Wed, 8 Dec 2021 10:26:16 +0100 Subject: [PATCH 09/25] ATS-968 Migrate to CentOS 7 base images (#490) --- .../Dockerfile | 18 +- .../3rd-party/ImageMagick-license.txt | 217 +++++++++--------- .../Dockerfile | 2 +- .../alfresco-transform-misc-boot/Dockerfile | 2 +- .../Dockerfile | 2 +- .../alfresco-transform-tika-boot/Dockerfile | 4 +- 6 files changed, 119 insertions(+), 126 deletions(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile index d314c739..6c6cb03d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -5,15 +5,15 @@ # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} ARG EXIFTOOL_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/exiftool/image-exiftool/${EXIFTOOL_VERSION}/image-exiftool-${EXIFTOOL_VERSION}.tgz -ARG IMAGEMAGICK_VERSION=7.0.10-59 -ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm -ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm +ARG IMAGEMAGICK_VERSION=7.1.0-16 +ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-centos7.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-centos7.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm ARG LIBREOFFICE_VERSION=7.0.6 @@ -32,12 +32,8 @@ ARG USERID=33017 COPY target/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin/alfresco-transform-core-aio-boot.jar && \ - curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \ - curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \ - curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \ - yum localinstall -y imagemagick-epel-dep.rpm && \ - yum localinstall -y imagemagick-distribution-*linux.rpm && \ - rm -f imagemagick-distribution-*.rpm && \ + yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ + yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ yum install -y cairo cups-libs libSM libGLU && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ @@ -50,7 +46,7 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr rm -f alfresco-pdf-renderer-linux.tgz && \ curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \ tar xzf ${EXIFTOOL_FOLDER}.tgz && \ - yum -y install perl && \ + yum -y install perl perl-ExtUtils-MakeMaker make && \ (cd ./${EXIFTOOL_FOLDER} && \ perl Makefile.PL && \ make && \ diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt index f16ade13..588997c7 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/licenses/3rd-party/ImageMagick-license.txt @@ -1,110 +1,107 @@ -The authoritative ImageMagick license can be found at -http://www.imagemagick.org/script/license.php and ImageMagick notices at -http://www.imagemagick.org/www/Notice.html. - -Before we get to the text of the license, lets just review what the license says in simple terms: - -It allows you to: - - * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes; - * use ImageMagick software in packages or distributions that you create; - * link against a library under a different license; - * link code under a different license against a library under this license; - * merge code into a work under a different license; - * extend patent grants to any code using code under this license; - *and extend patent protection. - -It forbids you to: - - * redistribute any piece of ImageMagick-originated software without proper attribution; - * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that ImageMagick Studio LLC endorses your distribution; - * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that you created the ImageMagick software in question. - -It requires you to: - - * include a copy of the license in any redistribution you may make that includes ImageMagick software; - * provide clear attribution to ImageMagick Studio LLC for any distributions that include ImageMagick software. - -It does not require you to: - - * include the source of the ImageMagick software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it; - * submit changes that you make to the software back to the ImageMagick Studio LLC (though such feedback is encouraged). - -A few other clarifications include: - * ImageMagick is freely available without charge; - * you may include ImageMagick on any digital media as long as you comply with the terms of the license; - * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software; - * the license is compatible with the GPL V3. - * when exporting the ImageMagick software, review its export classification. - -Terms and Conditions for Use, Reproduction, and Distribution - -The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow: - -Copyright © 1999-2018 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - a. You must give any other recipients of the Work or Derivative Works a copy of this License; and - - b. You must cause any modified files to carry prominent notices stating that You changed the files; and - - c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - -You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -How to Apply the License to your Work - -To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the ImageMagick License (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy - of the License at - - https://www.imagemagick.org/script/license.php - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. \ No newline at end of file +The authoritative ImageMagick license can be found at +https://imagemagick.org/script/license.php and ImageMagick notices at +https://raw.githubusercontent.com/ImageMagick/ImageMagick/main/NOTICE. + +Before we get to the text of the license, lets just review what the license says in simple terms: + +It allows you to: + + * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes; + * use ImageMagick software in packages or distributions that you create; + * link against a library under a different license; + * link code under a different license against a library under this license; + * merge code into a work under a different license; + * extend patent grants to any code using code under this license; + * and extend patent protection. + +It forbids you to: + + * redistribute any piece of ImageMagick-originated software without proper attribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that ImageMagick Studio LLC endorses your distribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that you created the ImageMagick software in question. + +It requires you to: + + * include a copy of the license in any redistribution you may make that includes ImageMagick software; + * provide clear attribution to ImageMagick Studio LLC for any distributions that include ImageMagick software. + +It does not require you to: + + * include the source of the ImageMagick software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it; + * submit changes that you make to the software back to the ImageMagick Studio LLC (though such feedback is encouraged). + +A few other clarifications include: + + * ImageMagick is freely available without charge; + * you may include ImageMagick on a DVD as long as you comply with the terms of the license; + * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software; + * the license is compatible with the GPL V3. + * when exporting the ImageMagick software, review its export classification. + +Terms and Conditions for Use, Reproduction, and Distribution + +The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow: + +Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. + +1. Definitions. + +License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License. + +Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution. + +Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + * You must give any other recipients of the Work or Derivative Works a copy of this License; and + * You must cause any modified files to carry prominent notices stating that You changed the files; and + * You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + * If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +How to Apply the License to your Work + +To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the ImageMagick License (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy + of the License at + + https://imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and limitations + under the License. diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index 43e270d2..e1845825 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile @@ -2,7 +2,7 @@ # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa ARG LIBREOFFICE_VERSION=7.0.6 diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile index 0f7ebe12..dbbfc7a2 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa ENV JAVA_OPTS="" diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile index 2e83187a..a5795366 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile @@ -2,7 +2,7 @@ # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV JAVA_OPTS="" diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index 03dd0bde..cf51974c 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} @@ -21,7 +21,7 @@ COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \ tar xzf ${EXIFTOOL_FOLDER}.tgz && \ - yum -y install perl && \ + yum -y install perl perl-ExtUtils-MakeMaker make && \ (cd ./${EXIFTOOL_FOLDER} && \ perl Makefile.PL && \ make && \ From d7f7520c4517ca211767e386b3a6f242ed354484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Wed, 8 Dec 2021 10:27:40 +0100 Subject: [PATCH 10/25] ATS-969 Tika upgrade 1.x -> 2.x (#493) --- .../alfresco-transform-tika-boot/pom.xml | 18 +++--- .../test/resources/quick.3g2_metadata.json | 5 +- .../test/resources/quick.3gp_metadata.json | 5 +- .../test/resources/quick.m4v_metadata.json | 5 +- .../test/resources/quick.mov_metadata.json | 5 +- .../test/resources/quick.mp4_metadata.json | 5 +- .../alfresco-transform-tika/pom.xml | 18 +++--- .../AbstractTikaMetadataExtractor.java | 56 ++++++++++--------- .../DWGMetadataExtractor.java | 8 +-- .../MP3MetadataExtractor.java | 6 +- .../MailMetadataExtractor.java | 23 ++++---- .../OfficeMetadataExtractor.java | 29 +++++----- .../OpenDocumentMetadataExtractor.java | 52 ++++++++++++++--- .../TikaAudioMetadataExtractor.java | 8 +-- .../tika/parsers/ExifToolParser.java | 12 ++-- pom.xml | 2 +- 16 files changed, 149 insertions(+), 108 deletions(-) diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml index 887b6524..b9a01e4d 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml @@ -65,13 +65,9 @@ org.apache.tika - tika-parsers + tika-parsers-standard-package ${dependency.tika.version} - - com.tdunning - json - org.bouncycastle bcprov-jdk15on @@ -80,14 +76,20 @@ org.bouncycastle bcmail-jdk15on - - org.quartz-scheduler - quartz + xml-apis + xml-apis + + + joda-time + joda-time + 2.2 + + org.bouncycastle diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json index 75afde88..4aba2f05 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json @@ -2,7 +2,8 @@ "{http://www.alfresco.org/model/content/1.0}description" : null, "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null, "{http://www.alfresco.org/model/content/1.0}created" : null, - "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000", + "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "8000", "{http://www.alfresco.org/model/content/1.0}author" : null, - "{http://www.alfresco.org/model/content/1.0}title" : null + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json index 75afde88..4aba2f05 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json @@ -2,7 +2,8 @@ "{http://www.alfresco.org/model/content/1.0}description" : null, "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null, "{http://www.alfresco.org/model/content/1.0}created" : null, - "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000", + "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "8000", "{http://www.alfresco.org/model/content/1.0}author" : null, - "{http://www.alfresco.org/model/content/1.0}title" : null + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json index 75afde88..dc61188e 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json @@ -2,7 +2,8 @@ "{http://www.alfresco.org/model/content/1.0}description" : null, "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null, "{http://www.alfresco.org/model/content/1.0}created" : null, - "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000", + "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050", "{http://www.alfresco.org/model/content/1.0}author" : null, - "{http://www.alfresco.org/model/content/1.0}title" : null + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json index 75afde88..96545700 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json @@ -2,7 +2,8 @@ "{http://www.alfresco.org/model/content/1.0}description" : null, "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null, "{http://www.alfresco.org/model/content/1.0}created" : null, - "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000", + "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050", "{http://www.alfresco.org/model/content/1.0}author" : null, - "{http://www.alfresco.org/model/content/1.0}title" : null + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://www.alfresco.org/model/audio/1.0}channelType" : "Mono" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json index 39086dfb..96545700 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json @@ -2,7 +2,8 @@ "{http://www.alfresco.org/model/content/1.0}description" : null, "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null, "{http://www.alfresco.org/model/content/1.0}created" : null, - "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "90000", + "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050", "{http://www.alfresco.org/model/content/1.0}author" : null, - "{http://www.alfresco.org/model/content/1.0}title" : null + "{http://www.alfresco.org/model/content/1.0}title" : null, + "{http://www.alfresco.org/model/audio/1.0}channelType" : "Mono" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml index e613c745..c7017cbd 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml +++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml @@ -27,13 +27,9 @@ org.apache.tika - tika-parsers + tika-parsers-standard-package ${dependency.tika.version} - - com.tdunning - json - org.bouncycastle bcprov-jdk15on @@ -42,11 +38,6 @@ org.bouncycastle bcmail-jdk15on - - - org.quartz-scheduler - quartz - xml-apis xml-apis @@ -54,6 +45,13 @@ + + + joda-time + joda-time + 2.2 + + org.bouncycastle diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java index 4a78ae00..c9e8ab60 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java @@ -28,7 +28,11 @@ package org.alfresco.transformer.metadataExtractors; import org.apache.tika.embedder.Embedder; import org.apache.tika.extractor.DocumentSelector; +import org.apache.tika.metadata.DublinCore; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.OfficeOpenXMLCore; +import org.apache.tika.metadata.Property; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.sax.ContentHandlerDecorator; @@ -58,7 +62,10 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * The parent of all Metadata Extractors which use Apache Tika under the hood. This handles all the @@ -83,7 +90,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr protected static final String KEY_CREATED = "created"; protected static final String KEY_DESCRIPTION = "description"; protected static final String KEY_COMMENTS = "comments"; - protected static final String KEY_TAGS = "dc:subject"; + protected static final String KEY_TAGS = DublinCore.SUBJECT.getName(); private static final String METADATA_SEPARATOR = ","; @@ -208,7 +215,6 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr } @Override - @SuppressWarnings( "deprecation" ) public Map extractMetadata(String sourceMimetype, Map transformOptions, File sourceFile) throws Exception { @@ -245,7 +251,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr for (String tikaKey : metadata.names()) { // TODO review this change (part of MNT-15267) - should we really force string concatenation here !? - putRawValue(tikaKey, getMetadataValue(metadata, tikaKey), rawProperties); + putRawValue(tikaKey, getMetadataValue(metadata, Property.internalText(tikaKey)), rawProperties); } // Now, map the common Tika metadata keys onto @@ -254,17 +260,17 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr // to work without needing any changes // The simple ones - putRawValue(KEY_AUTHOR, getMetadataValue(metadata, Metadata.AUTHOR), rawProperties); - putRawValue(KEY_TITLE, getMetadataValue(metadata, Metadata.TITLE), rawProperties); - putRawValue(KEY_COMMENTS, getMetadataValue(metadata, Metadata.COMMENTS), rawProperties); + putRawValue(KEY_AUTHOR, getMetadataValue(metadata, TikaCoreProperties.CREATOR), rawProperties); + putRawValue(KEY_TITLE, getMetadataValue(metadata, TikaCoreProperties.TITLE), rawProperties); + putRawValue(KEY_COMMENTS, getMetadataValue(metadata, TikaCoreProperties.COMMENTS), rawProperties); // Tags putRawValue(KEY_TAGS, getMetadataValues(metadata, KEY_TAGS), rawProperties); // Get the subject and description, despite things not // being nearly as consistent as one might hope - String subject = getMetadataValue(metadata, Metadata.SUBJECT); - String description = getMetadataValue(metadata, Metadata.DESCRIPTION); + String subject = getMetadataValue(metadata, OfficeOpenXMLCore.SUBJECT); + String description = getMetadataValue(metadata, TikaCoreProperties.DESCRIPTION); if(subject != null && description != null) { putRawValue(KEY_DESCRIPTION, description, rawProperties); @@ -282,13 +288,13 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr } // Try for the dates two different ways too - if(metadata.get(Metadata.CREATION_DATE) != null) + if(metadata.get(TikaCoreProperties.CREATED) != null) { - putRawValue(KEY_CREATED, metadata.get(Metadata.CREATION_DATE), rawProperties); + putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.CREATED), rawProperties); } - else if(metadata.get(Metadata.DATE) != null) + else if(metadata.get(TikaCoreProperties.MODIFIED) != null) { - putRawValue(KEY_CREATED, metadata.get(Metadata.DATE), rawProperties); + putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.MODIFIED), rawProperties); } // If people created a specific instance @@ -388,24 +394,11 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr return values.length == 0 ? null : (values.length == 1 ? values[0] : values); } - private String getMetadataValue(Metadata metadata, String key) + private String getMetadataValue(Metadata metadata, Property key) { if (metadata.isMultiValued(key)) { - String[] parts = metadata.getValues(key); - - // use Set to prevent duplicates - Set value = new LinkedHashSet<>(parts.length); - - for (int i = 0; i < parts.length; i++) - { - value.add(parts[i]); - } - - String valueStr = value.toString(); - - // remove leading/trailing braces [] - return valueStr.substring(1, valueStr.length() - 1); + return distinct(metadata.getValues(key)).collect(Collectors.joining(", ")); } else { @@ -413,6 +406,15 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr } } + protected static Stream distinct(final String[] strings) + { + return Stream.of(strings) + .filter(Objects::nonNull) + .map(String::strip) + .filter(s -> !s.isEmpty()) + .distinct(); + } + /** * This content handler will capture entries from within * the header of the Tika content XHTML, but ignore the diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java index 9f6ec66e..47f300ed 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -27,6 +27,7 @@ package org.alfresco.transformer.metadataExtractors; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.Parser; import org.apache.tika.parser.dwg.DWGParser; import org.slf4j.Logger; @@ -64,13 +65,12 @@ public class DWGMetadataExtractor extends AbstractTikaMetadataExtractor super(logger); } - @SuppressWarnings("deprecation") @Override protected Map extractSpecific(Metadata metadata, Map properties, Map headers) { - putRawValue(KEY_KEYWORD, metadata.get(Metadata.KEYWORDS), properties); - putRawValue(KEY_LAST_AUTHOR, metadata.get(Metadata.LAST_AUTHOR), properties); + putRawValue(KEY_KEYWORD, metadata.get(TikaCoreProperties.SUBJECT), properties); + putRawValue(KEY_LAST_AUTHOR, metadata.get(TikaCoreProperties.MODIFIED), properties); return properties; } diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java index d8957863..b6cd2826 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -27,6 +27,7 @@ package org.alfresco.transformer.metadataExtractors; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.XMPDM; import org.apache.tika.parser.Parser; import org.apache.tika.parser.mp3.Mp3Parser; @@ -86,7 +87,6 @@ public class MP3MetadataExtractor extends TikaAudioMetadataExtractor return new Mp3Parser(); } - @SuppressWarnings("deprecation") @Override protected Map extractSpecific(Metadata metadata, Map properties, Map headers) @@ -98,7 +98,7 @@ public class MP3MetadataExtractor extends TikaAudioMetadataExtractor // We only need these for people who had pre-existing mapping // properties from before the proper audio model was added putRawValue(KEY_ALBUM_TITLE, metadata.get(XMPDM.ALBUM), properties); - putRawValue(KEY_SONG_TITLE, metadata.get(Metadata.TITLE), properties); + putRawValue(KEY_SONG_TITLE, metadata.get(TikaCoreProperties.TITLE), properties); putRawValue(KEY_ARTIST, metadata.get(XMPDM.ARTIST), properties); putRawValue(KEY_COMMENT, metadata.get(XMPDM.LOG_COMMENT), properties); putRawValue(KEY_TRACK_NUMBER, metadata.get(XMPDM.TRACK_NUMBER), properties); diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java index 5d0a047f..86d168c6 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,7 +26,9 @@ */ package org.alfresco.transformer.metadataExtractors; +import org.apache.tika.metadata.Message; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.Parser; import org.apache.tika.parser.microsoft.OfficeParser; import org.slf4j.Logger; @@ -82,26 +84,25 @@ public class MailMetadataExtractor extends AbstractTikaMetadataExtractor return new OfficeParser(); } - @SuppressWarnings("deprecation") @Override protected Map extractSpecific(Metadata metadata, Map properties, Map headers) { - putRawValue(KEY_ORIGINATOR, metadata.get(Metadata.AUTHOR), properties); - putRawValue(KEY_SUBJECT, metadata.get(Metadata.TITLE), properties); - putRawValue(KEY_DESCRIPTION, metadata.get(Metadata.SUBJECT), properties); - putRawValue(KEY_SENT_DATE, metadata.get(Metadata.LAST_SAVED), properties); + putRawValue(KEY_ORIGINATOR, metadata.get(TikaCoreProperties.CREATOR), properties); + putRawValue(KEY_SUBJECT, metadata.get(TikaCoreProperties.TITLE), properties); + putRawValue(KEY_DESCRIPTION, metadata.get(TikaCoreProperties.SUBJECT), properties); + putRawValue(KEY_SENT_DATE, metadata.get(TikaCoreProperties.MODIFIED), properties); // Store the TO, but not cc/bcc in the addressee field - putRawValue(KEY_ADDRESSEE, metadata.get(Metadata.MESSAGE_TO), properties); + putRawValue(KEY_ADDRESSEE, metadata.get(Message.MESSAGE_TO), properties); // Store each of To, CC and BCC in their own fields - putRawValue(KEY_TO_NAMES, metadata.getValues(Metadata.MESSAGE_TO), properties); - putRawValue(KEY_CC_NAMES, metadata.getValues(Metadata.MESSAGE_CC), properties); - putRawValue(KEY_BCC_NAMES, metadata.getValues(Metadata.MESSAGE_BCC), properties); + putRawValue(KEY_TO_NAMES, metadata.getValues(Message.MESSAGE_TO), properties); + putRawValue(KEY_CC_NAMES, metadata.getValues(Message.MESSAGE_CC), properties); + putRawValue(KEY_BCC_NAMES, metadata.getValues(Message.MESSAGE_BCC), properties); // But store all email addresses (to/cc/bcc) in the addresses field - putRawValue(KEY_ADDRESSEES, metadata.getValues(Metadata.MESSAGE_RECIPIENT_ADDRESS), properties); + putRawValue(KEY_ADDRESSEES, metadata.getValues(Message.MESSAGE_RECIPIENT_ADDRESS), properties); return properties; } diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java index dfca577e..7612a386 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -27,6 +27,8 @@ package org.alfresco.transformer.metadataExtractors; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.Office; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.Parser; import org.apache.tika.parser.microsoft.OfficeParser; import org.slf4j.Logger; @@ -40,7 +42,7 @@ import java.util.Map; * * Configuration: (see OfficeMetadataExtractor_metadata_extract.properties and tika_engine_config.json) * - * This extracter uses the POI library to extract the following: + * This extractor uses the POI library to extract the following: * 
  *   author:             --      cm:author
  *   title:              --      cm:title
@@ -91,23 +93,20 @@ public class OfficeMetadataExtractor extends AbstractTikaMetadataExtractor
         return new OfficeParser();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_CREATE_DATETIME, metadata.get(Metadata.CREATION_DATE), properties);
-        putRawValue(KEY_LAST_SAVE_DATETIME, metadata.get(Metadata.LAST_SAVED), properties);
-        putRawValue(KEY_EDIT_TIME, metadata.get(Metadata.EDIT_TIME), properties);
-        putRawValue(KEY_FORMAT, metadata.get(Metadata.FORMAT), properties);
-        putRawValue(KEY_KEYWORDS, metadata.get(Metadata.KEYWORDS), properties);
-        putRawValue(KEY_LAST_AUTHOR, metadata.get(Metadata.LAST_AUTHOR), properties);
-        putRawValue(KEY_LAST_PRINTED, metadata.get(Metadata.LAST_PRINTED), properties);
-//       putRawValue(KEY_OS_VERSION, metadata.get(Metadata.OS_VERSION), properties);
-//       putRawValue(KEY_THUMBNAIL, metadata.get(Metadata.THUMBNAIL), properties);
-        putRawValue(KEY_PAGE_COUNT, metadata.get(Metadata.PAGE_COUNT), properties);
-        putRawValue(KEY_PARAGRAPH_COUNT, metadata.get(Metadata.PARAGRAPH_COUNT), properties);
-        putRawValue(KEY_WORD_COUNT, metadata.get(Metadata.WORD_COUNT), properties);
+        putRawValue(KEY_CREATE_DATETIME, metadata.get(TikaCoreProperties.CREATED), properties);
+        putRawValue(KEY_LAST_SAVE_DATETIME, metadata.get(TikaCoreProperties.MODIFIED), properties);
+        putRawValue(KEY_EDIT_TIME, metadata.get(TikaCoreProperties.MODIFIED), properties);
+        putRawValue(KEY_FORMAT, metadata.get(TikaCoreProperties.FORMAT), properties);
+        putRawValue(KEY_KEYWORDS, metadata.get(TikaCoreProperties.SUBJECT), properties);
+        putRawValue(KEY_LAST_AUTHOR, metadata.get(TikaCoreProperties.MODIFIER), properties);
+        putRawValue(KEY_LAST_PRINTED, metadata.get(TikaCoreProperties.PRINT_DATE), properties);
+        putRawValue(KEY_PAGE_COUNT, metadata.get(Office.PAGE_COUNT), properties);
+        putRawValue(KEY_PARAGRAPH_COUNT, metadata.get(Office.PARAGRAPH_COUNT), properties);
+        putRawValue(KEY_WORD_COUNT, metadata.get(Office.WORD_COUNT), properties);
         return properties;
     }
 }
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
index 4de536da..8014802b 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,18 +26,28 @@
  */
 package org.alfresco.transformer.metadataExtractors;
 
+import static org.apache.tika.metadata.DublinCore.NAMESPACE_URI_DC;
+
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.odf.OpenDocumentMetaParser;
 import org.apache.tika.parser.odf.OpenDocumentParser;
+import org.apache.tika.parser.xml.ElementMetadataHandler;
+import org.apache.tika.sax.TeeContentHandler;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xml.sax.ContentHandler;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * {@code "application/vnd.oasis.opendocument..."} and {@code "applicationvnd.oasis.opendocument..."} metadata extractor.
@@ -77,6 +87,7 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
     private static final String KEY_INITIAL_CREATOR = "initialCreator";
     private static final String KEY_KEYWORD = "keyword";
     private static final String KEY_LANGUAGE = "language";
+    private static final String KEY_ALFRESCO_CREATOR = "_alfresco:creator";
 
     private static final String CUSTOM_PREFIX = "custom:";
 
@@ -90,22 +101,33 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
     @Override
     protected Parser getParser()
     {
-        return new OpenDocumentParser();
+        OpenDocumentParser parser = new OpenDocumentParser();
+        parser.setMetaParser(new OpenDocumentMetaParser() {
+            @Override
+            protected ContentHandler getContentHandler(ContentHandler ch, Metadata md, ParseContext context)
+            {
+                final ContentHandler superHandler = super.getContentHandler(ch, md, context);
+                final ContentHandler creatorHandler = new ElementMetadataHandler(NAMESPACE_URI_DC, KEY_CREATOR, md, KEY_ALFRESCO_CREATOR);
+                return new TeeContentHandler(superHandler, creatorHandler);
+            }
+        });
+        return parser;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_CREATION_DATE, getDateOrNull(metadata.get(Metadata.CREATION_DATE)), properties);
-        putRawValue(KEY_CREATOR, metadata.get(Metadata.CREATOR), properties);
-        putRawValue(KEY_DATE, getDateOrNull(metadata.get(Metadata.DATE)), properties);
-        putRawValue(KEY_DESCRIPTION, metadata.get(Metadata.DESCRIPTION), properties);
+        putRawValue(KEY_CREATION_DATE, getDateOrNull(metadata.get(TikaCoreProperties.CREATED)), properties);
+        final String creator = getCreator(metadata);
+        putRawValue(KEY_CREATOR, creator, properties);
+        putRawValue(KEY_AUTHOR, creator, properties);
+        putRawValue(KEY_DATE, getDateOrNull(metadata.get(TikaCoreProperties.MODIFIED)), properties);
+        putRawValue(KEY_DESCRIPTION, metadata.get(TikaCoreProperties.DESCRIPTION), properties);
         putRawValue(KEY_GENERATOR, metadata.get("generator"), properties);
         putRawValue(KEY_INITIAL_CREATOR, metadata.get("initial-creator"), properties);
-        putRawValue(KEY_KEYWORD, metadata.get(Metadata.KEYWORDS), properties);
-        putRawValue(KEY_LANGUAGE, metadata.get(Metadata.LANGUAGE), properties);
+        putRawValue(KEY_KEYWORD, metadata.get(TikaCoreProperties.SUBJECT), properties);
+        putRawValue(KEY_LANGUAGE, metadata.get(TikaCoreProperties.LANGUAGE), properties);
 
         // Handle user-defined properties dynamically
         Map> mapping = super.getExtractMapping();
@@ -120,6 +142,18 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
         return properties;
     }
 
+    private String getCreator(Metadata metadata)
+    {
+        final List creators = distinct(metadata.getValues(TikaCoreProperties.CREATOR))
+                .collect(Collectors.toUnmodifiableList());
+        if (creators.size() == 1)
+        {
+            return creators.get(0);
+        }
+
+        return metadata.get(KEY_ALFRESCO_CREATOR);
+    }
+
     private Date getDateOrNull(String dateString)
     {
         if (dateString != null && dateString.length() != 0)
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
index 1a8a4a84..e7933ef3 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,6 +28,7 @@ package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.XMPDM;
 import org.apache.tika.parser.CompositeParser;
 import org.apache.tika.parser.Parser;
@@ -148,13 +149,12 @@ public class TikaAudioMetadataExtractor extends AbstractTikaMetadataExtractor
      * @param metadata     the metadata extracted from the file
      * @return          the description
      */
-    @SuppressWarnings("deprecation")
     private String generateDescription(Metadata metadata)
     {
         StringBuilder result = new StringBuilder();
-        if (metadata.get(Metadata.TITLE) != null)
+        if (metadata.get(TikaCoreProperties.TITLE) != null)
         {
-            result.append(metadata.get(Metadata.TITLE));
+            result.append(metadata.get(TikaCoreProperties.TITLE));
             if (metadata.get(XMPDM.ALBUM) != null)
             {
                 result
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
index e43677a4..9e15731e 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
@@ -44,9 +44,9 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.NullOutputStream;
 import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
-import org.apache.tika.io.NullOutputStream;
 import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
@@ -57,7 +57,7 @@ import org.apache.tika.parser.external.ExternalParser;
 import org.apache.tika.parser.external.ExternalParsersFactory;
 import org.apache.tika.parser.image.ImageParser;
 import org.apache.tika.parser.image.TiffParser;
-import org.apache.tika.parser.jpeg.JpegParser;
+import org.apache.tika.parser.image.JpegParser;
 import org.apache.tika.sax.XHTMLContentHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -263,7 +263,7 @@ public class ExifToolParser extends ExternalParser {
      * stream of the given process to the given XHTML content handler.
      * The standard output stream is closed once fully processed.
      *
-     * @param process process
+     * @param stream stream
      * @param xhtml XHTML content handler
      * @throws SAXException if the XHTML SAX events could not be handled
      * @throws IOException if an input error occurred
@@ -315,13 +315,13 @@ public class ExifToolParser extends ExternalParser {
      * standard stream of the given process. Potential exceptions
      * are ignored, and the stream is closed once fully processed.
      *
-     * @param process process
+     * @param stream stream
      */
     private void ignoreStream(final InputStream stream) {
         Thread t = new Thread() {
             public void run() {
                 try {
-                    IOUtils.copy(stream, new NullOutputStream());
+                    IOUtils.copy(stream, NullOutputStream.NULL_OUTPUT_STREAM);
                 } catch (IOException e) {
                 } finally {
                     IOUtils.closeQuietly(stream);
diff --git a/pom.xml b/pom.xml
index 2e4495ef..c3b7f75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.4.5
-        1.26
+        2.1.0
         4.1.2
         1.4
 

From 028b1ccaf60f3650b0f1ea3df89f2c22789919a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Dec 2021 22:10:41 +0000
Subject: [PATCH 11/25] Bump joda-time from 2.2 to 2.10.13

Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.2 to 2.10.13.
- [Release notes](https://github.com/JodaOrg/joda-time/releases)
- [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/JodaOrg/joda-time/compare/v2.2...v2.10.13)

---
updated-dependencies:
- dependency-name: joda-time:joda-time
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index b9a01e4d..2d579794 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -87,7 +87,7 @@
         
             joda-time
             joda-time
-            2.2
+            2.10.13
         
 
         
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index c7017cbd..3c9a5169 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -49,7 +49,7 @@
         
             joda-time
             joda-time
-            2.2
+            2.10.13
         
 
         

From 6a69611d1397699e4e783ede6f53c01d171e55c1 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad 
Date: Fri, 10 Dec 2021 14:10:03 +0000
Subject: [PATCH 12/25] ACS-2352: Added Veracode agent-based scanning
 integration.

---
 .travis.yml                             | 7 +++++++
 _ci/{sourceclear.sh => source_clear.sh} | 6 +++++-
 srcclr.yml                              | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename _ci/{sourceclear.sh => source_clear.sh} (78%)
 create mode 100644 srcclr.yml

diff --git a/.travis.yml b/.travis.yml
index 9448b7d5..e21dfc28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ branches:
     - /^ACS-.*$/
 
 stages:
+  - name: Veracode Scan
+    if: branch = master
   - build and test
   - release
   - company_release
@@ -34,6 +36,11 @@ before_install: bash _ci/init.sh
 
 jobs:
   include:
+    - stage: Veracode Scan
+      name: "Veracode - Source Clear Scan (SCA)"
+      install: skip
+      script: travis_wait 30 bash _ci/source_clear.sh
+
     - stage: Build and Test
       name: "Core & Base Snapshot deployment" # This is to separate the snapshot deployment from the following jobs, to prevent duplication on nexus
       if: branch = master AND type != pull_request
diff --git a/_ci/sourceclear.sh b/_ci/source_clear.sh
similarity index 78%
rename from _ci/sourceclear.sh
rename to _ci/source_clear.sh
index 5ad4a376..6ab40f79 100644
--- a/_ci/sourceclear.sh
+++ b/_ci/source_clear.sh
@@ -9,10 +9,14 @@ mvn -B -q clean install \
     -DskipTests \
     -Dmaven.javadoc.skip=true \
     com.srcclr:srcclr-maven-plugin:scan \
-    -Dcom.srcclr.apiToken=$SRCCLR_API_TOKEN > scan.log
+    -Dcom.srcclr.apiToken=${SRCCLR_API_TOKEN} > scan.log
 
 SUCCESS=$?   # this will read exit code of the previous command
 
+if [ -z "$VERACODE_FAILS_BUILD" ] || [ "$VERACODE_FAILS_BUILD" = false ] ; then
+    SUCCESS=0
+fi
+
 cat scan.log | grep -e 'Full Report Details' -e 'Failed'
 
 popd
diff --git a/srcclr.yml b/srcclr.yml
new file mode 100644
index 00000000..cd68c5bb
--- /dev/null
+++ b/srcclr.yml
@@ -0,0 +1,3 @@
+# To avoid the provided dependencies we set the scope to runtime. See: https://docs.veracode.com/r/c_sc_scan_directives
+# runtime: to restrict the scan to compile and runtime dependencies.
+scope: runtime
\ No newline at end of file

From 780b1fa7a3311539b48e8ade540f97cb83170374 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 09:22:55 +0000
Subject: [PATCH 13/25] Bump spring-boot-starter-parent from 2.6.0 to 2.6.2
 (#504)

Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.6.0 to 2.6.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.6.0...v2.6.2)

---
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] 

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 c3b7f75b..a8b7de39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     
         org.springframework.boot
         spring-boot-starter-parent
-        2.6.0
+        2.6.2
     
 
     

From f57bddb7934796f1d8a600d91dc5d663280bfe19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 09:34:57 +0000
Subject: [PATCH 14/25] Bump bcprov-jdk15on from 1.69 to 1.70 (#491)

Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.69 to 1.70.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk15on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index 2d579794..0ef89c8f 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -94,7 +94,7 @@
         
             org.bouncycastle
             bcprov-jdk15on
-            1.69
+            1.70
         
         
             org.bouncycastle
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 3c9a5169..372ad8e5 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -56,7 +56,7 @@
         
             org.bouncycastle
             bcprov-jdk15on
-            1.69
+            1.70
         
         
             org.bouncycastle

From c0f6f009627482e6524bbc20872e2de4d3832c96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:56:12 +0000
Subject: [PATCH 15/25] Bump bcmail-jdk15on from 1.69 to 1.70 (#492)

Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.69 to 1.70.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcmail-jdk15on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index 0ef89c8f..c8680e34 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -99,7 +99,7 @@
         
             org.bouncycastle
             bcmail-jdk15on
-            1.69
+            1.70
         
 
         
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 372ad8e5..430e1183 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -61,7 +61,7 @@
         
             org.bouncycastle
             bcmail-jdk15on
-            1.69
+            1.70
         
 
         

From 671867e16154dd635f066f6675629e8dfcbd1ae6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 11:00:12 +0000
Subject: [PATCH 16/25] Bump license-maven-plugin from 2.0.0 to
 2.0.1.alfresco-1 (#481)

Bumps [license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 2.0.0 to 2.0.1.alfresco-1.
- [Release notes](https://github.com/mojohaus/license-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/license-maven-plugin/commits)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:license-maven-plugin
  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 a8b7de39..abf0a12f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,7 +299,7 @@
                 
                     org.codehaus.mojo
                     license-maven-plugin
-                    2.0.0
+                    2.0.1.alfresco-1
                     
                         2005
                         Alfresco Software Limited

From a98f937b4ac9e4e95f6166f5ea0e6d9b39290f35 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Wed, 5 Jan 2022 12:17:17 +0000
Subject: [PATCH 17/25] ACS-2002 Enhance T-Router debug (#507)

[trigger release] 2.5.5-A1

By default T-Engines now provide the more readable TransformerDebug DEBUG messages, rather than the original detailed request and reply messages, which are still available as TRACE.
---
 .../alfresco-transform-core-aio-boot/pom.xml  |  2 +-
 .../alfresco-transform-core-aio/pom.xml       |  2 +-
 .../pom.xml                                   |  2 +-
 .../ImageMagickControllerTest.java            | 16 +----
 .../alfresco-transform-imagemagick/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 .../LibreOfficeControllerTest.java            | 14 +---
 .../alfresco-transform-libreoffice/pom.xml    |  2 +-
 .../alfresco-transform-misc-boot/pom.xml      |  2 +-
 .../alfresco-transform-misc/pom.xml           |  2 +-
 .../pom.xml                                   |  2 +-
 .../AlfrescoPdfRendererControllerTest.java    | 14 +---
 .../alfresco-transform-pdf-renderer/pom.xml   |  2 +-
 .../alfresco-transform-tika-boot/pom.xml      |  2 +-
 .../transformer/TikaControllerTest.java       | 15 +----
 .../alfresco-transform-tika/pom.xml           |  2 +-
 alfresco-transformer-base/pom.xml             |  4 +-
 .../AbstractTransformerController.java        | 65 ++++++++++++++-----
 .../transformer/QueueTransformService.java    |  4 +-
 .../config/WebApplicationConfig.java          |  9 ++-
 .../messaging/TransformReplySender.java       |  2 +-
 .../src/main/resources/application.yaml       |  1 +
 .../AbstractTransformerControllerTest.java    | 30 ++++++++-
 pom.xml                                       |  4 +-
 24 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
index 8835dc02..7b1a5290 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
index 62d7d308..d01055b9 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index 59042f09..d8d8fa4e 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java
index 65d58c17..7f1709dd 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -51,7 +51,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -380,18 +379,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         File sourceFile = getTestFile("quick." + sourceExtension, true);
         String targetFileRef = UUID.randomUUID().toString();
 
-        // Transformation Request POJO
-        TransformRequest transformRequest = new TransformRequest();
-        transformRequest.setRequestId("1");
-        transformRequest.setSchema(1);
-        transformRequest.setClientData("Alfresco Digital Business Platform");
-        transformRequest.setTransformRequestOptions(new HashMap<>());
-        transformRequest.setSourceReference(sourceFileRef);
-        transformRequest.setSourceExtension(sourceExtension);
-        transformRequest.setSourceMediaType(sourceMimetype);
-        transformRequest.setSourceSize(sourceFile.length());
-        transformRequest.setTargetExtension(targetExtension);
-        transformRequest.setTargetMediaType(targetMimetype);
+        TransformRequest transformRequest = createTransformRequest(sourceFileRef, sourceFile);
 
         // HTTP Request
         HttpHeaders headers = new HttpHeaders();
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index fa7ead45..8a382597 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index b9464bfc..0e39c946 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java
index 82b7b914..c9a71509 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -51,7 +51,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.UUID;
 
 import javax.annotation.PostConstruct;
@@ -228,16 +227,7 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest
         File sourceFile = getTestFile("quick." + sourceExtension, true);
         String targetFileRef = UUID.randomUUID().toString();
 
-        // Transformation Request POJO
-        TransformRequest transformRequest = new TransformRequest();
-        transformRequest.setRequestId("1");
-        transformRequest.setSchema(1);
-        transformRequest.setClientData("Alfresco Digital Business Platform");
-        transformRequest.setTransformRequestOptions(new HashMap<>());
-        transformRequest.setSourceReference(sourceFileRef);
-        transformRequest.setSourceExtension(sourceExtension);
-        transformRequest.setSourceSize(sourceFile.length());
-        transformRequest.setTargetExtension(targetExtension);
+        TransformRequest transformRequest = createTransformRequest(sourceFileRef, sourceFile);
 
         // HTTP Request
         HttpHeaders headers = new HttpHeaders();
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 4a627526..32066e38 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index 52e9cba0..f7503e8f 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index c19bed81..753a033c 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -9,7 +9,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
index b04a3372..d11ac173 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java
index d9d21821..0f729862 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -51,7 +51,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -292,16 +291,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro
         File sourceFile = getTestFile("quick." + sourceExtension, true);
         String targetFileRef = UUID.randomUUID().toString();
 
-        // Transformation Request POJO
-        TransformRequest transformRequest = new TransformRequest();
-        transformRequest.setRequestId("1");
-        transformRequest.setSchema(1);
-        transformRequest.setClientData("Alfresco Digital Business Platform");
-        transformRequest.setTransformRequestOptions(new HashMap<>());
-        transformRequest.setSourceReference(sourceFileRef);
-        transformRequest.setSourceExtension(sourceExtension);
-        transformRequest.setSourceSize(sourceFile.length());
-        transformRequest.setTargetExtension(targetExtension);
+        TransformRequest transformRequest = createTransformRequest(sourceFileRef, sourceFile);
 
         // HTTP Request
         HttpHeaders headers = new HttpHeaders();
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
index d4e190da..1660b28d 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index c8680e34..6ff5ea13 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
index 164b3376..2727d292 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -85,7 +85,6 @@ import static org.springframework.util.StringUtils.getFilenameExtension;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -609,17 +608,7 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
         File sourceFile = getTestFile("quick." + sourceExtension, true);
         String targetFileRef = UUID.randomUUID().toString();
 
-        // Transformation Request POJO
-        TransformRequest transformRequest = new TransformRequest();
-        transformRequest.setRequestId("1");
-        transformRequest.setSchema(1);
-        transformRequest.setClientData("Alfresco Digital Business Platform");
-        transformRequest.setTransformRequestOptions(new HashMap<>());
-        transformRequest.setSourceReference(sourceFileRef);
-        transformRequest.setSourceExtension(sourceExtension);
-        transformRequest.setSourceSize(sourceFile.length());
-        transformRequest.setTargetExtension(targetExtension);
-        transformRequest.setSourceMediaType(sourceMimetype);
+        TransformRequest transformRequest = createTransformRequest(sourceFileRef, sourceFile);
 
         // HTTP Request
         HttpHeaders headers = new HttpHeaders();
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 430e1183..3672452d 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 0ffd154e..c88fc15d 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,12 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-SNAPSHOT
+        2.5.5-A1-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-SNAPSHOT
+    2.5.5-A1-SNAPSHOT
 
     
         false
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
index 602d616e..06b4000c 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,12 +26,15 @@
  */
 package org.alfresco.transformer;
 
+import org.alfresco.transform.client.model.InternalContext;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.client.model.TransformRequestValidator;
 import org.alfresco.transform.client.model.config.TransformConfig;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.alfresco.transform.exceptions.TransformException;
+import org.alfresco.transform.router.TransformStack;
+import org.alfresco.transform.router.TransformerDebug;
 import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transformer.logging.LogEntry;
 import org.alfresco.transformer.model.FileRefResponse;
@@ -134,6 +137,9 @@ public abstract class AbstractTransformerController implements TransformControll
     @Autowired
     private TransformServiceRegistry transformRegistry;
 
+    @Autowired
+    private TransformerDebug transformerDebug;
+
     @GetMapping(value = "/transform/config")
     public ResponseEntity info()
     {
@@ -203,16 +209,18 @@ public abstract class AbstractTransformerController implements TransformControll
     public ResponseEntity transform(@RequestBody TransformRequest request,
         @RequestParam(value = "timeout", required = false) Long timeout)
     {
-        logger.info("Received {}, timeout {} ms", request, timeout);
+        logger.trace("Received {}, timeout {} ms", request, timeout);
 
         final TransformReply reply = new TransformReply();
-        reply.setInternalContext(request.getInternalContext());
         reply.setRequestId(request.getRequestId());
         reply.setSourceReference(request.getSourceReference());
         reply.setSchema(request.getSchema());
         reply.setClientData(request.getClientData());
 
         final Errors errors = validateTransformRequest(request);
+        validateInternalContext(request, errors);
+        initialiseContext(request);
+        reply.setInternalContext(request.getInternalContext());
         if (!errors.getAllErrors().isEmpty())
         {
             reply.setStatus(BAD_REQUEST.value());
@@ -222,7 +230,8 @@ public abstract class AbstractTransformerController implements TransformControll
                 .map(Object::toString)
                 .collect(joining(", ")));
 
-            logger.error("Invalid request, sending {}", reply);
+            transformerDebug.logFailure(reply);
+            logger.trace("Invalid request, sending {}", reply);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
 
@@ -237,7 +246,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(e.getStatusCode());
             reply.setErrorDetails(messageWithCause("Failed at reading the source file", e));
 
-            logger.error("Failed to load source file (TransformException), sending " + reply);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to load source file (TransformException), sending " + reply);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
         catch (HttpClientErrorException e)
@@ -245,8 +255,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(e.getStatusCode().value());
             reply.setErrorDetails(messageWithCause("Failed at reading the source file", e));
 
-            logger.error("Failed to load source file (HttpClientErrorException), sending " +
-                         reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to load source file (HttpClientErrorException), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
         catch (Exception e)
@@ -254,7 +264,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(INTERNAL_SERVER_ERROR.value());
             reply.setErrorDetails(messageWithCause("Failed at reading the source file", e));
 
-            logger.error("Failed to load source file (Exception), sending " + reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to load source file (Exception), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
 
@@ -266,10 +277,10 @@ public abstract class AbstractTransformerController implements TransformControll
         // Run the transformation
         try
         {
-
             String targetMimetype = request.getTargetMediaType();
             String sourceMimetype = request.getSourceMediaType();
             Map transformOptions = request.getTransformRequestOptions();
+            transformerDebug.logOptions(request);
             String transformName = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
             transformImpl(transformName, sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
         }
@@ -278,7 +289,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(e.getStatusCode());
             reply.setErrorDetails(messageWithCause("Failed at processing transformation", e));
 
-            logger.error("Failed to perform transform (TransformException), sending " + reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to perform transform (TransformException), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
         catch (Exception e)
@@ -286,7 +298,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(INTERNAL_SERVER_ERROR.value());
             reply.setErrorDetails(messageWithCause("Failed at processing transformation", e));
 
-            logger.error("Failed to perform transform (Exception), sending " + reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to perform transform (Exception), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
 
@@ -301,7 +314,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(e.getStatusCode());
             reply.setErrorDetails(messageWithCause("Failed at writing the transformed file", e));
 
-            logger.error("Failed to save target file (TransformException), sending " + reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to save target file (TransformException), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
         catch (HttpClientErrorException e)
@@ -309,8 +323,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(e.getStatusCode().value());
             reply.setErrorDetails(messageWithCause("Failed at writing the transformed file. ", e));
 
-            logger.error("Failed to save target file (HttpClientErrorException), sending " + reply,
-                e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to save target file (HttpClientErrorException), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
         catch (Exception e)
@@ -318,7 +332,8 @@ public abstract class AbstractTransformerController implements TransformControll
             reply.setStatus(INTERNAL_SERVER_ERROR.value());
             reply.setErrorDetails(messageWithCause("Failed at writing the transformed file. ", e));
 
-            logger.error("Failed to save target file (Exception), sending " + reply, e);
+            transformerDebug.logFailure(reply);
+            logger.trace("Failed to save target file (Exception), sending " + reply, e);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
 
@@ -343,7 +358,8 @@ public abstract class AbstractTransformerController implements TransformControll
         reply.setTargetReference(targetRef.getEntry().getFileRef());
         reply.setStatus(CREATED.value());
 
-        logger.info("Sending successful {}, timeout {} ms", reply, timeout);
+        transformerDebug.popTransform(reply);
+        logger.trace("Sending successful {}, timeout {} ms", reply, timeout);
         return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
     }
 
@@ -354,6 +370,21 @@ public abstract class AbstractTransformerController implements TransformControll
         return errors;
     }
 
+    private void validateInternalContext(TransformRequest request, Errors errors)
+    {
+        String errorMessage = InternalContext.checkForBasicErrors(request.getInternalContext(), "T-Request");
+        if (errorMessage != null)
+        {
+            errors.rejectValue("internalContext", null, errorMessage);
+        }
+    }
+
+    private void initialiseContext(TransformRequest request)
+    {
+        // If needed initialise the context enough to allow logging to take place without NPE checks
+        request.setInternalContext(InternalContext.initialise(request.getInternalContext()));
+    }
+
     /**
      * Loads the file with the specified sourceReference from Alfresco Shared File Store
      *
@@ -422,7 +453,7 @@ public abstract class AbstractTransformerController implements TransformControll
         }
         else if (logger.isInfoEnabled())
         {
-            logger.info("Using transform name provided in the request: " + requestTransformName);
+            logger.trace("Using transform name provided in the request: " + requestTransformName);
         }
         return transformName;
     }
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java
index 7cffd7dc..cb1d6fa4 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -106,7 +106,7 @@ public class QueueTransformService
             return;
         }
 
-        logger.info("New T-Request from queue with correlationId: {}", correlationId);
+        logger.trace("New T-Request from queue with correlationId: {}", correlationId);
 
         Optional transformRequest;
         try
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java
index d8dad96c..013f850e 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,6 +28,7 @@ package org.alfresco.transformer.config;
 
 import org.alfresco.transform.client.model.TransformRequestValidator;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
+import org.alfresco.transform.router.TransformerDebug;
 import org.alfresco.transformer.TransformInterceptor;
 import org.alfresco.transformer.TransformRegistryImpl;
 import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
@@ -78,4 +79,10 @@ public class WebApplicationConfig implements WebMvcConfigurer
     {
         return new TransformRegistryImpl();
     }
+
+    @Bean
+    public TransformerDebug transformerDebug()
+    {
+        return new TransformerDebug().setIsTEngine(true);
+    }
 }
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java
index 2e1e7fa2..e4583f53 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java
@@ -66,7 +66,7 @@ public class TransformReplySender
                 m.setJMSCorrelationID(correlationId);
                 return m;
             });
-            logger.info("Sent: {} - with correlation ID {}", reply, correlationId);
+            logger.trace("Sent: {} - with correlation ID {}", reply, correlationId);
         }
         catch (Exception e)
         {
diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml
index 7e22ec7a..7fa17b39 100644
--- a/alfresco-transformer-base/src/main/resources/application.yaml
+++ b/alfresco-transformer-base/src/main/resources/application.yaml
@@ -31,6 +31,7 @@ logging:
     org.alfresco.transformer.ImageMagickController: debug
     org.alfresco.transformer.TikaController: debug
     org.alfresco.transformer.MiscellaneousTransformersController: debug
+    org.alfresco.transform.router.TransformerDebug: debug
 
 fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file}
 
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java
index 073af004..b0344ef7 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -48,10 +48,12 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.transform.client.model.InternalContext;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.client.model.config.SupportedSourceAndTarget;
@@ -61,6 +63,7 @@ import org.alfresco.transform.client.model.config.TransformOptionGroup;
 import org.alfresco.transform.client.model.config.TransformOptionValue;
 import org.alfresco.transform.client.model.config.Transformer;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
+import org.alfresco.transform.router.TransformStack;
 import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transformer.probes.ProbeTestTransform;
 import org.junit.jupiter.api.Test;
@@ -104,6 +107,7 @@ public abstract class AbstractTransformerControllerTest
     protected String targetExtension;
     protected String sourceMimetype;
     protected String targetMimetype;
+    protected HashMap options = new HashMap<>();
 
     protected MockMultipartFile sourceFile;
     protected String expectedOptions;
@@ -220,6 +224,30 @@ public abstract class AbstractTransformerControllerTest
         return builder;
     }
 
+    protected TransformRequest createTransformRequest(String sourceFileRef, File sourceFile)
+    {
+        TransformRequest transformRequest = new TransformRequest();
+        transformRequest.setRequestId("1");
+        transformRequest.setSchema(1);
+        transformRequest.setClientData("Alfresco Digital Business Platform");
+        transformRequest.setTransformRequestOptions(options);
+        transformRequest.setSourceReference(sourceFileRef);
+        transformRequest.setSourceExtension(sourceExtension);
+        transformRequest.setSourceMediaType(sourceMimetype);
+        transformRequest.setSourceSize(sourceFile.length());
+        transformRequest.setTargetExtension(targetExtension);
+        transformRequest.setTargetMediaType(targetMimetype);
+        transformRequest.setInternalContext(InternalContext.initialise(null));
+        transformRequest.getInternalContext().getMultiStep().setInitialRequestId("123");
+        transformRequest.getInternalContext().getMultiStep().setInitialSourceMediaType(sourceMimetype);
+        TransformStack.setInitialTransformRequestOptions(transformRequest.getInternalContext(), options);
+        TransformStack.setInitialSourceReference(transformRequest.getInternalContext(), sourceFileRef);
+        TransformStack.addTransformLevel(transformRequest.getInternalContext(),
+                TransformStack.levelBuilder(TransformStack.PIPELINE_FLAG)
+                        .withStep("transformerName", sourceMimetype, targetMimetype));
+        return transformRequest;
+    }
+
     @Test
     public void simpleTransformTest() throws Exception
     {
diff --git a/pom.xml b/pom.xml
index abf0a12f..3ba15699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-SNAPSHOT
+    2.5.5-A1-SNAPSHOT
     pom
 
     
@@ -21,7 +21,7 @@
         2.0.24
         3.0.1.12
         ${project.version}
-        1.4.3
+        1.4.5
         5.16.3
         2.13.0
         ${dependency.jackson.version}

From b6d02f2c0ccb9fa2dd5dabbd7ae9925cdc5afc75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Dec 2021 22:09:07 +0000
Subject: [PATCH 18/25] Bump dependency.tika.version from 2.1.0 to 2.2.1

Bumps `dependency.tika.version` from 2.1.0 to 2.2.1.

Updates `tika-core` from 2.1.0 to 2.2.1
- [Release notes](https://github.com/apache/tika/releases)
- [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt)
- [Commits](https://github.com/apache/tika/commits)

Updates `tika-parsers-standard-package` from 2.1.0 to 2.2.1

---
updated-dependencies:
- dependency-name: org.apache.tika:tika-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.tika:tika-parsers-standard-package
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ba15699..715d62a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.4.5
-        2.1.0
+        2.2.1
         4.1.2
         1.4
 

From 48c77e2d0c22240ee287bd5655534cf94d559f91 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Wed, 5 Jan 2022 12:57:31 +0000
Subject: [PATCH 19/25] Revert "Bump dependency.tika.version from 2.1.0 to
 2.2.1"

[trigger release] 2.5.5-A1

This reverts commit b6d02f2c0ccb9fa2dd5dabbd7ae9925cdc5afc75.

The build failed. There was no build on the PR as far as I can see and none in the history.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 715d62a9..3ba15699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.4.5
-        2.2.1
+        2.1.0
         4.1.2
         1.4
 

From 8baba06fa99e70dec81be0cdcd4ec1128fb39ac6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:58:23 +0000
Subject: [PATCH 20/25] Bump dependency.cxf.version from 3.4.5 to 3.5.0

Bumps `dependency.cxf.version` from 3.4.5 to 3.5.0.

Updates `cxf-core` from 3.4.5 to 3.5.0

Updates `cxf-rt-rs-client` from 3.4.5 to 3.5.0

Updates `cxf-rt-frontend-jaxws` from 3.4.5 to 3.5.0

Updates `cxf-rt-transports-http` from 3.4.5 to 3.5.0

Updates `cxf-rt-ws-policy` from 3.4.5 to 3.5.0

---
updated-dependencies:
- dependency-name: org.apache.cxf:cxf-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.cxf:cxf-rt-rs-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.cxf:cxf-rt-transports-http
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.cxf:cxf-rt-ws-policy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ba15699..e4fee537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         2.13.0
         ${dependency.jackson.version}
         4.13.2
-        3.4.5
+        3.5.0
         2.1.0
         4.1.2
         1.4

From 042a76fb5be3c69c8b6fa2f25f8cf45e27415c1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Dec 2021 22:10:57 +0000
Subject: [PATCH 21/25] Bump dependency.jackson.version from 2.13.0 to 2.13.1

Bumps `dependency.jackson.version` from 2.13.0 to 2.13.1.

Updates `jackson-annotations` from 2.13.0 to 2.13.1
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `jackson-core` from 2.13.0 to 2.13.1
- [Release notes](https://github.com/FasterXML/jackson-core/releases)
- [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.13.0...jackson-core-2.13.1)

Updates `jackson-datatype-jdk8` from 2.13.0 to 2.13.1

Updates `jackson-datatype-jsr310` from 2.13.0 to 2.13.1

Updates `jackson-module-parameter-names` from 2.13.0 to 2.13.1
- [Release notes](https://github.com/FasterXML/jackson-modules-java8/releases)
- [Commits](https://github.com/FasterXML/jackson-modules-java8/compare/jackson-modules-java8-2.13.0...jackson-modules-java8-2.13.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.module:jackson-module-parameter-names
  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 e4fee537..bd0ba4ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         ${project.version}
         1.4.5
         5.16.3
-        2.13.0
+        2.13.1
         ${dependency.jackson.version}
         4.13.2
         3.5.0

From b18798f31306d27f0c2402ed0ed244e7a6a31f29 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Wed, 5 Jan 2022 16:04:20 +0000
Subject: [PATCH 22/25] [trigger release] 2.5.5-A1

- missing bit of useful debug included
---
 .../org/alfresco/transformer/AbstractTransformerController.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
index 06b4000c..d304a87a 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
@@ -234,6 +234,7 @@ public abstract class AbstractTransformerController implements TransformControll
             logger.trace("Invalid request, sending {}", reply);
             return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
         }
+        transformerDebug.pushTransform(request);
 
         // Load the source file
         File sourceFile;

From 9776577a452444dad634117d349635604fa9a9a8 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Wed, 5 Jan 2022 20:26:04 +0000
Subject: [PATCH 23/25] [trigger release] 2.5.5-A1 (#511)

Revert ATS-969 Tika upgrade 1.x -> 2.x (#493)

As the build is deleting the following, resulting in the release job failure
D	alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties
---
 .../alfresco-transform-tika-boot/pom.xml      | 11 +++-
 .../test/resources/quick.3g2_metadata.json    |  5 +-
 .../test/resources/quick.3gp_metadata.json    |  5 +-
 .../test/resources/quick.m4v_metadata.json    |  5 +-
 .../test/resources/quick.mov_metadata.json    |  5 +-
 .../test/resources/quick.mp4_metadata.json    |  5 +-
 .../alfresco-transform-tika/pom.xml           | 11 +++-
 .../AbstractTikaMetadataExtractor.java        | 56 +++++++++----------
 .../DWGMetadataExtractor.java                 |  8 +--
 .../MP3MetadataExtractor.java                 |  6 +-
 .../MailMetadataExtractor.java                | 23 ++++----
 .../OfficeMetadataExtractor.java              | 29 +++++-----
 .../OpenDocumentMetadataExtractor.java        | 52 +++--------------
 .../TikaAudioMetadataExtractor.java           |  8 +--
 .../tika/parsers/ExifToolParser.java          | 12 ++--
 pom.xml                                       |  2 +-
 16 files changed, 108 insertions(+), 135 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index 6ff5ea13..283e6374 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -65,9 +65,13 @@
         
         
             org.apache.tika
-            tika-parsers-standard-package
+            tika-parsers
             ${dependency.tika.version}
             
+                
+                    com.tdunning
+                    json
+                
                 
                     org.bouncycastle
                     bcprov-jdk15on
@@ -76,9 +80,10 @@
                     org.bouncycastle
                     bcmail-jdk15on
                 
+                
                 
-                    xml-apis
-                    xml-apis
+                    org.quartz-scheduler
+                    quartz
                 
             
         
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json
index 4aba2f05..75afde88 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3g2_metadata.json
@@ -2,8 +2,7 @@
   "{http://www.alfresco.org/model/content/1.0}description" : null,
   "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null,
   "{http://www.alfresco.org/model/content/1.0}created" : null,
-  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "8000",
+  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000",
   "{http://www.alfresco.org/model/content/1.0}author" : null,
-  "{http://www.alfresco.org/model/content/1.0}title" : null,
-  "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo"
+  "{http://www.alfresco.org/model/content/1.0}title" : null
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json
index 4aba2f05..75afde88 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.3gp_metadata.json
@@ -2,8 +2,7 @@
   "{http://www.alfresco.org/model/content/1.0}description" : null,
   "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null,
   "{http://www.alfresco.org/model/content/1.0}created" : null,
-  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "8000",
+  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000",
   "{http://www.alfresco.org/model/content/1.0}author" : null,
-  "{http://www.alfresco.org/model/content/1.0}title" : null,
-  "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo"
+  "{http://www.alfresco.org/model/content/1.0}title" : null
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json
index dc61188e..75afde88 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.m4v_metadata.json
@@ -2,8 +2,7 @@
   "{http://www.alfresco.org/model/content/1.0}description" : null,
   "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null,
   "{http://www.alfresco.org/model/content/1.0}created" : null,
-  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050",
+  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000",
   "{http://www.alfresco.org/model/content/1.0}author" : null,
-  "{http://www.alfresco.org/model/content/1.0}title" : null,
-  "{http://www.alfresco.org/model/audio/1.0}channelType" : "Stereo"
+  "{http://www.alfresco.org/model/content/1.0}title" : null
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json
index 96545700..75afde88 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mov_metadata.json
@@ -2,8 +2,7 @@
   "{http://www.alfresco.org/model/content/1.0}description" : null,
   "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null,
   "{http://www.alfresco.org/model/content/1.0}created" : null,
-  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050",
+  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "1000",
   "{http://www.alfresco.org/model/content/1.0}author" : null,
-  "{http://www.alfresco.org/model/content/1.0}title" : null,
-  "{http://www.alfresco.org/model/audio/1.0}channelType" : "Mono"
+  "{http://www.alfresco.org/model/content/1.0}title" : null
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json
index 96545700..39086dfb 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.mp4_metadata.json
@@ -2,8 +2,7 @@
   "{http://www.alfresco.org/model/content/1.0}description" : null,
   "{http://www.alfresco.org/model/audio/1.0}releaseDate" : null,
   "{http://www.alfresco.org/model/content/1.0}created" : null,
-  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "22050",
+  "{http://www.alfresco.org/model/audio/1.0}sampleRate" : "90000",
   "{http://www.alfresco.org/model/content/1.0}author" : null,
-  "{http://www.alfresco.org/model/content/1.0}title" : null,
-  "{http://www.alfresco.org/model/audio/1.0}channelType" : "Mono"
+  "{http://www.alfresco.org/model/content/1.0}title" : null
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 3672452d..48fe99bc 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -27,9 +27,13 @@
         
         
             org.apache.tika
-            tika-parsers-standard-package
+            tika-parsers
             ${dependency.tika.version}
             
+                
+                    com.tdunning
+                    json
+                
                 
                     org.bouncycastle
                     bcprov-jdk15on
@@ -38,6 +42,11 @@
                     org.bouncycastle
                     bcmail-jdk15on
                 
+                
+                
+                    org.quartz-scheduler
+                    quartz
+                
                 
                     xml-apis
                     xml-apis
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java
index c9e8ab60..4a78ae00 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java
@@ -28,11 +28,7 @@ package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.embedder.Embedder;
 import org.apache.tika.extractor.DocumentSelector;
-import org.apache.tika.metadata.DublinCore;
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.OfficeOpenXMLCore;
-import org.apache.tika.metadata.Property;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.sax.ContentHandlerDecorator;
@@ -62,10 +58,7 @@ import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * The parent of all Metadata Extractors which use Apache Tika under the hood. This handles all the
@@ -90,7 +83,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
     protected static final String KEY_CREATED = "created";
     protected static final String KEY_DESCRIPTION = "description";
     protected static final String KEY_COMMENTS = "comments";
-    protected static final String KEY_TAGS = DublinCore.SUBJECT.getName();
+    protected static final String KEY_TAGS = "dc:subject";
 
     private static final String METADATA_SEPARATOR = ",";
 
@@ -215,6 +208,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
     }
 
     @Override
+    @SuppressWarnings( "deprecation" )
     public Map extractMetadata(String sourceMimetype, Map transformOptions,
                                                      File sourceFile) throws Exception
     {
@@ -251,7 +245,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
             for (String tikaKey : metadata.names())
             {
                 // TODO review this change (part of MNT-15267) - should we really force string concatenation here !?
-                putRawValue(tikaKey, getMetadataValue(metadata, Property.internalText(tikaKey)), rawProperties);
+                putRawValue(tikaKey, getMetadataValue(metadata, tikaKey), rawProperties);
             }
 
             // Now, map the common Tika metadata keys onto
@@ -260,17 +254,17 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
             //  to work without needing any changes
 
             // The simple ones
-            putRawValue(KEY_AUTHOR, getMetadataValue(metadata, TikaCoreProperties.CREATOR), rawProperties);
-            putRawValue(KEY_TITLE, getMetadataValue(metadata, TikaCoreProperties.TITLE), rawProperties);
-            putRawValue(KEY_COMMENTS, getMetadataValue(metadata, TikaCoreProperties.COMMENTS), rawProperties);
+            putRawValue(KEY_AUTHOR, getMetadataValue(metadata, Metadata.AUTHOR), rawProperties);
+            putRawValue(KEY_TITLE, getMetadataValue(metadata, Metadata.TITLE), rawProperties);
+            putRawValue(KEY_COMMENTS, getMetadataValue(metadata, Metadata.COMMENTS), rawProperties);
 
             // Tags
             putRawValue(KEY_TAGS, getMetadataValues(metadata, KEY_TAGS), rawProperties);
 
             // Get the subject and description, despite things not
             //  being nearly as consistent as one might hope
-            String subject = getMetadataValue(metadata, OfficeOpenXMLCore.SUBJECT);
-            String description = getMetadataValue(metadata, TikaCoreProperties.DESCRIPTION);
+            String subject = getMetadataValue(metadata, Metadata.SUBJECT);
+            String description = getMetadataValue(metadata, Metadata.DESCRIPTION);
             if(subject != null && description != null)
             {
                 putRawValue(KEY_DESCRIPTION, description, rawProperties);
@@ -288,13 +282,13 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
             }
 
             // Try for the dates two different ways too
-            if(metadata.get(TikaCoreProperties.CREATED) != null)
+            if(metadata.get(Metadata.CREATION_DATE) != null)
             {
-                putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.CREATED), rawProperties);
+                putRawValue(KEY_CREATED, metadata.get(Metadata.CREATION_DATE), rawProperties);
             }
-            else if(metadata.get(TikaCoreProperties.MODIFIED) != null)
+            else if(metadata.get(Metadata.DATE) != null)
             {
-                putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.MODIFIED), rawProperties);
+                putRawValue(KEY_CREATED, metadata.get(Metadata.DATE), rawProperties);
             }
 
             // If people created a specific instance
@@ -394,11 +388,24 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
         return values.length == 0 ? null : (values.length == 1 ? values[0] : values);
     }
 
-    private String getMetadataValue(Metadata metadata, Property key)
+    private String getMetadataValue(Metadata metadata, String key)
     {
         if (metadata.isMultiValued(key))
         {
-            return distinct(metadata.getValues(key)).collect(Collectors.joining(", "));
+            String[] parts = metadata.getValues(key);
+
+            // use Set to prevent duplicates
+            Set value = new LinkedHashSet<>(parts.length);
+
+            for (int i = 0; i < parts.length; i++)
+            {
+                value.add(parts[i]);
+            }
+
+            String valueStr = value.toString();
+
+            // remove leading/trailing braces []
+            return valueStr.substring(1, valueStr.length() - 1);
         }
         else
         {
@@ -406,15 +413,6 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
         }
     }
 
-    protected static Stream distinct(final String[] strings)
-    {
-        return Stream.of(strings)
-                     .filter(Objects::nonNull)
-                     .map(String::strip)
-                     .filter(s -> !s.isEmpty())
-                     .distinct();
-    }
-
     /**
      * This content handler will capture entries from within
      *  the header of the Tika content XHTML, but ignore the
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java
index 47f300ed..9f6ec66e 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/DWGMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -27,7 +27,6 @@
 package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.dwg.DWGParser;
 import org.slf4j.Logger;
@@ -65,12 +64,13 @@ public class DWGMetadataExtractor extends AbstractTikaMetadataExtractor
         super(logger);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_KEYWORD, metadata.get(TikaCoreProperties.SUBJECT), properties);
-        putRawValue(KEY_LAST_AUTHOR, metadata.get(TikaCoreProperties.MODIFIED), properties);
+        putRawValue(KEY_KEYWORD, metadata.get(Metadata.KEYWORDS), properties);
+        putRawValue(KEY_LAST_AUTHOR, metadata.get(Metadata.LAST_AUTHOR), properties);
         return properties;
     }
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java
index b6cd2826..d8957863 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MP3MetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -27,7 +27,6 @@
 package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.XMPDM;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.mp3.Mp3Parser;
@@ -87,6 +86,7 @@ public class MP3MetadataExtractor extends TikaAudioMetadataExtractor
         return new Mp3Parser();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
@@ -98,7 +98,7 @@ public class MP3MetadataExtractor extends TikaAudioMetadataExtractor
         // We only need these for people who had pre-existing mapping
         //  properties from before the proper audio model was added
         putRawValue(KEY_ALBUM_TITLE, metadata.get(XMPDM.ALBUM), properties);
-        putRawValue(KEY_SONG_TITLE, metadata.get(TikaCoreProperties.TITLE), properties);
+        putRawValue(KEY_SONG_TITLE, metadata.get(Metadata.TITLE), properties);
         putRawValue(KEY_ARTIST, metadata.get(XMPDM.ARTIST), properties);
         putRawValue(KEY_COMMENT, metadata.get(XMPDM.LOG_COMMENT), properties);
         putRawValue(KEY_TRACK_NUMBER, metadata.get(XMPDM.TRACK_NUMBER), properties);
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java
index 86d168c6..5d0a047f 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/MailMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,9 +26,7 @@
  */
 package org.alfresco.transformer.metadataExtractors;
 
-import org.apache.tika.metadata.Message;
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.microsoft.OfficeParser;
 import org.slf4j.Logger;
@@ -84,25 +82,26 @@ public class MailMetadataExtractor extends AbstractTikaMetadataExtractor
         return new OfficeParser();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_ORIGINATOR, metadata.get(TikaCoreProperties.CREATOR), properties);
-        putRawValue(KEY_SUBJECT, metadata.get(TikaCoreProperties.TITLE), properties);
-        putRawValue(KEY_DESCRIPTION, metadata.get(TikaCoreProperties.SUBJECT), properties);
-        putRawValue(KEY_SENT_DATE, metadata.get(TikaCoreProperties.MODIFIED), properties);
+        putRawValue(KEY_ORIGINATOR, metadata.get(Metadata.AUTHOR), properties);
+        putRawValue(KEY_SUBJECT, metadata.get(Metadata.TITLE), properties);
+        putRawValue(KEY_DESCRIPTION, metadata.get(Metadata.SUBJECT), properties);
+        putRawValue(KEY_SENT_DATE, metadata.get(Metadata.LAST_SAVED), properties);
 
         // Store the TO, but not cc/bcc in the addressee field
-        putRawValue(KEY_ADDRESSEE, metadata.get(Message.MESSAGE_TO), properties);
+        putRawValue(KEY_ADDRESSEE, metadata.get(Metadata.MESSAGE_TO), properties);
 
         // Store each of To, CC and BCC in their own fields
-        putRawValue(KEY_TO_NAMES, metadata.getValues(Message.MESSAGE_TO), properties);
-        putRawValue(KEY_CC_NAMES, metadata.getValues(Message.MESSAGE_CC), properties);
-        putRawValue(KEY_BCC_NAMES, metadata.getValues(Message.MESSAGE_BCC), properties);
+        putRawValue(KEY_TO_NAMES, metadata.getValues(Metadata.MESSAGE_TO), properties);
+        putRawValue(KEY_CC_NAMES, metadata.getValues(Metadata.MESSAGE_CC), properties);
+        putRawValue(KEY_BCC_NAMES, metadata.getValues(Metadata.MESSAGE_BCC), properties);
 
         // But store all email addresses (to/cc/bcc) in the addresses field
-        putRawValue(KEY_ADDRESSEES, metadata.getValues(Message.MESSAGE_RECIPIENT_ADDRESS), properties);
+        putRawValue(KEY_ADDRESSEES, metadata.getValues(Metadata.MESSAGE_RECIPIENT_ADDRESS), properties);
 
         return properties;
     }
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java
index 7612a386..dfca577e 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OfficeMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -27,8 +27,6 @@
 package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.Office;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.microsoft.OfficeParser;
 import org.slf4j.Logger;
@@ -42,7 +40,7 @@ import java.util.Map;
  *
  * Configuration:   (see OfficeMetadataExtractor_metadata_extract.properties and tika_engine_config.json)
  *
- * This extractor uses the POI library to extract the following:
+ * This extracter uses the POI library to extract the following:
  * 
  *   author:             --      cm:author
  *   title:              --      cm:title
@@ -93,20 +91,23 @@ public class OfficeMetadataExtractor extends AbstractTikaMetadataExtractor
         return new OfficeParser();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_CREATE_DATETIME, metadata.get(TikaCoreProperties.CREATED), properties);
-        putRawValue(KEY_LAST_SAVE_DATETIME, metadata.get(TikaCoreProperties.MODIFIED), properties);
-        putRawValue(KEY_EDIT_TIME, metadata.get(TikaCoreProperties.MODIFIED), properties);
-        putRawValue(KEY_FORMAT, metadata.get(TikaCoreProperties.FORMAT), properties);
-        putRawValue(KEY_KEYWORDS, metadata.get(TikaCoreProperties.SUBJECT), properties);
-        putRawValue(KEY_LAST_AUTHOR, metadata.get(TikaCoreProperties.MODIFIER), properties);
-        putRawValue(KEY_LAST_PRINTED, metadata.get(TikaCoreProperties.PRINT_DATE), properties);
-        putRawValue(KEY_PAGE_COUNT, metadata.get(Office.PAGE_COUNT), properties);
-        putRawValue(KEY_PARAGRAPH_COUNT, metadata.get(Office.PARAGRAPH_COUNT), properties);
-        putRawValue(KEY_WORD_COUNT, metadata.get(Office.WORD_COUNT), properties);
+        putRawValue(KEY_CREATE_DATETIME, metadata.get(Metadata.CREATION_DATE), properties);
+        putRawValue(KEY_LAST_SAVE_DATETIME, metadata.get(Metadata.LAST_SAVED), properties);
+        putRawValue(KEY_EDIT_TIME, metadata.get(Metadata.EDIT_TIME), properties);
+        putRawValue(KEY_FORMAT, metadata.get(Metadata.FORMAT), properties);
+        putRawValue(KEY_KEYWORDS, metadata.get(Metadata.KEYWORDS), properties);
+        putRawValue(KEY_LAST_AUTHOR, metadata.get(Metadata.LAST_AUTHOR), properties);
+        putRawValue(KEY_LAST_PRINTED, metadata.get(Metadata.LAST_PRINTED), properties);
+//       putRawValue(KEY_OS_VERSION, metadata.get(Metadata.OS_VERSION), properties);
+//       putRawValue(KEY_THUMBNAIL, metadata.get(Metadata.THUMBNAIL), properties);
+        putRawValue(KEY_PAGE_COUNT, metadata.get(Metadata.PAGE_COUNT), properties);
+        putRawValue(KEY_PARAGRAPH_COUNT, metadata.get(Metadata.PARAGRAPH_COUNT), properties);
+        putRawValue(KEY_WORD_COUNT, metadata.get(Metadata.WORD_COUNT), properties);
         return properties;
     }
 }
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
index 8014802b..4de536da 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/OpenDocumentMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,28 +26,18 @@
  */
 package org.alfresco.transformer.metadataExtractors;
 
-import static org.apache.tika.metadata.DublinCore.NAMESPACE_URI_DC;
-
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
-import org.apache.tika.parser.odf.OpenDocumentMetaParser;
 import org.apache.tika.parser.odf.OpenDocumentParser;
-import org.apache.tika.parser.xml.ElementMetadataHandler;
-import org.apache.tika.sax.TeeContentHandler;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.ContentHandler;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * {@code "application/vnd.oasis.opendocument..."} and {@code "applicationvnd.oasis.opendocument..."} metadata extractor.
@@ -87,7 +77,6 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
     private static final String KEY_INITIAL_CREATOR = "initialCreator";
     private static final String KEY_KEYWORD = "keyword";
     private static final String KEY_LANGUAGE = "language";
-    private static final String KEY_ALFRESCO_CREATOR = "_alfresco:creator";
 
     private static final String CUSTOM_PREFIX = "custom:";
 
@@ -101,33 +90,22 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
     @Override
     protected Parser getParser()
     {
-        OpenDocumentParser parser = new OpenDocumentParser();
-        parser.setMetaParser(new OpenDocumentMetaParser() {
-            @Override
-            protected ContentHandler getContentHandler(ContentHandler ch, Metadata md, ParseContext context)
-            {
-                final ContentHandler superHandler = super.getContentHandler(ch, md, context);
-                final ContentHandler creatorHandler = new ElementMetadataHandler(NAMESPACE_URI_DC, KEY_CREATOR, md, KEY_ALFRESCO_CREATOR);
-                return new TeeContentHandler(superHandler, creatorHandler);
-            }
-        });
-        return parser;
+        return new OpenDocumentParser();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Map extractSpecific(Metadata metadata,
                                                         Map properties, Map headers)
     {
-        putRawValue(KEY_CREATION_DATE, getDateOrNull(metadata.get(TikaCoreProperties.CREATED)), properties);
-        final String creator = getCreator(metadata);
-        putRawValue(KEY_CREATOR, creator, properties);
-        putRawValue(KEY_AUTHOR, creator, properties);
-        putRawValue(KEY_DATE, getDateOrNull(metadata.get(TikaCoreProperties.MODIFIED)), properties);
-        putRawValue(KEY_DESCRIPTION, metadata.get(TikaCoreProperties.DESCRIPTION), properties);
+        putRawValue(KEY_CREATION_DATE, getDateOrNull(metadata.get(Metadata.CREATION_DATE)), properties);
+        putRawValue(KEY_CREATOR, metadata.get(Metadata.CREATOR), properties);
+        putRawValue(KEY_DATE, getDateOrNull(metadata.get(Metadata.DATE)), properties);
+        putRawValue(KEY_DESCRIPTION, metadata.get(Metadata.DESCRIPTION), properties);
         putRawValue(KEY_GENERATOR, metadata.get("generator"), properties);
         putRawValue(KEY_INITIAL_CREATOR, metadata.get("initial-creator"), properties);
-        putRawValue(KEY_KEYWORD, metadata.get(TikaCoreProperties.SUBJECT), properties);
-        putRawValue(KEY_LANGUAGE, metadata.get(TikaCoreProperties.LANGUAGE), properties);
+        putRawValue(KEY_KEYWORD, metadata.get(Metadata.KEYWORDS), properties);
+        putRawValue(KEY_LANGUAGE, metadata.get(Metadata.LANGUAGE), properties);
 
         // Handle user-defined properties dynamically
         Map> mapping = super.getExtractMapping();
@@ -142,18 +120,6 @@ public class OpenDocumentMetadataExtractor extends AbstractTikaMetadataExtractor
         return properties;
     }
 
-    private String getCreator(Metadata metadata)
-    {
-        final List creators = distinct(metadata.getValues(TikaCoreProperties.CREATOR))
-                .collect(Collectors.toUnmodifiableList());
-        if (creators.size() == 1)
-        {
-            return creators.get(0);
-        }
-
-        return metadata.get(KEY_ALFRESCO_CREATOR);
-    }
-
     private Date getDateOrNull(String dateString)
     {
         if (dateString != null && dateString.length() != 0)
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
index e7933ef3..1a8a4a84 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAudioMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,7 +28,6 @@ package org.alfresco.transformer.metadataExtractors;
 
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.XMPDM;
 import org.apache.tika.parser.CompositeParser;
 import org.apache.tika.parser.Parser;
@@ -149,12 +148,13 @@ public class TikaAudioMetadataExtractor extends AbstractTikaMetadataExtractor
      * @param metadata     the metadata extracted from the file
      * @return          the description
      */
+    @SuppressWarnings("deprecation")
     private String generateDescription(Metadata metadata)
     {
         StringBuilder result = new StringBuilder();
-        if (metadata.get(TikaCoreProperties.TITLE) != null)
+        if (metadata.get(Metadata.TITLE) != null)
         {
-            result.append(metadata.get(TikaCoreProperties.TITLE));
+            result.append(metadata.get(Metadata.TITLE));
             if (metadata.get(XMPDM.ALBUM) != null)
             {
                 result
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
index 9e15731e..e43677a4 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
+++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java
@@ -44,9 +44,9 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.IOUtils;
+import org.apache.tika.io.NullOutputStream;
 import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
@@ -57,7 +57,7 @@ import org.apache.tika.parser.external.ExternalParser;
 import org.apache.tika.parser.external.ExternalParsersFactory;
 import org.apache.tika.parser.image.ImageParser;
 import org.apache.tika.parser.image.TiffParser;
-import org.apache.tika.parser.image.JpegParser;
+import org.apache.tika.parser.jpeg.JpegParser;
 import org.apache.tika.sax.XHTMLContentHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -263,7 +263,7 @@ public class ExifToolParser extends ExternalParser {
      * stream of the given process to the given XHTML content handler.
      * The standard output stream is closed once fully processed.
      *
-     * @param stream stream
+     * @param process process
      * @param xhtml XHTML content handler
      * @throws SAXException if the XHTML SAX events could not be handled
      * @throws IOException if an input error occurred
@@ -315,13 +315,13 @@ public class ExifToolParser extends ExternalParser {
      * standard stream of the given process. Potential exceptions
      * are ignored, and the stream is closed once fully processed.
      *
-     * @param stream stream
+     * @param process process
      */
     private void ignoreStream(final InputStream stream) {
         Thread t = new Thread() {
             public void run() {
                 try {
-                    IOUtils.copy(stream, NullOutputStream.NULL_OUTPUT_STREAM);
+                    IOUtils.copy(stream, new NullOutputStream());
                 } catch (IOException e) {
                 } finally {
                     IOUtils.closeQuietly(stream);
diff --git a/pom.xml b/pom.xml
index bd0ba4ca..cf5d142f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.5.0
-        2.1.0
+        1.26
         4.1.2
         1.4
 

From 06b8d1e8d41e218d6872fea95ee104d34750b306 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Wed, 5 Jan 2022 20:58:49 +0000
Subject: [PATCH 24/25] [maven-release-plugin][skip ci] prepare release
 2.5.5-A1

---
 .../alfresco-transform-core-aio-boot/pom.xml                  | 2 +-
 .../alfresco-transform-core-aio/pom.xml                       | 2 +-
 .../alfresco-transform-imagemagick-boot/pom.xml               | 2 +-
 .../alfresco-transform-imagemagick/pom.xml                    | 2 +-
 .../alfresco-transform-libreoffice-boot/pom.xml               | 2 +-
 .../alfresco-transform-libreoffice/pom.xml                    | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml  | 2 +-
 alfresco-transform-misc/alfresco-transform-misc/pom.xml       | 2 +-
 .../alfresco-transform-pdf-renderer-boot/pom.xml              | 2 +-
 .../alfresco-transform-pdf-renderer/pom.xml                   | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml  | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml       | 2 +-
 alfresco-transformer-base/pom.xml                             | 4 ++--
 pom.xml                                                       | 4 ++--
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
index 7b1a5290..32dceab8 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
index d01055b9..b9a7351e 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index d8d8fa4e..34cd67cc 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 8a382597..6e6125a0 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index 0e39c946..a44bfc88 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 32066e38..b83d9ad6 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index f7503e8f..37ad06ec 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 753a033c..3665a347 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -9,7 +9,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
index d11ac173..cdfecd6d 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
index 1660b28d..fa8bcb58 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index 283e6374..f7067589 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 48fe99bc..da2f76ce 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index c88fc15d..98af418c 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,12 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1-SNAPSHOT
+        2.5.5-A1
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A1-SNAPSHOT
+    2.5.5-A1
 
     
         false
diff --git a/pom.xml b/pom.xml
index cf5d142f..2da70797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A1-SNAPSHOT
+    2.5.5-A1
     pom
 
     
@@ -117,7 +117,7 @@
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
         https://github.com/Alfresco/alfresco-transform-core
-        HEAD
+        2.5.5-A1
     
 
     

From 2fd8361a783f117592b55bbca4fc7273adf1db49 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Wed, 5 Jan 2022 20:58:51 +0000
Subject: [PATCH 25/25] [maven-release-plugin][skip ci] prepare for next
 development iteration

---
 .../alfresco-transform-core-aio-boot/pom.xml                  | 2 +-
 .../alfresco-transform-core-aio/pom.xml                       | 2 +-
 .../alfresco-transform-imagemagick-boot/pom.xml               | 2 +-
 .../alfresco-transform-imagemagick/pom.xml                    | 2 +-
 .../alfresco-transform-libreoffice-boot/pom.xml               | 2 +-
 .../alfresco-transform-libreoffice/pom.xml                    | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml  | 2 +-
 alfresco-transform-misc/alfresco-transform-misc/pom.xml       | 2 +-
 .../alfresco-transform-pdf-renderer-boot/pom.xml              | 2 +-
 .../alfresco-transform-pdf-renderer/pom.xml                   | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml  | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml       | 2 +-
 alfresco-transformer-base/pom.xml                             | 4 ++--
 pom.xml                                                       | 4 ++--
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
index 32dceab8..6f338a14 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
index b9a7351e..70bd2f3b 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index 34cd67cc..e120c545 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 6e6125a0..c86798f7 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index a44bfc88..6de6c55d 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index b83d9ad6..31ff7c05 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index 37ad06ec..08624503 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 3665a347..71fad537 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -9,7 +9,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
index cdfecd6d..2c90c250 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
@@ -9,7 +9,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
index fa8bcb58..1e220f8b 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index f7067589..e60698f0 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index da2f76ce..e0d09619 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -8,7 +8,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 98af418c..e7ad63cf 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,12 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.5-A1
+        2.5.5-A2-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A1
+    2.5.5-A2-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index 2da70797..e0916686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A1
+    2.5.5-A2-SNAPSHOT
     pom
 
     
@@ -117,7 +117,7 @@
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
         https://github.com/Alfresco/alfresco-transform-core
-        2.5.5-A1
+        HEAD