From df3bcf614736225b663ceddd8fa6afc120f7bc8f Mon Sep 17 00:00:00 2001
From: Sara <sara.aspery@alfresco.com>
Date: Tue, 16 May 2023 19:37:21 +0100
Subject: [PATCH] Feature/acs 5198 upgrade activemq image to jre17 (#796)

* ACS-5198 Upgrade activemq image from 5.17.1-jre11 to 5.17.4-jre17

* ACS-5198 Bump activemq image from 5.17.1 to 5.17.4

* ACS-5198 Bump log for activemq from 5.17.1 to 5.17.4

* ACS-5198 Remove minor and patch version from activemq log
---
 engines/aio/pom.xml         | 2 +-
 engines/example/pom.xml     | 4 ++--
 engines/imagemagick/pom.xml | 4 ++--
 engines/libreoffice/pom.xml | 4 ++--
 engines/pdfrenderer/pom.xml | 4 ++--
 engines/tika/pom.xml        | 4 ++--
 pom.xml                     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml
index d82da2d0..10d79822 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.4-jre17-rockylinux8</name>
                                             <run>
                                                 <hostname>activemq</hostname>
                                                 <ports>
diff --git a/engines/example/pom.xml b/engines/example/pom.xml
index 83b69a23..dfff6293 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.4-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.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml
index 4a62db14..8d358b53 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.4-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.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml
index 2be239ef..50ff9cf4 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.4-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.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml
index 7071eacc..e9a9a136 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.4-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.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml
index 083dc5c7..9af631cc 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.4-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.* started</log>
                                                     <time>20000</time>
                                                     <kill>500</kill>
                                                     <shutdown>100</shutdown>
diff --git a/pom.xml b/pom.xml
index bbbd0b7f..e506e303 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.4</dependency.activemq.version>
         <dependency.jackson.version>2.15.0</dependency.jackson.version>
         <dependency.cxf.version>4.0.1</dependency.cxf.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>