Merge branch 'master' into ATS-0000_refactor_packages [skip ci]

This commit is contained in:
alandavis
2022-07-13 12:54:25 +01:00
4 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
# LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt.
FROM alfresco/alfresco-base-java:jre11-centos7-202205121725 FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
ARG LIBREOFFICE_VERSION=7.2.5 ARG LIBREOFFICE_VERSION=7.2.5

View File

@@ -1,6 +1,6 @@
# Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.
FROM alfresco/alfresco-base-java:jre11-centos7-202205121725 FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
ENV JAVA_OPTS="" ENV JAVA_OPTS=""

View File

@@ -2,7 +2,7 @@
# Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
FROM alfresco/alfresco-base-java:jre11-centos7-202205121725 FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_VERSION=12.25
ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}

View File

@@ -225,7 +225,7 @@
<dependency> <dependency>
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.15.1</version> <version>1.15.2</version>
</dependency> </dependency>
<dependency> <dependency>