chore(jmc-core): update to JMC version 9.0.0 (#362)

cryostatio · Apr 30, 2024 · 34c5e0e · 34c5e0e
1 parent 7211daa
commit 34c5e0e
Show file tree

Hide file tree

Showing 253 changed files with 117 additions and 28,751 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,6 +44,15 @@
   </developer>
 </developers>
 
+<repositories>
+  <repository>
+    <id>jmc-libs</id>
+    <name>Adoptium JDK Mission Control Core Libraries</name>
+    <url>https://adoptium.jfrog.io/artifactory/jmc-libs</url>
+    <layout>default</layout>
+  </repository>
+</repositories>
+
 <distributionManagement>
   <repository>
     <id>github</id>
@@ -63,7 +72,7 @@
   <java.version>11</java.version>
   <maven.compiler.target>${java.version}</maven.compiler.target>
   <maven.compiler.source>${java.version}</maven.compiler.source>
-  <jmc.version>8.2.0</jmc.version>
+  <org.openjdk.jmc.version>9.0.0</org.openjdk.jmc.version>
 
   <io.smallrye.jandex.plugin.version>3.1.7</io.smallrye.jandex.plugin.version>
   <org.apache.maven.plugins.compiler.version>3.13.0</org.apache.maven.plugins.compiler.version>
@@ -96,27 +105,37 @@
   <dependency>
     <groupId>org.openjdk.jmc</groupId>
     <artifactId>common</artifactId>
-    <version>${jmc.version}</version>
+    <version>${org.openjdk.jmc.version}</version>
   </dependency>
   <dependency>
     <groupId>org.openjdk.jmc</groupId>
     <artifactId>flightrecorder</artifactId>
-    <version>${jmc.version}</version>
+    <version>${org.openjdk.jmc.version}</version>
+  </dependency>
+  <dependency>
+    <groupId>org.openjdk.jmc</groupId>
+    <artifactId>flightrecorder.configuration</artifactId>
+    <version>${org.openjdk.jmc.version}</version>
   </dependency>
   <dependency>
     <groupId>org.openjdk.jmc</groupId>
     <artifactId>flightrecorder.rules</artifactId>
-    <version>${jmc.version}</version>
+    <version>${org.openjdk.jmc.version}</version>
   </dependency>
   <dependency>
     <groupId>org.openjdk.jmc</groupId>
     <artifactId>flightrecorder.rules.jdk</artifactId>
-    <version>${jmc.version}</version>
+    <version>${org.openjdk.jmc.version}</version>
   </dependency>
   <dependency>
     <groupId>org.openjdk.jmc</groupId>
     <artifactId>jdp</artifactId>
-    <version>${jmc.version}</version>
+    <version>${org.openjdk.jmc.version}</version>
+  </dependency>
+  <dependency>
+    <groupId>org.openjdk.jmc</groupId>
+    <artifactId>rjmx.common</artifactId>
+    <version>${org.openjdk.jmc.version}</version>
   </dependency>
   <dependency>
     <groupId>org.apache.commons</groupId>

diff --git a/scripts/jmc-diff.sh b/scripts/jmc-diff.sh
diff --git a/scripts/jmc-embed.sh b/scripts/jmc-embed.sh
diff --git a/src/main/java/io/cryostat/core/EventOptionsBuilder.java b/src/main/java/io/cryostat/core/EventOptionsBuilder.java
@@ -27,9 +27,9 @@
 import org.openjdk.jmc.common.unit.QuantityConversionException;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeID;
-import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
-import org.openjdk.jmc.rjmx.services.jfr.IEventTypeInfo;
-import org.openjdk.jmc.rjmx.services.jfr.internal.FlightRecorderServiceV2;
+import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeInfo;
+import org.openjdk.jmc.rjmx.common.ServiceNotAvailableException;
+import org.openjdk.jmc.rjmx.common.services.jfr.internal.FlightRecorderServiceV2;
 
 import io.cryostat.core.net.JFRConnection;
 
@@ -96,7 +96,7 @@ public static class EventOptionException extends Exception {
     public static class Factory {
         public EventOptionsBuilder create(JFRConnection connection)
                 throws IOException, ServiceNotAvailableException,
-                        org.openjdk.jmc.rjmx.services.jfr.FlightRecorderException {
+                        org.openjdk.jmc.flightrecorder.configuration.FlightRecorderException {
             if (!FlightRecorderServiceV2.isAvailable(connection.getHandle())) {
                 throw new UnsupportedOperationException("Only FlightRecorder V2 is supported");
             }

diff --git a/src/main/java/io/cryostat/core/EventOptionsCustomizer.java b/src/main/java/io/cryostat/core/EventOptionsCustomizer.java
@@ -25,7 +25,7 @@
 import org.openjdk.jmc.common.unit.QuantityConversionException;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeID;
-import org.openjdk.jmc.rjmx.services.jfr.IEventTypeInfo;
+import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeInfo;
 
 import io.cryostat.core.net.JFRConnection;
 

diff --git a/src/main/java/io/cryostat/core/agent/AgentJMXHelper.java b/src/main/java/io/cryostat/core/agent/AgentJMXHelper.java
@@ -26,7 +26,7 @@
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
 
-import org.openjdk.jmc.rjmx.IConnectionHandle;
+import org.openjdk.jmc.rjmx.common.IConnectionHandle;
 
 public class AgentJMXHelper {
 

diff --git a/src/main/java/io/cryostat/core/jmc/CopyRecordingDescriptor.java b/src/main/java/io/cryostat/core/jmc/CopyRecordingDescriptor.java
@@ -20,7 +20,7 @@
 import javax.management.ObjectName;
 
 import org.openjdk.jmc.common.unit.IQuantity;
-import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor;
+import org.openjdk.jmc.flightrecorder.configuration.IRecordingDescriptor;
 
 public class CopyRecordingDescriptor implements IRecordingDescriptor {
     private final IRecordingDescriptor original;

diff --git a/src/main/java/io/cryostat/core/jmc/SecurityManager.java b/src/main/java/io/cryostat/core/jmc/SecurityManager.java
@@ -18,10 +18,10 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.openjdk.jmc.ui.common.security.ActionNotGrantedException;
-import org.openjdk.jmc.ui.common.security.FailedToSaveException;
-import org.openjdk.jmc.ui.common.security.ISecurityManager;
-import org.openjdk.jmc.ui.common.security.SecurityException;
+import org.openjdk.jmc.common.security.ActionNotGrantedException;
+import org.openjdk.jmc.common.security.FailedToSaveException;
+import org.openjdk.jmc.common.security.ISecurityManager;
+import org.openjdk.jmc.common.security.SecurityException;
 
 import io.cryostat.core.jmc.internal.Store;
 

diff --git a/src/main/java/io/cryostat/core/net/CryostatFlightRecorderService.java b/src/main/java/io/cryostat/core/net/CryostatFlightRecorderService.java
@@ -20,14 +20,14 @@
 
 import org.openjdk.jmc.common.unit.IConstrainedMap;
 import org.openjdk.jmc.common.unit.QuantityConversionException;
+import org.openjdk.jmc.flightrecorder.configuration.FlightRecorderException;
+import org.openjdk.jmc.flightrecorder.configuration.IFlightRecorderService;
+import org.openjdk.jmc.flightrecorder.configuration.IRecordingDescriptor;
+import org.openjdk.jmc.flightrecorder.configuration.events.EventConfiguration;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLModel;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
-import org.openjdk.jmc.rjmx.ConnectionException;
-import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
-import org.openjdk.jmc.rjmx.services.jfr.FlightRecorderException;
-import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService;
-import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor;
+import org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLModel;
+import org.openjdk.jmc.rjmx.common.ConnectionException;
+import org.openjdk.jmc.rjmx.common.ServiceNotAvailableException;
 
 import io.cryostat.core.EventOptionsBuilder.EventOptionException;
 import io.cryostat.core.EventOptionsBuilder.EventTypeException;

diff --git a/src/main/java/io/cryostat/core/net/JFRConnection.java b/src/main/java/io/cryostat/core/net/JFRConnection.java
@@ -22,9 +22,9 @@
 import javax.management.ReflectionException;
 import javax.management.remote.JMXServiceURL;
 
-import org.openjdk.jmc.rjmx.ConnectionException;
-import org.openjdk.jmc.rjmx.IConnectionHandle;
-import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
+import org.openjdk.jmc.rjmx.common.ConnectionException;
+import org.openjdk.jmc.rjmx.common.IConnectionHandle;
+import org.openjdk.jmc.rjmx.common.ServiceNotAvailableException;
 
 import io.cryostat.core.JvmIdentifier;
 import io.cryostat.core.sys.Clock;

diff --git a/src/main/java/io/cryostat/core/net/JFRConnectionToolkit.java b/src/main/java/io/cryostat/core/net/JFRConnectionToolkit.java
@@ -26,9 +26,9 @@
 import javax.management.MBeanServerConnection;
 import javax.management.remote.JMXServiceURL;
 
-import org.openjdk.jmc.rjmx.ConnectionDescriptorBuilder;
-import org.openjdk.jmc.rjmx.ConnectionException;
-import org.openjdk.jmc.rjmx.ConnectionToolkit;
+import org.openjdk.jmc.rjmx.common.ConnectionDescriptorBuilder;
+import org.openjdk.jmc.rjmx.common.ConnectionException;
+import org.openjdk.jmc.rjmx.common.ConnectionToolkit;
 
 import io.cryostat.core.sys.Environment;
 import io.cryostat.core.sys.FileSystem;