Skip to content

Commit 9223156

Browse files
Consume jnp-hipo4 4.5 from the hipo-java package registry (#1360)
* 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. * build: list the hipo-java repository first, per review 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. * Clean up pom.xml by removing comments Removed lengthy comments about repository configuration and updated the repository entry for `clas12-hipo-java`. * Clean up comment syntax in pom.xml Removed unnecessary comment syntax from pom.xml. --------- Co-authored-by: Nathan Baltzell <baltzell@gmx.com>
1 parent b6ca546 commit 9223156

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
</modules>
2020

2121
<repositories>
22+
<repository>
23+
<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 -->
24+
<url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
25+
</repository>
2226
<repository>
2327
<id>clas12maven</id>
2428
<url>https://clasweb.jlab.org/.clas12maven</url>
@@ -168,7 +172,7 @@
168172
<dependency>
169173
<groupId>org.jlab.jnp</groupId>
170174
<artifactId>jnp-hipo4</artifactId>
171-
<version>4.3-SNAPSHOT</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
175+
<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` -->
172176
</dependency>
173177

174178
<dependency>
@@ -216,7 +220,7 @@
216220
- see `docs/dependency_conflicts.md` for more info
217221
-->
218222

219-
<!-- resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.3-SNAPSHOT`
223+
<!-- resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.5`
220224
by choosing the later version of their `net.objecthunter:exp4j` dependency -->
221225
<dependency>
222226
<groupId>net.objecthunter</groupId>

0 commit comments

Comments
 (0)