From 1cd673de6337a3a397ef6d956d25af1d50a7af6e Mon Sep 17 00:00:00 2001 From: alandavis Date: Wed, 5 Jan 2022 21:56:41 +0000 Subject: [PATCH 01/52] Restore ATS-969 Tika upgrade 1.x -> 2.x (#493) This reverts commit 9776577a452444dad634117d349635604fa9a9a8. Was not possible to perform the release of 2.5.5-A1 with this upgrade of Tika. Possibly related to it forcing a change in the following files, which were then deleted in the build: 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, 135 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 e60698f0..ce041d99 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,10 +76,9 @@ org.bouncycastle bcmail-jdk15on - - org.quartz-scheduler - quartz + xml-apis + xml-apis 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 e0d09619..4059bcff 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 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 e0916686..edef853b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.5.0
-        1.26
+        2.1.0
         4.1.2
         1.4
 

From 2b095a9a893cc98a2ab4a50eb2b2f4ef672cf263 Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Thu, 6 Jan 2022 10:32:39 +0000
Subject: [PATCH 02/52] ACS-2382 Use central license information.

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index edef853b..b73b61f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,10 +312,15 @@
                                 add-third-party
                                 download-licenses
                             
+                            generate-resources
                             
-                                true
+                                true
                                 provided,test
                                 org.alfresco
+                                false
+                                https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
+                                https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt
+                                https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties
                             
                         
                         

From 6e6c8c12c26a9d19094c69887c3fda621bf648fd Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Thu, 6 Jan 2022 10:32:57 +0000
Subject: [PATCH 03/52] ACS-2382 Remove old license properties files.

---
 .../src/license/THIRD-PARTY.properties        | 54 -------------------
 .../src/license/THIRD-PARTY.properties        | 54 -------------------
 .../src/license/THIRD-PARTY.properties        | 46 ----------------
 .../src/license/THIRD-PARTY.properties        | 52 ------------------
 4 files changed, 206 deletions(-)
 delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
 delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
 delete mode 100644 alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
 delete mode 100644 alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
deleted file mode 100644
index 0a88bf91..00000000
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - (MIT-style) netCDF C library license
-# - 3-Clause BSD License
-# - Apache 2.0
-# - Apache License 2.0
-# - Apache License v2
-# - Apache License v2.0
-# - Apache License, Version 2.0
-# - Apache License, version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD 3-clause License w/nuclear disclaimer
-# - BSD 3-clause New License
-# - BSD License
-# - BSD-2-Clause
-# - Bouncy Castle Licence
-# - CDDL + GPLv2 with classpath exception
-# - CDDL, v1.0
-# - CDDL/GPLv2+CE
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License
-# - EDL 1.0
-# - EPL 2.0
-# - Eclipse Distribution License - v 1.0
-# - Eclipse Public License - v 1.0
-# - Eclipse Public License 2.0
-# - GNU General Public License, version 2 with the GNU Classpath Exception
-# - GNU Lesser General Public License
-# - GPL2 w/ CPE
-# - LGPL, v2.1 or later
-# - LGPL, version 2.1
-# - MIT License
-# - MIT License (MIT)
-# - Mozilla Public License 1.1 (MPL 1.1)
-# - OGC copyright
-# - Public Domain
-# - Public Domain, per Creative Commons CC0
-# - Similar to Apache License but with the acknowledgment clause removed
-# - The Apache License, Version 2.0
-# - The Apache Software License, Version 2.0
-# - The BSD License
-# - The MIT License
-# - The SAX License
-# - The W3C License
-# - UnRar License
-# - lgpl
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Thu Apr 09 10:34:00 BST 2020
-net.jcip--jcip-annotations--1.0=Public
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
deleted file mode 100644
index 15698916..00000000
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - (MIT-style) netCDF C library license
-# - 3-Clause BSD License
-# - Apache 2.0
-# - Apache License 2.0
-# - Apache License v2
-# - Apache License v2.0
-# - Apache License, Version 2.0
-# - Apache License, version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD 3-clause License w/nuclear disclaimer
-# - BSD 3-clause New License
-# - BSD License
-# - BSD-2-Clause
-# - Bouncy Castle Licence
-# - CDDL + GPLv2 with classpath exception
-# - CDDL, v1.0
-# - CDDL/GPLv2+CE
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License
-# - EDL 1.0
-# - EPL 2.0
-# - Eclipse Distribution License - v 1.0
-# - Eclipse Public License - v 1.0
-# - Eclipse Public License 2.0
-# - GNU General Public License, version 2 with the GNU Classpath Exception
-# - GNU Lesser General Public License
-# - GPL2 w/ CPE
-# - LGPL, v2.1 or later
-# - LGPL, version 2.1
-# - MIT License
-# - MIT License (MIT)
-# - Mozilla Public License 1.1 (MPL 1.1)
-# - OGC copyright
-# - Public Domain
-# - Public Domain, per Creative Commons CC0
-# - Similar to Apache License but with the acknowledgment clause removed
-# - The Apache License, Version 2.0
-# - The Apache Software License, Version 2.0
-# - The BSD License
-# - The MIT License
-# - The SAX License
-# - The W3C License
-# - UnRar License
-# - lgpl
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Thu Apr 09 10:33:33 BST 2020
-net.jcip--jcip-annotations--1.0=Public
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties b/alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
deleted file mode 100644
index ccb5f496..00000000
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - (MIT-style) netCDF C library license
-# - Apache 2.0
-# - Apache License 2.0
-# - Apache License v2.0
-# - Apache License, Version 2.0
-# - Apache License, version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD 3-clause New License
-# - BSD License
-# - Bouncy Castle Licence
-# - CDDL + GPLv2 with classpath exception
-# - CDDL, v1.0
-# - EPL 2.0
-# - Eclipse Public License - v 1.0
-# - Eclipse Public License, Version 1.0
-# - GNU Lesser General Public License
-# - GNU Lesser General Public License, Version 2.1
-# - GPL2 w/ CPE
-# - LGPL, v2.1 or later
-# - LGPL, version 2.1
-# - MIT License
-# - MIT License (MIT)
-# - MIT license
-# - Mozilla Public License 1.1 (MPL 1.1)
-# - New BSD license
-# - OGC copyright
-# - Public
-# - Public Domain
-# - Public Domain, per Creative Commons CC0
-# - Similar to Apache License but with the acknowledgment clause removed
-# - Specification License
-# - The Apache License, Version 2.0
-# - The Apache Software License, Version 2.0
-# - The BSD License
-# - The MIT License
-# - UnRar License
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Mon Aug 19 18:06:38 EEST 2019
-net.jcip--jcip-annotations--1.0=Public
diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties b/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties
deleted file mode 100644
index 475ce274..00000000
--- a/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - (MIT-style) netCDF C library license
-# - 3-Clause BSD License
-# - Apache 2.0
-# - Apache License 2.0
-# - Apache License v2
-# - Apache License v2.0
-# - Apache License, Version 2.0
-# - Apache License, version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD 3-clause License w/nuclear disclaimer
-# - BSD 3-clause New License
-# - BSD License
-# - BSD-2-Clause
-# - Bouncy Castle Licence
-# - CDDL + GPLv2 with classpath exception
-# - CDDL, v1.0
-# - CDDL/GPLv2+CE
-# - EDL 1.0
-# - EPL 2.0
-# - Eclipse Distribution License - v 1.0
-# - Eclipse Public License - v 1.0
-# - Eclipse Public License 2.0
-# - GNU General Public License, version 2 with the GNU Classpath Exception
-# - GNU Lesser General Public License
-# - GPL2 w/ CPE
-# - LGPL, v2.1 or later
-# - LGPL, version 2.1
-# - MIT License
-# - MIT License (MIT)
-# - Mozilla Public License 1.1 (MPL 1.1)
-# - OGC copyright
-# - Public Domain
-# - Public Domain, per Creative Commons CC0
-# - Similar to Apache License but with the acknowledgment clause removed
-# - The Apache License, Version 2.0
-# - The Apache Software License, Version 2.0
-# - The BSD License
-# - The MIT License
-# - The SAX License
-# - The W3C License
-# - UnRar License
-# - lgpl
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Thu Apr 09 10:31:19 BST 2020
-net.jcip--jcip-annotations--1.0=Public

From 8e4c51b30361b0af54b96dc4c8bcfee1442b9da0 Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Thu, 6 Jan 2022 10:36:45 +0000
Subject: [PATCH 04/52] ACS-2382 Upload CSV license report to S3.

---
 _ci/prepare_release_deploy.sh | 8 +++-----
 _ci/prepare_staging_deploy.sh | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/_ci/prepare_release_deploy.sh b/_ci/prepare_release_deploy.sh
index 7ea6308b..abf63d91 100644
--- a/_ci/prepare_release_deploy.sh
+++ b/_ci/prepare_release_deploy.sh
@@ -10,11 +10,9 @@ export VERSION=$(git describe --abbrev=0 --tags)
 
 mkdir -p deploy_dir
 
-# Download the WhiteSource report
-# mvn -B org.alfresco:whitesource-downloader-plugin:inventoryReport \
-#     -N \
-#     "-Dorg.whitesource.product=Transform Service" \
-#     -DsaveReportAs=deploy_dir/3rd-party.xlsx
+# Create third party license csv file and add it to the deploy directory.
+git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git
+python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir"
 
 echo "Local deploy directory content:"
 ls -lA deploy_dir
diff --git a/_ci/prepare_staging_deploy.sh b/_ci/prepare_staging_deploy.sh
index 82237779..32dbb8c9 100644
--- a/_ci/prepare_staging_deploy.sh
+++ b/_ci/prepare_staging_deploy.sh
@@ -10,11 +10,9 @@ export VERSION=$(git describe --abbrev=0 --tags)
 
 mkdir -p deploy_dir
 
-# Download the WhiteSource report
-# mvn -B org.alfresco:whitesource-downloader-plugin:inventoryReport \
-#     -N \
-#     "-Dorg.whitesource.product=Transform Service" \
-#     -DsaveReportAs=deploy_dir/3rd-party.xlsx
+# Create third party license csv file and add it to the deploy directory.
+git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git
+python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir"
 
 echo "Local deploy directory content:"
 ls -lA deploy_dir

From adcca8ceb64b11669d01954abacb81409eb7497f Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Thu, 6 Jan 2022 10:54:38 +0000
Subject: [PATCH 05/52] ACS-2382 Remove outdated references to Whitesource.

---
 .travis.yml               |  7 -------
 .whitesource              |  8 --------
 _ci/settings.xml          |  4 ----
 _ci/whitesource.sh        | 22 ----------------------
 docs/build-and-release.md |  2 +-
 5 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 .whitesource
 delete mode 100644 _ci/whitesource.sh

diff --git a/.travis.yml b/.travis.yml
index e21dfc28..789a64c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,13 +77,6 @@ jobs:
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh full-build
       script:  travis_wait 30 bash _ci/test.sh aio-test
-    # - name: "WhiteSource"
-    #   if: branch NOT IN (company_release)
-    #   script: bash _ci/whitesource.sh
-    # - name: "Source Clear Scan (SCA)"
-    #   if: branch NOT IN (company_release)
-    #   install: skip
-    #   script: travis_wait 30 bash _ci/sourceclear.sh
 #    - name: "Static Analysis (SAST)"
 # TODO ATS-721: comment out until it is possible to run concurrent SAST scans
 #    if: branch NOT IN (company_release) AND type != pull_request
diff --git a/.whitesource b/.whitesource
deleted file mode 100644
index f0569521..00000000
--- a/.whitesource
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "generalSettings": {
-    "shouldScanRepo": true
-  },
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure"
-  }
-}
\ No newline at end of file
diff --git a/_ci/settings.xml b/_ci/settings.xml
index 70a190a1..3f6e03bd 100644
--- a/_ci/settings.xml
+++ b/_ci/settings.xml
@@ -28,10 +28,6 @@
                     https://artifacts.alfresco.com/nexus/content/groups/internal
                 
             
-            
-                
-                ${env.WHITESOURCE_TOKEN}
-            
         
     
 
diff --git a/_ci/whitesource.sh b/_ci/whitesource.sh
deleted file mode 100644
index afb465c3..00000000
--- a/_ci/whitesource.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-echo "=========================== Starting WhiteSource Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-set -vex
-pushd "$(dirname "${BASH_SOURCE[0]}")/../"
-
-
-mvn -B clean install \
-    -DskipTests org.whitesource:whitesource-maven-plugin:update \
-    -Dorg.whitesource.failOnError=true \
-    -Dorg.whitesource.forceUpdate=true \
-    -Dorg.whitesource.checkPolicies=true \
-    -Dorg.whitesource.forceCheckAllDependencies=true \
-    -Dorg.whitesource.ignorePomModules=false \
-    "-Dorg.whitesource.product=Transform Service" \
-    -Dmaven.wagon.http.pool=false
-
-popd
-set +vex
-echo "=========================== Finishing WhiteSource Script =========================="
-
diff --git a/docs/build-and-release.md b/docs/build-and-release.md
index cbc6f14f..218751ac 100644
--- a/docs/build-and-release.md
+++ b/docs/build-and-release.md
@@ -4,7 +4,7 @@ The `.travis.yml` config file can be found in the root of the repository.
 
 
 ## Stages and Jobs
-1. **Build**: Java build with unit tests, integration tests and WhiteSource scan.
+1. **Build**: Java build with unit and integration tests.
 2. **Release**: Release with artifact deployment to Nexus and AWS Staging bucket.
 3. **Company Release**: Artifact deployment to AWS Release bucket.
 

From 105cc8d0af72358cbf9613c871d5192b338575a7 Mon Sep 17 00:00:00 2001
From: montgolfiere 
Date: Thu, 6 Jan 2022 16:19:37 +0000
Subject: [PATCH 06/52] ATS-935: Fix LibreOffice version in CI script (#510)

- in three places (it looks like 3rd place was missed as part of ATS-935)
---
 _ci/cache_artifacts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_ci/cache_artifacts.sh b/_ci/cache_artifacts.sh
index 2b7fc5e8..2c0f9abd 100644
--- a/_ci/cache_artifacts.sh
+++ b/_ci/cache_artifacts.sh
@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-LIBREOFFICE_VERSION=6.3.5
+LIBREOFFICE_VERSION=7.0.6
 
 # Cache the LibreOffice distribution, as it is takes a long time to download and it can cause the
 # build to fail (no output for more than 10 minutes)

From 6d08f0279d3366ac008412dc5a9712a47878977c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:19:56 +0000
Subject: [PATCH 07/52] Bump docker-maven-plugin from 0.38.0 to 0.38.1 (#503)

Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.38.0 to 0.38.1.
- [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.38.0...v0.38.1)

---
updated-dependencies:
- dependency-name: io.fabric8:docker-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 b73b61f7..7e2e5e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@
                 
                     io.fabric8
                     docker-maven-plugin
-                    0.38.0
+                    0.38.1
                     true
                     
                         

From 4f7364f7a428060f8217faab405db432c83be789 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Fri, 7 Jan 2022 10:50:27 +0000
Subject: [PATCH 08/52] Bump alfresco-transform-model from 1.4.5 to 1.4.6
 (#513)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7e2e5e5c..b5c9cd88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         2.0.24
         3.0.1.12
         ${project.version}
-        1.4.5
+        1.4.6
         5.16.3
         2.13.1
         ${dependency.jackson.version}

From 583dbce6b087e13859018068533decb9f005f736 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 16:52:25 +0000
Subject: [PATCH 09/52] Bump alfresco-transform-model from 1.4.5 to 1.4.6
 (#514)

Bumps [alfresco-transform-model](https://github.com/Alfresco/alfresco-transform-model) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Alfresco/alfresco-transform-model/releases)
- [Commits](https://github.com/Alfresco/alfresco-transform-model/commits)

---
updated-dependencies:
- dependency-name: org.alfresco:alfresco-transform-model
  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>

From d384e36e6e48db03cd0b7b1df4ae5558ebec93d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 15:23:46 +0000
Subject: [PATCH 10/52] Bump dependency.pdfbox.version from 2.0.24 to 2.0.25
 (#499)

Bumps `dependency.pdfbox.version` from 2.0.24 to 2.0.25.

Updates `pdfbox` from 2.0.24 to 2.0.25

Updates `pdfbox-tools` from 2.0.24 to 2.0.25

---
updated-dependencies:
- dependency-name: org.apache.pdfbox:pdfbox
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.pdfbox:pdfbox-tools
  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>
---
 alfresco-transform-misc/alfresco-transform-misc/pom.xml | 2 +-
 pom.xml                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 71fad537..9d25e6d6 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -42,7 +42,7 @@
         
             org.apache.pdfbox
             pdfbox-tools
-            2.0.24
+            2.0.25
         
 
         
diff --git a/pom.xml b/pom.xml
index b5c9cd88..14deeb10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         11
 
         latest
-        2.0.24
+        2.0.25
         3.0.1.12
         ${project.version}
         1.4.6

From 3889fa73b55206f6039a56417ac12943fb52b0d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jan 2022 22:11:18 +0000
Subject: [PATCH 11/52] Bump maven-jar-plugin from 3.2.0 to 3.2.2

Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 .../alfresco-transform-imagemagick-boot/pom.xml                 | 2 +-
 .../alfresco-transform-libreoffice-boot/pom.xml                 | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml    | 2 +-
 .../alfresco-transform-pdf-renderer-boot/pom.xml                | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml    | 2 +-
 alfresco-transformer-base/pom.xml                               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index e120c545..0bb2f0cf 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -89,7 +89,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index 6de6c55d..6d7b9f40 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -97,7 +97,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index 08624503..556be133 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -87,7 +87,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         
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 2c90c250..fcf39b7b 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
@@ -87,7 +87,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index ce041d99..4c1729e0 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -169,7 +169,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index e7ad63cf..c0e23659 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -81,7 +81,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.0
+                3.2.2
                 
                     
                         

From 59325bc38a9da8c2400544f0a539b69d68c710a5 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Thu, 13 Jan 2022 17:25:56 +0000
Subject: [PATCH 12/52] Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1
 (#516)

* Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1

Original PR https://github.com/Alfresco/alfresco-transform-core/pull/506 was merged to master where it failed. There had been no build of the PR before the merge, which is why this branch has been created.

* Use non deprecated TikaCoreProperties.SUBJECT with tika 2.2.1.

The deprecated OfficeOpenXMLCore.SUBJECT value worked in 2.2.0 but not 2.2.1

* With the upgrade of Tika from 2.2.0 to 2.2.1, the deprecated OfficeOpenXMLCore.SUBJECT metadata value became being null and the replacement TikaCoreProperties.SUBJECT became a multi value in a few of our test cases. For backward compatibility with very old versions of Alfresco, we have historically been added a number of extra values including "subject" and "description" back into the raw metadata, before mapping them onto Alfresco properties. These values existed in the original version of Tika used by Alfresco, so it is possible there are custom mappings out there that using them.

To complicate matters a little, out standard mappings for some types put the raw "subject" value into cm:description property. What makes it interesting is that the extra "description" value is not used but has the value originally in our expected metadata extarct data. That is why the quick_*_json files have been modified.
---
 .../transformer/TikaMetadataExtractsIT.java   | 24 +++++++++++++++++++
 .../test/resources/quick.odf_metadata.json    |  2 +-
 .../test/resources/quick.odg_metadata.json    |  2 +-
 .../test/resources/quick.odt_metadata.json    |  2 +-
 .../test/resources/quick.otg_metadata.json    |  2 +-
 .../test/resources/quick.ott_metadata.json    |  2 +-
 .../test/resources/quick.pdf_metadata.json    |  2 +-
 .../test/resources/quick.sxw_metadata.json    |  2 +-
 .../AbstractTikaMetadataExtractor.java        | 18 +++++++-------
 .../AbstractMetadataExtractsIT.java           |  6 ++---
 .../alfresco/transformer/TestFileInfo.java    |  6 +++++
 pom.xml                                       |  2 +-
 12 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java
index b5e35eb2..bcd376d7 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java
@@ -548,4 +548,28 @@ public class TikaMetadataExtractsIT extends AbstractMetadataExtractsIT
 
         );
     }
+
+    @ParameterizedTest
+    @MethodSource("tika2_2_1_upgradeFailures")
+    public void testTika_2_2_1_upgradeFailures(TestFileInfo testFileInfo)
+    {
+        super.testTransformation(testFileInfo);
+    }
+
+    private static Stream tika2_2_1_upgradeFailures()
+    {
+        // When we upgraded to Tika 2.2.1 from 2.2.0:
+        // - the original OfficeOpenXMLCore.SUBJECT raw metadata value started being null.
+        // - the replacement TikaCoreProperties.SUBJECT raw metadata changed into a multi value
+        // The following test files were the ones that failed.
+        return Stream.of(
+                testFile(MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE, "otg", "quick.otg"),
+                testFile(MIMETYPE_OPENOFFICE1_WRITER, "sxw", "quick.sxw"),
+                testFile(MIMETYPE_OPENDOCUMENT_GRAPHICS, "odg", "quick.odg"),
+                testFile(MIMETYPE_OPENDOCUMENT_TEXT, "odt", "quick.odt"),
+                testFile(MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE, "ott", "quick.ott"),
+                testFile(MIMETYPE_OPENDOCUMENT_FORMULA, "odf", "quick.odf"),
+                testFile(MIMETYPE_PDF, "pdf", "quick.pdf")
+        );
+    }
 }
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odf_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odf_metadata.json
index 64a82c12..e185ac01 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odf_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odf_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1138362922000,
   "{http://www.alfresco.org/model/content/1.0}author" : null,
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odg_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odg_metadata.json
index a542951b..c08f6a81 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odg_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odg_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1138362371000,
   "{http://www.alfresco.org/model/content/1.0}author" : "Derek Hulley",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt_metadata.json
index 37545ead..18faa8b9 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
   "{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otg_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otg_metadata.json
index a542951b..c08f6a81 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otg_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otg_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1138362371000,
   "{http://www.alfresco.org/model/content/1.0}author" : "Derek Hulley",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott_metadata.json
index 37545ead..18faa8b9 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
   "{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf_metadata.json
index 0f46dcb3..8758c90f 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : "2005-05-26T19:52:58Z",
   "{http://www.alfresco.org/model/content/1.0}author" : "Nevin Nollop",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw_metadata.json
index 37545ead..18faa8b9 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw_metadata.json
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw_metadata.json
@@ -1,5 +1,5 @@
 {
-  "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
+  "{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
   "{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
   "{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
   "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"
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..e52e9394 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
@@ -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.
  * -
@@ -269,30 +269,30 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
 
             // Get the subject and description, despite things not
             //  being nearly as consistent as one might hope
-            String subject = getMetadataValue(metadata, OfficeOpenXMLCore.SUBJECT);
+            String subject = getMetadataValue(metadata, TikaCoreProperties.SUBJECT);
             String description = getMetadataValue(metadata, TikaCoreProperties.DESCRIPTION);
-            if(subject != null && description != null)
+            if (subject != null && description != null)
             {
                 putRawValue(KEY_DESCRIPTION, description, rawProperties);
                 putRawValue(KEY_SUBJECT, subject, rawProperties);
             }
-            else if(subject != null)
+            else if (subject != null)
             {
                 putRawValue(KEY_DESCRIPTION, subject, rawProperties);
                 putRawValue(KEY_SUBJECT, subject, rawProperties);
             }
-            else if(description != null)
+            else if (description != null)
             {
                 putRawValue(KEY_DESCRIPTION, description, rawProperties);
                 putRawValue(KEY_SUBJECT, description, rawProperties);
             }
 
             // Try for the dates two different ways too
-            if(metadata.get(TikaCoreProperties.CREATED) != null)
+            if (metadata.get(TikaCoreProperties.CREATED) != null)
             {
                 putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.CREATED), rawProperties);
             }
-            else if(metadata.get(TikaCoreProperties.MODIFIED) != null)
+            else if (metadata.get(TikaCoreProperties.MODIFIED) != null)
             {
                 putRawValue(KEY_CREATED, metadata.get(TikaCoreProperties.MODIFIED), rawProperties);
             }
@@ -458,7 +458,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
 
         public void characters(char[] ch, int start, int len)
         {
-            if(text != null)
+            if (text != null)
             {
                 text.append(ch, start, len);
             }
@@ -466,7 +466,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
 
         public void endElement(String namespace, String localname, String qname)
         {
-            if(text != null && text.length() > 0)
+            if (text != null && text.length() > 0)
             {
                 tags.put(qname, text.toString());
             }
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java
index f6cd7069..97addbaa 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.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.
  * -
@@ -102,8 +102,8 @@ public abstract class AbstractMetadataExtractsIT
             jsonObjectMapper.writerWithDefaultPrettyPrinter().writeValue(actualMetadataFile, actualMetadata);
 
             Map expectedMetadata = readExpectedMetadata(metadataFilename, actualMetadataFile);
-            assertEquals(expectedMetadata, actualMetadata, 
-                "The metadata did not match the expected value. It has been saved in "+actualMetadataFile.getAbsolutePath());
+            assertEquals(expectedMetadata, actualMetadata,
+                    sourceFile+": The metadata did not match the expected value. It has been saved in "+actualMetadataFile.getAbsolutePath());
             actualMetadataFile.delete();
         }
         catch (Exception e)
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java
index 331213a9..15b8fb70 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java
@@ -76,4 +76,10 @@ public class TestFileInfo
     {
         return new TestFileInfo(mimeType, extension, path, false);
     }
+
+    @Override
+    public String toString()
+    {
+        return path;
+    }
 }
diff --git a/pom.xml b/pom.xml
index 14deeb10..75d34617 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         ${dependency.jackson.version}
         4.13.2
         3.5.0
-        2.1.0
+        2.2.1
         4.1.2
         1.4
 

From aca1c3c2313f48a54115654ab1c7bf64fec0efa4 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Thu, 13 Jan 2022 18:08:26 +0000
Subject: [PATCH 13/52] [trigger release] 2.5.5-A2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 75d34617..62848215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         2.0.25
         3.0.1.12
         ${project.version}
-        1.4.6
+        1.4.7
         5.16.3
         2.13.1
         ${dependency.jackson.version}

From 9a93e8bf89e53748d4ea29a56dd1c30157ff3b61 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 13 Jan 2022 18:42:25 +0000
Subject: [PATCH 14/52] [maven-release-plugin][skip ci] prepare release
 2.5.5-A2

---
 .../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 6f338a14..e74de0ae 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 70bd2f3b..46b7a833 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 0bb2f0cf..9c945d32 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index c86798f7..9bd85874 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 6d7b9f40..ce554d9e 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 31ff7c05..7bd90f51 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 556be133..772dd9c1 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 9d25e6d6..693ad08e 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 fcf39b7b..d5af42d7 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 1e220f8b..e3590750 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../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 4c1729e0..c76a25e0 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 4059bcff..c940bc33 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-A2-SNAPSHOT
+        2.5.5-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index c0e23659..a92ce14d 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-A2-SNAPSHOT
+        2.5.5-A2
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A2-SNAPSHOT
+    2.5.5-A2
 
     
         false
diff --git a/pom.xml b/pom.xml
index 62848215..2479e01a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A2-SNAPSHOT
+    2.5.5-A2
     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-A2
     
 
     

From 0342d2f2c386ca6745f2cd7d21e336bb6acfa448 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 13 Jan 2022 18:42:27 +0000
Subject: [PATCH 15/52] [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 e74de0ae..423dbc79 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-A2
+        2.5.5-A3-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 46b7a833..7feb681e 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-A2
+        2.5.5-A3-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 9c945d32..58e8691e 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-A2
+        2.5.5-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 9bd85874..41f9e621 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-A2
+        2.5.5-A3-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 ce554d9e..a715cf1d 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-A2
+        2.5.5-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 7bd90f51..c048aded 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-A2
+        2.5.5-A3-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 772dd9c1..2275c80b 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-A2
+        2.5.5-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 693ad08e..3678de90 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-A2
+        2.5.5-A3-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 d5af42d7..ac12458c 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-A2
+        2.5.5-A3-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 e3590750..b8982102 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-A2
+        2.5.5-A3-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 c76a25e0..7301a28a 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-A2
+        2.5.5-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index c940bc33..85d6d72c 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-A2
+        2.5.5-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index a92ce14d..541ff5cd 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-A2
+        2.5.5-A3-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A2
+    2.5.5-A3-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index 2479e01a..f01b17cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A2
+    2.5.5-A3-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-A2
+        HEAD
     
 
     

From ec49e323ff33f2095850b2869336f1efc8e574ff Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Thu, 13 Jan 2022 21:52:51 +0000
Subject: [PATCH 16/52] [trigger release] 2.5.5-A2 (#518)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f01b17cd..7a70f2d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A3-SNAPSHOT
+    2.5.5-A3-SNAPSHOT 
     pom
 
     

From 2f1704322de7455ad0ba88f82aea739c996f878c Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 13 Jan 2022 22:27:42 +0000
Subject: [PATCH 17/52] [maven-release-plugin][skip ci] prepare release
 2.5.5-A3

---
 .../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 423dbc79..eac32335 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 7feb681e..0dee8adc 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 58e8691e..1f57cf4e 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 41f9e621..4cee97f2 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 a715cf1d..0afa75fb 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index c048aded..8b895336 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 2275c80b..eb8f3c25 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 3678de90..02654b32 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 ac12458c..7fb54b9e 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 b8982102..905ddf71 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../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 7301a28a..562aa0af 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 85d6d72c..377d25bb 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-A3-SNAPSHOT
+        2.5.5-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 541ff5cd..73c333cb 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-A3-SNAPSHOT
+        2.5.5-A3
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A3-SNAPSHOT
+    2.5.5-A3
 
     
         false
diff --git a/pom.xml b/pom.xml
index 7a70f2d4..5c8e1495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A3-SNAPSHOT 
+    2.5.5-A3 
     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-A3
     
 
     

From ae612860986cc1f092ef7f2c66caf21983ad4c2a Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 13 Jan 2022 22:27:44 +0000
Subject: [PATCH 18/52] [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 eac32335..f4805db2 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-A3
+        2.5.5-A4-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 0dee8adc..eceb8795 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-A3
+        2.5.5-A4-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 1f57cf4e..d2d6d9a5 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-A3
+        2.5.5-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 4cee97f2..38e02b3d 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-A3
+        2.5.5-A4-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 0afa75fb..fa190ac7 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-A3
+        2.5.5-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 8b895336..c1550034 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-A3
+        2.5.5-A4-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 eb8f3c25..85edb777 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-A3
+        2.5.5-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 02654b32..bbdd5c36 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-A3
+        2.5.5-A4-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 7fb54b9e..fef10bd0 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-A3
+        2.5.5-A4-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 905ddf71..f9c2af0e 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-A3
+        2.5.5-A4-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 562aa0af..57dc08b8 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-A3
+        2.5.5-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 377d25bb..4aa72e34 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-A3
+        2.5.5-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 73c333cb..e5567b87 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-A3
+        2.5.5-A4-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A3
+    2.5.5-A4-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index 5c8e1495..67df3352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A3 
+    2.5.5-A4-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-A3
+        HEAD
     
 
     

From 167c77fb2c3c8f5c1ad7d4da634649f8674ef4fe Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Wed, 26 Jan 2022 17:51:00 +0000
Subject: [PATCH 19/52] ATS-973 [trigger release] 2.5.5 (#521)

---
 .../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                                                       | 2 +-
 14 files changed, 15 insertions(+), 15 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 f4805db2..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.5-A4-SNAPSHOT
+        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 eceb8795..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.5-A4-SNAPSHOT
+        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 d2d6d9a5..878df415 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-A4-SNAPSHOT
+        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 38e02b3d..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.5-A4-SNAPSHOT
+        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 fa190ac7..eb114978 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-A4-SNAPSHOT
+        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 c1550034..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.5-A4-SNAPSHOT
+        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 85edb777..28ca055a 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-A4-SNAPSHOT
+        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 bbdd5c36..3f208bd6 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-A4-SNAPSHOT
+        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 fef10bd0..00d85ed6 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-A4-SNAPSHOT
+        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 f9c2af0e..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.5-A4-SNAPSHOT
+        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 57dc08b8..7d1b72a2 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-A4-SNAPSHOT
+        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 4aa72e34..430e1183 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-A4-SNAPSHOT
+        2.5.5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index e5567b87..67904123 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-A4-SNAPSHOT
+        2.5.5-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-A4-SNAPSHOT
+    2.5.5-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index 67df3352..c490836e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5-A4-SNAPSHOT 
+    2.5.5-SNAPSHOT
     pom
 
     

From bec806510e0b5b413536561f4fdd5ec005d9ccc8 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Wed, 26 Jan 2022 18:30:09 +0000
Subject: [PATCH 20/52] [maven-release-plugin][skip ci] prepare release 2.5.5

---
 .../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 8835dc02..feadea38 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
         ../../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..6cd91979 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
         ../../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 878df415..6d12a599 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
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index fa7ead45..794ddc9a 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
         ../../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 eb114978..1d26f339 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
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 4a627526..d0ca0629 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
         ../../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 28ca055a..957cabf1 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
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 3f208bd6..8a2e585b 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
         ../../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 00d85ed6..9e3723b8 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
         ../../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 d4e190da..64e5da2c 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
         ../../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 7d1b72a2..7f580875 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
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 430e1183..9b3f26c2 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
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 67904123..1bff8716 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
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5-SNAPSHOT
+    2.5.5
 
     
         false
diff --git a/pom.xml b/pom.xml
index c490836e..eddc93b2 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
     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
     
 
     

From a4cc3d4818247d45807a3e00b5e0a6725ae40863 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Wed, 26 Jan 2022 18:30:11 +0000
Subject: [PATCH 21/52] [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 feadea38..a3371746 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
+        2.5.6-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 6cd91979..6255afe9 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
+        2.5.6-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 6d12a599..f4e5d3fb 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
+        2.5.6-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 794ddc9a..7059e211 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
+        2.5.6-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 1d26f339..5199261d 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
+        2.5.6-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index d0ca0629..bf6551d4 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
+        2.5.6-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 957cabf1..d8fd5a64 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
+        2.5.6-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 8a2e585b..89e0157e 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
+        2.5.6-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 9e3723b8..61b13115 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
+        2.5.6-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 64e5da2c..b3289f05 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
+        2.5.6-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 7f580875..a9b710e4 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
+        2.5.6-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 9b3f26c2..a299f224 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
+        2.5.6-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 1bff8716..2026e549 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
+        2.5.6-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.5
+    2.5.6-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index eddc93b2..a7bd26f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.5
+    2.5.6-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
+        HEAD
     
 
     

From e76da6878c8a90069f980f9f92c819adee2a03f9 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Thu, 27 Jan 2022 18:29:28 +0000
Subject: [PATCH 22/52] ACS-2479 AI Transformers do not start if built using
 ATS 1.5.0 components (#522)

[trigger release] 2.5.6

* Changes just tidy up white space and pick up the modified T-Model
---
 .../org/alfresco/transformer/AbstractTransformerController.java | 1 -
 .../org/alfresco/transformer/config/WebApplicationConfig.java   | 1 -
 pom.xml                                                         | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

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 d304a87a..936265e8 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
@@ -33,7 +33,6 @@ 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;
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 013f850e..467bd9e6 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
@@ -41,7 +41,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebApplicationConfig implements WebMvcConfigurer
 {
-
     @Override
     public void addInterceptors(InterceptorRegistry registry)
     {
diff --git a/pom.xml b/pom.xml
index a7bd26f0..27a551da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         2.0.25
         3.0.1.12
         ${project.version}
-        1.4.7
+        1.4.8
         5.16.3
         2.13.1
         ${dependency.jackson.version}

From f8be0f64aef0151b674b00288d9e95ef93b1dd09 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 27 Jan 2022 19:10:13 +0000
Subject: [PATCH 23/52] [maven-release-plugin][skip ci] prepare release 2.5.6

---
 .../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 a3371746..d3b7c784 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.6-SNAPSHOT
+        2.5.6
         ../../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 6255afe9..04adff23 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.6-SNAPSHOT
+        2.5.6
         ../../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 f4e5d3fb..bd11760a 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.6-SNAPSHOT
+        2.5.6
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 7059e211..345d2e6e 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.6-SNAPSHOT
+        2.5.6
         ../../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 5199261d..b78e5f4e 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.6-SNAPSHOT
+        2.5.6
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index bf6551d4..5fe11705 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.6-SNAPSHOT
+        2.5.6
         ../../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 d8fd5a64..f8b0e960 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.6-SNAPSHOT
+        2.5.6
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 89e0157e..ecff6a3b 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.6-SNAPSHOT
+        2.5.6
         ../../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 61b13115..b112aa91 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.6-SNAPSHOT
+        2.5.6
         ../../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 b3289f05..87cc715e 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.6-SNAPSHOT
+        2.5.6
         ../../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 a9b710e4..623975ed 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.6-SNAPSHOT
+        2.5.6
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index a299f224..d88ddf95 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.6-SNAPSHOT
+        2.5.6
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 2026e549..1c66796a 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,12 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.6-SNAPSHOT
+        2.5.6
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.6-SNAPSHOT
+    2.5.6
 
     
         false
diff --git a/pom.xml b/pom.xml
index 27a551da..d83ccb6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.6-SNAPSHOT
+    2.5.6
     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.6
     
 
     

From edadc1122f9ad3f47b9e3596058dd50cf4ac438a Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 27 Jan 2022 19:10:16 +0000
Subject: [PATCH 24/52] [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 d3b7c784..525646a2 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.6
+        2.5.7-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 04adff23..b7c0d367 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.6
+        2.5.7-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 bd11760a..3185721f 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.6
+        2.5.7-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 345d2e6e..c2c4295a 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.6
+        2.5.7-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 b78e5f4e..c3bc20e4 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.6
+        2.5.7-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 5fe11705..89256cac 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.6
+        2.5.7-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 f8b0e960..690a108e 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.6
+        2.5.7-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index ecff6a3b..9b276051 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.6
+        2.5.7-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 b112aa91..fa2d8a31 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.6
+        2.5.7-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 87cc715e..bc37b698 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.6
+        2.5.7-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 623975ed..31c2ef4c 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.6
+        2.5.7-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index d88ddf95..0b1f627e 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.6
+        2.5.7-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 1c66796a..3f3aeebc 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,12 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.6
+        2.5.7-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.6
+    2.5.7-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index d83ccb6f..2582eb36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.6
+    2.5.7-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.6
+        HEAD
     
 
     

From 4dcd36cfc5d481d43fa37122a03197d8884db182 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 17:12:32 +0000
Subject: [PATCH 25/52] Bump spring-boot-starter-parent from 2.6.2 to 2.6.3
 (#520)

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

---
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 2582eb36..00af12bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     
         org.springframework.boot
         spring-boot-starter-parent
-        2.6.2
+        2.6.3
     
 
     

From c28b65fba5b71fe90ead2cba70227d3873b533fc Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Wed, 2 Feb 2022 11:13:14 +0000
Subject: [PATCH 26/52] ACS-2499 Delete company release build stage. (#524)

* ACS-2499 Delete company release build stage.

This never uploaded any software, and so was not particularly useful. The software and license report should be
uploaded to S3 as part of the transform-service build.

Also skip uploading anything to staging bucket.
---
 .travis.yml                   | 41 +----------------------------------
 _ci/prepare_release_deploy.sh | 22 -------------------
 _ci/prepare_staging_deploy.sh | 22 -------------------
 docs/build-and-release.md     | 17 +--------------
 4 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100644 _ci/prepare_release_deploy.sh
 delete mode 100644 _ci/prepare_staging_deploy.sh

diff --git a/.travis.yml b/.travis.yml
index 789a64c1..66268894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ branches:
     - master
     - /^SP\/.+$/
     - /^HF\/.+$/
-    - company_release
     - /^ATS-.*$/
     - /^ACS-.*$/
 
@@ -30,7 +29,6 @@ stages:
     if: branch = master
   - build and test
   - release
-  - company_release
 
 before_install: bash _ci/init.sh
 
@@ -48,38 +46,32 @@ jobs:
       install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
       script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
     - name: "ImageMagick"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh imagemagick
       script: bash _ci/test.sh imagemagick
     - name: "LibreOffice"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh libreoffice
       script: bash _ci/test.sh libreoffice
     - name: "Transform Misc"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh misc
       script: bash _ci/test.sh misc
     - name: "PDF Renderer"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh pdf-renderer
       script: bash _ci/test.sh pdf-renderer
     - name: "Tika"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh tika
       script: bash _ci/test.sh tika
     - name: "All in One Transformer"
-      if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh full-build
       script:  travis_wait 30 bash _ci/test.sh aio-test
 #    - name: "Static Analysis (SAST)"
 # TODO ATS-721: comment out until it is possible to run concurrent SAST scans
-#    if: branch NOT IN (company_release) AND type != pull_request
+#    if: type != pull_request
 #      if: branch = master AND type != pull_request
 #      before_install:
 #      - bash _ci/static_analysis_init.sh
@@ -91,34 +83,3 @@ jobs:
       if: commit_message ~= /\[trigger release\]/ AND branch ~= /^(master|SP\/.+|HF\/.+)$/
       before_script: travis_wait bash _ci/cache_artifacts.sh
       script: travis_wait 55 bash _ci/release.sh
-      before_deploy: source _ci/prepare_staging_deploy.sh
-      deploy:
-        provider: s3
-        access_key_id: "${STAGING_AWS_ACCESS_KEY}"
-        secret_access_key: "${STAGING_AWS_SECRET_KEY}"
-        bucket: "alfresco-artefacts-staging"
-        skip_cleanup: true
-        region: "eu-west-1"
-        local_dir: "deploy_dir"
-        upload-dir: "enterprise/AlfrescoTransformServices/TransformEngines/${VERSION}"
-        on:
-          all_branches: true
-
-    - name: "Company Release"
-      stage: company_release
-      if: branch = company_release
-      before_install: bash _ci/init.sh
-      install: echo "NoOp"
-      script: echo "NoOp"
-      before_deploy: source _ci/prepare_release_deploy.sh
-      deploy:
-        provider: s3
-        access_key_id: "${RELEASE_AWS_ACCESS_KEY}"
-        secret_access_key: "${RELEASE_AWS_SECRET_KEY}"
-        bucket: "eu.dl.alfresco.com"
-        skip_cleanup: true
-        region: "eu-west-1"
-        local_dir: "deploy_dir"
-        upload-dir: "release/enterprise/AlfrescoTransformServices/TransformEngines/${VERSION}"
-        on:
-          branch: company_release
diff --git a/_ci/prepare_release_deploy.sh b/_ci/prepare_release_deploy.sh
deleted file mode 100644
index abf63d91..00000000
--- a/_ci/prepare_release_deploy.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-echo "========================== Starting Prepare Release Deploy Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-set -vex
-pushd "$(dirname "${BASH_SOURCE[0]}")/../"
-
-# Identify latest annotated tag (latest version)
-export VERSION=$(git describe --abbrev=0 --tags)
-
-mkdir -p deploy_dir
-
-# Create third party license csv file and add it to the deploy directory.
-git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git
-python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir"
-
-echo "Local deploy directory content:"
-ls -lA deploy_dir
-
-popd
-set +vex
-echo "========================== Finishing Prepare Release Deploy Script =========================="
diff --git a/_ci/prepare_staging_deploy.sh b/_ci/prepare_staging_deploy.sh
deleted file mode 100644
index 32dbb8c9..00000000
--- a/_ci/prepare_staging_deploy.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-echo "========================== Starting Prepare Staging Deploy Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-set -vex
-pushd "$(dirname "${BASH_SOURCE[0]}")/../"
-
-# Identify latest annotated tag (latest version)
-export VERSION=$(git describe --abbrev=0 --tags)
-
-mkdir -p deploy_dir
-
-# Create third party license csv file and add it to the deploy directory.
-git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git
-python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir"
-
-echo "Local deploy directory content:"
-ls -lA deploy_dir
-
-popd
-set +vex
-echo "========================== Finishing Prepare Staging Deploy Script =========================="
diff --git a/docs/build-and-release.md b/docs/build-and-release.md
index 218751ac..951d5b54 100644
--- a/docs/build-and-release.md
+++ b/docs/build-and-release.md
@@ -5,8 +5,7 @@ The `.travis.yml` config file can be found in the root of the repository.
 
 ## Stages and Jobs
 1. **Build**: Java build with unit and integration tests.
-2. **Release**: Release with artifact deployment to Nexus and AWS Staging bucket.
-3. **Company Release**: Artifact deployment to AWS Release bucket.
+2. **Release**: Release with artifact deployment to Nexus, DockerHub and Quay.io.
 
 
 ## Branches
@@ -27,10 +26,6 @@ Travis CI builds differ by branch:
   of the release jobs (no artifacts will be published until the PR is actually merged).
 * `ATS-*` branches:
   - regular builds which include only the _Build_ and _Tests_ stages;
-* `company_release` branch:
-  - builds that include the _Company Release_ stage only.
-  - the `company_release` branch should be used for one-off events; once used (a build 
-  completes), the branch should be deleted.
 
 All other branches are ignored.
 
@@ -67,13 +62,3 @@ been generated by steps (2) and (3), then an empty commit should be created - e.
 **Create a merge commit** (_Merge pull request_) or **Squash and merge** options are used, you 
 need to ensure that the _commit message_ contains the `[trigger release]` tag (sub-string).
 
-## Company Release process steps & info
-Prerequisites:
-  - The **Release** stage is complete - i.e. the release commit is tagged and the release 
-  artifacts are deployed on Nexus.
-
-Steps:
-1. Create a new `company_release` branch from the `master` / `SP/*`/ `HF/*` branch. This job uses 
-the latest branch git tag to identify the version that must be uploaded to the S3 release bucket.
-2. Wait for a green build on the branch.
-3. Delete local and remote `company_release` branch.

From e575ec943a5fa5dddca5593e6795a17a2bbb3cb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 13:41:33 +0000
Subject: [PATCH 27/52] Bump junrar from 7.4.0 to 7.4.1 (#523)

Bumps [junrar](https://github.com/junrar/junrar) from 7.4.0 to 7.4.1.
- [Release notes](https://github.com/junrar/junrar/releases)
- [Changelog](https://github.com/junrar/junrar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/junrar/junrar/compare/v7.4.0...v7.4.1)

---
updated-dependencies:
- dependency-name: com.github.junrar:junrar
  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 00af12bc..f4ca8202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@
             
                 com.github.junrar
                 junrar
-                7.4.0
+                7.4.1
             
             
                 org.apache.commons

From df519cfd6f74c904b8baadc2b80c3e98361e6ba1 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Wed, 9 Feb 2022 22:39:40 +0000
Subject: [PATCH 28/52] ACS-2498 Add coreVersion to T-Engine config (#526)

The bulk of the changes in this PR are to do with adding a coreVersion element to the transform element in the T-Engine config. For more detail see the class header of CoreVersionDecorator.

* Support the use of coreVersion so that it is possible to upgrade pods in any order
* Moved the majority of the RequestParamMap static finals to alfresco-transform-model and added a new one: "includeCoreVersion" parameter.
---
 _ci/source_clear.sh                           |  2 +-
 .../alfresco/transformer/AIOController.java   | 13 +++++--
 .../main/resources/application-default.yaml   |  1 +
 .../AIOControllerImageMagickTest.java         |  8 ++++
 .../AIOControllerLibreOfficeTest.java         |  7 ++++
 .../transformer/AIOControllerMiscTest.java    | 11 +++++-
 .../AIOControllerPdfRendererTest.java         | 10 ++++-
 .../transformer/AIOControllerTest.java        | 11 ++++--
 .../transformer/AIOControllerTikaTest.java    |  8 ++++
 .../main/resources/application-default.yaml   |  1 +
 .../main/resources/application-default.yaml   |  1 +
 .../alfresco/transformer/MiscController.java  |  4 +-
 .../main/resources/application-default.yaml   |  1 +
 .../HtmlParserContentTransformer.java         |  4 +-
 .../transformers/SelectableTransformer.java   |  5 +--
 .../StringExtractingContentTransformer.java   |  5 ++-
 .../TextToPdfContentTransformer.java          |  4 +-
 .../HtmlParserContentTransformerTest.java     |  4 +-
 .../main/resources/application-default.yaml   |  1 +
 .../main/resources/application-default.yaml   |  1 +
 .../AbstractTransformerController.java        | 11 ++++--
 .../transformer/TransformRegistryImpl.java    |  8 +++-
 .../transformer/util/RequestParamMap.java     | 39 ++++---------------
 .../AbstractTransformerControllerTest.java    | 28 ++++++++++++-
 pom.xml                                       |  2 +-
 25 files changed, 128 insertions(+), 62 deletions(-)

diff --git a/_ci/source_clear.sh b/_ci/source_clear.sh
index 6ab40f79..7842730b 100644
--- a/_ci/source_clear.sh
+++ b/_ci/source_clear.sh
@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set +e -v -x
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-mvn -B -q clean install \
+mvn -B -U -q clean install \
     -DskipTests \
     -Dmaven.javadoc.skip=true \
     com.srcclr:srcclr-maven-plugin:scan \
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
index 5d1beca4..431a4b2c 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.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.
  * -
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.io.File;
 import java.util.HashMap;
@@ -42,6 +43,8 @@ import java.util.Map;
 
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN;
+import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
+import static org.alfresco.transformer.util.RequestParamMap.INCLUDE_CORE_VERSION;
 import static org.alfresco.transformer.util.RequestParamMap.SOURCE_ENCODING;
 import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@@ -88,10 +91,12 @@ public class AIOController extends AbstractTransformerController
     }
 
     @Override
-    public ResponseEntity info()
+    public ResponseEntity info(
+            @RequestParam(value = INCLUDE_CORE_VERSION, required = false) Boolean includeCoreVersion)
     {
-        logger.info("GET Transform Config.");
+        logger.info("GET Transform Config" + (includeCoreVersion != null && includeCoreVersion ? " including coreVersion" : ""));
         TransformConfig transformConfig = transformRegistry.getTransformConfig();
+        transformConfig = setOrClearCoreVersion(transformConfig, includeCoreVersion);
         return new ResponseEntity<>(transformConfig, OK);
     }
 
@@ -105,7 +110,7 @@ public class AIOController extends AbstractTransformerController
         Transformer transformer = transformRegistry.getByTransformName(transformName);
         if (transformer == null)
         {
-            new TransformException(INTERNAL_SERVER_ERROR.value(), "No transformer mapping for - transform:"
+            throw new TransformException(INTERNAL_SERVER_ERROR.value(), "No transformer mapping for - transform:"
                     + transformName + " sourceMimetype:" + sourceMimetype + " targetMimetype:" + targetMimetype);
         }
 
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
index 3a55ed6b..da6e68a3 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
@@ -2,6 +2,7 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.aio.acs}
 transform:
   core:
+    version: @project.version@
     pdfrenderer:
         exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer}
     libreoffice:
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
index 0be23b4b..04ba2954 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
@@ -106,6 +106,14 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTest
 
 
     }
+
+    @Test
+    @Override
+    public void testGetTransformConfigInfoExcludingCoreVersion()
+    {
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
+    }
+
     @Test
     @Override
     public void testGetInfoFromConfigWithDuplicates()
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerLibreOfficeTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerLibreOfficeTest.java
index b0613dc4..8bf1a2ef 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerLibreOfficeTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerLibreOfficeTest.java
@@ -88,6 +88,13 @@ public class AIOControllerLibreOfficeTest extends LibreOfficeControllerTest
 
     }
 
+    @Test
+    @Override
+    public void testGetTransformConfigInfoExcludingCoreVersion()
+    {
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
+    }
+
     @Test
     @Override
     public void testGetInfoFromConfigWithDuplicates()
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerMiscTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerMiscTest.java
index 5b94df75..4e4be7c4 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerMiscTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerMiscTest.java
@@ -45,15 +45,22 @@ public class AIOControllerMiscTest extends MiscControllerTest
         // just test that we are actually testing against the AIOController (instead of MiscController)
         assertTrue(controller instanceof AIOController, "Wrong controller wired for test");
     }
-    
+
     @Test
     @Override
     public void testGetTransformConfigInfo()
     {
-        // Ignore the test in super class as the way the AIO transformer provides config is fundamentality different.
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
 
     }
 
+    @Test
+    @Override
+    public void testGetTransformConfigInfoExcludingCoreVersion()
+    {
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
+    }
+
     @Test
     @Override
     public void testGetInfoFromConfigWithDuplicates()
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerPdfRendererTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerPdfRendererTest.java
index a944aaf4..063cb1db 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerPdfRendererTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerPdfRendererTest.java
@@ -84,9 +84,15 @@ public class AIOControllerPdfRendererTest extends AlfrescoPdfRendererControllerT
     public void testGetTransformConfigInfo()
     {
         // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
-
-
     }
+
+    @Test
+    @Override
+    public void testGetTransformConfigInfoExcludingCoreVersion()
+    {
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
+    }
+
     @Test
     @Override
     public void testGetInfoFromConfigWithDuplicates()
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java
index 2b62642f..82f6508f 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.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.
  * -
@@ -38,7 +38,6 @@ import org.springframework.context.annotation.Import;
 @Import(AIOCustomConfig.class)
 public class AIOControllerTest //extends AbstractTransformerControllerTest 
 {
-
     @Autowired
     AIOController aioController;
 
@@ -64,6 +63,12 @@ public class AIOControllerTest //extends AbstractTransformerControllerTest
     @Test
     public void emptyTest()
     {
-        aioController.info();
+        aioController.info(null);
+    }
+
+    @Test
+    public void emptyTestWithIncludeCoreVersion()
+    {
+        aioController.info(true);
     }
 }
\ No newline at end of file
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTikaTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTikaTest.java
index 9c720faa..12e62476 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTikaTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTikaTest.java
@@ -57,6 +57,14 @@ public class AIOControllerTikaTest extends TikaControllerTest
 
 
     }
+
+    @Test
+    @Override
+    public void testGetTransformConfigInfoExcludingCoreVersion()
+    {
+        // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different.
+    }
+
     @Test
     @Override
     public void testGetInfoFromConfigWithDuplicates()
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
index 6b813c68..30851c71 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
@@ -2,6 +2,7 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.imagemagick.acs}
 transform:
   core:
+    version: @project.version@
     config:
       location: classpath:imagemagick_engine_config.json
     imagemagick:
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml
index 2c286ef4..53d01728 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml
@@ -2,6 +2,7 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs}
 transform:
   core:
+    version: @project.version@
     config:
       location: classpath:libreoffice_engine_config.json
     libreoffice:
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java
index 6a5498fe..d987a430 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.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.
  * -
@@ -38,7 +38,7 @@ import java.util.Map;
 
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN;
-import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.SOURCE_ENCODING;
+import static org.alfresco.transformer.util.RequestParamMap.SOURCE_ENCODING;
 import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER;
 
 @Controller
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml
index 30fea7ee..2624c89b 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml
@@ -2,5 +2,6 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.misc.acs}
 transform:
   core:
+    version: @project.version@
     config:
       location: classpath:misc_engine_config.json
\ No newline at end of file
diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java
index 4c64016d..eb84e5f8 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.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.
  * -
@@ -42,6 +42,8 @@ import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.util.Map;
 
+import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING;
+
 /**
  * Content transformer which wraps the HTML Parser library for
  * parsing HTML content.
diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java
index dd9c712f..af89da91 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.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.
  * -
@@ -36,9 +36,6 @@ import java.util.Map;
  */
 public interface SelectableTransformer
 {
-    String SOURCE_ENCODING = "sourceEncoding";
-    String TARGET_ENCODING = "targetEncoding";
-
     default void transform(String sourceMimetype, String targetMimetype, Map parameters,
                    File sourceFile, File targetFile) throws Exception
     {
diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java
index 0c006de9..0a1760a6 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.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.
  * -
@@ -42,6 +42,9 @@ import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.util.Map;
 
+import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING;
+import static org.alfresco.transform.client.util.RequestParamMap.TARGET_ENCODING;
+
 /**
  * Converts any textual format to plain text.
  * 

diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java
index 1cf823bd..253d1c88 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.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.
  * -
@@ -50,6 +50,8 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING;
+
 /**
  * 

  * This code is based on a class of the same name originally implemented in alfresco-repository.
diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
index c41b7220..775a4408 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.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.
  * -
@@ -35,7 +35,7 @@ import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.alfresco.transformer.transformers.StringExtractingContentTransformer.SOURCE_ENCODING;
+import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HtmlParserContentTransformerTest
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml
index 75860056..1602d74e 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml
@@ -2,6 +2,7 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.alfresco-pdf-renderer.acs}
 transform:
   core:
+    version: @project.version@
     config:
       location: classpath:pdfrenderer_engine_config.json
     pdfrenderer:
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml
index 559c09c3..729549ac 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml
@@ -2,6 +2,7 @@ queue:
   engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.tika.acs}
 transform:
   core:
+    version: @project.version@
     config:
       location: classpath:tika_engine_config.json
     tika:
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 936265e8..3a7b64bf 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
@@ -63,6 +63,8 @@ import java.util.List;
 import java.util.Map;
 
 import static java.util.stream.Collectors.joining;
+import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
+import static org.alfresco.transform.client.util.RequestParamMap.INCLUDE_CORE_VERSION;
 import static org.alfresco.transformer.fs.FileManager.TempFileProvider.createTempFile;
 import static org.alfresco.transformer.fs.FileManager.buildFile;
 import static org.alfresco.transformer.fs.FileManager.createAttachment;
@@ -140,11 +142,12 @@ public abstract class AbstractTransformerController implements TransformControll
     private TransformerDebug transformerDebug;
 
     @GetMapping(value = "/transform/config")
-    public ResponseEntity info()
+    public ResponseEntity info(
+            @RequestParam(value = INCLUDE_CORE_VERSION, required = false) Boolean includeCoreVersion)
     {
-        logger.info("GET Transform Config.");
-        final TransformConfig transformConfig =
-            ((TransformRegistryImpl) transformRegistry).getTransformConfig();
+        logger.info("GET Transform Config" + (includeCoreVersion != null && includeCoreVersion ? " including coreVersion" : ""));
+        TransformConfig transformConfig = ((TransformRegistryImpl) transformRegistry).getTransformConfig();
+        transformConfig = setOrClearCoreVersion(transformConfig, includeCoreVersion);
         return new ResponseEntity<>(transformConfig, OK);
     }
 
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
index 25c620c0..29e506a5 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
@@ -26,6 +26,7 @@
 package org.alfresco.transformer;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 import java.io.IOException;
@@ -61,6 +62,9 @@ public class TransformRegistryImpl extends AbstractTransformRegistry
     @Value("${transform.core.config.location:classpath:engine_config.json}")
     private String locationFromProperty;
 
+    @Value("${transform.core.version}")
+    private String coreVersion;
+
     private Resource engineConfig;
 
     @PostConstruct
@@ -82,7 +86,9 @@ public class TransformRegistryImpl extends AbstractTransformRegistry
     {
         try (Reader reader = new InputStreamReader(engineConfig.getInputStream(), UTF_8))
         {
-            return jsonObjectMapper.readValue(reader, TransformConfig.class);
+            TransformConfig transformConfig = jsonObjectMapper.readValue(reader, TransformConfig.class);
+            setCoreVersionOnSingleStepTransformers(transformConfig.getTransformers(), coreVersion);
+            return transformConfig;
         }
         catch (IOException e)
         {
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java
index 544fb31d..7ffa3e4a 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.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,7 +26,11 @@
  */
 package org.alfresco.transformer.util;
 
-public interface RequestParamMap
+/**
+ * Extends the list of transform options with historic request parameters or 'extra' parameters used in testing
+ * or communication in the all-in-one transformer.
+ */
+public interface RequestParamMap extends org.alfresco.transform.client.util.RequestParamMap
 {
     // This property can be sent by acs repository's legacy transformers to force a transform,
     // instead of letting this T-Engine determine it based on the request parameters.
@@ -35,41 +39,12 @@ public interface RequestParamMap
     // See ATS-731.
     @Deprecated
     String TRANSFORM_NAME_PROPERTY = "transformName";
-
     String TRANSFORM_NAME_PARAMETER = "alfresco.transform-name-parameter";
-    String FILE = "file";
 
-    String SOURCE_ENCODING          = "sourceEncoding";
+    String FILE = "file";
     String SOURCE_EXTENSION         = "sourceExtension";
     String SOURCE_MIMETYPE          = "sourceMimetype";
     String TARGET_EXTENSION         = "targetExtension";
     String TARGET_MIMETYPE          = "targetMimetype";
-    String TARGET_ENCODING          = "targetEncoding";
     String TEST_DELAY               = "testDelay";
-    String PAGE_REQUEST_PARAM       = "page";    
-    String WIDTH_REQUEST_PARAM      = "width";
-    String HEIGHT_REQUEST_PARAM     = "height";
-    String ALLOW_PDF_ENLARGEMENT    = "allowPdfEnlargement";
-    String MAINTAIN_PDF_ASPECT_RATIO = "maintainPdfAspectRatio";
-    String START_PAGE              = "startPage";
-    String END_PAGE                = "endPage";
-    String ALPHA_REMOVE            = "alphaRemove";
-    String AUTO_ORIENT             = "autoOrient";
-    String CROP_GRAVITY            = "cropGravity";
-    String CROP_WIDTH              = "cropWidth";
-    String CROP_HEIGHT             = "cropHeight";
-    String CROP_PERCENTAGE         = "cropPercentage";
-    String CROP_X_OFFSET           = "cropXOffset";
-    String CROP_Y_OFFSET           = "cropYOffset";
-    String THUMBNAIL               = "thumbnail";
-    String RESIZE_WIDTH            = "resizeWidth";
-    String RESIZE_HEIGHT           = "resizeHeight";
-    String RESIZE_PERCENTAGE       = "resizePercentage";
-    String ALLOW_ENLARGEMENT       = "allowEnlargement";
-    String MAINTAIN_ASPECT_RATIO   = "maintainAspectRatio";
-    String COMMAND_OPTIONS         = "commandOptions";
-    String TIMEOUT                 = "timeout";
-    String INCLUDE_CONTENTS        = "includeContents";
-    String NOT_EXTRACT_BOOKMARKS_TEXT = "notExtractBookmarksText";
-    String PAGE_LIMIT              = "pageLimit";
 }
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 b0344ef7..193096ec 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
@@ -69,6 +69,7 @@ import org.alfresco.transformer.probes.ProbeTestTransform;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.core.io.ClassPathResource;
@@ -103,6 +104,9 @@ public abstract class AbstractTransformerControllerTest
     @SpyBean
     protected TransformServiceRegistry transformRegistry;
 
+    @Value("${transform.core.version}")
+    private String currentCoreVersion;
+
     protected String sourceExtension;
     protected String targetExtension;
     protected String sourceMimetype;
@@ -196,7 +200,7 @@ public abstract class AbstractTransformerControllerTest
                     " does not exist in the resources directory");
         }
         // added as part of ATS-702 to allow test resources to be read from the imported jar files to prevent test resource duplication
-        if(testFileUrl!=null)
+        if (testFileUrl!=null)
         {
             // Each use of the tempDir should result in a unique directory being used
             testFile = new File(tempDir, testFilename);
@@ -407,6 +411,28 @@ public abstract class AbstractTransformerControllerTest
 
     @Test
     public void testGetTransformConfigInfo() throws Exception
+    {
+        TransformConfig expectedTransformConfig = objectMapper
+            .readValue(getTestFile(getEngineConfigName(), true),
+                TransformConfig.class);
+        expectedTransformConfig.getTransformers().forEach(transformer -> transformer.setCoreVersion(currentCoreVersion));
+
+        ReflectionTestUtils.setField(transformRegistry, "engineConfig",
+            new ClassPathResource(getEngineConfigName()));
+
+        String response = mockMvc
+            .perform(MockMvcRequestBuilders.get("/transform/config?includeCoreVersion=true"))
+            .andExpect(status().is(OK.value()))
+            .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
+            .andReturn().getResponse().getContentAsString();
+
+        TransformConfig transformConfig = objectMapper.readValue(response, TransformConfig.class);
+        assertEquals(expectedTransformConfig, transformConfig);
+    }
+
+    @Test
+    // Test for case when T-Router or Repository is a version that does not expect it
+    public void testGetTransformConfigInfoExcludingCoreVersion() throws Exception
     {
         TransformConfig expectedTransformConfig = objectMapper
             .readValue(getTestFile(getEngineConfigName(), true),
diff --git a/pom.xml b/pom.xml
index f4ca8202..5f8a7eb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         2.0.25
         3.0.1.12
         ${project.version}
-        1.4.8
+        1.4.9
         5.16.3
         2.13.1
         ${dependency.jackson.version}

From a89e1610042842de0f72e98c7c632195f7aa4635 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Thu, 10 Feb 2022 23:50:19 +0000
Subject: [PATCH 29/52] ACS-2498 Switch to using a configVersion parameter on
 the /transform/config endpoint (#530)

* Fixed the config returned by the AIO as it did not include the coreVersion even though the individual ones did.
---
 .../alfresco/transformer/AIOController.java   |  9 +++--
 .../alfresco/transformer/AIOCustomConfig.java |  8 +++-
 .../transformer/AIOControllerTest.java        | 25 +++++++++++--
 .../transformer/AIOTransformRegistry.java     | 22 ++++++++---
 .../ImageMagickControllerTest.java            | 15 ++++----
 .../LibreOfficeControllerTest.java            |  5 ++-
 .../transformer/MiscControllerTest.java       |  5 ++-
 .../AlfrescoPdfRendererControllerTest.java    |  9 +++--
 .../transformer/TikaControllerTest.java       | 13 ++++---
 .../AbstractTransformerController.java        | 17 +++++----
 .../config/WebApplicationConfig.java          |  4 +-
 .../transformer/AbstractHttpRequestTest.java  |  5 ++-
 .../AbstractTransformerControllerTest.java    | 37 ++++++++++---------
 .../alfresco/transformer/EngineClient.java    |  5 ++-
 pom.xml                                       |  2 +-
 15 files changed, 115 insertions(+), 66 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
index 431a4b2c..c373fafe 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
@@ -44,7 +44,8 @@ import java.util.Map;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN;
 import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
-import static org.alfresco.transformer.util.RequestParamMap.INCLUDE_CORE_VERSION;
+import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT;
+import static org.alfresco.transformer.util.RequestParamMap.CONFIG_VERSION;
 import static org.alfresco.transformer.util.RequestParamMap.SOURCE_ENCODING;
 import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@@ -92,11 +93,11 @@ public class AIOController extends AbstractTransformerController
 
     @Override
     public ResponseEntity info(
-            @RequestParam(value = INCLUDE_CORE_VERSION, required = false) Boolean includeCoreVersion)
+            @RequestParam(value = CONFIG_VERSION, defaultValue = CONFIG_VERSION_DEFAULT) int configVersion)
     {
-        logger.info("GET Transform Config" + (includeCoreVersion != null && includeCoreVersion ? " including coreVersion" : ""));
+        logger.info("GET Transform Config version: " + configVersion);
         TransformConfig transformConfig = transformRegistry.getTransformConfig();
-        transformConfig = setOrClearCoreVersion(transformConfig, includeCoreVersion);
+        transformConfig = setOrClearCoreVersion(transformConfig, configVersion);
         return new ResponseEntity<>(transformConfig, OK);
     }
 
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 fb5ceb67..7f01dc9c 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
@@ -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,6 +85,9 @@ public class AIOCustomConfig
     @Value("${transform.core.tika.pdfBox.notExtractBookmarksTextDefault:false}")
     private boolean notExtractBookmarksTextDefault;
 
+    @Value("${transform.core.version}")
+    private String coreVersion;
+
     /**
      *
      * @return Override the TransformRegistryImpl used in {@link AbstractTransformerController}
@@ -94,13 +97,14 @@ public class AIOCustomConfig
     public TransformServiceRegistry aioTransformRegistry() throws Exception
     {
         AIOTransformRegistry aioTransformRegistry = new AIOTransformRegistry();
+        aioTransformRegistry.setCoreVersion(coreVersion);
 
         // 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(tEngine); // now a poor name - should be combineTransformers
         }
         aioTransformRegistry.registerCombinedTransformers();
         return aioTransformRegistry;
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java
index 82f6508f..1dc97d3b 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java
@@ -29,15 +29,26 @@ package org.alfresco.transformer;
 import java.io.IOException;
 
 import org.alfresco.transform.client.model.TransformRequest;
+import org.alfresco.transform.client.model.config.TransformConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.context.annotation.Import;
+import org.springframework.http.ResponseEntity;
+
+import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT;
+import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_LATEST;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 @WebMvcTest(AIOController.class)
 @Import(AIOCustomConfig.class)
 public class AIOControllerTest //extends AbstractTransformerControllerTest 
 {
+    @Value("${transform.core.version}")
+    private String coreVersion;
+
     @Autowired
     AIOController aioController;
 
@@ -63,12 +74,20 @@ public class AIOControllerTest //extends AbstractTransformerControllerTest
     @Test
     public void emptyTest()
     {
-        aioController.info(null);
+        ResponseEntity responseEntity = aioController.info(Integer.valueOf(CONFIG_VERSION_DEFAULT));
+        responseEntity.getBody().getTransformers().forEach(transformer -> {
+            assertNull(transformer.getCoreVersion(), transformer.getTransformerName() +
+                    " should have had a null coreValue but was " + transformer.getCoreVersion());
+        });
     }
 
     @Test
-    public void emptyTestWithIncludeCoreVersion()
+    public void emptyTestWithLatestVersion()
     {
-        aioController.info(true);
+        ResponseEntity responseEntity = aioController.info(CONFIG_VERSION_LATEST);
+        responseEntity.getBody().getTransformers().forEach(transformer -> {
+            assertNotNull(transformer.getCoreVersion(), transformer.getTransformerName() +
+                    " should have had a coreValue but was null. Should have been " + coreVersion);
+        });
     }
 }
\ No newline at end of file
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java
index 3e86fc87..71d6b799 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.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.
  * -
@@ -34,6 +34,7 @@ import org.alfresco.transform.client.registry.TransformCache;
 import org.alfresco.transformer.executors.Transformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -43,6 +44,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers;
 
 /**
  * AIOTransformRegistry manages all of the sub transformers registered to it and provides aggregated TransformConfig.
@@ -53,6 +55,8 @@ public class AIOTransformRegistry extends AbstractTransformRegistry
 
     private static final String ENGINE_CONFIG_LOCATION_POSTFIX = "_engine_config.json";
 
+    private String coreVersion;
+
     private CombinedTransformConfig combinedTransformConfig = new CombinedTransformConfig();
 
     // Holds the structures used by AbstractTransformRegistry to look up what is supported.
@@ -64,20 +68,26 @@ public class AIOTransformRegistry extends AbstractTransformRegistry
     // Represents the mapping between a transform and a transformer, multiple mappings can point to the same transformer.
     private Map transformerEngineMapping = new HashMap();
 
+    public void setCoreVersion(String coreVersion)
+    {
+        this.coreVersion = coreVersion;
+    }
+
     /**
      * Adds a transformer's (T-Engine) config to the configuration and creates a map of transforms to the T-Engine.
      * The name of this method is now misleading as the registry of transforms takes place in
      * {@link #registerCombinedTransformers()} .
-     * @param transformer The transformer implementation, this could be a single transformer
+     * @param tEngine The transformer implementation, this could be a single transformer
      *                    or a transformer managing multiple sub transformers. The transformer's configuration file will
      *                    be read based on the {@link Transformer#getTransformerId()} value.
      */
-    public void registerTransformer(final Transformer transformer) throws Exception
+    public void registerTransformer(final Transformer tEngine) throws Exception
     {
         // Load config for the transformer
-        String location = getTransformConfigLocation(transformer);
+        String location = getTransformConfigLocation(tEngine);
         TransformConfig transformConfig = loadTransformConfig(location);
-        String transformerId = transformer.getTransformerId();
+        setCoreVersionOnSingleStepTransformers(transformConfig.getTransformers(), coreVersion);
+        String transformerId = tEngine.getTransformerId();
         combinedTransformConfig.addTransformConfig(transformConfig, location, transformerId, this);
 
         // Map all of the transforms defined in the config to this Transformer implementation
@@ -90,7 +100,7 @@ public class AIOTransformRegistry extends AbstractTransformRegistry
             {
                 log.debug("Overriding transform with name: '{}' originally defined in '{}'.", transformerName, originalTEngine.getTransformerId());
             }
-            transformerEngineMapping.put(transformerName, transformer);
+            transformerEngineMapping.put(transformerName, tEngine);
             log.debug("Registered transform with name: '{}' defined in '{}'.", transformerName, transformerId);
         }
     }
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 7f1709dd..12d10691 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
@@ -26,6 +26,7 @@
  */
 package org.alfresco.transformer;
 
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.alfresco.transformer.util.MimetypeMap.PREFIX_IMAGE;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -227,7 +228,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         expectedOptions = "-auto-orient " + "-gravity " + value + " +repage";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -244,7 +245,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
     {
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -260,7 +261,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         expectedSourceSuffix = "[2-3]";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -298,7 +299,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         expectedSourceSuffix = "[2-3]";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -336,7 +337,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         expectedOptions = "( horrible command / ); -auto-orient -resize 321x654";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -365,7 +366,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
     {
         when(mockExecutionResult.getExitValue()).thenReturn(1);
 
-        mockMvc.perform(mockMvcRequest("/transform", sourceFile, "targetExtension", "xxx"))
+        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", "xxx"))
                .andExpect(status().is(BAD_REQUEST.value()))
                .andExpect(
                    status().reason(containsString("Transformer exit code was not 0: \nSTDERR")));
@@ -399,7 +400,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest
         String tr = objectMapper.writeValueAsString(transformRequest);
         String transformationReplyAsString = mockMvc
             .perform(MockMvcRequestBuilders
-                .post("/transform")
+                .post(ENDPOINT_TRANSFORM)
                 .header(ACCEPT, APPLICATION_JSON_VALUE)
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .content(tr))
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 c9a71509..298f335a 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
@@ -27,6 +27,7 @@
 package org.alfresco.transformer;
 
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.alfresco.transformer.util.RequestParamMap.SOURCE_MIMETYPE;
 import static org.alfresco.transformer.util.RequestParamMap.TARGET_EXTENSION;
 import static org.alfresco.transformer.util.RequestParamMap.TARGET_MIMETYPE;
@@ -200,7 +201,7 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest
 
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param(TARGET_EXTENSION, "xxx")
                 .param(SOURCE_MIMETYPE,sourceMimetype)
@@ -247,7 +248,7 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest
         String tr = objectMapper.writeValueAsString(transformRequest);
         String transformationReplyAsString = mockMvc
             .perform(MockMvcRequestBuilders
-                .post("/transform")
+                .post(ENDPOINT_TRANSFORM)
                 .header(ACCEPT, APPLICATION_JSON_VALUE)
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .content(tr))
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java
index d4b4ff86..89c1f71b 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.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.
  * -
@@ -35,6 +35,7 @@ import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORD
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_RFC822;
 import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -490,7 +491,7 @@ public class MiscControllerTest extends AbstractTransformerControllerTest
             "test_file." + sourceExtension, sourceMimetype, content);
 
         final MockHttpServletRequestBuilder requestBuilder = super
-            .mockMvcRequest("/transform", sourceFile)
+            .mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile)
             .param("targetExtension", targetExtension)
             .param("targetMimetype", targetMimetype)
             .param("sourceMimetype", sourceMimetype);
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 0f729862..22a38754 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
@@ -26,6 +26,7 @@
  */
 package org.alfresco.transformer;
 
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -221,7 +222,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro
         expectedOptions = "--width=321 --height=654 --allow-enlargement --maintain-aspect-ratio --page=2";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -245,7 +246,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro
         expectedOptions = "--width=321 --height=654 --page=2";
         mockMvc
             .perform(MockMvcRequestBuilders
-                .multipart("/transform")
+                .multipart(ENDPOINT_TRANSFORM)
                 .file(sourceFile)
                 .param("targetExtension", targetExtension)
                 .param("targetMimetype", targetMimetype)
@@ -277,7 +278,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro
     {
         when(mockExecutionResult.getExitValue()).thenReturn(1);
 
-        mockMvc.perform(mockMvcRequest("/transform", sourceFile, "targetExtension", "xxx"))
+        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", "xxx"))
                .andExpect(status().is(BAD_REQUEST.value()))
                .andExpect(status()
                    .reason(containsString("Transformer exit code was not 0: \nSTDERR")));
@@ -311,7 +312,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro
         String tr = objectMapper.writeValueAsString(transformRequest);
         String transformationReplyAsString = mockMvc
             .perform(MockMvcRequestBuilders
-                .post("/transform")
+                .post(ENDPOINT_TRANSFORM)
                 .header(ACCEPT, APPLICATION_JSON_VALUE)
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .content(tr))
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 2727d292..c379e567 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
@@ -27,6 +27,7 @@
 package org.alfresco.transformer;
 
 import static java.nio.file.Files.readAllBytes;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.alfresco.transformer.executors.Tika.ARCHIVE;
 import static org.alfresco.transformer.executors.Tika.CSV;
 import static org.alfresco.transformer.executors.Tika.DOC;
@@ -249,9 +250,9 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
 
         System.out.println("Test " + transform + " " + sourceExtension + " to " + targetExtension);
         MockHttpServletRequestBuilder requestBuilder = includeContents == null
-                                                       ? mockMvcRequest("/transform", sourceFile,
+                                                       ? mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile,
             "targetExtension", this.targetExtension)
-                                                       : mockMvcRequest("/transform", sourceFile,
+                                                       : mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile,
             "targetExtension", this.targetExtension, INCLUDE_CONTENTS, includeContents.toString());
         MvcResult result = mockMvc.perform(requestBuilder)
                                   .andExpect(status().is(OK.value()))
@@ -368,7 +369,7 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
         mockTransformCommand(PDF, TXT, MIMETYPE_PDF, true);
         targetEncoding = "rubbish";
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(INTERNAL_SERVER_ERROR.value()));
     }
 
@@ -553,7 +554,7 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
                  "\"{http://www.alfresco.org/model/content/1.0}created\":\"created1\"}";
 
         MockHttpServletRequestBuilder requestBuilder =
-                super.mockMvcRequest("/transform", sourceFile,
+                super.mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile,
                         "targetExtension", XSLX,
                         "metadata", metadata,
                         "targetMimetype", MIMETYPE_METADATA_EMBED,
@@ -583,7 +584,7 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
     {
         mockTransformCommand(PDF, TXT, MIMETYPE_PDF, true);
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension).param(
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension).param(
                 NOT_EXTRACT_BOOKMARKS_TEXT, "true"))
                .andExpect(status().is(OK.value()))
                .andExpect(header().string("Content-Disposition",
@@ -628,7 +629,7 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
         String tr = objectMapper.writeValueAsString(transformRequest);
         String transformationReplyAsString = mockMvc
             .perform(MockMvcRequestBuilders
-                .post("/transform")
+                .post(ENDPOINT_TRANSFORM)
                 .header(ACCEPT, APPLICATION_JSON_VALUE)
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .content(tr))
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 3a7b64bf..af22c2ad 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
@@ -64,7 +64,10 @@ import java.util.Map;
 
 import static java.util.stream.Collectors.joining;
 import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
-import static org.alfresco.transform.client.util.RequestParamMap.INCLUDE_CORE_VERSION;
+import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION;
+import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG;
 import static org.alfresco.transformer.fs.FileManager.TempFileProvider.createTempFile;
 import static org.alfresco.transformer.fs.FileManager.buildFile;
 import static org.alfresco.transformer.fs.FileManager.createAttachment;
@@ -141,17 +144,17 @@ public abstract class AbstractTransformerController implements TransformControll
     @Autowired
     private TransformerDebug transformerDebug;
 
-    @GetMapping(value = "/transform/config")
+    @GetMapping(value = ENDPOINT_TRANSFORM_CONFIG)
     public ResponseEntity info(
-            @RequestParam(value = INCLUDE_CORE_VERSION, required = false) Boolean includeCoreVersion)
+            @RequestParam(value = CONFIG_VERSION, defaultValue = CONFIG_VERSION_DEFAULT) int configVersion)
     {
-        logger.info("GET Transform Config" + (includeCoreVersion != null && includeCoreVersion ? " including coreVersion" : ""));
+        logger.info("GET Transform Config version: " + configVersion);
         TransformConfig transformConfig = ((TransformRegistryImpl) transformRegistry).getTransformConfig();
-        transformConfig = setOrClearCoreVersion(transformConfig, includeCoreVersion);
+        transformConfig = setOrClearCoreVersion(transformConfig, configVersion);
         return new ResponseEntity<>(transformConfig, OK);
     }
 
-    @PostMapping(value = "/transform", consumes = MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = ENDPOINT_TRANSFORM, consumes = MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity transform(HttpServletRequest request,
                                               @RequestParam(FILE) MultipartFile sourceMultipartFile,
                                               @RequestParam(TARGET_EXTENSION) String targetExtension,
@@ -206,7 +209,7 @@ public abstract class AbstractTransformerController implements TransformControll
      * @param timeout Transformation timeout
      * @return A transformation reply
      */
-    @PostMapping(value = "/transform", produces = APPLICATION_JSON_VALUE)
+    @PostMapping(value = ENDPOINT_TRANSFORM, produces = APPLICATION_JSON_VALUE)
     @ResponseBody
     public ResponseEntity transform(@RequestBody TransformRequest request,
         @RequestParam(value = "timeout", required = false) Long timeout)
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 467bd9e6..0efd8d23 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
@@ -38,6 +38,8 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
+
 @Configuration
 public class WebApplicationConfig implements WebMvcConfigurer
 {
@@ -46,7 +48,7 @@ public class WebApplicationConfig implements WebMvcConfigurer
     {
         registry
             .addInterceptor(transformInterceptor())
-            .addPathPatterns("/transform", "/live", "/ready");
+            .addPathPatterns(ENDPOINT_TRANSFORM, "/live", "/ready");
     }
 
     @Bean
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
index 1398f80d..7bafa372 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.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.
  * -
@@ -26,6 +26,7 @@
  */
 package org.alfresco.transformer;
 
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
@@ -125,7 +126,7 @@ public abstract class AbstractHttpRequestTest
     protected void sendTranformationRequest(
         final HttpEntity> entity, final String errorMessage)
     {
-        final ResponseEntity response = restTemplate.exchange("/transform", POST, entity,
+        final ResponseEntity response = restTemplate.exchange(ENDPOINT_TRANSFORM, POST, entity,
             String.class, "");
         assertEquals(errorMessage, getErrorMessage(response.getBody()));
     }
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 193096ec..77ce416d 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
@@ -27,6 +27,9 @@
 package org.alfresco.transformer;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -105,7 +108,7 @@ public abstract class AbstractTransformerControllerTest
     protected TransformServiceRegistry transformRegistry;
 
     @Value("${transform.core.version}")
-    private String currentCoreVersion;
+    private String coreVersion;
 
     protected String sourceExtension;
     protected String targetExtension;
@@ -213,7 +216,7 @@ public abstract class AbstractTransformerControllerTest
     protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile,
         String... params)
     {
-        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.multipart("/transform").file(
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.multipart(ENDPOINT_TRANSFORM).file(
             sourceFile);
 
         if (params.length % 2 != 0)
@@ -256,7 +259,7 @@ public abstract class AbstractTransformerControllerTest
     public void simpleTransformTest() throws Exception
     {
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(OK.value()))
                .andExpect(content().bytes(expectedTargetFileBytes))
                .andExpect(header().string("Content-Disposition",
@@ -267,7 +270,7 @@ public abstract class AbstractTransformerControllerTest
     public void testDelayTest() throws Exception
     {
         long start = System.currentTimeMillis();
-        mockMvc.perform(mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension,
+        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension,
             "testDelay", "400"))
                .andExpect(status().is(OK.value()))
                .andExpect(content().bytes(expectedTargetFileBytes))
@@ -282,7 +285,7 @@ public abstract class AbstractTransformerControllerTest
     @Test
     public void noTargetFileTest() throws Exception
     {
-        mockMvc.perform(mockMvcRequest("/transform", sourceFile, "targetExtension", "xxx"))
+        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", "xxx"))
                .andExpect(status().is(INTERNAL_SERVER_ERROR.value()));
     }
 
@@ -294,7 +297,7 @@ public abstract class AbstractTransformerControllerTest
             expectedSourceFileBytes);
 
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(OK.value()))
                .andExpect(content().bytes(expectedTargetFileBytes))
                .andExpect(header().string("Content-Disposition",
@@ -309,7 +312,7 @@ public abstract class AbstractTransformerControllerTest
             expectedSourceFileBytes);
 
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(OK.value()))
                .andExpect(content().bytes(expectedTargetFileBytes))
                .andExpect(header().string("Content-Disposition",
@@ -323,7 +326,7 @@ public abstract class AbstractTransformerControllerTest
         sourceFile = new MockMultipartFile("file", "abc/", sourceMimetype, expectedSourceFileBytes);
 
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(BAD_REQUEST.value()))
                .andExpect(status().reason(containsString("The source filename was not supplied")));
     }
@@ -334,14 +337,14 @@ public abstract class AbstractTransformerControllerTest
         sourceFile = new MockMultipartFile("file", "", sourceMimetype, expectedSourceFileBytes);
 
         mockMvc.perform(
-            mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension))
+            mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension))
                .andExpect(status().is(BAD_REQUEST.value()));
     }
 
     @Test
     public void noTargetExtensionTest() throws Exception
     {
-        mockMvc.perform(mockMvcRequest("/transform", sourceFile))
+        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile))
                .andExpect(status().is(BAD_REQUEST.value()))
                .andExpect(status().reason(
                    containsString("Request parameter 'targetExtension' is missing")));
@@ -386,7 +389,7 @@ public abstract class AbstractTransformerControllerTest
         String tr = objectMapper.writeValueAsString(transformRequest);
         String transformationReplyAsString = mockMvc
             .perform(MockMvcRequestBuilders
-                .post("/transform")
+                .post(ENDPOINT_TRANSFORM)
                 .header(ACCEPT, APPLICATION_JSON_VALUE)
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .content(tr))
@@ -415,13 +418,13 @@ public abstract class AbstractTransformerControllerTest
         TransformConfig expectedTransformConfig = objectMapper
             .readValue(getTestFile(getEngineConfigName(), true),
                 TransformConfig.class);
-        expectedTransformConfig.getTransformers().forEach(transformer -> transformer.setCoreVersion(currentCoreVersion));
+        expectedTransformConfig.getTransformers().forEach(transformer -> transformer.setCoreVersion(coreVersion));
 
         ReflectionTestUtils.setField(transformRegistry, "engineConfig",
             new ClassPathResource(getEngineConfigName()));
 
         String response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/transform/config?includeCoreVersion=true"))
+            .perform(MockMvcRequestBuilders.get(ENDPOINT_TRANSFORM_CONFIG_LATEST))
             .andExpect(status().is(OK.value()))
             .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
             .andReturn().getResponse().getContentAsString();
@@ -442,7 +445,7 @@ public abstract class AbstractTransformerControllerTest
             new ClassPathResource(getEngineConfigName()));
 
         String response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/transform/config"))
+            .perform(MockMvcRequestBuilders.get(ENDPOINT_TRANSFORM_CONFIG))
             .andExpect(status().is(OK.value()))
             .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
             .andReturn().getResponse().getContentAsString();
@@ -460,7 +463,7 @@ public abstract class AbstractTransformerControllerTest
             new ClassPathResource("engine_config_with_duplicates.json"));
 
         String response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/transform/config"))
+            .perform(MockMvcRequestBuilders.get(ENDPOINT_TRANSFORM_CONFIG))
             .andExpect(status().is(OK.value()))
             .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
             .andReturn().getResponse().getContentAsString();
@@ -487,7 +490,7 @@ public abstract class AbstractTransformerControllerTest
             new ClassPathResource("engine_config_incomplete.json"));
 
         String response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/transform/config"))
+            .perform(MockMvcRequestBuilders.get(ENDPOINT_TRANSFORM_CONFIG))
             .andExpect(status().is(OK.value()))
             .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
             .andReturn().getResponse().getContentAsString();
@@ -510,7 +513,7 @@ public abstract class AbstractTransformerControllerTest
             new ClassPathResource("engine_config_no_transform_options.json"));
 
         String response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/transform/config"))
+            .perform(MockMvcRequestBuilders.get(ENDPOINT_TRANSFORM_CONFIG))
             .andExpect(status().is(OK.value()))
             .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
             .andReturn().getResponse().getContentAsString();
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java
index cdb83032..78a2c7cc 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015-2019 Alfresco Software, Ltd.  All rights reserved.
+ *  Copyright 2015-2022 Alfresco Software, Ltd.  All rights reserved.
  *
  *  License rights for this program may be obtained from Alfresco Software, Ltd.
  *  pursuant to a written agreement and any use of this program without such an
@@ -8,6 +8,7 @@
 package org.alfresco.transformer;
 
 import static java.util.Collections.emptyMap;
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
 
 import java.util.Map;
@@ -63,6 +64,6 @@ public class EngineClient
 
         final HttpEntity> entity = new HttpEntity<>(body, headers);
 
-        return REST_TEMPLATE.postForEntity(engineUrl + "/transform", entity, Resource.class);
+        return REST_TEMPLATE.postForEntity(engineUrl + ENDPOINT_TRANSFORM, entity, Resource.class);
     }
 }
diff --git a/pom.xml b/pom.xml
index 5f8a7eb9..fd28f68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         2.0.25
         3.0.1.12
         ${project.version}
-        1.4.9
+        1.4.10
         5.16.3
         2.13.1
         ${dependency.jackson.version}

From f2021396071874fd4f0652479c1f865ce2fd2fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20=C5=BBurek?= 
Date: Fri, 11 Feb 2022 09:59:13 +0100
Subject: [PATCH 30/52] ATS-977: Remove dependencies needed to build the
 `image-exiftool` (#532)

* Remove dependencies needed to build the `image-exiftool`
---
 .../alfresco-transform-core-aio-boot/Dockerfile                  | 1 +
 alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile  | 1 +
 2 files changed, 2 insertions(+)

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 6c6cb03d..814491b0 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -52,6 +52,7 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr
     make && \
     make test && \
     make install) && \
+    yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
     yum clean all
 
 ADD target/generated-resources/licenses              /licenses
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
index cf51974c..40aa1cf7 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
@@ -27,6 +27,7 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${
     make && \
     make test && \
     make install) && \
+    yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
     yum clean all
 
 ADD target/generated-resources/licenses              /licenses

From 11e3cb4b205b75c5564ac3a1736f3f5cd144c9d0 Mon Sep 17 00:00:00 2001
From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com>
Date: Mon, 14 Feb 2022 11:30:48 +0100
Subject: [PATCH 31/52] ACS-2497 T-Core: Accept DAU requests (#525)

* ACS-2497 Add implementation of Direct Access Url usage for transformation.
Add possibly to pass Direct Access Url to Transform request instead of a sending a file.
---
 README.md                                     |  4 +-
 .../transformer/MiscControllerTest.java       |  8 ++
 .../resources/templates/transformForm.html    |  1 +
 .../transformer/TikaControllerTest.java       | 11 +++
 .../transformer/TikaHttpRequestTest.java      | 22 ++---
 .../AbstractTransformerController.java        | 66 ++++++++++++--
 .../transformer/AbstractHttpRequestTest.java  | 34 ++++++-
 .../AbstractTransformerControllerTest.java    | 91 +++++++++++++++++++
 8 files changed, 211 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 2093f3e2..4723c2b2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Contains the common transformer (T-Engine) code, plus a few actual implementatio
  
 ### Documentation
 
-In addition to the sub-projects (such as `alfresco-transformer-base` README above) some additional documentation can be found in:
+In addition to the subprojects (such as `alfresco-transformer-base` README above) some additional documentation can be found in:
 
 * [this project's docs](docs) folder
 * [ACS Packaging docs](https://github.com/Alfresco/acs-packaging/tree/master/docs) folder
@@ -68,7 +68,7 @@ You can find examples of using Core AIO in the reference ACS Deployment for Dock
 * [ACS Community](https://github.com/Alfresco/acs-deployment/blob/master/docker-compose/community-docker-compose.yml)
 * [ACS Enterprise](https://github.com/Alfresco/acs-deployment/blob/master/docker-compose/docker-compose.yml)
 
-You can find examples of using the indivudal T-Engines in the reference ACS Deployment for Helm / Kubernetes:
+You can find examples of using the individual T-Engines in the reference ACS Deployment for Helm / Kubernetes:
 * [ACS Community](https://github.com/Alfresco/acs-deployment/blob/master/helm/alfresco-content-services/community_values.yaml)
 * [ACS Enterprise](https://github.com/Alfresco/acs-deployment/blob/master/helm/alfresco-content-services/values.yaml)
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java
index 89c1f71b..e4dec7e0 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java
@@ -532,4 +532,12 @@ public class MiscControllerTest extends AbstractTransformerControllerTest
         text = text.replaceAll("\\n", "");
         return text;
     }
+
+    @Test
+    @Override
+    public void queueTransformRequestUsingDirectAccessUrlTest() throws Exception
+    {
+        super.targetMimetype = this.targetMimetype;
+        super.queueTransformRequestUsingDirectAccessUrlTest();
+    }
 }
\ No newline at end of file
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html
index d6d9ba76..6d47ff5f 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html
@@ -6,6 +6,7 @@
         

             
+                
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 c379e567..83541ec8 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
@@ -644,4 +644,15 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
         assertEquals(transformRequest.getClientData(), transformReply.getClientData());
         assertEquals(transformRequest.getSchema(), transformReply.getSchema());
     }
+
+    @Test
+    @Override
+    public void httpTransformRequestUsingDirectAccessUrlTest() throws Exception
+    {
+        this.sourceExtension = PDF;
+        this.targetExtension = TXT;
+        this.sourceMimetype  = MIMETYPE_PDF;
+        expectedTargetFileBytes = readTestFile(targetExtension);
+        super.httpTransformRequestUsingDirectAccessUrlTest();
+    }
 }
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java
index c972f3b2..56aef563 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.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.
  * -
@@ -56,18 +56,18 @@ public class TikaHttpRequestTest extends AbstractHttpRequestTest
     // Override method as Tika requires sourceMimetype
     // If not provided then sourceMimetype request parameter error will be thrown.
     @Override
-    protected void assertTransformError(boolean addFile, String errorMessage)
+    protected void assertTransformError(boolean addFile,
+                                        String errorMessage,
+                                        LinkedMultiValueMap additionalParams)
     {
         LinkedMultiValueMap parameters = new LinkedMultiValueMap<>();
-        if (addFile)
-        {
-            parameters.add("file", new ClassPathResource("quick." + getSourceExtension()));
-        }
         parameters.add("sourceMimetype", "application/pdf");
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MULTIPART_FORM_DATA);
-        HttpEntity> entity = new HttpEntity<>(parameters,
-            headers);
-        super.sendTranformationRequest(entity, errorMessage);
+
+        if (additionalParams != null)
+        {
+            parameters.addAll(additionalParams);
+        }
+
+        super.assertTransformError(addFile, errorMessage, parameters);
     }
 }
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 af22c2ad..a3ffcf3c 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
@@ -37,6 +37,7 @@ import org.alfresco.transform.router.TransformerDebug;
 import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transformer.logging.LogEntry;
 import org.alfresco.transformer.model.FileRefResponse;
+import org.codehaus.plexus.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
+import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -64,6 +67,7 @@ import java.util.Map;
 
 import static java.util.stream.Collectors.joining;
 import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION;
 import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
@@ -130,7 +134,7 @@ public abstract class AbstractTransformerController implements TransformControll
 
     // Request parameters that are not part of transform options
     public static final List NON_TRANSFORM_OPTION_REQUEST_PARAMETERS = Arrays.asList(SOURCE_EXTENSION,
-            TARGET_EXTENSION, TARGET_MIMETYPE, SOURCE_MIMETYPE, TEST_DELAY, TRANSFORM_NAME_PROPERTY);
+            TARGET_EXTENSION, TARGET_MIMETYPE, SOURCE_MIMETYPE, TEST_DELAY, TRANSFORM_NAME_PROPERTY, DIRECT_ACCESS_URL);
 
     @Autowired
     private AlfrescoSharedFileStoreClient alfrescoSharedFileStoreClient;
@@ -156,16 +160,16 @@ public abstract class AbstractTransformerController implements TransformControll
 
     @PostMapping(value = ENDPOINT_TRANSFORM, consumes = MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity transform(HttpServletRequest request,
-                                              @RequestParam(FILE) MultipartFile sourceMultipartFile,
+                                              @RequestParam(value = FILE, required = false) MultipartFile sourceMultipartFile,
                                               @RequestParam(TARGET_EXTENSION) String targetExtension,
                                               @RequestParam(value = SOURCE_MIMETYPE, required = false) String sourceMimetype,
                                               @RequestParam(value = TARGET_MIMETYPE, required = false) String targetMimetype,
                                               @RequestParam Map requestParameters,
-                                              @RequestParam (value = TEST_DELAY, required = false) Long testDelay,
+                                              @RequestParam(value = TEST_DELAY, required = false) Long testDelay,
 
                                               // The TRANSFORM_NAME_PROPERTY param allows ACS legacy transformers to specify which transform to use,
                                               // It can be removed once legacy transformers are removed from ACS.
-                                              @RequestParam (value = TRANSFORM_NAME_PROPERTY, required = false) String requestTransformName)
+                                              @RequestParam(value = TRANSFORM_NAME_PROPERTY, required = false) String requestTransformName)
     {
         if (logger.isDebugEnabled())
         {
@@ -173,10 +177,27 @@ public abstract class AbstractTransformerController implements TransformControll
                     + "targetExtension: '{}', requestParameters: {}", sourceMimetype, targetMimetype, targetExtension, requestParameters);
         }
 
-        final String targetFilename = createTargetFileName(
-                sourceMultipartFile.getOriginalFilename(), targetExtension);
+        final String directUrl = requestParameters.getOrDefault(DIRECT_ACCESS_URL, "");
+
+        File sourceFile;
+        String sourceFilename;
+        if (directUrl.isBlank())
+        {
+            if (sourceMultipartFile ==  null)
+            {
+                throw new TransformException(BAD_REQUEST.value(), "Required request part 'file' is not present");
+            }
+            sourceFile = createSourceFile(request, sourceMultipartFile);
+            sourceFilename = sourceMultipartFile.getOriginalFilename();
+        }
+        else
+        {
+            sourceFile = getSourceFileFromDirectUrl(directUrl);
+            sourceFilename = sourceFile.getName();
+        }
+
+        final String targetFilename = createTargetFileName(sourceFilename, targetExtension);
         getProbeTestTransform().incrementTransformerCount();
-        final File sourceFile = createSourceFile(request, sourceMultipartFile);
         final File targetFile = createTargetFile(request, targetFilename);
 
         Map transformOptions = getTransformOptions(requestParameters);
@@ -191,6 +212,25 @@ public abstract class AbstractTransformerController implements TransformControll
         return body;
     }
 
+    private File getSourceFileFromDirectUrl(String directUrl)
+    {
+        File sourceFile = createTempFile("tmp", ".tmp");
+        try
+        {
+            FileUtils.copyURLToFile(new URL(directUrl), sourceFile);
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new TransformException(BAD_REQUEST.value(), "Direct Access Url is invalid.", e);
+        }
+        catch (IOException e)
+        {
+            throw new TransformException(BAD_REQUEST.value(), "Direct Access Url not found.", e);
+        }
+
+        return sourceFile;
+    }
+
     protected Map getTransformOptions(Map requestParameters)
     {
         Map transformOptions = new HashMap<>(requestParameters);
@@ -245,7 +285,15 @@ public abstract class AbstractTransformerController implements TransformControll
         File sourceFile;
         try
         {
-            sourceFile = loadSourceFile(request.getSourceReference(), request.getSourceExtension());
+            final String directUrl = request.getTransformRequestOptions().getOrDefault(DIRECT_ACCESS_URL, "");
+            if (directUrl.isBlank())
+            {
+                sourceFile = loadSourceFile(request.getSourceReference(), request.getSourceExtension());
+            }
+            else
+            {
+                sourceFile = getSourceFileFromDirectUrl(directUrl);
+            }
         }
         catch (TransformException e)
         {
@@ -285,7 +333,7 @@ public abstract class AbstractTransformerController implements TransformControll
         {
             String targetMimetype = request.getTargetMediaType();
             String sourceMimetype = request.getSourceMediaType();
-            Map transformOptions = request.getTransformRequestOptions();
+            Map transformOptions = getTransformOptions(request.getTransformRequestOptions());
             transformerDebug.logOptions(request);
             String transformName = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
             transformImpl(transformName, sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
index 7bafa372..6dd6c245 100644
--- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
+++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
@@ -26,6 +26,7 @@
  */
 package org.alfresco.transformer;
 
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.HttpMethod.POST;
@@ -90,9 +91,12 @@ public abstract class AbstractHttpRequestTest
     @Test
     public void noFileError()
     {
-        // Transformer name is not part of the title as this is checked by another handler
+        LinkedMultiValueMap parameters = new LinkedMultiValueMap<>();
+        parameters.add("targetExtension", ".tmp");
+
         assertTransformError(false,
-            "Required request part 'file' is not present");
+                getTransformerName() + " - Required request part 'file' is not present",
+                parameters);
     }
 
     @Test
@@ -104,10 +108,12 @@ public abstract class AbstractHttpRequestTest
     private void assertMissingParameter(String name)
     {
         assertTransformError(true,
-            getTransformerName() + " - Request parameter '" + name + "' is missing");
+            getTransformerName() + " - Request parameter '" + name + "' is missing", null);
     }
 
-    protected void assertTransformError(boolean addFile, String errorMessage)
+    protected void assertTransformError(boolean addFile,
+                                        String errorMessage,
+                                        LinkedMultiValueMap additionalParams)
     {
         LinkedMultiValueMap parameters = new LinkedMultiValueMap<>();
         if (addFile)
@@ -115,6 +121,11 @@ public abstract class AbstractHttpRequestTest
             parameters.add("file",
                 new org.springframework.core.io.ClassPathResource("quick." + getSourceExtension()));
         }
+        if (additionalParams != null)
+        {
+            parameters.addAll(additionalParams);
+        }
+
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MULTIPART_FORM_DATA);
         HttpEntity> entity = new HttpEntity<>(parameters,
@@ -123,6 +134,21 @@ public abstract class AbstractHttpRequestTest
         sendTranformationRequest(entity, errorMessage);
     }
 
+    @Test
+    public void httpTransformRequestDirectAccessUrlNotFoundTest()
+    {
+        String directUrl = "https://expired/direct/access/url";
+
+        LinkedMultiValueMap parameters = new LinkedMultiValueMap<>();
+        parameters.add("targetExtension", ".tmp");
+        parameters.add(DIRECT_ACCESS_URL, directUrl);
+
+        assertTransformError(false,
+                getTransformerName() + " - Direct Access Url not found.",
+                parameters);
+
+    }
+
     protected void sendTranformationRequest(
         final HttpEntity> entity, final String errorMessage)
     {
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 77ce416d..616119e2 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
@@ -27,6 +27,7 @@
 package org.alfresco.transformer;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG;
@@ -34,9 +35,12 @@ import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.ACCEPT;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -55,6 +59,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import org.alfresco.transform.client.model.InternalContext;
 import org.alfresco.transform.client.model.TransformReply;
@@ -68,6 +73,8 @@ 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.model.FileRefEntity;
+import org.alfresco.transformer.model.FileRefResponse;
 import org.alfresco.transformer.probes.ProbeTestTransform;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -214,6 +221,36 @@ public abstract class AbstractTransformerControllerTest
     }
 
     protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile,
+                                                           String... params)
+    {
+        if (sourceFile == null)
+        {
+            return mockMvcRequestWithoutMockMultipartFile(url, params);
+        }
+        else
+        {
+            return mockMvcRequestWithMockMultipartFile(url, sourceFile, params);
+        }
+    }
+
+    private MockHttpServletRequestBuilder mockMvcRequestWithoutMockMultipartFile(String url,
+                                                           String... params)
+    {
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.multipart(ENDPOINT_TRANSFORM);
+
+        if (params.length % 2 != 0)
+        {
+            throw new IllegalArgumentException("each param should have a name and value.");
+        }
+        for (int i = 0; i < params.length; i += 2)
+        {
+            builder = builder.param(params[i], params[i + 1]);
+        }
+
+        return builder;
+    }
+
+    private MockHttpServletRequestBuilder mockMvcRequestWithMockMultipartFile(String url, MockMultipartFile sourceFile,
         String... params)
     {
         MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.multipart(ENDPOINT_TRANSFORM).file(
@@ -569,4 +606,58 @@ public abstract class AbstractTransformerControllerTest
         transformer.setSupportedSourceAndTargetList(supportedSourceAndTargetList);
         return transformer;
     }
+
+    @Test
+    public void queueTransformRequestUsingDirectAccessUrlTest() throws Exception
+    {
+        // Files
+        String sourceFileRef = UUID.randomUUID().toString();
+        File sourceFile = getTestFile("quick." + sourceExtension, true);
+        String targetFileRef = UUID.randomUUID().toString();
+
+        TransformRequest transformRequest = createTransformRequest(sourceFileRef, sourceFile);
+        Map transformRequestOptions = transformRequest.getTransformRequestOptions();
+
+        String directUrl = "file://" + sourceFile.toPath();
+
+        transformRequestOptions.put(DIRECT_ACCESS_URL, directUrl);
+        transformRequest.setTransformRequestOptions(transformRequestOptions);
+
+        when(alfrescoSharedFileStoreClient.saveFile(any()))
+                .thenReturn(new FileRefResponse(new FileRefEntity(targetFileRef)));
+
+        // Update the Transformation Request with any specific params before sending it
+        updateTransformRequestWithSpecificOptions(transformRequest);
+
+        // Serialize and call the transformer
+        String tr = objectMapper.writeValueAsString(transformRequest);
+        String transformationReplyAsString = mockMvc
+                .perform(MockMvcRequestBuilders
+                        .post("/transform")
+                        .header(ACCEPT, APPLICATION_JSON_VALUE)
+                        .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
+                        .content(tr))
+                .andExpect(status().is(CREATED.value()))
+                .andReturn().getResponse().getContentAsString();
+
+        TransformReply transformReply = objectMapper.readValue(transformationReplyAsString,
+                TransformReply.class);
+
+        // Assert the reply
+        assertEquals(transformRequest.getRequestId(), transformReply.getRequestId());
+        assertEquals(transformRequest.getClientData(), transformReply.getClientData());
+        assertEquals(transformRequest.getSchema(), transformReply.getSchema());
+    }
+
+    @Test
+    public void httpTransformRequestUsingDirectAccessUrlTest() throws Exception
+    {
+        File dauSourceFile = getTestFile("quick." + sourceExtension, true);
+        String directUrl = "file://" + dauSourceFile.toPath();
+
+        mockMvc.perform(
+                       mockMvcRequest("/transform", null, "targetExtension", targetExtension, DIRECT_ACCESS_URL, directUrl))
+               .andExpect(status().is(OK.value()))
+               .andExpect(content().bytes(expectedTargetFileBytes));
+    }
 }

From 64669eebd21d0807fcba6c2c4395ab69567b0da4 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Mon, 14 Feb 2022 11:59:15 +0000
Subject: [PATCH 32/52] [trigger release] 2.5.7-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                              | 3 +--
 pom.xml                                                        | 2 +-
 14 files changed, 14 insertions(+), 15 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 525646a2..65754548 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.7-SNAPSHOT
+        2.5.7-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 b7c0d367..d6a72a5e 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.7-SNAPSHOT
+        2.5.7-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 3185721f..c3134fa1 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.7-SNAPSHOT
+        2.5.7-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index c2c4295a..a410dada 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.7-SNAPSHOT
+        2.5.7-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 c3bc20e4..4ade081a 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.7-SNAPSHOT
+        2.5.7-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 89256cac..e704c529 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.7-SNAPSHOT
+        2.5.7-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 690a108e..df80665e 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.7-SNAPSHOT
+        2.5.7-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 9b276051..66a3743d 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.7-SNAPSHOT
+        2.5.7-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 fa2d8a31..32708eb4 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.7-SNAPSHOT
+        2.5.7-A1-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 bc37b698..24badfcb 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.7-SNAPSHOT
+        2.5.7-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 31c2ef4c..24772d83 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.7-SNAPSHOT
+        2.5.7-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 0b1f627e..6228a60d 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.7-SNAPSHOT
+        2.5.7-A1-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 3f3aeebc..38e25482 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,12 +4,11 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-SNAPSHOT
+        2.5.7-A1-SNAPSHOT
         ../pom.xml
     
 
     alfresco-transformer-base
-    2.5.7-SNAPSHOT
 
     
         false
diff --git a/pom.xml b/pom.xml
index fd28f68b..b1f8d04b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-SNAPSHOT
+    2.5.7-A1-SNAPSHOT
     pom
 
     

From 7497bdb4641eecc63b880ec598c603828a350930 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Mon, 14 Feb 2022 12:37:29 +0000
Subject: [PATCH 33/52] [maven-release-plugin][skip ci] prepare release
 2.5.7-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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 65754548..b1af3c07 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.7-A1-SNAPSHOT
+        2.5.7-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 d6a72a5e..772f70c5 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.7-A1-SNAPSHOT
+        2.5.7-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 c3134fa1..988e0bf8 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.7-A1-SNAPSHOT
+        2.5.7-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index a410dada..3b3522f0 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.7-A1-SNAPSHOT
+        2.5.7-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 4ade081a..cd4d7520 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.7-A1-SNAPSHOT
+        2.5.7-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index e704c529..49d5e3a7 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.7-A1-SNAPSHOT
+        2.5.7-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 df80665e..3aab8dee 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.7-A1-SNAPSHOT
+        2.5.7-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 66a3743d..fba18758 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.7-A1-SNAPSHOT
+        2.5.7-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 32708eb4..9ad45944 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.7-A1-SNAPSHOT
+        2.5.7-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 24badfcb..d1293da8 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.7-A1-SNAPSHOT
+        2.5.7-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 24772d83..97681fe0 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.7-A1-SNAPSHOT
+        2.5.7-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 6228a60d..bcfc0173 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.7-A1-SNAPSHOT
+        2.5.7-A1
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 38e25482..3577d437 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A1-SNAPSHOT
+        2.5.7-A1
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index b1f8d04b..4a9a65a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A1-SNAPSHOT
+    2.5.7-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.7-A1
     
 
     

From ae095778e338f043ee37a1820ffb0fc364495558 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Mon, 14 Feb 2022 12:37:31 +0000
Subject: [PATCH 34/52] [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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 b1af3c07..10f6642e 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.7-A1
+        2.5.7-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 772f70c5..76a9afcc 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.7-A1
+        2.5.7-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 988e0bf8..1c81eae3 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.7-A1
+        2.5.7-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 3b3522f0..d1300b2d 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.7-A1
+        2.5.7-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 cd4d7520..c72b877e 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.7-A1
+        2.5.7-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 49d5e3a7..86b90d47 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.7-A1
+        2.5.7-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 3aab8dee..6927eb12 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.7-A1
+        2.5.7-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 fba18758..f311ce07 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.7-A1
+        2.5.7-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 9ad45944..46673aee 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.7-A1
+        2.5.7-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 d1293da8..49d81b56 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.7-A1
+        2.5.7-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 97681fe0..41146811 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.7-A1
+        2.5.7-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 bcfc0173..ef5f5594 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.7-A1
+        2.5.7-A2-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 3577d437..847cd630 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A1
+        2.5.7-A2-SNAPSHOT
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index 4a9a65a1..94aee9ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A1
+    2.5.7-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.7-A1
+        HEAD
     
 
     

From 5587d183f3ffb97e26bc940f5f2bfefae68ff419 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:40:01 +0000
Subject: [PATCH 35/52] Bump docker-maven-plugin from 0.38.1 to 0.39.0 (#528)

Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.38.1 to 0.39.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.38.1...v0.39.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 94aee9ef..0b42785c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@
                 
                     io.fabric8
                     docker-maven-plugin
-                    0.38.1
+                    0.39.0
                     true
                     
                         

From f05b54dea33a165e6798fe27497001c003daddf7 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Fri, 18 Feb 2022 14:08:18 +0000
Subject: [PATCH 36/52] ACS-2497 Rework
 httpTransformRequestUsingDirectAccessUrlTest so it can be used in AI and
 Aspose (#535)

---
 .../alfresco/transformer/TikaControllerTest.java |  5 ++---
 .../src/main/resources/templates/log.html        |  1 +
 .../AbstractTransformerControllerTest.java       | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

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 83541ec8..5ee48b2f 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
@@ -153,6 +153,8 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
     {
         sourceExtension = "pdf";
         targetExtension = "txt";
+        sourceMimetype = MIMETYPE_PDF;
+        targetMimetype = MIMETYPE_TEXT_PLAIN;
     }
 
     @Override
@@ -649,9 +651,6 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
     @Override
     public void httpTransformRequestUsingDirectAccessUrlTest() throws Exception
     {
-        this.sourceExtension = PDF;
-        this.targetExtension = TXT;
-        this.sourceMimetype  = MIMETYPE_PDF;
         expectedTargetFileBytes = readTestFile(targetExtension);
         super.httpTransformRequestUsingDirectAccessUrlTest();
     }
diff --git a/alfresco-transformer-base/src/main/resources/templates/log.html b/alfresco-transformer-base/src/main/resources/templates/log.html
index 856c5dd1..ee973306 100644
--- a/alfresco-transformer-base/src/main/resources/templates/log.html
+++ b/alfresco-transformer-base/src/main/resources/templates/log.html
@@ -36,6 +36,7 @@
     
 
 
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 616119e2..297f19e0 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
@@ -27,6 +27,7 @@
 package org.alfresco.transformer;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN;
 import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST;
@@ -86,6 +87,7 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -655,9 +657,15 @@ public abstract class AbstractTransformerControllerTest
         File dauSourceFile = getTestFile("quick." + sourceExtension, true);
         String directUrl = "file://" + dauSourceFile.toPath();
 
-        mockMvc.perform(
-                       mockMvcRequest("/transform", null, "targetExtension", targetExtension, DIRECT_ACCESS_URL, directUrl))
-               .andExpect(status().is(OK.value()))
-               .andExpect(content().bytes(expectedTargetFileBytes));
+        ResultActions resultActions = mockMvc.perform(
+                mockMvcRequest(ENDPOINT_TRANSFORM, null)
+                        .param("targetExtension", targetExtension)
+                        .param(DIRECT_ACCESS_URL, directUrl))
+                .andExpect(status().is(OK.value()));
+
+        if (expectedTargetFileBytes != null)
+        {
+            resultActions.andExpect(content().bytes(expectedTargetFileBytes));
+        }
     }
 }

From 583023d81df11503dd40a1ea2207a94f495c54f3 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Fri, 18 Feb 2022 15:11:50 +0000
Subject: [PATCH 37/52] [trigger release] 2.5.7-A2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b42785c..0aae181f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A2-SNAPSHOT
+    2.5.7-A2-SNAPSHOT 
     pom
 
     

From 18b413c8273bb50ff8106d947779b4f07afeedc5 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Fri, 18 Feb 2022 15:47:11 +0000
Subject: [PATCH 38/52] [maven-release-plugin][skip ci] prepare release
 2.5.7-A2

---
 .../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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 10f6642e..6f9b4acf 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 76a9afcc..1d1a9b87 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 1c81eae3..013ef992 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index d1300b2d..472612c3 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 c72b877e..7beaf2dd 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 86b90d47..3beddccf 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 6927eb12..65b9395b 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index f311ce07..ced2c996 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 46673aee..1cab14dd 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 49d81b56..4ca194fb 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../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 41146811..33cc6bff 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index ef5f5594..3716d473 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.7-A2-SNAPSHOT
+        2.5.7-A2
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 847cd630..c7502bbb 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A2-SNAPSHOT
+        2.5.7-A2
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index 0aae181f..8414b400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A2-SNAPSHOT 
+    2.5.7-A2 
     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.7-A2
     
 
     

From f2478ee2b7beffca2769ffe6c96dcc13e3f29709 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Fri, 18 Feb 2022 15:47:14 +0000
Subject: [PATCH 39/52] [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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 6f9b4acf..6d7be2dc 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.7-A2
+        2.5.7-A3-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 1d1a9b87..8485301e 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.7-A2
+        2.5.7-A3-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 013ef992..7d866e1d 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.7-A2
+        2.5.7-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 472612c3..9cbc5197 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.7-A2
+        2.5.7-A3-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 7beaf2dd..09460d19 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.7-A2
+        2.5.7-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 3beddccf..a8745535 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.7-A2
+        2.5.7-A3-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 65b9395b..3d4d85e3 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.7-A2
+        2.5.7-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index ced2c996..94f08472 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.7-A2
+        2.5.7-A3-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 1cab14dd..cb53f2a4 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.7-A2
+        2.5.7-A3-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 4ca194fb..9afded3e 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.7-A2
+        2.5.7-A3-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 33cc6bff..ce4493ce 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.7-A2
+        2.5.7-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 3716d473..69c5d04f 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.7-A2
+        2.5.7-A3-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index c7502bbb..dc55f631 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A2
+        2.5.7-A3-SNAPSHOT
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index 8414b400..adf5f1a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A2 
+    2.5.7-A3-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.7-A2
+        HEAD
     
 
     

From 44d34ce3f288d049e16ce41bb459d6413f1d59e5 Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Mon, 21 Feb 2022 13:16:50 +0000
Subject: [PATCH 40/52] ATS-981 Avoid CVE-2022-23181 with
 spring-boot-starter-web 2.6.3 (#537)

[trigger release] 2.5.7-A3
---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index adf5f1a4..c661fa5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,15 @@
         
     
 
+    
+    
+        
+            org.apache.tomcat.embed
+            tomcat-embed-core
+            9.0.58
+        
+    
+
     
         
             alfresco-public-snapshots

From 7a6a8878ab6dfff3dcd8f88d3507bad36efa6705 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 13:22:19 +0000
Subject: [PATCH 41/52] Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 (#533)

[skip ci] another  DB merge to come

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.3.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-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 c661fa5e..16828191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
-                3.3.1
+                3.3.2
                 
                     none
                 

From 7105a61339780c99a4bf8fcefc1aefbb9a482250 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 14:01:26 +0000
Subject: [PATCH 42/52] Bump activemq-client from 5.16.3 to 5.16.4 (#534)

[skip ci] about to do a release

Bumps [activemq-client](https://github.com/apache/activemq) from 5.16.3 to 5.16.4.
- [Release notes](https://github.com/apache/activemq/releases)
- [Commits](https://github.com/apache/activemq/compare/activemq-5.16.3...activemq-5.16.4)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  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 16828191..caec65a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         3.0.1.12
         ${project.version}
         1.4.10
-        5.16.3
+        5.16.4
         2.13.1
         ${dependency.jackson.version}
         4.13.2

From ea7acd4d06dd7bbc784d788bb0dfe5ecfd143350 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Mon, 21 Feb 2022 14:02:09 +0000
Subject: [PATCH 43/52] [trigger release] 2.5.7-A3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index caec65a2..fd2c8c2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A3-SNAPSHOT 
+    2.5.7-A3-SNAPSHOT
     pom
 
     

From 5a3733399250ae47efc87ca54e433885215eeb34 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Mon, 21 Feb 2022 14:38:43 +0000
Subject: [PATCH 44/52] [maven-release-plugin][skip ci] prepare release
 2.5.7-A3

---
 .../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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 6d7be2dc..71c3cd2e 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 8485301e..625e7788 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 7d866e1d..f27ffd0f 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 9cbc5197..6b7ea138 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 09460d19..c38e4a7f 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index a8745535..e9083a31 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 3d4d85e3..ec1f5dd1 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 94f08472..09e27aaf 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 cb53f2a4..cd9ee50c 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 9afded3e..7ed91c68 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../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 ce4493ce..325593c5 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 69c5d04f..a60002bc 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.7-A3-SNAPSHOT
+        2.5.7-A3
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index dc55f631..9d18f284 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A3-SNAPSHOT
+        2.5.7-A3
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index fd2c8c2a..8c087619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A3-SNAPSHOT
+    2.5.7-A3
     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.7-A3
     
 
     

From 27bea9a89b78c51eafc5d9b9fa989ad6389f4ed8 Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Mon, 21 Feb 2022 14:38:45 +0000
Subject: [PATCH 45/52] [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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 71c3cd2e..13a44f62 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.7-A3
+        2.5.7-A4-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 625e7788..2f71aac3 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.7-A3
+        2.5.7-A4-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 f27ffd0f..b43895e7 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.7-A3
+        2.5.7-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 6b7ea138..19f879e8 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.7-A3
+        2.5.7-A4-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 c38e4a7f..235f1d79 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.7-A3
+        2.5.7-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index e9083a31..e7e09c31 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.7-A3
+        2.5.7-A4-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 ec1f5dd1..6ef5ed01 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.7-A3
+        2.5.7-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 09e27aaf..ba7dcc07 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.7-A3
+        2.5.7-A4-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 cd9ee50c..a1a72ab2 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.7-A3
+        2.5.7-A4-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 7ed91c68..bcdf7ecc 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.7-A3
+        2.5.7-A4-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 325593c5..aabd3a14 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.7-A3
+        2.5.7-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index a60002bc..e816949e 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.7-A3
+        2.5.7-A4-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 9d18f284..74f279ea 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -4,7 +4,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A3
+        2.5.7-A4-SNAPSHOT
         ../pom.xml
     
 
diff --git a/pom.xml b/pom.xml
index 8c087619..8d4d39e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A3
+    2.5.7-A4-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.7-A3
+        HEAD
     
 
     

From 8c6313ad7efb86f0fb7e4057ebada4e4fa56af4e Mon Sep 17 00:00:00 2001
From: Tom Page 
Date: Wed, 23 Feb 2022 09:30:22 +0000
Subject: [PATCH 46/52] ACS-2072 Enforce third party license compliance.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8d4d39e3..844adf97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@
                                 true
                                 provided,test
                                 org.alfresco
-                                false
+                                true
                                 https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
                                 https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt
                                 https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties

From 4429ba2823df232f6c331aaf3b8843a6711b2667 Mon Sep 17 00:00:00 2001
From: Nebil Kisa 
Date: Wed, 23 Feb 2022 18:48:19 +0000
Subject: [PATCH 47/52] ATS-864: Switch from fabric8 to docker mvn plugin
 (#436)

* ATS-864: Switch from fabric8 to docker mvn plugin

* moved docker-maven-plugin config to execution

* Update to latest docker-maven-plugin

* remove unnecessary config

Co-authored-by: David Edwards 
Co-authored-by: Marcello Teodori <151025+mteodori@users.noreply.github.com>
---
 .github/dependabot.yml                        |   3 -
 .../alfresco-transform-core-aio-boot/pom.xml  | 183 ++++++++---------
 .../alfresco-transform-core-aio/pom.xml       |  12 +-
 .../pom.xml                                   | 184 ++++++++---------
 .../alfresco-transform-imagemagick/pom.xml    |  12 +-
 .../pom.xml                                   | 192 ++++++++----------
 .../alfresco-transform-libreoffice/pom.xml    |  14 +-
 .../alfresco-transform-misc-boot/pom.xml      | 192 ++++++++----------
 .../alfresco-transform-misc/pom.xml           |  12 +-
 .../pom.xml                                   | 184 ++++++++---------
 .../alfresco-transform-pdf-renderer/pom.xml   |  12 +-
 .../alfresco-transform-tika-boot/pom.xml      | 184 ++++++++---------
 .../alfresco-transform-tika/pom.xml           |  11 +-
 alfresco-transformer-base/pom.xml             |   3 +-
 pom.xml                                       |  47 +----
 15 files changed, 513 insertions(+), 732 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 89240b8e..857ef2d2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,9 +14,6 @@ updates:
     timezone: Europe/London
   open-pull-requests-limit: 99
   ignore:
-  - dependency-name: io.fabric8:fabric8-maven-plugin
-    versions:
-    - "> 4.4.0, < 4.5"
   registries:
   - maven-alfresco-internal
 - package-ecosystem: docker
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 13a44f62..c6eeff03 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
@@ -1,10 +1,8 @@
 
 
-
     4.0.0
     alfresco-transform-core-aio-boot
     Alfresco Core All-In-One Transformer Spring Boot
-    jar
 
     
         org.alfresco
@@ -104,89 +102,83 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
             
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    aio
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -198,20 +190,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -219,6 +198,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -232,7 +224,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -240,7 +232,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -250,7 +242,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -260,16 +252,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -285,15 +270,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -303,7 +288,7 @@
                                  
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -313,8 +298,6 @@
                         
                         
                             
-                                build-push-image
-                                deploy
                                 
                                     build
                                     push
@@ -326,4 +309,4 @@
             
         
     
-
\ No newline at end of file
+
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 2f71aac3..a20fecfe 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -3,7 +3,6 @@
     4.0.0
     alfresco-transform-core-aio
     Alfresco Core All-In-One Transformer
-    jar
 
     
         alfresco-transform-core
@@ -56,21 +55,12 @@
         
     
 
-
     
         
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index b43895e7..0f23e9a3 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -1,8 +1,8 @@
+
 
     4.0.0
     alfresco-transform-imagemagick-boot
     Alfresco ImageMagick Transformer Spring Boot
-    jar
 
     
         org.alfresco
@@ -66,30 +66,14 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
             
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
@@ -101,66 +85,75 @@
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    imagemagick
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ 5.16.1 .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -172,20 +165,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -193,6 +173,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -206,7 +199,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -214,7 +207,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -224,7 +217,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -234,16 +227,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -259,15 +245,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -277,7 +263,7 @@
                                 
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -287,8 +273,6 @@
                         
                         
                             
-                                build-push-image
-                                deploy
                                 
                                     build
                                     push
@@ -300,4 +284,4 @@
             
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 19f879e8..5741fb85 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -3,7 +3,6 @@
     4.0.0
     alfresco-transform-imagemagick
     Alfresco ImageMagick Transformer
-    jar
 
     
         alfresco-transform-core
@@ -18,7 +17,6 @@
             alfresco-transformer-base
             ${project.version}
         
-
     
 
     
@@ -27,14 +25,6 @@
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index 235f1d79..963d3708 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -1,8 +1,8 @@
+
 
     4.0.0
     alfresco-transform-libreoffice-boot
     Alfresco LibreOffice Transformer Spring Boot 
-    jar
 
     
         org.alfresco
@@ -74,30 +74,14 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
             
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
@@ -109,66 +93,75 @@
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    libreoffice
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ 5.16.1 .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -180,20 +173,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -201,6 +181,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -214,7 +207,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -222,7 +215,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -232,7 +225,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -242,16 +235,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -267,15 +253,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -285,7 +271,7 @@
                                 
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -293,19 +279,9 @@
                                 
                             
                         
-                        
-                            
-                                build-push-image
-                                deploy
-                                
-                                    build
-                                    push
-                                
-                            
-                        
                     
                 
             
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index e7e09c31..3f592924 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -3,7 +3,6 @@
     4.0.0
     alfresco-transform-libreoffice
     Alfresco LibreOffice Transformer
-    jar
 
     
         alfresco-transform-core
@@ -18,12 +17,10 @@
             alfresco-transformer-base
             ${project.version}
         
-
         
             org.dom4j
             dom4j
         
-
         
             org.alfresco
             alfresco-jodconverter-core
@@ -44,15 +41,6 @@
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
     
-
-
\ No newline at end of file
+
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index 6ef5ed01..95757407 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -1,10 +1,8 @@
 
 
-
     4.0.0
     alfresco-transform-misc-boot
     Alfresco Miscellaneous Transformer Spring Boot
-    jar
 
     
         org.alfresco
@@ -64,30 +62,14 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
             
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
@@ -99,66 +81,75 @@
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    misc
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ 5.16.1 .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -170,20 +161,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -191,6 +169,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -204,7 +195,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -212,7 +203,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -222,7 +213,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -232,16 +223,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -257,15 +241,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -275,7 +259,7 @@
                                 
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -283,19 +267,9 @@
                                 
                             
                         
-                        
-                            
-                                build-push-image
-                                deploy
-                                
-                                    build
-                                    push
-                                
-                            
-                        
                     
                 
             
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index ba7dcc07..99c7ba28 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -1,10 +1,8 @@
 
 
-
     4.0.0
     alfresco-transform-misc
     Alfresco Miscellaneous Transformer
-    jar
 
     
         alfresco-transform-core
@@ -83,14 +81,6 @@
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
     
-
\ No newline at end of file
+
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 a1a72ab2..4594abb0 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
@@ -1,10 +1,8 @@
+
 
-    
-    
     4.0.0
     alfresco-transform-pdf-renderer-boot
     Alfresco Pdf Renderer Spring Boot
-    jar
 
     
         org.alfresco
@@ -64,30 +62,14 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
             
             
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
@@ -99,66 +81,75 @@
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    alfresco-pdf-renderer
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ 5.16.1 .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -170,20 +161,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -191,6 +169,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -204,7 +195,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -212,7 +203,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -222,7 +213,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -232,16 +223,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -257,15 +241,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -275,7 +259,7 @@
                                 
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -285,8 +269,6 @@
                         
                         
                             
-                                build-push-image
-                                deploy
                                 
                                     build
                                     push
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 bcdf7ecc..7c1e0421 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
@@ -1,8 +1,8 @@
+
 
     4.0.0
     alfresco-transform-pdf-renderer
     Alfresco Pdf Renderer Transformer
-    jar
 
     
         org.alfresco
@@ -25,14 +25,6 @@
                 org.codehaus.mojo
                 license-maven-plugin
             
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
         
-          
+    
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index aabd3a14..94463273 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -1,8 +1,8 @@
+
 
     4.0.0
     alfresco-transform-tika-boot
     Alfresco Tika Transformer Spring Boot
-    jar
 
     
         org.alfresco
@@ -146,21 +146,6 @@
             
                 org.springframework.boot
                 spring-boot-maven-plugin
-                
-                    
-                        
-                            repackage
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
             
             
                 org.codehaus.mojo
@@ -169,7 +154,6 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
@@ -181,66 +165,75 @@
         
     
 
-
     
         
             docker-it-setup
             
             
                 
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                    
                     
                         io.fabric8
                         docker-maven-plugin
-                        
-                            
-                                
-                                    activemq
-                                    alfresco/alfresco-activemq:5.16.1
-                                    
-                                        activemq
-                                        
-                                            8161:8161
-                                            5672:5672
-                                            61616:61616
-                                        
-                                        
-                                            Apache ActiveMQ 5.16.1 .* started
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-
-                                
-                                    tika
-                                    ${image.name}:${image.tag}
-                                    
-                                        
-                                            8090:8090
-                                        
-                                        
-                                            
-                                                http://localhost:8090/transform/config
-                                                GET
-                                                200...299
-                                            
-                                            
-                                            500
-                                            100
-                                            
-                                                kill 1
-                                                kill -9 1
-                                            
-                                        
-                                    
-                                
-                            
-                        
+                        
+                            
+                                integration-tests
+                                
+                                    start
+                                    stop
+                                
+                                
+                                    
+                                        
+                                            alfresco/alfresco-activemq:5.16.1
+                                            
+                                                activemq
+                                                
+                                                    8161:8161
+                                                    5672:5672
+                                                    61616:61616
+                                                
+                                                
+                                                    Apache ActiveMQ 5.16.1 .* started
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                
+                                                    8090:8090
+                                                
+                                                
+                                                    
+                                                        http://localhost:8090/transform/config
+                                                        GET
+                                                        200...299
+                                                    
+                                                    
+                                                    500
+                                                    100
+                                                    
+                                                        kill 1
+                                                        kill -9 1
+                                                    
+                                                
+                                            
+                                        
+                                    
+                                
+                            
+                        
                     
                 
             
@@ -252,20 +245,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
-                            
-                                
-                                    ${image.name}:${image.tag}
-                                    
-                                        ${project.basedir}/
-                                        
-                                            true
-                                        
-                                    
-                                
-                            
-                        
+                        docker-maven-plugin
                         
                             
                                 build-image
@@ -273,6 +253,19 @@
                                 
                                     build
                                 
+                                
+                                    
+                                        
+                                            ${image.name}:${image.tag}
+                                            
+                                                ${project.basedir}
+                                                
+                                                    true
+                                                
+                                            
+                                        
+                                    
+                                
                             
                         
                     
@@ -286,7 +279,7 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
+                        docker-maven-plugin
                         
                             
                                 
@@ -294,7 +287,7 @@
                                     ${image.name}:${image.tag}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -304,7 +297,7 @@
                                 
                                     ${image.name}:${image.tag}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -314,16 +307,9 @@
                         
                         
                             
-                                build-image
-                                package
-                                
-                                    build
-                                
-                            
-                            
-                                push-image
                                 install
                                 
+                                    build
                                     push
                                 
                             
@@ -339,15 +325,15 @@
                 
                     
                         io.fabric8
-                        fabric8-maven-plugin
-                        
+                        docker-maven-plugin
+                        
                             
                                 
                                 
                                     ${image.name}:${project.version}
                                     ${image.registry}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -357,7 +343,7 @@
                                 
                                     ${image.name}:${project.version}
                                     
-                                        ${project.basedir}/
+                                        ${project.basedir}
                                         
                                             true
                                         
@@ -367,8 +353,6 @@
                         
                         
                             
-                                build-push-image
-                                deploy
                                 
                                     build
                                     push
@@ -380,4 +364,4 @@
             
         
     
-
\ 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 e816949e..de48b22a 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -3,7 +3,6 @@
     4.0.0
     alfresco-transform-tika
     Alfresco Tika Transformer
-    jar
 
     
         alfresco-transform-core
@@ -117,18 +116,10 @@
 
     
         
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-            
             
                 org.codehaus.mojo
                 license-maven-plugin
             
         
     
-
\ No newline at end of file
+
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 74f279ea..56bf0a55 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -1,3 +1,4 @@
+
 
     4.0.0
 
@@ -5,7 +6,6 @@
         org.alfresco
         alfresco-transform-core
         2.5.7-A4-SNAPSHOT
-        ../pom.xml
     
 
     alfresco-transformer-base
@@ -80,7 +80,6 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
                 
                     
                         
diff --git a/pom.xml b/pom.xml
index 844adf97..21d4743e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
         org.springframework.boot
         spring-boot-starter-parent
         2.6.3
+        
     
 
     
@@ -34,7 +35,6 @@
         false
     
 
-
     
         
             full-build
@@ -113,6 +113,7 @@
             
         
     
+
     
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
         scm:git:https://github.com/Alfresco/alfresco-transform-core.git
@@ -273,7 +274,6 @@
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
-                3.3.2
                 
                     none
                 
@@ -299,6 +299,7 @@
         
             
                 
+                    org.apache.maven.plugins
                     maven-release-plugin
                     2.5.3
                     
@@ -379,15 +380,6 @@
                             ${project.build.directory}
                         
                     
-                    
-                        
-                            default-test
-                            
-                                test
-                            
-                            test
-                        
-                    
                 
                 
                     org.apache.maven.plugins
@@ -396,43 +388,12 @@
                         1
                         true
                     
-                    
-                        
-                            
-                                integration-test
-                                verify
-                            
-                        
-                    
-                
-                
-                    io.fabric8
-                    fabric8-maven-plugin
-                    4.4.0
                 
                 
                     io.fabric8
                     docker-maven-plugin
                     0.39.0
-                    true
-                    
-                        
-                            before-integration-tests
-                            pre-integration-test
-                            
-                                stop
-                                start
-                            
-                        
-                        
-                            after-integration-tests
-                            post-integration-test
-                            
-                                stop
-                            
-                        
-                    
-                
+                 
             
         
     

From 6b1f5b68c232cb774945f96db6d1e1a3819f1953 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Wed, 23 Feb 2022 19:51:39 +0100
Subject: [PATCH 48/52] ATS-864: fix dependabot

---
 .github/dependabot.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 857ef2d2..dc35cf2b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,7 +13,6 @@ updates:
     time: "22:00"
     timezone: Europe/London
   open-pull-requests-limit: 99
-  ignore:
   registries:
   - maven-alfresco-internal
 - package-ecosystem: docker

From 61c1f802ef8b796405411667254d2b45d5f0dbbd Mon Sep 17 00:00:00 2001
From: Alan Davis 
Date: Wed, 23 Feb 2022 23:51:10 +0000
Subject: [PATCH 49/52] ACS-2587 Include directAccessUrl in T-Config if
 supported (#539)

The t-config returned by the T-Router & T-Engines should include directAccessUrl as an optional transform option when the T-engine supports it.

[trigger release] 2.5.7-A4
---
 .../java/org/alfresco/transformer/AIOTransformRegistry.java   | 2 +-
 .../java/org/alfresco/transformer/TransformRegistryImpl.java  | 2 +-
 pom.xml                                                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java
index 71d6b799..0dadfee5 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java
@@ -86,7 +86,7 @@ public class AIOTransformRegistry extends AbstractTransformRegistry
         // Load config for the transformer
         String location = getTransformConfigLocation(tEngine);
         TransformConfig transformConfig = loadTransformConfig(location);
-        setCoreVersionOnSingleStepTransformers(transformConfig.getTransformers(), coreVersion);
+        setCoreVersionOnSingleStepTransformers(transformConfig, coreVersion);
         String transformerId = tEngine.getTransformerId();
         combinedTransformConfig.addTransformConfig(transformConfig, location, transformerId, this);
 
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
index 29e506a5..f2289c37 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
@@ -87,7 +87,7 @@ public class TransformRegistryImpl extends AbstractTransformRegistry
         try (Reader reader = new InputStreamReader(engineConfig.getInputStream(), UTF_8))
         {
             TransformConfig transformConfig = jsonObjectMapper.readValue(reader, TransformConfig.class);
-            setCoreVersionOnSingleStepTransformers(transformConfig.getTransformers(), coreVersion);
+            setCoreVersionOnSingleStepTransformers(transformConfig, coreVersion);
             return transformConfig;
         }
         catch (IOException e)
diff --git a/pom.xml b/pom.xml
index 21d4743e..f2a88fb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A4-SNAPSHOT
+    2.5.7-A4-SNAPSHOT 
     pom
 
     
@@ -22,7 +22,7 @@
         2.0.25
         3.0.1.12
         ${project.version}
-        1.4.10
+        1.4.11
         5.16.4
         2.13.1
         ${dependency.jackson.version}

From 27b04ee0499a9313af834ddab228897fa98be037 Mon Sep 17 00:00:00 2001
From: alandavis 
Date: Thu, 24 Feb 2022 00:01:56 +0000
Subject: [PATCH 50/52] ACS-2587 Fix test failure

[trigger release] 2.5.7-A4
---
 .../transformer/AbstractTransformerControllerTest.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 297f19e0..9bb6fbe0 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
@@ -457,7 +457,11 @@ public abstract class AbstractTransformerControllerTest
         TransformConfig expectedTransformConfig = objectMapper
             .readValue(getTestFile(getEngineConfigName(), true),
                 TransformConfig.class);
-        expectedTransformConfig.getTransformers().forEach(transformer -> transformer.setCoreVersion(coreVersion));
+        expectedTransformConfig.getTransformers().forEach(transformer -> {
+            transformer.setCoreVersion(coreVersion);
+            transformer.getTransformOptions().add(DIRECT_ACCESS_URL);
+        });
+        expectedTransformConfig.getTransformOptions().put(DIRECT_ACCESS_URL, Set.of(new TransformOptionValue(false, DIRECT_ACCESS_URL)));
 
         ReflectionTestUtils.setField(transformRegistry, "engineConfig",
             new ClassPathResource(getEngineConfigName()));

From e37c17250ff2342cfd0fab0534b772cb3b8cca0b Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 24 Feb 2022 00:39:20 +0000
Subject: [PATCH 51/52] [maven-release-plugin][skip ci] prepare release
 2.5.7-A4

---
 .../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-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-boot/pom.xml                    | 2 +-
 alfresco-transform-tika/alfresco-transform-tika/pom.xml     | 2 +-
 alfresco-transformer-base/pom.xml                           | 2 +-
 pom.xml                                                     | 6 +++---
 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 c6eeff03..a87dd656 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
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 a20fecfe..b3bc184a 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 0f23e9a3..655fcd0d 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.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index 5741fb85..bda9c25f 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 963d3708..9db59616 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.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 3f592924..078e7e7b 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 95757407..98a1696a 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 99c7ba28..56b62afe 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 4594abb0..76d8f7d9 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
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 7c1e0421..710a65f0 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.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../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 94463273..126150e2 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.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index de48b22a..b1fe8879 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 56bf0a55..749c51e2 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -5,7 +5,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4-SNAPSHOT
+        2.5.7-A4
     
 
     alfresco-transformer-base
diff --git a/pom.xml b/pom.xml
index f2a88fb2..3a0e1894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A4-SNAPSHOT 
+    2.5.7-A4 
     pom
 
     
         org.springframework.boot
         spring-boot-starter-parent
         2.6.3
-        
+        
     
 
     
@@ -118,7 +118,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.7-A4
     
 
     

From ce7f300ed7c5d0587ae523b4a110e716182c386a Mon Sep 17 00:00:00 2001
From: Travis CI User 
Date: Thu, 24 Feb 2022 00:39:22 +0000
Subject: [PATCH 52/52] [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                             | 2 +-
 pom.xml                                                       | 4 ++--
 14 files changed, 15 insertions(+), 15 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 a87dd656..3ab5cd16 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
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4
+        2.5.7-A5-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 b3bc184a..c87aeae0 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4
+        2.5.7-A5-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 655fcd0d..94efe009 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.7-A4
+        2.5.7-A5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
index bda9c25f..d1ea0893 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4
+        2.5.7-A5-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 9db59616..1d5e1c6f 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.7-A4
+        2.5.7-A5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
index 078e7e7b..f4ea7103 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4
+        2.5.7-A5-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 98a1696a..bc60d51e 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4
+        2.5.7-A5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 56b62afe..b14ad669 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4
+        2.5.7-A5-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 76d8f7d9..7d1a1e0b 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
@@ -7,7 +7,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4
+        2.5.7-A5-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 710a65f0..62ac5aff 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.7-A4
+        2.5.7-A5-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 126150e2..98962274 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.7-A4
+        2.5.7-A5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index b1fe8879..8e5574fb 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -7,7 +7,7 @@
     
         alfresco-transform-core
         org.alfresco
-        2.5.7-A4
+        2.5.7-A5-SNAPSHOT
         ../../pom.xml
     
 
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 749c51e2..1fc41d5c 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -5,7 +5,7 @@
     
         org.alfresco
         alfresco-transform-core
-        2.5.7-A4
+        2.5.7-A5-SNAPSHOT
     
 
     alfresco-transformer-base
diff --git a/pom.xml b/pom.xml
index 3a0e1894..e62f874e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     org.alfresco
     alfresco-transform-core
-    2.5.7-A4 
+    2.5.7-A5-SNAPSHOT 
     pom
 
     
@@ -118,7 +118,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.7-A4
+        HEAD
     
 
     


                 
file *
Direct Url

                 
sourceMimetype *

                 
targetExtension *

                 
targetMimetype *