ARTEMIS-5051 disable jolokia detectors in console war

apache · Sep 20, 2024 · ebd97bb · ebd97bb
1 parent 7882c92
commit ebd97bb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/artemis-hawtio/artemis-console/src/main/resources/META-INF/detectors 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
diff --git 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/.../test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java b/.../test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
@@ -66,7 +66,7 @@ public static void createServers() throws Exception {
 
       {
          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();
       }