From 0aa62531502c2843372182b6d548eb38ddee7e25 Mon Sep 17 00:00:00 2001 From: Alexandru-Eusebiu Epure Date: Fri, 11 Jun 2021 11:23:10 +0300 Subject: [PATCH] ATS-935: Upgrade LibreOffice to 7.0.6 (from 6.3.5) (#418) * MNT-22433 : LO never returns to AIO for one file upgrade LibreOffice to 7.0.6 (from 6.3.5) Remove test and test resource for .msg type --- .../alfresco-transform-core-aio-boot/Dockerfile | 4 ++-- .../src/main/resources/application-default.yaml | 2 +- .../Dockerfile | 4 ++-- .../src/main/resources/application-default.yaml | 2 +- .../LibreOfficeTransformationIT.java | 5 +---- .../src/test/resources/quick.msg | Bin 28160 -> 0 bytes .../resources/libreoffice_engine_config.json | 2 -- docs/external-engine-configuration.md | 4 ++-- pom.xml | 2 +- 9 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.msg 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 9fa9be40..f83ab4f6 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -16,7 +16,7 @@ ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositor ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -ARG LIBREOFFICE_VERSION=6.3.5 +ARG LIBREOFFICE_VERSION=7.0.6 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz 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 @@ -38,7 +38,7 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr yum localinstall -y imagemagick-epel-dep.rpm && \ yum localinstall -y imagemagick-distribution-*linux.rpm && \ rm -f imagemagick-distribution-*.rpm && \ - yum install -y cairo cups-libs libSM && \ + yum install -y cairo cups-libs libSM libGLU && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \ 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 10f46c27..3a55ed6b 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 @@ -5,7 +5,7 @@ transform: pdfrenderer: exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer} libreoffice: - path: ${LIBREOFFICE_HOME:/opt/libreoffice6.3} + path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0} maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} timeout: ${LIBREOFFICE_TIMEOUT:1200000} portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100} diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index 5e06f58d..6dc7b769 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile @@ -4,7 +4,7 @@ FROM alfresco/alfresco-base-java:11.0.11-openjdk-centos-8@sha256:7d4177162080b8f18b3c7b9f59fb86a3c74c8e82aa329ab4e3878d660bc16195 -ARG LIBREOFFICE_VERSION=6.3.5 +ARG LIBREOFFICE_VERSION=7.0.6 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz ENV JAVA_OPTS="" @@ -18,7 +18,7 @@ ARG USERID=33003 COPY target/${env.project_artifactId}-${env.project_version}.jar libreoffice-dist-*-linux.gz / RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ - yum install -y cairo cups-libs libSM && \ + yum install -y cairo cups-libs libSM libGLU && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \ 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 2bcbaaf0..2c286ef4 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 @@ -5,7 +5,7 @@ transform: config: location: classpath:libreoffice_engine_config.json libreoffice: - path: ${LIBREOFFICE_HOME:/opt/libreoffice6.3} + path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0} maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} timeout: ${LIBREOFFICE_TIMEOUT:1200000} portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100} diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java index 886a00c5..7dd05877 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java @@ -145,7 +145,6 @@ public class LibreOfficeTransformationIT testFile(MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO ,"xltm" ,"quick.xltm"), testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW ,"ppsx" ,"quick.ppsx"), testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO ,"ppsm" ,"quick.ppsm"), - testFile(MIMETYPE_OUTLOOK_MSG ,"msg" ,"quick.msg"), testFile(MIMETYPE_DITA ,"dita" ,"quick.dita"), testFile(MIMETYPE_TEXT_PLAIN ,"txt" ,"quick.txt"), testFile(MIMETYPE_STC ,"stc" ,"quick.stc"), @@ -185,16 +184,14 @@ public class LibreOfficeTransformationIT allTargets("quick.xml", pdfTarget), allTargets("quick.xltm", pdfTarget), allTargets("quick.dita", pdfTarget), - allTargets("quick.msg", pdfTarget), allTargets("quick.ppsm", pdfTarget), allTargets("quick.ppsx", pdfTarget), allTargets("quick.stc", pdfTarget), allTargets("quick.sti", pdfTarget), allTargets("quick.stw", pdfTarget), allTargets("quick.sxc", pdfTarget), - allTargets("quick.sxi", pdfTarget), + allTargets("quick.sxi", pdfTarget) - allTargets("quick.msg", txtTarget) ) .flatMap(identity()); } diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.msg b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.msg deleted file mode 100644 index 6ee3750070192fe8b014c0fc1bad1e8944d6d6cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28160 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 diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json index ef9d16a9..0532a574 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json @@ -231,8 +231,6 @@ {"sourceMediaType": "application/vnd.ms-powerpoint.slideshow.macroenabled.12", "priority": 110, "targetMediaType": "application/pdf" }, - {"sourceMediaType": "application/vnd.ms-outlook", "priority": 110, "targetMediaType": "application/pdf" }, - {"sourceMediaType": "application/dita+xml", "priority": 110, "targetMediaType": "application/pdf" }, {"sourceMediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "targetMediaType": "text/html" }, diff --git a/docs/external-engine-configuration.md b/docs/external-engine-configuration.md index fa9050ce..79605968 100644 --- a/docs/external-engine-configuration.md +++ b/docs/external-engine-configuration.md @@ -50,7 +50,7 @@ The following externalized T-engines properties are available: | ACTIVEMQ_PASSWORD | ActiveMQ Password. | admin | | FILE_STORE_URL | T-Engine Port. | http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file | | TRANSFORM_ENGINE_REQUEST_QUEUE | T-Engine queue used for async requests. | org.alfresco.transform.engine.libreoffice.acs | -| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice6.3 | +| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice7.0 | | LIBREOFFICE_MAX_TASKS_PER_PROCESS | Number of maximum tasks per process. | 200 | | LIBREOFFICE_TIMEOUT | Timeout value for LibreOffice `execution timeout`, `queue timeout` and `connection timeout`. | 1200000 | | LIBREOFFICE_PORT_NUMBERS | LibreOffice port. | 8100 | @@ -86,7 +86,7 @@ The following externalized T-engines properties are available: | TRANSFORM_ENGINE_REQUEST_QUEUE | T-Engine queue used for async requests. | org.alfresco.transform.engine.aio.acs | | PDFRENDERER_EXE | Path to Pdf-renderer EXE. | /usr/bin/alfresco-pdf-renderer | | TRANSFORM_ENGINE_REQUEST_QUEUE | T-Engine queue used for async requests. | org.alfresco.transform.engine.libreoffice.acs | -| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice6.3 | +| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice7.0 | | LIBREOFFICE_MAX_TASKS_PER_PROCESS | Number of maximum tasks per process. | 200 | | LIBREOFFICE_TIMEOUT | Timeout value for LibreOffice `execution timeout`, `queue timeout` and `connection timeout`. | 1200000 | | LIBREOFFICE_PORT_NUMBERS | LibreOffice port. | 8100 | diff --git a/pom.xml b/pom.xml index 773f1ba0..7cf97a07 100644 --- a/pom.xml +++ b/pom.xml @@ -356,7 +356,7 @@ /usr/bin/convert /usr/lib64/ImageMagick-7.0.10/lib /usr/lib64/ImageMagick-7.0.10 - /opt/libreoffice6.3 + /opt/libreoffice7.0 200 1200000 8100