From ebd97bb91a362dd6368dc65550c9e37140767355 Mon Sep 17 00:00:00 2001
From: Gary Tully <gary.tully@gmail.com>
Date: Wed, 18 Sep 2024 20:06:17 +0100
Subject: [PATCH] ARTEMIS-5051 disable jolokia detectors in console war

---
 .../src/main/resources/META-INF/detectors                | 9 +++++++++
 pom.xml                                                  | 1 +
 .../tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java   | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 artemis-hawtio/artemis-console/src/main/resources/META-INF/detectors

diff --git a/artemis-hawtio/artemis-console/src/main/resources/META-INF/detectors b/artemis-hawtio/artemis-console/src/main/resources/META-INF/detectors
new file mode 100644
index 0000000000..8cecfccad6
--- /dev/null
+++ b/artemis-hawtio/artemis-console/src/main/resources/META-INF/detectors
@@ -0,0 +1,9 @@
+!org.jolokia.detector.GeronimoDetector
+!org.jolokia.detector.JBossDetector
+!org.jolokia.detector.ActiveMQDetector
+!org.jolokia.detector.TomcatDetector
+!org.jolokia.detector.JettyDetector
+!org.jolokia.detector.GlassfishDetector
+!org.jolokia.detector.WeblogicDetector
+!org.jolokia.detector.WebsphereDetector
+!org.jolokia.detector.LightstreamerDetector
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3387769db2..fbf25cf44e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,6 +939,7 @@
                      <exclude>**/target/</exclude>
                      <exclude>**/META-INF/services/*</exclude>
                      <exclude>**/META-INF/MANIFEST.MF</exclude>
+                     <exclude>**/META-INF/detectors</exclude>
                      <exclude>**/*.iml</exclude>
                      <exclude>**/*.jceks</exclude>
                      <exclude>**/*.jks</exclude>
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
index 773d7b3afd..5198bd6106 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
@@ -66,7 +66,7 @@ public class JmxRBACBrokerSecurityTest extends SmokeTestBase {
 
       {
          HelperCreate cliCreateServer = new HelperCreate();
-         cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setNoWeb(true).setArtemisInstance(server0Location).
+         cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setNoWeb(false).setArtemisInstance(server0Location).
             setConfiguration("./src/main/resources/servers/jmx-rbac-broker-security").setArgs("--java-options", "-Djava.rmi.server.hostname=localhost -Djavax.management.builder.initial=org.apache.activemq.artemis.core.server.management.ArtemisRbacMBeanServerBuilder");
          cliCreateServer.createServer();
       }