From ae4143ccc6b0aefee14fa6ccb2fe7985537ebc0f Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Jul 2019 16:01:11 +0100 Subject: [PATCH 1/2] ATS-465: Security: DEPLOY-714 - Update Dockerfiles (ATS) to new Java Base Image (Open JDK 11.0.1) - core T-Engines --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 2 +- alfresco-docker-imagemagick/Dockerfile | 2 +- alfresco-docker-libreoffice/Dockerfile | 2 +- alfresco-docker-tika/Dockerfile | 2 +- alfresco-docker-transform-misc/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index bf9bc2a9..cb8d8683 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index f90e4216..28cb8787 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index aefaaa57..ba2f5d5b 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index 73373eb7..ec2a51c0 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" diff --git a/alfresco-docker-transform-misc/Dockerfile b/alfresco-docker-transform-misc/Dockerfile index 08d5b20b..9f6f498d 100644 --- a/alfresco-docker-transform-misc/Dockerfile +++ b/alfresco-docker-transform-misc/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" From be48c8e7a91f267e70bc0978bb4ac815dc99d5dd Mon Sep 17 00:00:00 2001 From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> Date: Fri, 5 Jul 2019 11:39:39 +0300 Subject: [PATCH 2/2] ATS-467 : T-Engine logs fill up with ActiveMQ errors when used in ACS Community edition - instantiate JMS beans only when 'activemq.url' property is set - fix integration tests --- .../AlfrescoPdfRendererQueueTransformServiceIT.java | 3 ++- .../transformer/ImageMagickQueueTransformServiceIT.java | 3 ++- .../transformer/LibreOfficeQueueTransformServiceIT.java | 3 ++- .../alfresco/transformer/TikaQueueTransformServiceIT.java | 3 ++- .../alfresco/transformer/MiscQueueTransformServiceIT.java | 3 ++- .../org/alfresco/transformer/QueueTransformService.java | 2 ++ .../transformer/AbstractQueueTransformServiceIT.java | 6 +----- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java index 9447a04b..31a3c5ec 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java @@ -41,7 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner; * created on 15/01/2019 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = {"activemq.url=nio://localhost:61616"}) public class AlfrescoPdfRendererQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java index dcb03cd3..412d2bd0 100644 --- a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java +++ b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java @@ -41,7 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner; * created on 15/01/2019 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = {"activemq.url=nio://localhost:61616"}) public class ImageMagickQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java index 45b153d8..5437fd17 100644 --- a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java +++ b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java @@ -40,7 +40,8 @@ import org.springframework.test.context.junit4.SpringRunner; * created on 15/01/2019 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = {"activemq.url=nio://localhost:61616"}) public class LibreOfficeQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java index 8515b054..684f901f 100644 --- a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java +++ b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java @@ -41,7 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner; * created on 15/01/2019 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = {"activemq.url=nio://localhost:61616"}) public class TikaQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java b/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java index c78c5817..149a8f28 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java +++ b/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java @@ -37,7 +37,8 @@ import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = {"activemq.url=nio://localhost:61616"}) public class MiscQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java index 80a658b0..e00e7e12 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java @@ -38,6 +38,7 @@ import org.alfresco.transformer.messaging.TransformReplySender; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.HttpStatus; import org.springframework.jms.annotation.JmsListener; import org.springframework.jms.support.converter.MessageConversionException; @@ -55,6 +56,7 @@ import java.util.Optional; * created on 18/12/2018 */ @Component +@ConditionalOnProperty(name="activemq.url") public class QueueTransformService { private static final Logger logger = LoggerFactory.getLogger(QueueTransformService.class); diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java index 60df7d36..2cd533db 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java @@ -26,12 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; import static org.junit.Assert.assertEquals; -import java.util.UUID; - import javax.jms.Queue; import org.alfresco.transform.client.model.TransformReply; @@ -49,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner; * created on 15/01/2019 */ @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(properties = {"activemq.url=nio://localhost:61616"}) public abstract class AbstractQueueTransformServiceIT { @Autowired