mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-07-31 17:38:33 +00:00
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
This commit is contained in:
committed by
GitHub
parent
4b990fb1f4
commit
0aa6253150
@@ -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_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
|
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 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
|
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-epel-dep.rpm && \
|
||||||
yum localinstall -y imagemagick-distribution-*linux.rpm && \
|
yum localinstall -y imagemagick-distribution-*linux.rpm && \
|
||||||
rm -f imagemagick-distribution-*.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 && \
|
test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
|
||||||
ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-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 && \
|
curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \
|
||||||
|
@@ -5,7 +5,7 @@ transform:
|
|||||||
pdfrenderer:
|
pdfrenderer:
|
||||||
exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer}
|
exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer}
|
||||||
libreoffice:
|
libreoffice:
|
||||||
path: ${LIBREOFFICE_HOME:/opt/libreoffice6.3}
|
path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0}
|
||||||
maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200}
|
maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200}
|
||||||
timeout: ${LIBREOFFICE_TIMEOUT:1200000}
|
timeout: ${LIBREOFFICE_TIMEOUT:1200000}
|
||||||
portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100}
|
portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100}
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
FROM alfresco/alfresco-base-java:11.0.11-openjdk-centos-8@sha256:7d4177162080b8f18b3c7b9f59fb86a3c74c8e82aa329ab4e3878d660bc16195
|
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 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=""
|
ENV JAVA_OPTS=""
|
||||||
@@ -18,7 +18,7 @@ ARG USERID=33003
|
|||||||
COPY target/${env.project_artifactId}-${env.project_version}.jar libreoffice-dist-*-linux.gz /
|
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 && \
|
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 && \
|
test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
|
||||||
ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-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 && \
|
curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \
|
||||||
|
@@ -5,7 +5,7 @@ transform:
|
|||||||
config:
|
config:
|
||||||
location: classpath:libreoffice_engine_config.json
|
location: classpath:libreoffice_engine_config.json
|
||||||
libreoffice:
|
libreoffice:
|
||||||
path: ${LIBREOFFICE_HOME:/opt/libreoffice6.3}
|
path: ${LIBREOFFICE_HOME:/opt/libreoffice7.0}
|
||||||
maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200}
|
maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200}
|
||||||
timeout: ${LIBREOFFICE_TIMEOUT:1200000}
|
timeout: ${LIBREOFFICE_TIMEOUT:1200000}
|
||||||
portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100}
|
portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100}
|
||||||
|
@@ -145,7 +145,6 @@ public class LibreOfficeTransformationIT
|
|||||||
testFile(MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO ,"xltm" ,"quick.xltm"),
|
testFile(MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO ,"xltm" ,"quick.xltm"),
|
||||||
testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW ,"ppsx" ,"quick.ppsx"),
|
testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW ,"ppsx" ,"quick.ppsx"),
|
||||||
testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO ,"ppsm" ,"quick.ppsm"),
|
testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO ,"ppsm" ,"quick.ppsm"),
|
||||||
testFile(MIMETYPE_OUTLOOK_MSG ,"msg" ,"quick.msg"),
|
|
||||||
testFile(MIMETYPE_DITA ,"dita" ,"quick.dita"),
|
testFile(MIMETYPE_DITA ,"dita" ,"quick.dita"),
|
||||||
testFile(MIMETYPE_TEXT_PLAIN ,"txt" ,"quick.txt"),
|
testFile(MIMETYPE_TEXT_PLAIN ,"txt" ,"quick.txt"),
|
||||||
testFile(MIMETYPE_STC ,"stc" ,"quick.stc"),
|
testFile(MIMETYPE_STC ,"stc" ,"quick.stc"),
|
||||||
@@ -185,16 +184,14 @@ public class LibreOfficeTransformationIT
|
|||||||
allTargets("quick.xml", pdfTarget),
|
allTargets("quick.xml", pdfTarget),
|
||||||
allTargets("quick.xltm", pdfTarget),
|
allTargets("quick.xltm", pdfTarget),
|
||||||
allTargets("quick.dita", pdfTarget),
|
allTargets("quick.dita", pdfTarget),
|
||||||
allTargets("quick.msg", pdfTarget),
|
|
||||||
allTargets("quick.ppsm", pdfTarget),
|
allTargets("quick.ppsm", pdfTarget),
|
||||||
allTargets("quick.ppsx", pdfTarget),
|
allTargets("quick.ppsx", pdfTarget),
|
||||||
allTargets("quick.stc", pdfTarget),
|
allTargets("quick.stc", pdfTarget),
|
||||||
allTargets("quick.sti", pdfTarget),
|
allTargets("quick.sti", pdfTarget),
|
||||||
allTargets("quick.stw", pdfTarget),
|
allTargets("quick.stw", pdfTarget),
|
||||||
allTargets("quick.sxc", pdfTarget),
|
allTargets("quick.sxc", pdfTarget),
|
||||||
allTargets("quick.sxi", pdfTarget),
|
allTargets("quick.sxi", pdfTarget)
|
||||||
|
|
||||||
allTargets("quick.msg", txtTarget)
|
|
||||||
)
|
)
|
||||||
.flatMap(identity());
|
.flatMap(identity());
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@@ -231,8 +231,6 @@
|
|||||||
|
|
||||||
{"sourceMediaType": "application/vnd.ms-powerpoint.slideshow.macroenabled.12", "priority": 110, "targetMediaType": "application/pdf" },
|
{"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/dita+xml", "priority": 110, "targetMediaType": "application/pdf" },
|
||||||
|
|
||||||
{"sourceMediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "targetMediaType": "text/html" },
|
{"sourceMediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "targetMediaType": "text/html" },
|
||||||
|
@@ -50,7 +50,7 @@ The following externalized T-engines properties are available:
|
|||||||
| ACTIVEMQ_PASSWORD | ActiveMQ Password. | admin |
|
| ACTIVEMQ_PASSWORD | ActiveMQ Password. | admin |
|
||||||
| FILE_STORE_URL | T-Engine Port. | http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file |
|
| 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 |
|
| 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_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_TIMEOUT | Timeout value for LibreOffice `execution timeout`, `queue timeout` and `connection timeout`. | 1200000 |
|
||||||
| LIBREOFFICE_PORT_NUMBERS | LibreOffice port. | 8100 |
|
| 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 |
|
| 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 |
|
| 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 |
|
| 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_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_TIMEOUT | Timeout value for LibreOffice `execution timeout`, `queue timeout` and `connection timeout`. | 1200000 |
|
||||||
| LIBREOFFICE_PORT_NUMBERS | LibreOffice port. | 8100 |
|
| LIBREOFFICE_PORT_NUMBERS | LibreOffice port. | 8100 |
|
||||||
|
2
pom.xml
2
pom.xml
@@ -356,7 +356,7 @@
|
|||||||
<IMAGEMAGICK_EXE>/usr/bin/convert</IMAGEMAGICK_EXE>
|
<IMAGEMAGICK_EXE>/usr/bin/convert</IMAGEMAGICK_EXE>
|
||||||
<IMAGEMAGICK_DYN>/usr/lib64/ImageMagick-7.0.10/lib</IMAGEMAGICK_DYN>
|
<IMAGEMAGICK_DYN>/usr/lib64/ImageMagick-7.0.10/lib</IMAGEMAGICK_DYN>
|
||||||
<IMAGEMAGICK_ROOT>/usr/lib64/ImageMagick-7.0.10</IMAGEMAGICK_ROOT>
|
<IMAGEMAGICK_ROOT>/usr/lib64/ImageMagick-7.0.10</IMAGEMAGICK_ROOT>
|
||||||
<LIBREOFFICE_HOME>/opt/libreoffice6.3</LIBREOFFICE_HOME>
|
<LIBREOFFICE_HOME>/opt/libreoffice7.0</LIBREOFFICE_HOME>
|
||||||
<LIBREOFFICE_MAX_TASKS_PER_PROCESS>200</LIBREOFFICE_MAX_TASKS_PER_PROCESS>
|
<LIBREOFFICE_MAX_TASKS_PER_PROCESS>200</LIBREOFFICE_MAX_TASKS_PER_PROCESS>
|
||||||
<LIBREOFFICE_TIMEOUT>1200000</LIBREOFFICE_TIMEOUT>
|
<LIBREOFFICE_TIMEOUT>1200000</LIBREOFFICE_TIMEOUT>
|
||||||
<LIBREOFFICE_PORT_NUMBERS>8100</LIBREOFFICE_PORT_NUMBERS>
|
<LIBREOFFICE_PORT_NUMBERS>8100</LIBREOFFICE_PORT_NUMBERS>
|
||||||
|
Reference in New Issue
Block a user