From fba896cf52bab9ced82b4f68f61a6f9d30d9f60c Mon Sep 17 00:00:00 2001
From: MathieuOuillon <mathieu.ouillon1@gmail.com>
Date: Sat, 25 Jul 2026 10:48:30 -0400
Subject: [PATCH 1/4] build: consume jnp-hipo4 4.5 from the hipo-java package
 registry

jnp-hipo4 is now built and released from its own repository,
code.jlab.org/hallb/clas12/hipo-java, instead of being cut from the monolithic
jnp tree. Points the dependency at 4.5 from that project's package registry,
which is public and needs no credentials.

Two things this changes beyond the coordinate. The old clasweb artifact was a fat
jar bundling exp4j, lz4 and xxhash, so the exp4j 0.4.8 pinned here to resolve the
jnp-hipo/jnp-hipo4 conflict was being shadowed by a bundled copy; 4.5 publishes a
plain jar and declares exp4j and lz4-java as ordinary dependencies, so that pin
governs again. It also drops the classes the fat jar duplicated with jnp-hipo
(matrix, ascii, readers, MigLayout) -- all still supplied by jnp-hipo, which this
project already depends on, and the ones this project actually imports come from
there.

Verified against an unmodified development baseline: 49 modules build, 1620
source files compile, and the test suite is identical -- 14 run, 0 failures, and
the same single DCReconstructionTest error, which is the absent TORUS field map
and reproduces without this change. maven-enforcer's DependencyConvergence passes.
---
 pom.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f263a359c8..64f591c1dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,14 @@
       <id>jnp-maven</id>
       <url>https://clasweb.jlab.org/.jhep/maven</url>
     </repository>
+    <!-- `jnp-hipo4` is now built and published from its own repository,
+         https://code.jlab.org/hallb/clas12/hipo-java, rather than being cut from
+         the monolithic `jnp` tree. Project 919's package registry is public, so
+         this needs no credentials. -->
+    <repository>
+      <id>clas12-hipo-java</id>
+      <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
+    </repository>
   </repositories>
 
   <profiles>
@@ -168,7 +176,7 @@
       <dependency>
         <groupId>org.jlab.jnp</groupId>
         <artifactId>jnp-hipo4</artifactId>
-        <version>4.3-SNAPSHOT</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
+        <version>4.5</version> <!-- from code.jlab.org/hallb/clas12/hipo-java; WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
       </dependency>
 
       <dependency>
@@ -216,7 +224,7 @@
         - see `docs/dependency_conflicts.md` for more info
       -->
 
-      <!-- resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.3-SNAPSHOT`
+      <!-- resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.5`
            by choosing the later version of their `net.objecthunter:exp4j` dependency -->
       <dependency>
         <groupId>net.objecthunter</groupId>

From f92fe43e9e15bad4ca3af54241183530ac800739 Mon Sep 17 00:00:00 2001
From: MathieuOuillon <mathieu.ouillon1@gmail.com>
Date: Mon, 27 Jul 2026 20:06:46 -0400
Subject: [PATCH 2/4] build: list the hipo-java repository first, per review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maven queries repositories in declaration order and takes the first that
answers with the coordinate, so whichever comes first *decides* what
`org.jlab.jnp:jnp-hipo4` resolves to. The clasweb repositories still carry the
old fat-jar `jnp-hipo4`; with them ahead of this entry, either one serving a
4.5 would shadow the artifact this project means to consume, and nothing would
report it.

Verified rather than assumed. The effective POM now orders them
clas12-hipo-java, clas12maven, jnp-maven, central. With the local cache entry
removed, `jnp-hipo4:4.5` is downloaded from clas12-hipo-java.

The trade-off is real and is written into the comment: code.jlab.org is asked
first for every artifact and misses on all but `jnp-hipo4`. Resolving
`org.json:json` walks clas12-hipo-java, clas12maven, jnp-maven, then central,
which serves it. Note the miss is silent at default verbosity — Maven logs no
404, it just tries the next repository — so the cost is latency and a stall
when that host is unwell, not visible errors. It goes away if a real repository
manager ever proxies these.
---
 pom.xml | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64f591c1dd..66cf83d71f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,35 @@
   </modules>
 
   <repositories>
+    <!-- `jnp-hipo4` is now built and published from its own repository,
+         https://code.jlab.org/hallb/clas12/hipo-java, rather than being cut from
+         the monolithic `jnp` tree. Project 919's package registry is public, so
+         this needs no credentials.
+
+         LISTED FIRST DELIBERATELY, and it has to stay first. Maven queries
+         repositories in declaration order and takes the first one that answers
+         with the coordinate, so whichever is listed first *decides* what
+         `org.jlab.jnp:jnp-hipo4` means. The clasweb repositories below still
+         carry the old fat-jar `jnp-hipo4`; if either ever serves a 4.5, being
+         ahead of this entry would silently shadow the artifact this project
+         means to consume, with no error to notice.
+
+         The cost is that Maven now asks code.jlab.org first for *every*
+         artifact it has to fetch, and everything except `jnp-hipo4` misses.
+         Verified: resolving `org.json:json` walks clas12-hipo-java →
+         clas12maven → jnp-maven → central and is served by central. A miss is
+         *silent* at default verbosity — no 404 in the log, Maven just moves to
+         the next repository — so the symptom is not errors but latency, one
+         extra round trip per artifact, and a stall on every resolution whenever
+         that host is slow or down rather than cleanly 404ing.
+
+         That is accepted: waiting on a request beats resolving a dependency
+         from a source nobody chose. It goes away if JLab ever runs a real
+         repository manager to proxy these. -->
+    <repository>
+      <id>clas12-hipo-java</id>
+      <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
+    </repository>
     <repository>
       <id>clas12maven</id>
       <url>https://clasweb.jlab.org/.clas12maven</url>
@@ -27,14 +56,6 @@
       <id>jnp-maven</id>
       <url>https://clasweb.jlab.org/.jhep/maven</url>
     </repository>
-    <!-- `jnp-hipo4` is now built and published from its own repository,
-         https://code.jlab.org/hallb/clas12/hipo-java, rather than being cut from
-         the monolithic `jnp` tree. Project 919's package registry is public, so
-         this needs no credentials. -->
-    <repository>
-      <id>clas12-hipo-java</id>
-      <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
-    </repository>
   </repositories>
 
   <profiles>

From b8b3f924160afa5e12a802dfdd6576f94b9ca1af Mon Sep 17 00:00:00 2001
From: Mathieu Ouillon <67646911+mathieuouillon@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:09:01 -0400
Subject: [PATCH 3/4] Clean up pom.xml by removing comments

Removed lengthy comments about repository configuration and updated the repository entry for `clas12-hipo-java`.
---
 pom.xml | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66cf83d71f..d24587fee9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,33 +19,9 @@
   </modules>
 
   <repositories>
-    <!-- `jnp-hipo4` is now built and published from its own repository,
-         https://code.jlab.org/hallb/clas12/hipo-java, rather than being cut from
-         the monolithic `jnp` tree. Project 919's package registry is public, so
-         this needs no credentials.
-
-         LISTED FIRST DELIBERATELY, and it has to stay first. Maven queries
-         repositories in declaration order and takes the first one that answers
-         with the coordinate, so whichever is listed first *decides* what
-         `org.jlab.jnp:jnp-hipo4` means. The clasweb repositories below still
-         carry the old fat-jar `jnp-hipo4`; if either ever serves a 4.5, being
-         ahead of this entry would silently shadow the artifact this project
-         means to consume, with no error to notice.
-
-         The cost is that Maven now asks code.jlab.org first for *every*
-         artifact it has to fetch, and everything except `jnp-hipo4` misses.
-         Verified: resolving `org.json:json` walks clas12-hipo-java →
-         clas12maven → jnp-maven → central and is served by central. A miss is
-         *silent* at default verbosity — no 404 in the log, Maven just moves to
-         the next repository — so the symptom is not errors but latency, one
-         extra round trip per artifact, and a stall on every resolution whenever
-         that host is slow or down rather than cleanly 404ing.
-
-         That is accepted: waiting on a request beats resolving a dependency
-         from a source nobody chose. It goes away if JLab ever runs a real
-         repository manager to proxy these. -->
+    ` -->
     <repository>
-      <id>clas12-hipo-java</id>
+      <id>clas12-hipo-java</id>  <!-- `jnp-hipo4` is now built and published from its own repository, https://code.jlab.org/hallb/clas12/hipo-java. Project 919's package registry is public -->
       <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
     </repository>
     <repository>

From 8aa99629bdb0d8f97bd677f53d4fb3cd731d2bc1 Mon Sep 17 00:00:00 2001
From: Mathieu Ouillon <67646911+mathieuouillon@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:09:26 -0400
Subject: [PATCH 4/4] Clean up comment syntax in pom.xml

Removed unnecessary comment syntax from pom.xml.
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d24587fee9..8cc5752ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
   </modules>
 
   <repositories>
-    ` -->
     <repository>
       <id>clas12-hipo-java</id>  <!-- `jnp-hipo4` is now built and published from its own repository, https://code.jlab.org/hallb/clas12/hipo-java. Project 919's package registry is public -->
       <url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>