diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java index 800cbd8ab9f..e5307a950ae 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java @@ -775,7 +775,7 @@ static void registerAll() { .validateAndRegister(); /*[IF CRAC_SUPPORT]*/ - create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance()) + create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance()) .addInterface(jdk.crac.management.CRaCMXBean.class) .validateAndRegister(); /*[ENDIF] CRAC_SUPPORT */ diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java index 53002fd2578..5d5511077e7 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java @@ -112,7 +112,7 @@ public final class PlatformMBeanProvider extends sun.management.spi.PlatformMBea } /*[IF CRAC_SUPPORT]*/ - ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$ + ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$ .addInterface(jdk.crac.management.CRaCMXBean.class) .register(allComponents); /*[ENDIF] CRAC_SUPPORT */ diff --git a/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java b/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java index d3f8d672cc8..f64c4c9b808 100644 --- a/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java +++ b/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java @@ -23,6 +23,7 @@ package jdk.crac.management; import java.lang.management.PlatformManagedObject; +import jdk.crac.management.internal.CRaCMXBeanImpl; /** * A management interface of the CRaC functionality in the Java virtual machine. diff --git a/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBeanImpl.java b/jcl/src/jdk.management/share/classes/jdk/crac/management/internal/CRaCMXBeanImpl.java similarity index 96% rename from jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBeanImpl.java rename to jcl/src/jdk.management/share/classes/jdk/crac/management/internal/CRaCMXBeanImpl.java index 5addf07ec2a..9a9179f267b 100644 --- a/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/jdk/crac/management/internal/CRaCMXBeanImpl.java @@ -20,11 +20,12 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 */ -package jdk.crac.management; +package jdk.crac.management.internal; import java.util.concurrent.TimeUnit; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import jdk.crac.management.CRaCMXBean; import openj9.internal.criu.InternalCRIUSupport; /** diff --git a/jcl/src/jdk.management/share/classes/module-info.java.extra b/jcl/src/jdk.management/share/classes/module-info.java.extra index 31f6fd97c31..020a6a82ec5 100644 --- a/jcl/src/jdk.management/share/classes/module-info.java.extra +++ b/jcl/src/jdk.management/share/classes/module-info.java.extra @@ -22,6 +22,7 @@ */ exports com.ibm.lang.management; -exports openj9.lang.management; exports com.ibm.virtualization.management; +exports jdk.crac.management; +exports openj9.lang.management; provides sun.management.spi.PlatformMBeanProvider with com.ibm.lang.management.internal.PlatformMBeanProvider;