From 1ad93022497349472f51d215bbe3778489a8260d Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 12:50:01 +0200
Subject: [PATCH 1/6] [ACS-3350] Upgrade to Java 17

---
 .travis.yml                                                     | 2 +-
 .../alfresco-transform-core-aio-boot/Dockerfile                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b56d37d1..dd243fdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: java
-jdk: openjdk11
+jdk: openjdk17
 os: linux
 dist: focal
 
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 43798b5c..cc4ed7b2 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -5,7 +5,7 @@
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre11-centos7-202205121725
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}

From 8b6f74d5f54ce9e67052142c4e9617c1cbcd6001 Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 12:50:28 +0200
Subject: [PATCH 2/6] [ACS-3350] Upgrade to Java 17

---
 .../alfresco-transform-imagemagick-boot/Dockerfile              | 2 +-
 .../alfresco-transform-libreoffice-boot/Dockerfile              | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile | 2 +-
 .../alfresco-transform-pdf-renderer-boot/Dockerfile             | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
index 1175769c..49553dbd 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 
-FROM alfresco/alfresco-base-java:jre11-centos7-202205121725
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 ARG IMAGEMAGICK_VERSION=7.1.0-16
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
index ca5a8f42..0b352b23 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # 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-202207110835
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 ARG LIBREOFFICE_VERSION=7.2.5
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
index 8e7432da..af1a87b6 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
@@ -1,6 +1,6 @@
 # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.
 
-FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 ENV JAVA_OPTS=""
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
index 601172b5..82415f0c 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre11-centos7-202205121725
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 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 JAVA_OPTS=""
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
index 8fb572b5..6339d1eb 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
 
-FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
+FROM alfresco/alfresco-base-java:jre17-rockylinux8
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}

From 064c88815d3b4f19e49a31484044769d14dcc77d Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 12:52:14 +0200
Subject: [PATCH 3/6] [ACS-3350] add branch to Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dd243fdf..93900c09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ branches:
     - /^HF\/.+$/
     - /^ATS-.*$/
     - /^ACS-.*$/
+    - feature/ACS-3350_upgrade-to-Java-17
 
 stages:
   - name: Veracode Scan

From 73adcd8e775a2c29c7717370a5bf8097c4ba9784 Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 14:12:59 +0200
Subject: [PATCH 4/6] [ACS-3350] change rockylinux8 to centos7

---
 .../alfresco-transform-core-aio-boot/Dockerfile                 | 2 +-
 .../alfresco-transform-imagemagick-boot/Dockerfile              | 2 +-
 .../alfresco-transform-libreoffice-boot/Dockerfile              | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile | 2 +-
 .../alfresco-transform-pdf-renderer-boot/Dockerfile             | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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 cc4ed7b2..111d9b2b 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -5,7 +5,7 @@
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
index 49553dbd..8536ed72 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 ARG IMAGEMAGICK_VERSION=7.1.0-16
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
index 0b352b23..488d0641 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # 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:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 ARG LIBREOFFICE_VERSION=7.2.5
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
index af1a87b6..e5cb60f1 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
@@ -1,6 +1,6 @@
 # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 ENV JAVA_OPTS=""
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
index 82415f0c..3501941d 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 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 JAVA_OPTS=""
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
index 6339d1eb..aa848860 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-centos7
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}

From 0442dab64277d14e7147500d6485b6b6a2ba4aa5 Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 14:41:37 +0200
Subject: [PATCH 5/6] [ACS-3350] clean up travis file

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 93900c09..dd243fdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ branches:
     - /^HF\/.+$/
     - /^ATS-.*$/
     - /^ACS-.*$/
-    - feature/ACS-3350_upgrade-to-Java-17
 
 stages:
   - name: Veracode Scan

From abee6cd90356fe15019ed04886f1e0e370a6c828 Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <Aleksandra.Onych@hyland.com>
Date: Mon, 1 Aug 2022 14:55:26 +0200
Subject: [PATCH 6/6] [ACS-3350] change Dockerfile jre version

---
 .../alfresco-transform-core-aio-boot/Dockerfile                 | 2 +-
 .../alfresco-transform-imagemagick-boot/Dockerfile              | 2 +-
 .../alfresco-transform-libreoffice-boot/Dockerfile              | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile | 2 +-
 .../alfresco-transform-pdf-renderer-boot/Dockerfile             | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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 111d9b2b..a5d1380e 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -5,7 +5,7 @@
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
index 8536ed72..252bfdd8 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 
-FROM alfresco/alfresco-base-java:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 ARG IMAGEMAGICK_VERSION=7.1.0-16
 
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
index 488d0641..bdb22c0a 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # 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:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 ARG LIBREOFFICE_VERSION=7.2.5
 
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
index e5cb60f1..16959395 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile
@@ -1,6 +1,6 @@
 # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.
 
-FROM alfresco/alfresco-base-java:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 ENV JAVA_OPTS=""
 
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
index 3501941d..dfea4621 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 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 JAVA_OPTS=""
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
index aa848860..50abe2fa 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
@@ -2,7 +2,7 @@
 
 # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
 
-FROM alfresco/alfresco-base-java:jre17-centos7
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 
 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}