ARIES-2160 - Simple MBeanServer based on the platform implementation

Use the new MBeanServer Platform bundle in the ITs
apache · Dec 16, 2024 · c43e03e · c43e03e
1 parent 961c9ff
commit c43e03e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 45 deletions.
diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
@@ -76,6 +76,11 @@
             <artifactId>org.apache.aries.jmx.core.whiteboard</artifactId>
             <version>1.1.7-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.mbeanserver-platform</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>

diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
@@ -40,11 +40,9 @@
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
 
-import org.apache.aries.jmx.test.MbeanServerActivator;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
@@ -87,17 +85,10 @@ protected Option jmxRuntime() {
 				mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api").versionAsInProject(),
 				mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard").versionAsInProject(),
 				mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
-				mbeanServerBundle()
+				mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.mbeanserver-platform").versionAsInProject()
 				);
 	}
 
-	protected Option mbeanServerBundle() {
-		return provision(bundle()
-		        .add(MbeanServerActivator.class)
-		        .set(Constants.BUNDLE_ACTIVATOR, MbeanServerActivator.class.getName())
-		        .build(withBnd()));
-	}
-
 	protected Option bundlea() {
 		return provision(bundle()
 		        .add(org.apache.aries.jmx.test.bundlea.Activator.class)

diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java