diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index c88c7e68..9a57c0aa 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -12,8 +12,8 @@ ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} ARG EXIFTOOL_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/exiftool/image-exiftool/${EXIFTOOL_VERSION}/image-exiftool-${EXIFTOOL_VERSION}.tgz ARG IMAGEMAGICK_VERSION=7.1.0-16 -ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-rockylinux8.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-rockylinux8.rpm +ENV IMAGEMAGICK_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-${IMAGEMAGICK_VERSION}.x86_64.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-libs-${IMAGEMAGICK_VERSION}.x86_64.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ARG LIBREOFFICE_VERSION=7.2.5 @@ -35,6 +35,7 @@ COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ + rpm -e --nodeps libgs && \ yum install -y cairo cups-libs libSM libGLU && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml index 7936b1fe..4be91387 100644 --- a/engines/aio/pom.xml +++ b/engines/aio/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/base/pom.xml b/engines/base/pom.xml index b2832e13..d44553b2 100644 --- a/engines/base/pom.xml +++ b/engines/base/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/example/pom.xml b/engines/example/pom.xml index 4f77032f..2ea5f358 100644 --- a/engines/example/pom.xml +++ b/engines/example/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/imagemagick/Dockerfile b/engines/imagemagick/Dockerfile index 796708d4..09209531 100644 --- a/engines/imagemagick/Dockerfile +++ b/engines/imagemagick/Dockerfile @@ -4,10 +4,11 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835 +# For other ImageMagick versions please look at https://github.com/Alfresco/imagemagick-build tags ARG IMAGEMAGICK_VERSION=7.1.0-16 -ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-rockylinux8.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-rockylinux8.rpm +ENV IMAGEMAGICK_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-${IMAGEMAGICK_VERSION}.x86_64.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-libs-${IMAGEMAGICK_VERSION}.x86_64.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ENV JAVA_OPTS="" @@ -22,7 +23,8 @@ COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ - yum clean all + yum clean all && \ + rpm -e --nodeps libgs ADD target/generated-resources/licenses /licenses ADD target/generated-resources/licenses.xml /licenses/ diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml index 689e47d7..0b2ade57 100644 --- a/engines/imagemagick/pom.xml +++ b/engines/imagemagick/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/imagemagick/rockylinux8/README.md b/engines/imagemagick/rockylinux8/README.md deleted file mode 100644 index a351ddcf..00000000 --- a/engines/imagemagick/rockylinux8/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# How to create ImageMagick RPM packages for Rocky Linux 8 -1. `cd` to this directory -2. Use Rocky Linux base image and execute the [build-rpms.sh](scripts/build-rpms.sh) script - -```bash -docker run -it --rm -v `pwd`:/opt/alfresco/imagemagick alfresco/alfresco-base-java:jre11-rockylinux8-202207110835@sha256:01810e3e77d188f48ad6549b63cf1d34ce7d61ba9ca3fb03f0c24cc8f5c73429 /bin/bash /opt/alfresco/imagemagick/scripts/build-rpms.sh -``` - -> **Note:** If you want to know more details or need to upgrade the ImageMagick version please check the comments in the [build-rpms.sh](scripts/build-rpms.sh) file - -3. RPMs will be created in the `rpms` directory - -```bash -bash-3.2$ ls rpms -ImageMagick-7.0.10-59.x86_64.rockylinux8.rpm ImageMagick-libs-7.0.10-59.x86_64.rockylinux8.rpm -``` \ No newline at end of file diff --git a/engines/imagemagick/rockylinux8/scripts/build-rpms.sh b/engines/imagemagick/rockylinux8/scripts/build-rpms.sh deleted file mode 100644 index 2c052013..00000000 --- a/engines/imagemagick/rockylinux8/scripts/build-rpms.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -set -e - -IMAGEMAGICK_VERSION=7.1.0-16 - -#Installing SRPM package. For future proof builds the SRPM package is uploaded to Alfresco's nexus repository. -rpm -i https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/$IMAGEMAGICK_VERSION/imagemagick-distribution-$IMAGEMAGICK_VERSION-src.rpm - -#liblqr is not available on Rocky Linux 8. Removing it from the spec. -sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec - -#We need some libraries from the epel repo. -yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - -#We are going to compile the imagemagick so we need development tools. -yum -y group install "Development Tools" - -#We are building the imagemagick from the official SRPM package. It allows us to be as compatible with the official RPM packages as possible. -# Installing direct build time dependencies (excluding liblqr-1-devel) -yum install -y dnf-plugins-core -dnf config-manager --set-enabled powertools - -yum -y install bzip2-devel freetype-devel libjpeg-devel libpng-devel libtiff-devel giflib-devel \ - zlib-devel perl-devel perl-generators djvulibre-devel libwmf-devel jasper-devel \ - libtool-ltdl-devel libX11-devel libXext-devel libXt-devel lcms2-devel libxml2-devel librsvg2-devel \ - fftw-devel ilmbase-devel OpenEXR-devel libwebp-devel jbigkit-devel openjpeg2-devel graphviz-devel \ - libraqm-devel LibRaw-devel -# Installing indirect dependencies -# ImageMagick tests requite non default fonts -yum groupinstall -y "fonts" -# ImageMagick spec requires ldconfig_scriptlets macro -yum -y install epel-rpm-macros - -#Building binary RPM packages -rpmbuild -bb ~/rpmbuild/SPECS/ImageMagick.spec - -#Copy RPMs to well known directory. -mkdir -p /opt/alfresco/imagemagick/rpms -cp ~/rpmbuild/RPMS/x86_64/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.rockylinux8.rpm -cp ~/rpmbuild/RPMS/x86_64/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.rockylinux8.rpm \ No newline at end of file diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml index bbc1f53a..c1cda73a 100644 --- a/engines/libreoffice/pom.xml +++ b/engines/libreoffice/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml index 1d173ad9..c5af39b6 100644 --- a/engines/misc/pom.xml +++ b/engines/misc/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml index e5ecbdd7..702fe82f 100644 --- a/engines/pdfrenderer/pom.xml +++ b/engines/pdfrenderer/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml index 3e651b2b..f55b2cb3 100644 --- a/engines/tika/pom.xml +++ b/engines/tika/pom.xml @@ -7,8 +7,8 @@ org.alfresco alfresco-transform-core - ../../pom.xml 3.0.0-HXP-A6-SNAPSHOT + ../../pom.xml @@ -82,7 +82,7 @@ joda-time joda-time - 2.10.14 + 2.11.0 diff --git a/pom.xml b/pom.xml index 5f5e4ce5..59c4d245 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.2 + 2.7.3 @@ -233,7 +233,7 @@ org.jsoup jsoup - 1.15.2 + 1.15.3 @@ -251,6 +251,11 @@ httpmime 4.5.13 + + org.yaml + snakeyaml + 1.31 +