jgrapht is now only required by the 'cdk-legacy' module.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Aug 5, 2014 · 7d01881 · 7d01881
1 parent d9ef05e
commit 7d01881
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 179 deletions.
diff --git a/base/standard/pom.xml b/base/standard/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>vecmath</artifactId>
             <version>1.5.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/base/test-standard/pom.xml b/base/test-standard/pom.xml
@@ -30,12 +30,6 @@
             <artifactId>hamcrest-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/cip/pom.xml b/descriptor/cip/pom.xml
@@ -29,12 +29,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>uk.ac.ebi.beam</groupId>
             <artifactId>beam-core</artifactId>

diff --git a/descriptor/fingerprint/pom.xml b/descriptor/fingerprint/pom.xml
@@ -51,12 +51,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/descriptor/ionpot/pom.xml b/descriptor/ionpot/pom.xml
@@ -30,12 +30,6 @@
             <version>1.0.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/descriptor/qsar/pom.xml b/descriptor/qsar/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>Jama</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/qsaratomic/pom.xml b/descriptor/qsaratomic/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>Jama</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/qsarbond/pom.xml b/descriptor/qsarbond/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>Jama</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/qsarionpot/pom.xml b/descriptor/qsarionpot/pom.xml
@@ -42,12 +42,6 @@
             <version>1.0.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>xom</groupId>
             <artifactId>xom</artifactId>

diff --git a/descriptor/qsarmolecular/pom.xml b/descriptor/qsarmolecular/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>Jama</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/qsarprotein/pom.xml b/descriptor/qsarprotein/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>Jama</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>

diff --git a/descriptor/signature/pom.xml b/descriptor/signature/pom.xml
@@ -48,12 +48,6 @@
             <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-annotation</artifactId>

diff --git a/display/renderbasic/pom.xml b/display/renderbasic/pom.xml
@@ -39,12 +39,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-annotation</artifactId>

diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>cdk-interfaces</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jgrapht</groupId>
+            <artifactId>jgrapht</artifactId>
+            <version>0.6.0</version>
+        </dependency>
         <dependency>
             <groupId>org.openscience.cdk</groupId>
             <artifactId>cdk-data</artifactId>

diff --git a/misc/test-extra/pom.xml b/misc/test-extra/pom.xml
@@ -36,12 +36,6 @@
             <version>1.0.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.xml-cml</groupId>
             <artifactId>cmlxom</artifactId>

diff --git a/storage/inchi/pom.xml b/storage/inchi/pom.xml
@@ -53,12 +53,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/storage/io/pom.xml b/storage/io/pom.xml
@@ -49,12 +49,6 @@
             <version>2.1.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.xml-cml</groupId>
             <artifactId>cmlxom</artifactId>

diff --git a/storage/ioformats/pom.xml b/storage/ioformats/pom.xml
@@ -28,12 +28,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.xml-cml</groupId>
             <artifactId>cmlxom</artifactId>

diff --git a/storage/libiocml/pom.xml b/storage/libiocml/pom.xml
@@ -50,12 +50,6 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-annotation</artifactId>

diff --git a/storage/smiles/pom.xml b/storage/smiles/pom.xml
@@ -46,12 +46,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/tool/builder3d/pom.xml b/tool/builder3d/pom.xml
@@ -52,12 +52,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-core</artifactId>

diff --git a/tool/charges/pom.xml b/tool/charges/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>vecmath</artifactId>
             <version>1.5.2</version>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-        </dependency>
         <dependency>
             <groupId>uk.ac.ebi.beam</groupId>
             <artifactId>beam-core</artifactId>

diff --git a/tool/forcefield/pom.xml b/tool/forcefield/pom.xml
@@ -47,12 +47,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/tool/formula/pom.xml b/tool/formula/pom.xml
@@ -35,12 +35,6 @@
             <version>1.0.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/tool/fragment/pom.xml b/tool/fragment/pom.xml
@@ -48,12 +48,6 @@
             <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-interfaces</artifactId>

diff --git a/tool/group/pom.xml b/tool/group/pom.xml
@@ -19,12 +19,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-annotation</artifactId>

diff --git a/tool/pcore/pom.xml b/tool/pcore/pom.xml
@@ -38,12 +38,6 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/tool/sdg/pom.xml b/tool/sdg/pom.xml
@@ -47,12 +47,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-annotation</artifactId>

diff --git a/tool/smarts/pom.xml b/tool/smarts/pom.xml
@@ -45,12 +45,6 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

diff --git a/tool/smsd/pom.xml b/tool/smsd/pom.xml
@@ -44,12 +44,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>uk.ac.ebi.beam</groupId>
             <artifactId>beam-core</artifactId>

diff --git a/tool/structgen/pom.xml b/tool/structgen/pom.xml
@@ -30,12 +30,6 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>