From a701c0fddb5c529d9095bae69e3c78d08d8b73aa Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Thu, 13 Jun 2019 14:36:00 +0300 Subject: [PATCH 01/20] ATS-452 : AI-CE: Release Intelligence Services 1.0.2 - set the SNAPSHOT versions --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 37c1e389..5ecfe213 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ 2.1.0-EA3-SNAPSHOT pom + 1.8 latest From b77e5e081c6409a521a1188c47fcb4c2fb352025 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 25 Jun 2019 12:21:58 +0300 Subject: [PATCH 02/20] Trigger next build From 421da5f3925b670df054fcee6a1ff734d681e0fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 00:16:29 +0000 Subject: [PATCH 03/20] Bump license-maven-plugin from 1.20 to 2.0.0 Bumps [license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 1.20 to 2.0.0. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/license-maven-plugin-1.20...license-maven-plugin-2.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce0ceafe..85dceaf0 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ org.codehaus.mojo license-maven-plugin - 1.20 + 2.0.0 2005 Alfresco Software Limited From 34221402b6416031dcdc61cd65025e256ebd0af9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 00:15:54 +0000 Subject: [PATCH 04/20] Bump dependency.pdfbox.version from 2.0.15 to 2.0.16 Bumps `dependency.pdfbox.version` from 2.0.15 to 2.0.16. Updates `pdfbox` from 2.0.15 to 2.0.16 Updates `pdfbox-tools` from 2.0.15 to 2.0.16 Signed-off-by: dependabot-preview[bot] --- alfresco-docker-transform-misc/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index ac0a2b63..17d38723 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -69,7 +69,7 @@ org.apache.pdfbox pdfbox-tools - 2.0.15 + 2.0.16 diff --git a/pom.xml b/pom.xml index 85dceaf0..aac1d345 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.8 latest - 2.0.15 + 2.0.16 7.17 8.39 3.0.1.1 From 4da81d99aac20ad58c42f66ded02e9d54d396db5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 11:41:35 +0000 Subject: [PATCH 05/20] Bump junrar from 1.0.1 to 4.0.0 Bumps [junrar](https://github.com/junrar/junrar) from 1.0.1 to 4.0.0. - [Release notes](https://github.com/junrar/junrar/releases) - [Commits](https://github.com/junrar/junrar/compare/junrar-1.0.1...junrar-4.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aac1d345..e2b60fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ com.github.junrar junrar - 1.0.1 + 4.0.0 org.apache.commons From 28158ec48b15e9af9dd7f97e31f753596548d2e5 Mon Sep 17 00:00:00 2001 From: eknizat <26163420+eknizat@users.noreply.github.com> Date: Tue, 2 Jul 2019 10:13:33 +0100 Subject: [PATCH 06/20] REPO-4331: Update target file size check (#66) * REPO-4331: Transformers should not throw an exception when source and target files are empty --- .../transformers/SelectingTransformer.java | 16 +++++++++++++--- .../transformer/MiscControllerTest.java | 19 ++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index c3149970..077c2117 100644 --- a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java +++ b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java @@ -63,7 +63,7 @@ public class SelectingTransformer transformers.add(new HtmlParserContentTransformer()); transformers.add(new StringExtractingContentTransformer()); transformers.add(new TextToPdfContentTransformer()); -// transformers.add(new OOXMLThumbnailContentTransformer()); // Doesn't work with java 11, comment put and disabled test +// transformers.add(new OOXMLThumbnailContentTransformer()); // Doesn't work with java 11, transformer and test disabled } /** @@ -90,10 +90,15 @@ public class SelectingTransformer { throw new TransformException(INTERNAL_SERVER_ERROR.value(), getMessage(e)); } - if (!targetFile.exists() || targetFile.length() == 0) + if (!targetFile.exists()) { throw new TransformException(INTERNAL_SERVER_ERROR.value(), - "Transformer failed to create an output file"); + "Transformer failed to create an output file. Target file does not exist."); + } + if (sourceFile.length() > 0 && targetFile.length() == 0) + { + throw new TransformException(INTERNAL_SERVER_ERROR.value(), + "Transformer failed to create an output file. Target file is empty but source file was not empty."); } } @@ -104,6 +109,11 @@ public class SelectingTransformer { if (transformer.isTransformable(sourceMimetype, targetMimetype, parameters)) { + if (logger.isDebugEnabled()) + { + logger.debug("Using " + transformer.getClass().getName() + + " to transform from " + sourceMimetype + " to " + targetMimetype ); + } return transformer; } } diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java index 66d63619..bdf505b1 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java +++ b/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java @@ -155,7 +155,7 @@ public class MiscControllerTest extends AbstractTransformerControllerTest } @Test - public void testStringtoString() throws Exception + public void testStringToString() throws Exception { String expected = null; byte[] content = null; @@ -181,6 +181,23 @@ public class MiscControllerTest extends AbstractTransformerControllerTest assertTrue("The content did not include \""+expected, contentResult.contains(expected)); } + @Test + public void testEmptyTextFileReturnsEmptyFile() throws Exception + { + // Use empty content to create an empty source file + byte[] content = new byte[0]; + + MvcResult result = sendText("txt", + "UTF-8", + MIMETYPE_TEXT_PLAIN, + "txt", + MIMETYPE_TEXT_PLAIN, + "UTF-8", + content); + + assertEquals("Returned content should be empty for an empty source file", 0, result.getResponse().getContentLength()); + } + @Test public void textToPdf() throws Exception { From ae4143ccc6b0aefee14fa6ccb2fe7985537ebc0f Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Jul 2019 16:01:11 +0100 Subject: [PATCH 07/20] 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 08/20] 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 From fe8a9397f9052417ff632843d5afecaf558a7149 Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Fri, 5 Jul 2019 16:35:48 +0300 Subject: [PATCH 09/20] ATS-460 : ATS: T-Engines - Update license information to *not* refer to Enterprise edition - removed enterprise lines from dockerfiles --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 1 - alfresco-docker-imagemagick/Dockerfile | 1 - alfresco-docker-libreoffice/Dockerfile | 1 - alfresco-docker-tika/Dockerfile | 1 - 4 files changed, 4 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index cb8d8683..ac10f423 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -1,6 +1,5 @@ # Image provides a container in which to run alfresco-pdf-renderer transformations for Alfresco Enterprise Content Services. -# 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-f410546b40ea diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 28cb8787..5876d339 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -1,6 +1,5 @@ # Image provides a container in which to run ImageMagick transformations for Alfresco Enterprise Content Services. -# 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-f410546b40ea diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index ba2f5d5b..cfa6dc4e 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -1,6 +1,5 @@ # Image provides a container in which to run LibreOffice transformations for Alfresco Enterprise Content Services. -# 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-f410546b40ea diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index ec2a51c0..acc0897e 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -1,6 +1,5 @@ # Image provides a container in which to run Tika transformations for Alfresco Enterprise Content Services. -# 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-f410546b40ea From 24edf0792e182c7d04dea329fdfe9d18a5e17265 Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Mon, 8 Jul 2019 11:35:55 +0300 Subject: [PATCH 10/20] ATS-460 : ATS: T-Engines - Update license information to *not* refer to Enterprise edition - removed enterprise line --- alfresco-docker-alfresco-pdf-renderer/LICENSES.md | 2 -- alfresco-docker-imagemagick/LICENSES.md | 2 -- alfresco-docker-libreoffice/LICENSES.md | 2 -- alfresco-docker-tika/LICENSES.md | 2 -- 4 files changed, 8 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/LICENSES.md b/alfresco-docker-alfresco-pdf-renderer/LICENSES.md index 61ec4d48..8dd5b427 100644 --- a/alfresco-docker-alfresco-pdf-renderer/LICENSES.md +++ b/alfresco-docker-alfresco-pdf-renderer/LICENSES.md @@ -1,6 +1,4 @@ ### Licenses -* The code in the alfresco-docker-alfresco-pdf-renderer project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * The alfresco-pdf-renderer transformer uses the PDFium library from Google Inc. See [https://pdfium.googlesource.com/pdfium/+/master/LICENSE](https://pdfium.googlesource.com/pdfium/+/master/LICENSE) or the [pdfium.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/pdfium.txt) file placed in the root directory of the docker image. diff --git a/alfresco-docker-imagemagick/LICENSES.md b/alfresco-docker-imagemagick/LICENSES.md index a6d2cbee..c8506825 100644 --- a/alfresco-docker-imagemagick/LICENSES.md +++ b/alfresco-docker-imagemagick/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-imagemagick project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * ImageMagick is from ImageMagick Studio LLC. See the license at [http://www.imagemagick.org/script/license.php](http://www.imagemagick.org/script/license.php) or the [ImageMagick-license.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt) file placed in the root directory of the docker image. diff --git a/alfresco-docker-libreoffice/LICENSES.md b/alfresco-docker-libreoffice/LICENSES.md index 6675172b..3afa9da0 100644 --- a/alfresco-docker-libreoffice/LICENSES.md +++ b/alfresco-docker-libreoffice/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-libreoffice project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * This transformer uses LibreOffice from The Document Foundation. See the license at [https://www.libreoffice.org/download/license/](https://www.libreoffice.org/download/license/) or the [libreoffice.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/libreoffice.txt) diff --git a/alfresco-docker-tika/LICENSES.md b/alfresco-docker-tika/LICENSES.md index dfdb7c47..ad2c6210 100644 --- a/alfresco-docker-tika/LICENSES.md +++ b/alfresco-docker-tika/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-imagemagick project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0 or the [Apache 2.0.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt) file placed in the root directory of the docker image. From f1edbb71e9a31dfbbdc18a321975f572a06b116e Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Mon, 8 Jul 2019 11:40:29 +0300 Subject: [PATCH 11/20] ATS-460 : ATS: T-Engines - Update license information to *not* refer to Enterprise edition - updated controller line --- .../AlfrescoPdfRendererController.java | 4 +- .../transformer/ImageMagickController.java | 4 +- .../transformer/LibreOfficeController.java | 4 +- .../alfresco/transformer/TikaController.java | 4 +- .../alfresco/transformer/MiscController.java | 37 +++++++++---------- .../transformer/logging/StandardMessages.java | 5 +-- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java index 3e7870d9..6c6988e0 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.springframework.http.HttpStatus.OK; import java.io.File; @@ -85,7 +85,7 @@ public class AlfrescoPdfRendererController extends AbstractTransformerController public AlfrescoPdfRendererController() { logger.info("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(logger::info); + Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); logger.info("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"); logger.info("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); } 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 a78ab15b..a6042f31 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 @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.alfresco.transformer.util.Util.stringToInteger; import static org.springframework.http.HttpStatus.OK; @@ -88,7 +88,7 @@ public class ImageMagickController extends AbstractTransformerController public ImageMagickController() { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(logger::info); + Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); logger.info("This transformer uses ImageMagick from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt"); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java index 6614f63e..cad84b4b 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java +++ b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.springframework.http.HttpStatus.OK; import java.io.File; @@ -86,7 +86,7 @@ public class LibreOfficeController extends AbstractTransformerController public LibreOfficeController() { logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(logger::info); + Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); logger.info("This transformer uses LibreOffice from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt"); logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java index 3822400f..32e0528f 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java +++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java @@ -37,7 +37,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.alfresco.transformer.util.Util.stringToBoolean; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.OK; @@ -96,7 +96,7 @@ public class TikaController extends AbstractTransformerController public TikaController() { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(logger::info); + Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); logger.info("Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\ 2.0.txt"); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java index 74e05a33..226fb08d 100644 --- a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java +++ b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java @@ -26,9 +26,26 @@ */ package org.alfresco.transformer; -import org.alfresco.transformer.transformers.SelectingTransformer; +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.fs.FileManager.createAttachment; +import static org.alfresco.transformer.fs.FileManager.createSourceFile; +import static org.alfresco.transformer.fs.FileManager.createTargetFile; +import static org.alfresco.transformer.fs.FileManager.createTargetFileName; +import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.SOURCE_ENCODING; +import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.TARGET_ENCODING; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; +import org.alfresco.transformer.transformers.SelectingTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -39,24 +56,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.Arrays; -import java.util.HashMap; -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.transformers.HtmlParserContentTransformer.TARGET_ENCODING; -import static org.alfresco.transformer.fs.FileManager.createAttachment; -import static org.alfresco.transformer.fs.FileManager.createSourceFile; -import static org.alfresco.transformer.fs.FileManager.createTargetFile; -import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; -import static org.springframework.http.HttpStatus.OK; -import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; - @Controller public class MiscController extends AbstractTransformerController { diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java index f24fbed7..2334827d 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java @@ -28,10 +28,7 @@ package org.alfresco.transformer.logging; public interface StandardMessages { - String ENTERPRISE_LICENCE = - "This image is only intended to be used with the Alfresco Enterprise Content Repository which is covered by\n"+ - "https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use\n" + - "\n" + + String LICENCE = "License rights for this program may be obtained from Alfresco Software, Ltd. pursuant to a written agreement\n" + "and any use of this program without such an agreement is prohibited.\n" + "\n" ; From c06009c00c300db96deb4799fb719e470ab8373f Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Mon, 8 Jul 2019 13:33:54 +0300 Subject: [PATCH 12/20] ATS-460 : ATS: T-Engines - Update license information to *not* refer to Enterprise edition - updated dockerfile for imagemagick --- alfresco-docker-imagemagick/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 5876d339..de17d8eb 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -1,5 +1,3 @@ -# Image provides a container in which to run ImageMagick transformations for Alfresco Enterprise Content Services. - # 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-f410546b40ea From 753df7897250bfff900ef3fb34b587167918f4b2 Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Mon, 8 Jul 2019 15:29:33 +0300 Subject: [PATCH 13/20] ATS-460 : ATS: T-Engines - Update license information to *not* refer to Enterprise edition - updated dockerfiles --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 2 +- alfresco-docker-imagemagick/Dockerfile | 2 ++ alfresco-docker-libreoffice/Dockerfile | 2 +- alfresco-docker-tika/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index ac10f423..6907373b 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -1,4 +1,4 @@ -# Image provides a container in which to run alfresco-pdf-renderer transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run alfresco-pdf-renderer transformations for Alfresco Content Services. # 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. diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index de17d8eb..4bafc88e 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -1,3 +1,5 @@ +# Image provides a container in which to run ImageMagick transformations for Alfresco Content Services. + # 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-f410546b40ea diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index cfa6dc4e..9cd8b9ee 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -1,4 +1,4 @@ -# Image provides a container in which to run LibreOffice transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run LibreOffice transformations for Alfresco Content Services. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index acc0897e..83149f76 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -1,4 +1,4 @@ -# Image provides a container in which to run Tika transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run Tika transformations for Alfresco Content Services. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. From 964ef9094a37019a5f1313ca66aeb0b6bce92945 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 8 Jul 2019 16:53:10 +0100 Subject: [PATCH 14/20] ATS-481: Workaround attempt to upgrade from dom4j 1.6.1 to 2.1.1 (pending REPO-4514) - transitive dependency (alfresco-core <- spring-surf-core-configservice) --- pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index e2b60fd3..8f9dcf3d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,29 @@ + org.alfresco alfresco-core ${dependency.alfresco-core.version} + + + + org + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-data-model From c7fd2acd85fabacd36023fcbb13cc963fee98ab9 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 8 Jul 2019 17:11:39 +0100 Subject: [PATCH 15/20] ATS-481: Temp workaround attempt to update from dom4j 1.6.1 to 2.1.1 (pending REPO-4514) - transitive dependency (alfresco-core <- spring-surf-core-configservice) --- alfresco-docker-alfresco-pdf-renderer/pom.xml | 17 +++++++++++++++++ alfresco-docker-imagemagick/pom.xml | 17 +++++++++++++++++ alfresco-docker-libreoffice/pom.xml | 17 +++++++++++++++++ alfresco-docker-tika/pom.xml | 17 +++++++++++++++++ alfresco-docker-transform-misc/pom.xml | 16 ++++++++++++++++ alfresco-transformer-base/pom.xml | 17 +++++++++++++++++ pom.xml | 4 ++-- 7 files changed, 103 insertions(+), 2 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index e7410dc0..cb28fc73 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -45,10 +45,27 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 8845950c..2b698831 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -45,10 +45,27 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 9b005596..25351358 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -45,10 +45,27 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-jodconverter-core diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index c91ac006..224c2605 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -46,10 +46,27 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-data-model diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 17d38723..5c55c203 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -47,9 +47,25 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + + org.dom4j + dom4j + 2.1.1 diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 3fea7243..4c9f8808 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -39,10 +39,27 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-transform-model diff --git a/pom.xml b/pom.xml index 8f9dcf3d..8a5f8a61 100644 --- a/pom.xml +++ b/pom.xml @@ -52,12 +52,12 @@ alfresco-core ${dependency.alfresco-core.version} - org + dom4j dom4j From 8b3e451b44a4226ebdb0ebd0190f4b33c5746d01 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 9 Jul 2019 01:43:10 +0300 Subject: [PATCH 16/20] ATS-467 : Disable JMS Config beans on missing "activemq.url" property --- .../transformer/messaging/MessagingConfig.java | 6 ++++++ .../src/main/resources/application.yaml | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java index 437b349d..ce5d7568 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java @@ -34,6 +34,7 @@ import org.apache.activemq.command.ActiveMQQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jms.annotation.JmsListenerConfigurer; @@ -52,6 +53,7 @@ import org.springframework.transaction.PlatformTransactionManager; * created on 18/12/2018 */ @Configuration +@ConditionalOnProperty(name = "activemq.url") public class MessagingConfig implements JmsListenerConfigurer { private static final Logger logger = LoggerFactory.getLogger(MessagingConfig.class); @@ -63,6 +65,7 @@ public class MessagingConfig implements JmsListenerConfigurer } @Bean + @ConditionalOnProperty(name = "activemq.url") public DefaultMessageHandlerMethodFactory methodFactory() { DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory(); @@ -71,6 +74,7 @@ public class MessagingConfig implements JmsListenerConfigurer } @Bean + @ConditionalOnProperty(name = "activemq.url") public DefaultJmsListenerContainerFactory jmsListenerContainerFactory( final ConnectionFactory connectionFactory, final TransformMessageConverter transformMessageConverter) @@ -84,6 +88,7 @@ public class MessagingConfig implements JmsListenerConfigurer } @Bean + @ConditionalOnProperty(name = "activemq.url") public PlatformTransactionManager transactionManager(final ConnectionFactory connectionFactory) { final JmsTransactionManager transactionManager = new JmsTransactionManager(); @@ -92,6 +97,7 @@ public class MessagingConfig implements JmsListenerConfigurer } @Bean + @ConditionalOnProperty(name = "activemq.url") public Queue engineRequestQueue(@Value("${queue.engineRequestQueue}") String engineRequestQueueValue) { return new ActiveMQQueue(engineRequestQueueValue); diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml index 8bc4f767..d18bf043 100644 --- a/alfresco-transformer-base/src/main/resources/application.yaml +++ b/alfresco-transformer-base/src/main/resources/application.yaml @@ -1,3 +1,4 @@ +--- spring: servlet: multipart: @@ -18,7 +19,7 @@ server: logging: level: - #org.alfresco.util.exec.RuntimeExec: debug + # org.alfresco.util.exec.RuntimeExec: debug org.alfresco.transformer.LibreOfficeController: debug org.alfresco.transformer.JodConverterSharedInstance: debug org.alfresco.transformer.AlfrescoPdfRendererController: debug @@ -36,9 +37,9 @@ management: web: exposure: include: - - metrics - - prometheus - - health + - metrics + - prometheus + - health metrics: enable[http]: false enable[logback]: false @@ -46,4 +47,4 @@ management: enable[jvm.classes]: false container: - name: ${HOSTNAME:t-engine} \ No newline at end of file + name: ${HOSTNAME:t-engine} From 3e4f6af0e46160c4634669a76de223485b7ce46c Mon Sep 17 00:00:00 2001 From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> Date: Wed, 10 Jul 2019 13:42:28 +0300 Subject: [PATCH 17/20] ATS-467 : JMS config startup message (#72) --- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 8 +-- .../src/license/THIRD-PARTY.properties | 10 +--- .../src/license/THIRD-PARTY.properties | 8 +-- .../transformer/messaging/MessagingInfo.java | 56 +++++++++++++++++++ 6 files changed, 71 insertions(+), 27 deletions(-) create mode 100644 alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties index 1c9f0703..9e3a8812 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:08:50 EEST 2019 +#Tue Jul 09 13:35:12 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties index 28289f6e..eeeb7e0b 100644 --- a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:05 EEST 2019 +#Tue Jul 09 13:35:40 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties index 3266375a..52c90861 100644 --- a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - CDDL+GPL License @@ -19,18 +19,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:19 EEST 2019 +#Tue Jul 09 13:36:53 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-tika/src/license/THIRD-PARTY.properties b/alfresco-docker-tika/src/license/THIRD-PARTY.properties index d522096b..bea04d22 100644 --- a/alfresco-docker-tika/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-tika/src/license/THIRD-PARTY.properties @@ -11,20 +11,17 @@ # - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD +# - BSD 3-clause New License # - BSD License # - BSD licence # - Bouncy Castle Licence # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 -# - CDDL v1.1 / GPL v2 dual license # - CDDL+GPL License # - CDDL, v1.0 # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL -# - Common Development and Distribution License (CDDL) v1.0 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - EDL 1.0 # - EPL 2.0 # - Eclipse Distribution License - v 1.0 # - Eclipse Public License - v 1.0 @@ -45,6 +42,7 @@ # - Public Domain, per Creative Commons CC0 # - Similar to Apache License but with the acknowledgment clause removed # - Specification License +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The BSD License @@ -53,12 +51,11 @@ # - The SAX License # - The W3C License # - UnRar License -# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:08:04 EEST 2019 +#Tue Jul 09 13:34:27 EEST 2019 org.acegisecurity--acegi-security--0.8.2_patched=Apache License 2.0 net.jcip--jcip-annotations--1.0=Public xerces--xercesImpl--2.11.0-alfresco-patched-20180402=Apache License 2.0 @@ -66,4 +63,3 @@ javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 xpp3--xpp3--1.1.3_8=Apache 1.1 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties index d886e03b..2ce17de2 100644 --- a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties +++ b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties @@ -6,7 +6,7 @@ # - Apache License 2.0 # - Apache License, Version 2.0 # - Apache License, version 2.0 -# - BSD +# - BSD 3-clause New License # - BSD License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 @@ -21,18 +21,16 @@ # - MIT License # - MIT license # - Public Domain, per Creative Commons CC0 +# - Sun Binary Code License Agreement # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 # - The JSON License # - The MIT License -# - The SAX License -# - The W3C License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 21 12:09:33 EEST 2019 +#Tue Jul 09 13:38:31 EEST 2019 javax.transaction--jta--1.1=Sun Binary Code License Agreement commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0 -dom4j--dom4j--1.6.1=BSD diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java new file mode 100644 index 00000000..986b347c --- /dev/null +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java @@ -0,0 +1,56 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2019 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transformer.messaging; + +import javax.annotation.PostConstruct; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * Prints JMS status information at application startup. + * + * @author Cezar Leahu + */ +@Configuration +public class MessagingInfo +{ + private static final Logger logger = LoggerFactory.getLogger(MessagingInfo.class); + + @Value("${activemq.url:}") + private String activemqUrl; + + @PostConstruct + public void init() + { + final boolean jms = activemqUrl != null && !activemqUrl.isBlank(); + logger.info("JMS client is {}, activemq.url: '{}'", jms ? "ENABLED" : "DISABLED", + activemqUrl); + } +} From 74fc0162b1b196e7a6af20c225a38ae9f9e35f0b Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 10 Jul 2019 17:12:50 +0100 Subject: [PATCH 18/20] ATS-487: Security: DEPLOY-734 - Update Dockerfiles (x5 T-Engines) to new Java Base Image (Open JDK 11.0.1) --- 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 6907373b..2b3b8e6f 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -2,7 +2,7 @@ # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 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 4bafc88e..60c5d643 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -2,7 +2,7 @@ # 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-f410546b40ea +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 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 9cd8b9ee..4aa2936c 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -2,7 +2,7 @@ # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 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 83149f76..ce0c6762 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 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 9f6f498d..972c37a6 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-f410546b40ea +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 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 13e665ec4d06448f62630d3805db30196f5d132f Mon Sep 17 00:00:00 2001 From: aftene Date: Thu, 11 Jul 2019 14:26:49 +0300 Subject: [PATCH 19/20] ATS-473 - ATS: T-Engines 2.1.0-EA4 release - update alfresco-transform-model dependency to the latest version in alfresco-transform-core --- 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-docker-transform-misc/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 2 +- 7 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 cb28fc73..fe9e0654 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 2b698831..dda46da0 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 25351358..f94fefd5 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 224c2605..4db9d9cc 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 5c55c203..3bf2b09b 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 4c9f8808..605b375d 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 ../pom.xml alfresco-transformer-base - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 diff --git a/pom.xml b/pom.xml index d45e46be..d1ed6fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4-SNAPSHOT + 2.1.0-EA4 pom From 7353479ff1ff83da71f75287b59ef148b0240deb Mon Sep 17 00:00:00 2001 From: aftene Date: Thu, 11 Jul 2019 16:07:14 +0300 Subject: [PATCH 20/20] ATS-473 - ATS: T-Engines 2.1.0-EA4 release - revert update alfresco-transform-model dependency to the latest version in alfresco-transform-core --- 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-docker-transform-misc/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 2 +- 7 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 fe9e0654..cb28fc73 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index dda46da0..2b698831 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index f94fefd5..25351358 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 4db9d9cc..224c2605 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 3bf2b09b..5c55c203 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 605b375d..4c9f8808 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT ../pom.xml alfresco-transformer-base - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT diff --git a/pom.xml b/pom.xml index d1ed6fdf..d45e46be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.0-EA4 + 2.1.0-EA4-SNAPSHOT pom