Merge pull request #188 from egonw/patch/dataFeaturesInIOFormats

Merged the last bits of cdk-annotation into cdk-ioformats
cdk · Jan 7, 2016 · fcac95e · fcac95e
2 parents 591b21d + 2c4b04e
commit fcac95e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 21 deletions.
diff --git a/base/pom.xml b/base/pom.xml
@@ -11,6 +11,7 @@
     </parent>
     <name>cdk-base</name>
     <modules>
+        <module>annotation</module>
         <module>interfaces</module>
         <module>atomtype</module>
         <module>core</module>
@@ -21,7 +22,6 @@
         <module>test-core</module>
         <module>test-standard</module>
         <module>test-valencycheck</module>
-        <module>annotation</module>
         <module>data</module>
         <module>silent</module>
         <module>datadebug</module>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -20,11 +20,6 @@
             <artifactId>cdk-interfaces</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-annotation</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-core</artifactId>

diff --git a/misc/extra/pom.xml b/misc/extra/pom.xml
@@ -30,11 +30,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-annotation</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-data</artifactId>

diff --git a/storage/io/pom.xml b/storage/io/pom.xml
@@ -60,11 +60,6 @@
             <version>1.2.5</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-annotation</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-interfaces</artifactId>

diff --git a/storage/ioformats/pom.xml b/storage/ioformats/pom.xml
@@ -57,11 +57,6 @@
             <version>1.1.4c</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-annotation</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-interfaces</artifactId>

diff --git a/...g/openscience/cdk/tools/DataFeatures.java → ...g/openscience/cdk/tools/DataFeatures.java b/...g/openscience/cdk/tools/DataFeatures.java → ...g/openscience/cdk/tools/DataFeatures.java