Remove Guava dependency

johnmay · egonw · commit fc122daa1828 · 2022-01-01T11:32:07.000+01:00
diff --git a/app/depict/pom.xml b/app/depict/pom.xml
@@ -30,10 +30,6 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.openscience.cdk</groupId>
             <artifactId>cdk-core</artifactId>
diff --git a/base/core/pom.xml b/base/core/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-interfaces</artifactId>
diff --git a/base/data/pom.xml b/base/data/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/base/data/src/main/java/org/openscience/cdk/AtomContainer2.java b/base/data/src/main/java/org/openscience/cdk/AtomContainer2.java
@@ -880,6 +880,7 @@ public void add(IAtomContainer that) {
                 addAtom(atom);
             }
         }
+        /* FIXME!!! */
         for (IBond bond : that.bonds()) {
             if (!bond.getFlag(CDKConstants.VISITED)) {
                 bond.setFlag(CDKConstants.VISITED, true);
diff --git a/base/isomorphism/pom.xml b/base/isomorphism/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/base/silent/pom.xml b/base/silent/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/base/standard/pom.xml b/base/standard/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-interfaces</artifactId>
diff --git a/base/test-core/pom.xml b/base/test-core/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
diff --git a/base/test-standard/pom.xml b/base/test-standard/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>vecmath</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/display/renderbasic/pom.xml b/display/renderbasic/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -26,10 +26,6 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -458,11 +458,6 @@
                 <artifactId>beam-func</artifactId>
                 <version>1.3.4</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>31.0-jre</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/storage/ctab/pom.xml b/storage/ctab/pom.xml
@@ -45,10 +45,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/storage/inchi/pom.xml b/storage/inchi/pom.xml
@@ -52,11 +52,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-core</artifactId>
diff --git a/storage/io/pom.xml b/storage/io/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/storage/ioformats/pom.xml b/storage/ioformats/pom.xml
@@ -14,10 +14,6 @@
     
     <name>cdk-ioformats</name>
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/storage/smiles/pom.xml b/storage/smiles/pom.xml
@@ -18,10 +18,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>uk.ac.ebi.beam</groupId>
             <artifactId>beam-core</artifactId>
diff --git a/tool/forcefield/pom.xml b/tool/forcefield/pom.xml
@@ -29,10 +29,6 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-core</artifactId>
diff --git a/tool/pcore/pom.xml b/tool/pcore/pom.xml
@@ -22,10 +22,6 @@
             <groupId>xom</groupId>
             <artifactId>xom</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/tool/sdg/pom.xml b/tool/sdg/pom.xml
@@ -23,10 +23,6 @@
             <groupId>javax.vecmath</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/tool/smarts/pom.xml b/tool/smarts/pom.xml
@@ -13,10 +13,6 @@
     <artifactId>cdk-smarts</artifactId>
     <name>cdk-smarts</name>
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -880,6 +880,7 @@ public void add(IAtomContainer that) {`
`880`	`880`	`addAtom(atom);`
`881`	`881`	`}`
`882`	`882`	`}`
	`883`	`+ /* FIXME!!! */`
`883`	`884`	`for (IBond bond : that.bonds()) {`
`884`	`885`	`if (!bond.getFlag(CDKConstants.VISITED)) {`
`885`	`886`	`bond.setFlag(CDKConstants.VISITED, true);`