From 81fefbafc9b376ca9881c6ef294c110579cb3e1b Mon Sep 17 00:00:00 2001
From: Pierre Villard <pierre.villard.fr@gmail.com>
Date: Sat, 8 Apr 2023 20:15:27 +0300
Subject: [PATCH] NIFI-11420 Upgraded ActiveMQ from 5.15.15 to 5.18.0

This closes #7151

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 minifi/pom.xml                                  | 11 -----------
 .../nifi-jms-bundle/nifi-jms-processors/pom.xml | 17 ++++++++---------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/minifi/pom.xml b/minifi/pom.xml
index 2088c5f398..163917a008 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -754,17 +754,6 @@ limitations under the License.
                 <artifactId>javax.jms-api</artifactId>
                 <version>2.0.1</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-client</artifactId>
-                <version>5.15.15</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-broker</artifactId>
-                <version>5.15.15</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-common</artifactId>
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index b522cf4b8c..97012fc162 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -69,20 +69,19 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-client</artifactId>
-            <version>5.15.15</version>
-            <exclusions>
-                <!-- -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>5.18.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>5.15.15</version>
+            <version>5.18.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>