diff --git a/_ci/cache_artifacts.sh b/_ci/cache_artifacts.sh index 2c0f9abd..9870752c 100644 --- a/_ci/cache_artifacts.sh +++ b/_ci/cache_artifacts.sh @@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" -LIBREOFFICE_VERSION=7.0.6 +LIBREOFFICE_VERSION=7.2.5 # Cache the LibreOffice distribution, as it is takes a long time to download and it can cause the # build to fail (no output for more than 10 minutes) 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 f542798a..1d8e4446 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-centos7.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -ARG LIBREOFFICE_VERSION=7.0.6 +ARG LIBREOFFICE_VERSION=7.2.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 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 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 da6e68a3..a57aa716 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 @@ -6,7 +6,7 @@ transform: pdfrenderer: exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer} libreoffice: - path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0} + path: ${LIBREOFFICE_HOME:/opt/libreoffice7.2} 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 1820ad8f..9641a6a6 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:jre11-centos7-202203071429 -ARG LIBREOFFICE_VERSION=7.0.6 +ARG LIBREOFFICE_VERSION=7.2.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 JAVA_OPTS="" 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 53d01728..645e2371 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 @@ -6,7 +6,7 @@ transform: config: location: classpath:libreoffice_engine_config.json libreoffice: - path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0} + path: ${LIBREOFFICE_HOME:/opt/libreoffice7.2} maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} timeout: ${LIBREOFFICE_TIMEOUT:1200000} portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100} diff --git a/docs/external-engine-configuration.md b/docs/external-engine-configuration.md index 79605968..33cde1e1 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/libreoffice7.0 | +| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice7.2 | | 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/libreoffice7.0 | +| LIBREOFFICE_HOME | Path to LibreOffice_Home. | /opt/libreoffice7.2 | | 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 5da120f6..e278e3fb 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,7 @@ /usr/bin/convert /usr/lib64/ImageMagick-7.0.10/lib /usr/lib64/ImageMagick-7.0.10 - /opt/libreoffice7.0 + /opt/libreoffice7.2 200 1200000 8100