Skip to content

Commit dee6b2c

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Cleanup dependencies in CDK tool modules.
1 parent c7c7771 commit dee6b2c

File tree

14 files changed

+28
-348
lines changed

14 files changed

+28
-348
lines changed

‎tool/builder3d/pom.xml‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,15 @@
1414

1515
<name>cdk-builder3d</name>
1616
<dependencies>
17-
<dependency>
18-
<groupId>gov.nist.math</groupId>
19-
<artifactId>jama</artifactId>
20-
</dependency>
2117
<dependency>
2218
<groupId>javax.vecmath</groupId>
2319
<artifactId>vecmath</artifactId>
2420
</dependency>
25-
<dependency>
26-
<groupId>com.google.guava</groupId>
27-
<artifactId>guava</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>uk.ac.ebi.beam</groupId>
31-
<artifactId>beam-core</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>uk.ac.ebi.beam</groupId>
35-
<artifactId>beam-func</artifactId>
36-
</dependency>
3721
<dependency>
3822
<groupId>junit</groupId>
3923
<artifactId>junit</artifactId>
4024
<scope>test</scope>
4125
</dependency>
42-
<dependency>
43-
<groupId>org.hamcrest</groupId>
44-
<artifactId>hamcrest</artifactId>
45-
<scope>test</scope>
46-
</dependency>
4726
<dependency>
4827
<groupId>${project.groupId}</groupId>
4928
<artifactId>cdk-core</artifactId>
@@ -66,29 +45,19 @@
6645
</dependency>
6746
<dependency>
6847
<groupId>${project.groupId}</groupId>
69-
<artifactId>cdk-io</artifactId>
48+
<artifactId>cdk-ctab</artifactId>
7049
<version>${project.parent.version}</version>
7150
</dependency>
7251
<dependency>
7352
<groupId>${project.groupId}</groupId>
7453
<artifactId>cdk-standard</artifactId>
7554
<version>${project.parent.version}</version>
7655
</dependency>
77-
<dependency>
78-
<groupId>${project.groupId}</groupId>
79-
<artifactId>cdk-charges</artifactId>
80-
<version>${project.parent.version}</version>
81-
</dependency>
8256
<dependency>
8357
<groupId>${project.groupId}</groupId>
8458
<artifactId>cdk-forcefield</artifactId>
8559
<version>${project.parent.version}</version>
8660
</dependency>
87-
<dependency>
88-
<groupId>${project.groupId}</groupId>
89-
<artifactId>cdk-valencycheck</artifactId>
90-
<version>${project.parent.version}</version>
91-
</dependency>
9261
<dependency>
9362
<groupId>${project.groupId}</groupId>
9463
<artifactId>cdk-sdg</artifactId>
@@ -99,30 +68,12 @@
9968
<artifactId>cdk-isomorphism</artifactId>
10069
<version>${project.parent.version}</version>
10170
</dependency>
102-
<dependency>
103-
<groupId>${project.groupId}</groupId>
104-
<artifactId>cdk-diff</artifactId>
105-
<version>${project.parent.version}</version>
106-
<scope>test</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>${project.groupId}</groupId>
110-
<artifactId>cdk-ioformats</artifactId>
111-
<version>${project.parent.version}</version>
112-
<scope>test</scope>
113-
</dependency>
11471
<dependency>
11572
<groupId>${project.groupId}</groupId>
11673
<artifactId>cdk-smiles</artifactId>
11774
<version>${project.parent.version}</version>
11875
<scope>test</scope>
11976
</dependency>
120-
<dependency>
121-
<groupId>${project.groupId}</groupId>
122-
<artifactId>cdk-extra</artifactId>
123-
<version>${project.parent.version}</version>
124-
<scope>test</scope>
125-
</dependency>
12677
<dependency>
12778
<groupId>${project.groupId}</groupId>
12879
<artifactId>cdk-test</artifactId>
@@ -142,7 +93,7 @@
14293
<artifactId>cdk-testdata</artifactId>
14394
<version>${project.parent.version}</version>
14495
<type>test-jar</type>
145-
<scope>test</scope>
96+
<scope>test</scope>
14697
</dependency>
14798
<dependency>
14899
<groupId>${project.groupId}</groupId>

‎tool/builder3dtools/pom.xml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@
1414

1515
<name>cdk-builder3dtools</name>
1616
<dependencies>
17-
<dependency>
18-
<groupId>javax.vecmath</groupId>
19-
<artifactId>vecmath</artifactId>
20-
</dependency>
2117
<dependency>
2218
<groupId>${project.groupId}</groupId>
2319
<artifactId>cdk-core</artifactId>
2420
<version>${project.parent.version}</version>
2521
</dependency>
26-
<dependency>
27-
<groupId>${project.groupId}</groupId>
28-
<artifactId>cdk-data</artifactId>
29-
<version>${project.parent.version}</version>
30-
</dependency>
3122
<dependency>
3223
<groupId>${project.groupId}</groupId>
3324
<artifactId>cdk-silent</artifactId>
@@ -38,11 +29,6 @@
3829
<artifactId>cdk-interfaces</artifactId>
3930
<version>${project.parent.version}</version>
4031
</dependency>
41-
<dependency>
42-
<groupId>${project.groupId}</groupId>
43-
<artifactId>cdk-io</artifactId>
44-
<version>${project.parent.version}</version>
45-
</dependency>
4632
<dependency>
4733
<groupId>${project.groupId}</groupId>
4834
<artifactId>cdk-ctab</artifactId>
@@ -53,21 +39,6 @@
5339
<artifactId>cdk-standard</artifactId>
5440
<version>${project.parent.version}</version>
5541
</dependency>
56-
<dependency>
57-
<groupId>${project.groupId}</groupId>
58-
<artifactId>cdk-charges</artifactId>
59-
<version>${project.parent.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>cdk-forcefield</artifactId>
64-
<version>${project.parent.version}</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>${project.groupId}</groupId>
68-
<artifactId>cdk-valencycheck</artifactId>
69-
<version>${project.parent.version}</version>
70-
</dependency>
7142
<dependency>
7243
<groupId>${project.groupId}</groupId>
7344
<artifactId>cdk-smiles</artifactId>

‎tool/charges/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
<groupId>javax.vecmath</groupId>
1919
<artifactId>vecmath</artifactId>
2020
</dependency>
21-
<dependency>
22-
<groupId>uk.ac.ebi.beam</groupId>
23-
<artifactId>beam-core</artifactId>
24-
</dependency>
25-
<dependency>
26-
<groupId>uk.ac.ebi.beam</groupId>
27-
<artifactId>beam-func</artifactId>
28-
</dependency>
2921
<dependency>
3022
<groupId>junit</groupId>
3123
<artifactId>junit</artifactId>
@@ -36,11 +28,6 @@
3628
<artifactId>hamcrest</artifactId>
3729
<scope>test</scope>
3830
</dependency>
39-
<dependency>
40-
<groupId>com.google.guava</groupId>
41-
<artifactId>guava</artifactId>
42-
<scope>test</scope>
43-
</dependency>
4431
<dependency>
4532
<groupId>${project.groupId}</groupId>
4633
<artifactId>cdk-core</artifactId>
@@ -53,7 +40,7 @@
5340
</dependency>
5441
<dependency>
5542
<groupId>${project.groupId}</groupId>
56-
<artifactId>cdk-io</artifactId>
43+
<artifactId>cdk-ctab</artifactId>
5744
<version>${project.parent.version}</version>
5845
</dependency>
5946
<dependency>
@@ -85,7 +72,7 @@
8572
</dependency>
8673
<dependency>
8774
<groupId>${project.groupId}</groupId>
88-
<artifactId>cdk-extra</artifactId>
75+
<artifactId>cdk-atomtype</artifactId>
8976
<version>${project.parent.version}</version>
9077
<scope>test</scope>
9178
</dependency>
@@ -107,7 +94,7 @@
10794
<artifactId>cdk-testdata</artifactId>
10895
<version>${project.parent.version}</version>
10996
<type>test-jar</type>
110-
<scope>test</scope>
97+
<scope>test</scope>
11198
</dependency>
11299
</dependencies>
113100

‎tool/forcefield/pom.xml‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,6 @@
1414

1515
<name>cdk-forcefield</name>
1616
<dependencies>
17-
<dependency>
18-
<groupId>gov.nist.math</groupId>
19-
<artifactId>jama</artifactId>
20-
<scope>test</scope>
21-
</dependency>
22-
<dependency>
23-
<groupId>javax.vecmath</groupId>
24-
<artifactId>vecmath</artifactId>
25-
</dependency>
26-
<dependency>
27-
<groupId>uk.ac.ebi.beam</groupId>
28-
<artifactId>beam-core</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>uk.ac.ebi.beam</groupId>
32-
<artifactId>beam-func</artifactId>
33-
</dependency>
3417
<dependency>
3518
<groupId>junit</groupId>
3619
<artifactId>junit</artifactId>
@@ -62,17 +45,17 @@
6245
</dependency>
6346
<dependency>
6447
<groupId>${project.groupId}</groupId>
65-
<artifactId>cdk-io</artifactId>
48+
<artifactId>cdk-standard</artifactId>
6649
<version>${project.parent.version}</version>
6750
</dependency>
6851
<dependency>
6952
<groupId>${project.groupId}</groupId>
70-
<artifactId>cdk-standard</artifactId>
53+
<artifactId>cdk-charges</artifactId>
7154
<version>${project.parent.version}</version>
7255
</dependency>
7356
<dependency>
74-
<groupId>${project.groupId}</groupId>
75-
<artifactId>cdk-charges</artifactId>
57+
<groupId>org.openscience.cdk</groupId>
58+
<artifactId>cdk-atomtype</artifactId>
7659
<version>${project.parent.version}</version>
7760
</dependency>
7861
<dependency>
@@ -94,19 +77,7 @@
9477
</dependency>
9578
<dependency>
9679
<groupId>${project.groupId}</groupId>
97-
<artifactId>cdk-extra</artifactId>
98-
<version>${project.parent.version}</version>
99-
<scope>test</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>${project.groupId}</groupId>
103-
<artifactId>cdk-pdb</artifactId>
104-
<version>${project.parent.version}</version>
105-
<scope>test</scope>
106-
</dependency>
107-
<dependency>
108-
<groupId>${project.groupId}</groupId>
109-
<artifactId>cdk-valencycheck</artifactId>
80+
<artifactId>cdk-isomorphism</artifactId>
11081
<version>${project.parent.version}</version>
11182
<scope>test</scope>
11283
</dependency>

‎tool/formula/pom.xml‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
<name>cdk-formula</name>
1616
<dependencies>
17-
<dependency>
18-
<groupId>javax.vecmath</groupId>
19-
<artifactId>vecmath</artifactId>
20-
</dependency>
2117
<dependency>
2218
<groupId>junit</groupId>
2319
<artifactId>junit</artifactId>
@@ -28,21 +24,6 @@
2824
<artifactId>hamcrest</artifactId>
2925
<scope>test</scope>
3026
</dependency>
31-
<dependency>
32-
<groupId>gov.nist.math</groupId>
33-
<artifactId>jama</artifactId>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>xom</groupId>
38-
<artifactId>xom</artifactId>
39-
<scope>test</scope>
40-
</dependency>
41-
<dependency>
42-
<groupId>com.google.guava</groupId>
43-
<artifactId>guava</artifactId>
44-
<scope>test</scope>
45-
</dependency>
4627
<dependency>
4728
<groupId>${project.groupId}</groupId>
4829
<artifactId>cdk-core</artifactId>
@@ -79,13 +60,13 @@
7960
</dependency>
8061
<dependency>
8162
<groupId>${project.groupId}</groupId>
82-
<artifactId>cdk-valencycheck</artifactId>
63+
<artifactId>cdk-atomtype</artifactId>
8364
<version>${project.parent.version}</version>
8465
<scope>test</scope>
8566
</dependency>
8667
<dependency>
8768
<groupId>${project.groupId}</groupId>
88-
<artifactId>cdk-io</artifactId>
69+
<artifactId>cdk-valencycheck</artifactId>
8970
<version>${project.parent.version}</version>
9071
<scope>test</scope>
9172
</dependency>

0 commit comments

Comments
 (0)