From 376707dc4ccb639ee754fa15c3b4c41da77d5129 Mon Sep 17 00:00:00 2001
From: Christopher Dilks <c-dilks@users.noreply.github.com>
Date: Fri, 9 Oct 2026 11:50:31 -0400
Subject: [PATCH 1/2] build: consume `jclara` and `xmsg` from `code.jlab.org`

---
 pom.xml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 960b55d943..277553f7fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,12 @@
       <id>code.jlab.org-hipo-java</id>
       <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
     </repository>
+    <repository>
+      <!-- git repo:  https://code.jlab.org/hallb/clas12/coatjava/xmsg-java -->
+      <!-- artifacts: xmsg -->
+      <id>code.jlab.org-xmsg-java</id>
+      <url>https://code.jlab.org/api/v4/projects/959/packages/maven</url>
+    </repository>
     <repository>
       <!-- git repo:  https://code.jlab.org/hallb/clas12/coatjava/clara-java -->
       <!-- artifacts: jclara -->
@@ -133,13 +139,13 @@
       <dependency>
         <groupId>org.jlab.coda</groupId>
         <artifactId>xmsg</artifactId>
-        <version>2.3</version>
+        <version>2.5</version>
       </dependency>
 
       <dependency>
         <groupId>org.jlab.coda</groupId>
         <artifactId>jclara</artifactId>
-        <version>4.3</version>
+        <version>6.2</version>
       </dependency>
 
       <dependency>
@@ -228,7 +234,7 @@
       <dependency> <!-- sets version number for all 'ai.djl' dependencies -->
         <groupId>ai.djl</groupId>
         <artifactId>bom</artifactId>
-        <version>0.38.0</version> <!-- WARNING: if changed, check the `com.google.code.gson:gson` version; see `docs/dependency_conflicts.md` -->
+        <version>0.38.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -246,18 +252,6 @@
         <version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
       </dependency>
 
-      <!--
-        resolve convergence conflict between `org.jlab.coda:jclara` and `ai.djl:api`
-        by choosing the later version of their `com.google.code.gson:gson` dependency
-        - `djl`'s `gson` version is here: https://github.com/deepjavalibrary/djl/blob/master/gradle/libs.versions.toml
-        - see `docs/dependency_conflicts.md` for more info
-      -->
-      <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.13.1</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
-      </dependency>
-
       <!--
         resolve convergence conflict between `j4ml:j4ml-clas12` and `clas-tracking`
         by using the version of `org.ejml:ejml-simple` used by `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT`

From c2aad449a1d1c87ec8cce9b8c9fa24ff44f8e69d Mon Sep 17 00:00:00 2001
From: Christopher Dilks <c-dilks@users.noreply.github.com>
Date: Fri, 9 Oct 2026 12:02:02 -0400
Subject: [PATCH 2/2] fix: bundle gson

---
 reconstruction/alert/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml
index f6badbc8dd..0b7301ad8d 100644
--- a/reconstruction/alert/pom.xml
+++ b/reconstruction/alert/pom.xml
@@ -132,7 +132,7 @@
             </goals>
             <configuration>
               <outputDirectory>${project.build.directory}/lib/services</outputDirectory>
-              <includeGroupIds>ai.djl</includeGroupIds>
+              <includeGroupIds>ai.djl,com.google.code.gson</includeGroupIds>
             </configuration>
           </execution>
         </executions>