From 9d413737526f26ddf4ec8f4b153a55542bab20ee Mon Sep 17 00:00:00 2001
From: kcichonczyk <88378534+kcichonczyk@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:01:53 +0100
Subject: [PATCH] [PRODSEC-7375] activemq version bump, fixing CVE-2023-46604

---
 amps/ags/rm-community/rm-community-repo/.env     | 2 +-
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env
index a7aec5de9c6..d5fe8363537 100644
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.8.1
 POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
+ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env
index a7aec5de9c6..d5fe8363537 100644
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.8.1
 POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
+ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
diff --git a/pom.xml b/pom.xml
index 8743459bba4..c8a1d972a5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
         <dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
         <dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
-        <dependency.activemq.version>5.18.2</dependency.activemq.version>
+        <dependency.activemq.version>5.18.3</dependency.activemq.version>
         <dependency.apache-compress.version>1.24.0</dependency.apache-compress.version>
         <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
diff --git a/scripts/ci/docker-compose/docker-compose-db.yaml b/scripts/ci/docker-compose/docker-compose-db.yaml
index 54d81327fa2..acdeba18585 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.18.2-jre17-rockylinux8
+    image: alfresco/alfresco-activemq:5.18.3-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 e1b90965b32..36ea0c7089f 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", "with-mtls-transform-core-aio"]
-    image: alfresco/alfresco-activemq:5.18.2-jre17-rockylinux8
+    image: alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire