From 4b6467eedb4afa0823eed8ebd15b765caf55783f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20=C5=BBurek?= <Piotr.Zurek@hyland.com>
Date: Wed, 15 Nov 2023 15:01:57 +0100
Subject: [PATCH] MNT-24065 Upgrade Active MQ (#886)

---
 engines/aio/pom.xml         |  2 +-
 engines/example/pom.xml     |  4 ++--
 engines/imagemagick/pom.xml |  4 ++--
 engines/libreoffice/pom.xml |  4 ++--
 engines/misc/pom.xml        |  4 ++--
 engines/pdfrenderer/pom.xml |  4 ++--
 engines/tika/pom.xml        |  4 ++--
 pom.xml                     | 12 +++++++++++-
 8 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml
index 9b7f4b3b0..cf8862684 100644
--- a/engines/aio/pom.xml
+++ b/engines/aio/pom.xml
@@ -240,7 +240,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/engines/example/pom.xml b/engines/example/pom.xml
index bf34427d7..f52e2766c 100644
--- a/engines/example/pom.xml
+++ b/engines/example/pom.xml
@@ -114,7 +114,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -123,7 +123,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml
index 09f65b9e7..593f89d78 100644
--- a/engines/imagemagick/pom.xml
+++ b/engines/imagemagick/pom.xml
@@ -106,7 +106,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -115,7 +115,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml
index 4ad5fa7a1..48f750c92 100644
--- a/engines/libreoffice/pom.xml
+++ b/engines/libreoffice/pom.xml
@@ -110,7 +110,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -119,7 +119,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml
index 8a806784c..ecb913feb 100644
--- a/engines/misc/pom.xml
+++ b/engines/misc/pom.xml
@@ -154,7 +154,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.16.1</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -163,7 +163,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.16.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml
index 2807a8706..795462c52 100644
--- a/engines/pdfrenderer/pom.xml
+++ b/engines/pdfrenderer/pom.xml
@@ -102,7 +102,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -111,7 +111,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml
index 06ce663bf..f9621c29f 100644
--- a/engines/tika/pom.xml
+++ b/engines/tika/pom.xml
@@ -198,7 +198,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
+                                            <name>alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
@@ -207,7 +207,7 @@
                                                     <port>61616:61616</port>
                                                 </ports>
                                                 <wait>
-                                                    <log>Apache ActiveMQ 5.17.1 .* started</log>
+                                                    <log>Apache ActiveMQ 5.17.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/pom.xml b/pom.xml
index ca3c79f69..df63c9fae 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.14</dependency.alfresco-jodconverter-core.version>
         <env.project_version>${project.version}</env.project_version>
-        <dependency.activemq.version>5.17.1</dependency.activemq.version>
+        <dependency.activemq.version>5.17.6</dependency.activemq.version>
         <dependency.jackson.version>2.15.0-rc2</dependency.jackson.version>
         <dependency.cxf.version>3.5.3</dependency.cxf.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
@@ -189,6 +189,16 @@
                 <artifactId>activemq-client</artifactId>
                 <version>${dependency.activemq.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-broker</artifactId>
+                <version>${dependency.activemq.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-openwire-legacy</artifactId>
+                <version>${dependency.activemq.version}</version>
+            </dependency>
             <!-- Google Guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>