Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 9 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/alert/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading