Skip to content

Commit 94bd217

Browse files
authored
build: consume jclara and xmsg from code.jlab.org (#1498)
* build: consume `jclara` and `xmsg` from `code.jlab.org` * fix: bundle gson
1 parent 3add5e1 commit 94bd217

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

‎pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<id>code.jlab.org-hipo-java</id>
2727
<url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
2828
</repository>
29+
<repository>
30+
<!-- git repo: https://code.jlab.org/hallb/clas12/coatjava/xmsg-java -->
31+
<!-- artifacts: xmsg -->
32+
<id>code.jlab.org-xmsg-java</id>
33+
<url>https://code.jlab.org/api/v4/projects/959/packages/maven</url>
34+
</repository>
2935
<repository>
3036
<!-- git repo: https://code.jlab.org/hallb/clas12/coatjava/clara-java -->
3137
<!-- artifacts: jclara -->
@@ -133,13 +139,13 @@
133139
<dependency>
134140
<groupId>org.jlab.coda</groupId>
135141
<artifactId>xmsg</artifactId>
136-
<version>2.3</version>
142+
<version>2.5</version>
137143
</dependency>
138144

139145
<dependency>
140146
<groupId>org.jlab.coda</groupId>
141147
<artifactId>jclara</artifactId>
142-
<version>4.3</version>
148+
<version>6.2</version>
143149
</dependency>
144150

145151
<dependency>
@@ -228,7 +234,7 @@
228234
<dependency> <!-- sets version number for all 'ai.djl' dependencies -->
229235
<groupId>ai.djl</groupId>
230236
<artifactId>bom</artifactId>
231-
<version>0.38.0</version> <!-- WARNING: if changed, check the `com.google.code.gson:gson` version; see `docs/dependency_conflicts.md` -->
237+
<version>0.38.0</version>
232238
<type>pom</type>
233239
<scope>import</scope>
234240
</dependency>
@@ -246,18 +252,6 @@
246252
<version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
247253
</dependency>
248254

249-
<!--
250-
resolve convergence conflict between `org.jlab.coda:jclara` and `ai.djl:api`
251-
by choosing the later version of their `com.google.code.gson:gson` dependency
252-
- `djl`'s `gson` version is here: https://github.com/deepjavalibrary/djl/blob/master/gradle/libs.versions.toml
253-
- see `docs/dependency_conflicts.md` for more info
254-
-->
255-
<dependency>
256-
<groupId>com.google.code.gson</groupId>
257-
<artifactId>gson</artifactId>
258-
<version>2.13.1</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
259-
</dependency>
260-
261255
<!--
262256
resolve convergence conflict between `j4ml:j4ml-clas12` and `clas-tracking`
263257
by using the version of `org.ejml:ejml-simple` used by `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT`

‎reconstruction/alert/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</goals>
133133
<configuration>
134134
<outputDirectory>${project.build.directory}/lib/services</outputDirectory>
135-
<includeGroupIds>ai.djl</includeGroupIds>
135+
<includeGroupIds>ai.djl,com.google.code.gson</includeGroupIds>
136136
</configuration>
137137
</execution>
138138
</executions>

0 commit comments

Comments
 (0)