Skip to content

Commit 8158f35

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Significant dependency cleanup in the descriptor/qsar modules.
1 parent d1dfe3a commit 8158f35

File tree

12 files changed

+26
-824
lines changed

12 files changed

+26
-824
lines changed

‎descriptor/cip/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@
2828
<artifactId>hamcrest</artifactId>
2929
<scope>test</scope>
3030
</dependency>
31-
<dependency>
32-
<groupId>uk.ac.ebi.beam</groupId>
33-
<artifactId>beam-core</artifactId>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>uk.ac.ebi.beam</groupId>
38-
<artifactId>beam-func</artifactId>
39-
<scope>test</scope>
40-
</dependency>
4131
<dependency>
4232
<groupId>${project.groupId}</groupId>
4333
<artifactId>cdk-interfaces</artifactId>
@@ -78,12 +68,6 @@
7868
<version>${project.parent.version}</version>
7969
<scope>test</scope>
8070
</dependency>
81-
<dependency>
82-
<groupId>${project.groupId}</groupId>
83-
<artifactId>cdk-valencycheck</artifactId>
84-
<version>${project.parent.version}</version>
85-
<scope>test</scope>
86-
</dependency>
8771
<dependency>
8872
<groupId>${project.groupId}</groupId>
8973
<artifactId>cdk-io</artifactId>

‎descriptor/fingerprint/pom.xml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@
2323
<artifactId>commons-math3</artifactId>
2424
<version>3.6.1</version>
2525
</dependency>
26-
<dependency>
27-
<groupId>com.google.guava</groupId>
28-
<artifactId>guava</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>uk.ac.ebi.beam</groupId>
32-
<artifactId>beam-core</artifactId>
33-
</dependency>
34-
<dependency>
35-
<groupId>uk.ac.ebi.beam</groupId>
36-
<artifactId>beam-func</artifactId>
37-
</dependency>
3826
<dependency>
3927
<groupId>org.hamcrest</groupId>
4028
<artifactId>hamcrest</artifactId>
@@ -85,12 +73,6 @@
8573
<artifactId>cdk-formula</artifactId>
8674
<version>${project.parent.version}</version>
8775
</dependency>
88-
<dependency>
89-
<groupId>${project.groupId}</groupId>
90-
<artifactId>cdk-io</artifactId>
91-
<version>${project.parent.version}</version>
92-
<scope>test</scope>
93-
</dependency>
9476
<dependency>
9577
<groupId>${project.groupId}</groupId>
9678
<artifactId>cdk-test</artifactId>
@@ -123,9 +105,14 @@
123105
<version>${project.parent.version}</version>
124106
<scope>test</scope>
125107
</dependency>
108+
<dependency>
109+
<groupId>org.openscience.cdk</groupId>
110+
<artifactId>cdk-ctab</artifactId>
111+
<version>${project.parent.version}</version>
112+
</dependency>
126113
<dependency>
127114
<groupId>${project.groupId}</groupId>
128-
<artifactId>cdk-extra</artifactId>
115+
<artifactId>cdk-atomtype</artifactId>
129116
<version>${project.parent.version}</version>
130117
<scope>test</scope>
131118
</dependency>

‎descriptor/ionpot/pom.xml‎

Lines changed: 1 addition & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -3,124 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<artifactId>cdk-descriptor</artifactId>
98
<groupId>org.openscience.cdk</groupId>
109
<version>2.7-SNAPSHOT</version>
1110
</parent>
12-
1311
<artifactId>cdk-ionpot</artifactId>
14-
1512
<name>cdk-ionpot</name>
16-
<dependencies>
17-
<dependency>
18-
<groupId>junit</groupId>
19-
<artifactId>junit</artifactId>
20-
<scope>test</scope>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.hamcrest</groupId>
24-
<artifactId>hamcrest</artifactId>
25-
<scope>test</scope>
26-
</dependency>
27-
<dependency>
28-
<groupId>gov.nist.math</groupId>
29-
<artifactId>jama</artifactId>
30-
<scope>test</scope>
31-
</dependency>
32-
<dependency>
33-
<groupId>javax.vecmath</groupId>
34-
<artifactId>vecmath</artifactId>
35-
<scope>test</scope>
36-
</dependency>
37-
<dependency>
38-
<groupId>xom</groupId>
39-
<artifactId>xom</artifactId>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>${project.groupId}</groupId>
44-
<artifactId>cdk-interfaces</artifactId>
45-
<version>${project.parent.version}</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>${project.groupId}</groupId>
49-
<artifactId>cdk-core</artifactId>
50-
<version>${project.parent.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>${project.groupId}</groupId>
54-
<artifactId>cdk-standard</artifactId>
55-
<version>${project.parent.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>${project.groupId}</groupId>
59-
<artifactId>cdk-libiocml</artifactId>
60-
<version>${project.parent.version}</version>
61-
</dependency>
62-
<dependency>
63-
<groupId>${project.groupId}</groupId>
64-
<artifactId>cdk-valencycheck</artifactId>
65-
<version>${project.parent.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>${project.groupId}</groupId>
69-
<artifactId>cdk-isomorphism</artifactId>
70-
<version>${project.parent.version}</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>${project.groupId}</groupId>
74-
<artifactId>cdk-dict</artifactId>
75-
<version>${project.parent.version}</version>
76-
</dependency>
77-
<dependency>
78-
<groupId>${project.groupId}</groupId>
79-
<artifactId>cdk-charges</artifactId>
80-
<version>${project.parent.version}</version>
81-
</dependency>
82-
<dependency>
83-
<groupId>${project.groupId}</groupId>
84-
<artifactId>cdk-reaction</artifactId>
85-
<version>${project.parent.version}</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>${project.groupId}</groupId>
89-
<artifactId>cdk-data</artifactId>
90-
<version>${project.parent.version}</version>
91-
<scope>test</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>${project.groupId}</groupId>
95-
<artifactId>cdk-silent</artifactId>
96-
<version>${project.parent.version}</version>
97-
<scope>test</scope>
98-
</dependency>
99-
<dependency>
100-
<groupId>${project.groupId}</groupId>
101-
<artifactId>cdk-extra</artifactId>
102-
<version>${project.parent.version}</version>
103-
<scope>test</scope>
104-
</dependency>
105-
<dependency>
106-
<groupId>${project.groupId}</groupId>
107-
<artifactId>cdk-io</artifactId>
108-
<version>${project.parent.version}</version>
109-
<scope>test</scope>
110-
</dependency>
111-
<dependency>
112-
<groupId>${project.groupId}</groupId>
113-
<artifactId>cdk-smiles</artifactId>
114-
<version>${project.parent.version}</version>
115-
<scope>test</scope>
116-
</dependency>
117-
<dependency>
118-
<groupId>${project.groupId}</groupId>
119-
<artifactId>cdk-test</artifactId>
120-
<version>${project.parent.version}</version>
121-
<type>test-jar</type>
122-
<scope>test</scope>
123-
</dependency>
124-
</dependencies>
125-
13+
<description>Deprecated - Functionality moved to cdk-legacy</description>
12614
</project>

‎descriptor/qsar/pom.xml‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,16 @@
1414

1515
<name>cdk-qsar</name>
1616
<dependencies>
17-
<dependency>
18-
<groupId>gov.nist.math</groupId>
19-
<artifactId>jama</artifactId>
20-
</dependency>
21-
<dependency>
22-
<groupId>javax.vecmath</groupId>
23-
<artifactId>vecmath</artifactId>
24-
</dependency>
25-
<dependency>
26-
<groupId>xom</groupId>
27-
<artifactId>xom</artifactId>
28-
</dependency>
2917
<dependency>
3018
<groupId>junit</groupId>
3119
<artifactId>junit</artifactId>
3220
<scope>test</scope>
3321
</dependency>
34-
<dependency>
35-
<groupId>org.hamcrest</groupId>
36-
<artifactId>hamcrest</artifactId>
37-
<scope>test</scope>
38-
</dependency>
3922
<dependency>
4023
<groupId>${project.groupId}</groupId>
4124
<artifactId>cdk-interfaces</artifactId>
4225
<version>${project.parent.version}</version>
4326
</dependency>
44-
<dependency>
45-
<groupId>${project.groupId}</groupId>
46-
<artifactId>cdk-core</artifactId>
47-
<version>${project.parent.version}</version>
48-
</dependency>
4927
<dependency>
5028
<groupId>${project.groupId}</groupId>
5129
<artifactId>cdk-standard</artifactId>
@@ -57,86 +35,13 @@
5735
<version>${project.parent.version}</version>
5836
<scope>test</scope>
5937
</dependency>
60-
<dependency>
61-
<groupId>${project.groupId}</groupId>
62-
<artifactId>cdk-silent</artifactId>
63-
<version>${project.parent.version}</version>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>${project.groupId}</groupId>
68-
<artifactId>cdk-io</artifactId>
69-
<version>${project.parent.version}</version>
70-
<scope>test</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>${project.groupId}</groupId>
74-
<artifactId>cdk-pdb</artifactId>
75-
<version>${project.parent.version}</version>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>${project.groupId}</groupId>
80-
<artifactId>cdk-valencycheck</artifactId>
81-
<version>${project.parent.version}</version>
82-
<scope>test</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>${project.groupId}</groupId>
86-
<artifactId>cdk-extra</artifactId>
87-
<version>${project.parent.version}</version>
88-
<scope>test</scope>
89-
</dependency>
90-
<dependency>
91-
<groupId>${project.groupId}</groupId>
92-
<artifactId>cdk-reaction</artifactId>
93-
<version>${project.parent.version}</version>
94-
<scope>test</scope>
95-
</dependency>
96-
<dependency>
97-
<groupId>${project.groupId}</groupId>
98-
<artifactId>cdk-charges</artifactId>
99-
<version>${project.parent.version}</version>
100-
<scope>test</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>${project.groupId}</groupId>
104-
<artifactId>cdk-smiles</artifactId>
105-
<version>${project.parent.version}</version>
106-
<scope>test</scope>
107-
</dependency>
10838
<dependency>
10939
<groupId>${project.groupId}</groupId>
11040
<artifactId>cdk-test</artifactId>
11141
<version>${project.parent.version}</version>
11242
<type>test-jar</type>
11343
<scope>test</scope>
11444
</dependency>
115-
<dependency>
116-
<groupId>${project.groupId}</groupId>
117-
<artifactId>cdk-builder3d</artifactId>
118-
<version>${project.parent.version}</version>
119-
<scope>test</scope>
120-
</dependency>
121-
<dependency>
122-
<groupId>${project.groupId}</groupId>
123-
<artifactId>cdk-forcefield</artifactId>
124-
<version>${project.parent.version}</version>
125-
<scope>test</scope>
126-
</dependency>
127-
<dependency>
128-
<groupId>${project.groupId}</groupId>
129-
<artifactId>cdk-sdg</artifactId>
130-
<version>${project.parent.version}</version>
131-
<scope>test</scope>
132-
</dependency>
133-
<dependency>
134-
<groupId>${project.groupId}</groupId>
135-
<artifactId>cdk-testdata</artifactId>
136-
<version>${project.parent.version}</version>
137-
<type>test-jar</type>
138-
<scope>test</scope>
139-
</dependency>
14045
</dependencies>
14146

14247
</project>

0 commit comments

Comments
 (0)