From bff24713916cffe6d19020aeb7092521ae0c9b06 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Wed, 24 Oct 2018 14:07:37 +0300 Subject: [PATCH 1/5] ATS-158 : T-Engine - ImageMagick: security fix - remove commandOptions (from JSON-based interface) - removed 'commandOptions' from ImageMagick --- .../java/org/alfresco/transformer/ImageMagickController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java index 87aee38f..e2ff71f8 100644 --- a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java +++ b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java @@ -201,10 +201,9 @@ public class ImageMagickController extends AbstractTransformerController Boolean resizePercentage = stringToBoolean(transformOptions.get("resizePercentage")); Boolean allowEnlargement = stringToBoolean(transformOptions.get("allowEnlargement")); Boolean maintainAspectRatio = stringToBoolean(transformOptions.get("maintainAspectRatio")); - String commandOptions = transformOptions.get("commandOptions"); String options = buildTransformOptions(startPage, endPage , alphaRemove, autoOrient, cropGravity, cropWidth, cropHeight, cropPercentage, - cropXOffset, cropYOffset, thumbnail, resizeWidth, resizeHeight, resizePercentage, allowEnlargement, maintainAspectRatio, commandOptions); + cropXOffset, cropYOffset, thumbnail, resizeWidth, resizeHeight, resizePercentage, allowEnlargement, maintainAspectRatio, null); String pageRange = calculatePageRange(startPage, endPage); executeTransformCommand(options, sourceFile, pageRange, targetFile, timeout); From 78735a89f5897ca53fcfc649f6872da1eb0bb0f8 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Wed, 24 Oct 2018 16:42:34 +0300 Subject: [PATCH 2/5] ATS-165 : T-Engines build fails at the Release stage (if Build JDK = Open JDK 11) - changed parent from alfresco-super-pom to spring-boot-starter-parent - added javadoc plugin to be executed on build --- pom.xml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 42c4a33d..91161e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.alfresco - alfresco-super-pom - 9 + org.springframework.boot + spring-boot-starter-parent + 2.0.5.RELEASE + org.alfresco @@ -44,13 +45,6 @@ - - org.springframework.boot - spring-boot-starter-parent - ${dependency.spring-boot.version} - pom - import - ch.qos.logback logback-core @@ -121,4 +115,22 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + attach-javadocs + + jar + + + + + + + From c3f3126c8d7256049d4f42b07ec1e60bb429e1a7 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Fri, 26 Oct 2018 10:06:02 +0300 Subject: [PATCH 3/5] ATS-165 : T-Engines build fails at the Release stage (if Build JDK = Open JDK 11) - added release-plugin --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 91161e7d..95bf40c5 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,15 @@ + + + + + maven-release-plugin + 2.5.3 + + + From d0d0ad04fe2873de7979950103ad655bd2d5c58e Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 26 Oct 2018 08:44:28 +0000 Subject: [PATCH 4/5] [maven-release-plugin] prepare release alfresco-docker-transformers-2.0.4.3 --- alfresco-docker-alfresco-pdf-renderer/pom.xml | 2 +- alfresco-docker-imagemagick/pom.xml | 2 +- alfresco-docker-libreoffice/pom.xml | 2 +- alfresco-docker-tika/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index df976cd4..ad7a9500 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 6edf4b92..0023d432 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index c3afd46f..d72f499c 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 40fa3386..088e5b19 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 49ef0eaf..3abdd374 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 ../pom.xml org.alfresco alfresco-transformer-base - 2.0.5-SNAPSHOT + 2.0.4.3 diff --git a/pom.xml b/pom.xml index 95bf40c5..aa045c08 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-docker-transformers - 2.0.5-SNAPSHOT + 2.0.4.3 pom @@ -40,7 +40,7 @@ scm:git:https://git.alfresco.com/Repository/alfresco-docker-transformers.git scm:git:https://git.alfresco.com/Repository/alfresco-docker-transformers.git https://git.alfresco.com/Repository/alfresco-docker-transformers - HEAD + alfresco-docker-transformers-2.0.4.3 From c4d12caa14fb31f58512cba04a175c05f3b06346 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 26 Oct 2018 08:44:30 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- alfresco-docker-alfresco-pdf-renderer/pom.xml | 2 +- alfresco-docker-imagemagick/pom.xml | 2 +- alfresco-docker-libreoffice/pom.xml | 2 +- alfresco-docker-tika/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index ad7a9500..df976cd4 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 0023d432..6edf4b92 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index d72f499c..c3afd46f 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 088e5b19..40fa3386 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 3abdd374..49ef0eaf 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT ../pom.xml org.alfresco alfresco-transformer-base - 2.0.4.3 + 2.0.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index aa045c08..95bf40c5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-docker-transformers - 2.0.4.3 + 2.0.5-SNAPSHOT pom @@ -40,7 +40,7 @@ scm:git:https://git.alfresco.com/Repository/alfresco-docker-transformers.git scm:git:https://git.alfresco.com/Repository/alfresco-docker-transformers.git https://git.alfresco.com/Repository/alfresco-docker-transformers - alfresco-docker-transformers-2.0.4.3 + HEAD