From 8104c92e8cebf21e1163c4ee3f345abb2e58e858 Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Thu, 16 Nov 2023 11:36:05 +0100
Subject: [PATCH] MNT-24063 Bump ActiveMQ to 5.16.7 (#2308)

---
 amps/ags/rm-community/rm-community-repo/.env     | 2 +-
 amps/ags/rm-community/rm-community-repo/pom.xml  | 4 ++--
 packaging/tests/environment/.env                 | 2 +-
 pom.xml                                          | 2 +-
 scripts/ci/docker-compose/docker-compose-db.yaml | 2 +-
 scripts/ci/docker-compose/docker-compose.yaml    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env
index 40fff0bfd10..28c24f4b5b0 100644
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.5.7
 SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
-ACTIVEMQ_TAG=5.16.1
+ACTIVEMQ_TAG=5.16.7-jre17-rockylinux8
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index aa3763f94a2..c76d1728efe 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -428,7 +428,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
@@ -499,7 +499,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env
index 40fff0bfd10..28c24f4b5b0 100644
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.5.7
 SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
-ACTIVEMQ_TAG=5.16.1
+ACTIVEMQ_TAG=5.16.7-jre17-rockylinux8
diff --git a/pom.xml b/pom.xml
index 66bf613c771..7414b20f382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
         <dependency.keycloak.version>15.0.2</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.4.3.Final</dependency.jboss.logging.version>
         <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
-        <dependency.activemq.version>5.16.1</dependency.activemq.version>
+        <dependency.activemq.version>5.16.7</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.1.1</dependency.awaitility.version>
diff --git a/scripts/ci/docker-compose/docker-compose-db.yaml b/scripts/ci/docker-compose/docker-compose-db.yaml
index fae06eade04..d150dfee628 100644
--- a/scripts/ci/docker-compose/docker-compose-db.yaml
+++ b/scripts/ci/docker-compose/docker-compose-db.yaml
@@ -34,7 +34,7 @@ services:
     ports:
       - "3307:3306"
   activemq:
-    image: alfresco/alfresco-activemq:5.16.1
+    image: alfresco/alfresco-activemq:5.16.7-jre17-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire
\ No newline at end of file
diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml
index dc72d49ef9d..2996d197508 100644
--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       - "5433:5432"
   activemq:
     profiles: ["default", "with-transform-core-aio", "activemq"]
-    image: alfresco/alfresco-activemq:5.16.1
+    image: alfresco/alfresco-activemq:5.16.7-jre17-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire
\ No newline at end of file