From e21e7099647d8552243cd5ca9c7a7738fd7900a1 Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Mon, 25 Jul 2022 15:37:07 +0200
Subject: [PATCH 1/2] ACS-3307 Upgrade activemq to 5.17.1

---
 .../alfresco-transform-core-aio-boot/pom.xml                  | 2 +-
 .../alfresco-transform-imagemagick-boot/pom.xml               | 2 +-
 .../alfresco-transform-libreoffice-boot/pom.xml               | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml  | 2 +-
 .../alfresco-transform-pdf-renderer-boot/pom.xml              | 2 +-
 alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml  | 4 ++--
 pom.xml                                                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
index 65d30754..02234fd8 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
@@ -133,7 +133,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index f3628f57..78fd0ce1 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -108,7 +108,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index 12bc18aa..4955db93 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -116,7 +116,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index c51d2b37..088a1065 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -104,7 +104,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
index 9fb05667..bb6befb5 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
@@ -104,7 +104,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
index 575e538f..e6d90968 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
@@ -188,7 +188,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -197,7 +197,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/pom.xml b/pom.xml
index 049a3333..fdc0736f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
         <dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version>
         <env.project_version>${project.version}</env.project_version>
-        <dependency.activemq.version>5.16.4</dependency.activemq.version>
+        <dependency.activemq.version>5.17.1</dependency.activemq.version>
         <dependency.jackson.version>2.13.3</dependency.jackson.version>
         <dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
         <dependency.junit.version>4.13.2</dependency.junit.version>

From df4057ad5910d761c0aa7fc3a2457291ba32c152 Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Wed, 27 Jul 2022 13:53:09 +0200
Subject: [PATCH 2/2] ACS-3307 Upgrade activemq to 5.17.1

---
 .../alfresco-transform-imagemagick-boot/pom.xml                 | 2 +-
 .../alfresco-transform-libreoffice-boot/pom.xml                 | 2 +-
 alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml    | 2 +-
 .../alfresco-transform-pdf-renderer-boot/pom.xml                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
index 78fd0ce1..287aca6b 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
@@ -117,7 +117,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
index 4955db93..b9ae2a86 100644
--- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
+++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
@@ -125,7 +125,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
index 088a1065..e0822839 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
@@ -113,7 +113,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
index bb6befb5..9694599e 100644
--- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
+++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
@@ -113,7 +113,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>