Skip to content

Commit 114ac09

Browse files
authored
build: remove unnecessary shaded coat-libs.jar dependencies (#1481)
1 parent f174e66 commit 114ac09

5 files changed

Lines changed: 12 additions & 52 deletions

File tree

‎common-tools/coat-libs/pom.xml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,12 @@
3636
<artifactId>j4ml-clas12</artifactId>
3737
</dependency>
3838

39-
<dependency>
40-
<groupId>org.jama</groupId>
41-
<artifactId>jamapack</artifactId>
42-
<version>1.0</version>
43-
</dependency>
44-
4539
<dependency>
4640
<groupId>org.jlab.plugins</groupId>
4741
<artifactId>trackfitter</artifactId>
4842
<version>1.0</version>
4943
</dependency>
5044

51-
<dependency>
52-
<groupId>org.jlab.plugins</groupId>
53-
<artifactId>jMath</artifactId>
54-
<version>1.0</version>
55-
</dependency>
56-
5745
<dependency>
5846
<groupId>org.jlab.clas</groupId>
5947
<artifactId>clas-io</artifactId>
@@ -144,22 +132,6 @@
144132
<version>14.2.1-SNAPSHOT</version>
145133
</dependency>
146134

147-
<dependency>
148-
<groupId>org.freehep</groupId>
149-
<artifactId>jminuit</artifactId>
150-
</dependency>
151-
152-
<dependency>
153-
<groupId>de.erichseifert</groupId>
154-
<artifactId>vectorgraphics2d</artifactId>
155-
<version>1.0</version>
156-
</dependency>
157-
158-
<dependency>
159-
<groupId>net.objecthunter</groupId>
160-
<artifactId>exp4j</artifactId>
161-
</dependency>
162-
163135
</dependencies>
164136

165137
<build>

‎pom.xml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<dependency>
134134
<groupId>org.jlab</groupId>
135135
<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` -->
137137
</dependency>
138138

139139
<dependency>
@@ -194,7 +194,7 @@
194194
<dependency>
195195
<groupId>org.jlab.jnp</groupId>
196196
<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` -->
198198
</dependency>
199199

200200
<dependency>
@@ -241,27 +241,24 @@
241241
<scope>import</scope>
242242
</dependency>
243243

244-
<!-- BEGIN DEPENDENCY CONFLICT RESOLUTION -->
245244
<!--
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
248249
- see `docs/dependency_conflicts.md` for more info
249250
-->
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-
-->
255251
<dependency>
256252
<groupId>net.objecthunter</groupId>
257253
<artifactId>exp4j</artifactId>
258254
<version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
259255
</dependency>
260256

261257
<!--
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`
263259
by choosing the later version of their `com.google.code.gson:gson` dependency
264260
- `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
265262
-->
266263
<dependency>
267264
<groupId>com.google.code.gson</groupId>
@@ -270,17 +267,16 @@
270267
</dependency>
271268

272269
<!--
273-
resolve conflict between `j4ml:j4ml-clas12` and `clas-tracking`
270+
resolve convergence conflict between `j4ml:j4ml-clas12` and `clas-tracking`
274271
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
275273
-->
276274
<dependency>
277275
<groupId>org.ejml</groupId>
278276
<artifactId>ejml-simple</artifactId>
279277
<version>0.40</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
280278
</dependency>
281279

282-
<!-- END DEPENDENCY CONFLICT RESOLUTION -->
283-
284280
</dependencies>
285281
</dependencyManagement>
286282

‎reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCCluster.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import org.jlab.io.base.DataBank;
99
import org.jlab.io.base.DataEvent;
10-
//import org.jMath.Vector.threeVec;
1110
import java.util.List;
1211
import java.util.ArrayList;
1312
import org.jlab.geom.prim.Vector3D;

‎reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCClusterCorrection.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
package org.jlab.service.ltcc;
77

8-
//import org.jMath.Vector.threeVec;
9-
108
import org.jlab.geom.prim.Vector3D;
119

1210

@@ -27,13 +25,13 @@ public class LTCCClusterCorrection {
2725
/*
2826
* static member function calcPosition
2927
* arguments:
30-
- threeVec clusterPos: estimated cluster position from the
28+
- Vector3D clusterPos: estimated cluster position from the
3129
reconstruction
3230
- double p: track momentum
3331
- int charge: track charge
3432
- double torus: torus field setting
3533
- double solenoid: solenoid field setting
36-
* returns (threeVec): a vector with a more accurate cluster position
34+
* returns (Vector3D): a vector with a more accurate cluster position
3735
*/
3836
public static Vector3D calcPosition(Vector3D clusterPos, double p,
3937
int charge, double torus, double solenoid) {

‎reconstruction/rtpc/src/main/java/org/jlab/rec/rtpc/Geometry.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
import java.io.FileNotFoundException;
55
import java.io.PrintWriter;
66

7-
/*import org.jMath.Vector.threeVec;
8-
9-
import trackfitter.surface.Line;
10-
import trackfitter.track.Helix;*/
11-
127
public class Geometry {
138

149
public Geometry() {

0 commit comments

Comments
 (0)