From 8acff769b3a21ea0a40dac5d1b4408e7a6e65591 Mon Sep 17 00:00:00 2001 From: evasques Date: Tue, 14 Apr 2020 15:55:37 +0100 Subject: [PATCH] REPO-4919 - LibreOffice 6.3.5 (#201) * REPO-4919 - LibreOffice 6.3.5 * REPO-4919 - updated LO version in alfresco-transform-core-aio-boot Dockerfile to 6.3.5 --- .../alfresco-transform-core-aio-boot/Dockerfile | 2 +- .../alfresco-transform-libreoffice-boot/Dockerfile | 2 +- .../alfresco/transformer/executors/LibreOfficeJavaExecutor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 5d6799fb..7db8472c 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -14,7 +14,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_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt -ARG LIBREOFFICE_VERSION=6.1.6 +ARG LIBREOFFICE_VERSION=6.3.5 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 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-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index 0c67e8a6..d1c08b98 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.1-openjdk-centos-7-72b88c6f1f4c -ARG LIBREOFFICE_VERSION=6.1.6 +ARG LIBREOFFICE_VERSION=6.3.5 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 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-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index 38ba646a..345f8d10 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java @@ -53,7 +53,7 @@ public class LibreOfficeJavaExecutor implements JavaExecutor private static final Logger logger = LoggerFactory.getLogger(LibreOfficeJavaExecutor.class); private static final int JODCONVERTER_TRANSFORMATION_ERROR_CODE = 3088; - private static final String OFFICE_HOME = "/opt/libreoffice6.1"; + private static final String OFFICE_HOME = "/opt/libreoffice6.3"; private JodConverter jodconverter;