From afe31b73e3533d054183ca62640a455552bcddb4 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 17 Jul 2019 12:57:57 +0100 Subject: [PATCH] MNT-20337/REPO-4534/ATS-484 LibreOffice 6.1.6 --- README.md | 2 +- alfresco-docker-libreoffice/Dockerfile | 6 +++--- .../transformer/executors/LibreOfficeJavaExecutor.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4b129d7c..e467b0da 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Contains the common transformer (T-Engine) code, plus a few actual implementatio The project can be built by running the Maven command: ```bash -mvn clean install -Plocal +mvn clean install -DskipTests -Plocal ``` > The `local` Maven profile builds local Docker images for each T-Engine. diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index 4aa2936c..d980033e 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -4,7 +4,7 @@ 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_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/6.1.6/libreoffice-dist-6.1.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 ENV JAVA_OPTS="" @@ -18,8 +18,8 @@ COPY target/alfresco-docker-libreoffice-${env.project_version}.jar libreoffice-d RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \ yum install -y cairo cups-libs libSM && \ - test -f libreoffice-dist-5.4.6-linux.gz && \ - ln -s libreoffice-dist-5.4.6-linux.gz libreoffice-dist-linux.gz || \ + test -f libreoffice-dist-6.1.6-linux.gz && \ + ln -s libreoffice-dist-6.1.6-linux.gz libreoffice-dist-linux.gz || \ curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \ curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \ tar xzf libreoffice-dist-linux.gz && \ diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index 65279440..77469bd3 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java +++ b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java @@ -57,7 +57,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/libreoffice5.4"; + private static final String OFFICE_HOME = "/opt/libreoffice6.1"; private JodConverter jodconverter;