|
133 | 133 | <dependency> |
134 | 134 | <groupId>org.jlab</groupId> |
135 | 135 | <artifactId>groot</artifactId> |
136 | | - <version>4.0.5</version> |
| 136 | + <version>4.0.5</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` --> |
137 | 137 | </dependency> |
138 | 138 |
|
139 | 139 | <dependency> |
|
194 | 194 | <dependency> |
195 | 195 | <groupId>org.jlab.jnp</groupId> |
196 | 196 | <artifactId>jnp-hipo4</artifactId> |
197 | | - <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` --> |
| 197 | + <version>4.5</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` --> |
198 | 198 | </dependency> |
199 | 199 |
|
200 | 200 | <dependency> |
|
241 | 241 | <scope>import</scope> |
242 | 242 | </dependency> |
243 | 243 |
|
244 | | - <!-- BEGIN DEPENDENCY CONFLICT RESOLUTION --> |
245 | 244 | <!-- |
246 | | - the following dependency versions are specified to resolve dependency tree conflicts |
247 | | - - see also exclusions in `maven-enforcer-plugin` |
| 245 | + resolve convergence conflict of `net.objecthunter:exp4j` by choosing the latest used by |
| 246 | + - `org.jlab:groot:5.0.0` uses version 0.4.8 |
| 247 | + - `org.jlab.jnp:jnp-hipo4:4.5` uses version 0.4.8 |
| 248 | + - `org.jlab.jnp:jnp-hipo:2.0-SNAPSHOT` uses version 0.4.4 |
248 | 249 | - see `docs/dependency_conflicts.md` for more info |
249 | 250 | --> |
250 | | - |
251 | | - <!-- |
252 | | - resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.5` |
253 | | - by choosing the later version of their `net.objecthunter:exp4j` dependency |
254 | | - --> |
255 | 251 | <dependency> |
256 | 252 | <groupId>net.objecthunter</groupId> |
257 | 253 | <artifactId>exp4j</artifactId> |
258 | 254 | <version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` --> |
259 | 255 | </dependency> |
260 | 256 |
|
261 | 257 | <!-- |
262 | | - resolve conflict between `org.jlab.coda:jclara` and `ai.djl:api` |
| 258 | + resolve convergence conflict between `org.jlab.coda:jclara` and `ai.djl:api` |
263 | 259 | by choosing the later version of their `com.google.code.gson:gson` dependency |
264 | 260 | - `djl`'s `gson` version is here: https://github.com/deepjavalibrary/djl/blob/master/gradle/libs.versions.toml |
| 261 | + - see `docs/dependency_conflicts.md` for more info |
265 | 262 | --> |
266 | 263 | <dependency> |
267 | 264 | <groupId>com.google.code.gson</groupId> |
|
270 | 267 | </dependency> |
271 | 268 |
|
272 | 269 | <!-- |
273 | | - resolve conflict between `j4ml:j4ml-clas12` and `clas-tracking` |
| 270 | + resolve convergence conflict between `j4ml:j4ml-clas12` and `clas-tracking` |
274 | 271 | by using the version of `org.ejml:ejml-simple` used by `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT` |
| 272 | + - see `docs/dependency_conflicts.md` for more info |
275 | 273 | --> |
276 | 274 | <dependency> |
277 | 275 | <groupId>org.ejml</groupId> |
278 | 276 | <artifactId>ejml-simple</artifactId> |
279 | 277 | <version>0.40</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` --> |
280 | 278 | </dependency> |
281 | 279 |
|
282 | | - <!-- END DEPENDENCY CONFLICT RESOLUTION --> |
283 | | - |
284 | 280 | </dependencies> |
285 | 281 | </dependencyManagement> |
286 | 282 |
|
|
0 commit comments