Skip to content

build(deps): bump jclara, xmsg, ccdbrcdb #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c-dilks wants to merge 10 commits into
base: development
Choose a base branch
from
+25 −19
Open

build(deps): bump jclara, xmsg, ccdbrcdb #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
09197a0
build(deps): bump `org.jlab.coda:jclara` to 6.1
c-dilks Sep 28, 2026
e4c730a
fix: xmsg snapshot...
c-dilks Sep 28, 2026
2c4442a
fix: jclara 6.2, xmsg 2.5
c-dilks Sep 28, 2026
2eaf83d
fix: add xmsg repo
c-dilks Sep 28, 2026
49b8885
build: drop conflict resolution for gson
c-dilks Sep 28, 2026
002ce01
doc: rm comment
c-dilks Sep 29, 2026
cfaf452
doc: groot brings in conflicting exp4j too
c-dilks Sep 28, 2026
894de18
fix: include transitive `gson`
c-dilks Sep 28, 2026
6cd83be
build: consume ccdbrcdb
c-dilks Sep 29, 2026
da8d6ee
doc: commant jclara
c-dilks Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common-tools/clas-io/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>xmsg</artifactId>
<version>2.3</version>
</dependency>

<dependency>
Expand Down
41 changes: 24 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,17 @@
<url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
</repository>
<repository>
<id>clas12-clara-java</id>
<id>clas12-clara-java</id> <!-- `jclara` -->
<url>https://code.jlab.org/api/v4/projects/243/packages/maven</url>
</repository>
<repository>
<id>clas12-xmsg-java</id>
<url>https://code.jlab.org/api/v4/projects/959/packages/maven</url>
</repository>
<repository>
<id>clas12-ccdbrcdb-java</id>
<url>https://code.jlab.org/api/v4/projects/245/packages/maven</url>
</repository>
<repository>
<id>clas12maven</id>
<url>https://clasweb.jlab.org/.clas12maven</url>
Expand Down Expand Up @@ -127,7 +135,7 @@
<dependency>
<groupId>org.jlab</groupId>
<artifactId>groot</artifactId>
<version>4.0.5</version>
<version>4.0.5</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
</dependency>

<dependency>
Expand All @@ -139,7 +147,13 @@
<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>jclara</artifactId>
<version>4.3</version>
<version>6.2</version>
</dependency>

<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>xmsg</artifactId>
<version>2.5</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -200,7 +214,7 @@
<dependency>
<groupId>org.jlab.ccdbrcdb</groupId>
<artifactId>ccdbrcdb</artifactId>
<version>2.0</version>
<version>2.1</version>
</dependency>

<dependency>
Expand All @@ -212,7 +226,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>
Expand All @@ -224,24 +238,17 @@
- 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.5`
by choosing the later version of their `net.objecthunter:exp4j` dependency -->
<!-- resolve conflicting `net.objecthunter:exp4j` by choosing the latest used by
- `org.jlab.jnp:jnp-hipo`
- `org.jlab.jnp:jnp-hipo4`
- `org.jlab:groot`
-->
<dependency>
<groupId>net.objecthunter</groupId>
<artifactId>exp4j</artifactId>
<version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
</dependency>

<!-- resolve 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
-->
<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 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` -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/alert/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,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>
Expand Down
Loading