diff --git a/pom.xml b/pom.xml
index a4520d98..28a31bdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,20 @@
https://github.com/cryostatio/cryostat-agent/tree/main
+
+
+ s01.oss.sonatype.org-snapshot
+ https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+ false
+
+
+ true
+ always
+
+
+
+
io.cryostat.agent.Agent
UTF-8
@@ -77,7 +91,7 @@
2.51.1
${com.google.dagger.version}
- 2.30.3
+ 4.0.0-SNAPSHOT
2.13.0
4.5.14
@@ -168,9 +182,8 @@
io.cryostat
-
- cryostat-core
- ${io.cryostat.core.version}
+ libcryostat
+ ${io.cryostat.libcryostat.version}
org.slf4j
@@ -313,6 +326,10 @@
true
shaded
+
+ io.cryostat.libcryostat
+ ${shade.prefix}.io.cryostat.libcryostat
+
io.cryostat.core
${shade.prefix}.io.cryostat.core
@@ -446,7 +463,7 @@
- java,javax,org.openjdk.jmc,io.cryostat,
+ java,javax,io.cryostat,
diff --git a/src/main/java/io/cryostat/agent/MainModule.java b/src/main/java/io/cryostat/agent/MainModule.java
index 86779d1a..924185a1 100644
--- a/src/main/java/io/cryostat/agent/MainModule.java
+++ b/src/main/java/io/cryostat/agent/MainModule.java
@@ -52,8 +52,8 @@
import io.cryostat.agent.remote.RemoteContext;
import io.cryostat.agent.remote.RemoteModule;
import io.cryostat.agent.triggers.TriggerModule;
-import io.cryostat.core.JvmIdentifier;
-import io.cryostat.core.net.IDException;
+import io.cryostat.libcryostat.JvmIdentifier;
+import io.cryostat.libcryostat.net.IDException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/io/cryostat/agent/model/MBeanInfo.java b/src/main/java/io/cryostat/agent/model/MBeanInfo.java
index c697ded3..e7f163aa 100644
--- a/src/main/java/io/cryostat/agent/model/MBeanInfo.java
+++ b/src/main/java/io/cryostat/agent/model/MBeanInfo.java
@@ -31,11 +31,11 @@
import java.util.Map;
import java.util.concurrent.Callable;
-import io.cryostat.core.net.MBeanMetrics;
-import io.cryostat.core.net.MemoryMetrics;
-import io.cryostat.core.net.OperatingSystemMetrics;
-import io.cryostat.core.net.RuntimeMetrics;
-import io.cryostat.core.net.ThreadMetrics;
+import io.cryostat.libcryostat.net.MBeanMetrics;
+import io.cryostat.libcryostat.net.MemoryMetrics;
+import io.cryostat.libcryostat.net.OperatingSystemMetrics;
+import io.cryostat.libcryostat.net.RuntimeMetrics;
+import io.cryostat.libcryostat.net.ThreadMetrics;
import com.sun.management.UnixOperatingSystemMXBean;
import org.apache.commons.codec.digest.DigestUtils;
diff --git a/src/main/java/io/cryostat/agent/remote/MBeanContext.java b/src/main/java/io/cryostat/agent/remote/MBeanContext.java
index e6326523..cb835537 100644
--- a/src/main/java/io/cryostat/agent/remote/MBeanContext.java
+++ b/src/main/java/io/cryostat/agent/remote/MBeanContext.java
@@ -21,7 +21,7 @@
import javax.inject.Inject;
import io.cryostat.agent.model.MBeanInfo;
-import io.cryostat.core.net.MBeanMetrics;
+import io.cryostat.libcryostat.net.MBeanMetrics;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.net.httpserver.HttpExchange;
diff --git a/src/main/java/io/cryostat/agent/remote/RecordingsContext.java b/src/main/java/io/cryostat/agent/remote/RecordingsContext.java
index ac83c3ca..899b0018 100644
--- a/src/main/java/io/cryostat/agent/remote/RecordingsContext.java
+++ b/src/main/java/io/cryostat/agent/remote/RecordingsContext.java
@@ -36,8 +36,8 @@
import io.cryostat.agent.FlightRecorderHelper;
import io.cryostat.agent.harvest.Harvester;
import io.cryostat.agent.util.StringUtils;
-import io.cryostat.core.serialization.SerializableRecordingDescriptor;
-import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
+import io.cryostat.libcryostat.serialization.SerializableRecordingDescriptor;
+import io.cryostat.libcryostat.templates.InvalidEventTemplateException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;