Skip to content

Commit

Permalink
Cleanup of dependencies in CDK storage/io modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnmay @egonw
johnmay authored and egonw committed Dec 22, 2021
1 parent 869bfce commit d1dfe3a
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 227 deletions.
27 changes: 25 additions & 2 deletions storage/ctab/pom.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cdk-storage</artifactId>
<groupId>org.openscience.cdk</groupId>
Expand Down Expand Up @@ -42,6 +42,29 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<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>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openscience.cdk</groupId>
<artifactId>cdk-core</artifactId>
<version>2.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openscience.cdk</groupId>
<artifactId>cdk-standard</artifactId>
<version>2.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down
19 changes: 11 additions & 8 deletions storage/inchi/pom.xml
View file
Expand Up @@ -12,16 +12,25 @@

<artifactId>cdk-inchi</artifactId>

<properties>
<jna-inchi.version>1.0.1</jna-inchi.version>
</properties>

<name>cdk-inchi</name>
<dependencies>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
</dependency>
<dependency>
<groupId>io.github.dan2097</groupId>
<artifactId>jna-inchi-api</artifactId>
<version>${jna-inchi.version}</version>
</dependency>
<dependency>
<groupId>io.github.dan2097</groupId>
<artifactId>jna-inchi-core</artifactId>
<version>1.0.1</version>
<version>${jna-inchi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -60,7 +69,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-io</artifactId>
<artifactId>cdk-atomtype</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -88,12 +97,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-render</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-test</artifactId>
Expand Down
23 changes: 8 additions & 15 deletions storage/io/pom.xml
View file
Expand Up @@ -38,25 +38,18 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
</dependency>
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
84 changes: 1 addition & 83 deletions storage/ioformats/pom.xml
View file
Expand Up @@ -28,39 +28,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.4c</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openscience.cdk</groupId>
<artifactId>cdk-interfaces</artifactId>
Expand All @@ -72,60 +44,6 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-core</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-standard</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<!--<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-io</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-iordf</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-smiles</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-pdb</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-libiocml</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-extra</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-data</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-test</artifactId>
Expand All @@ -138,7 +56,7 @@
<artifactId>cdk-testdata</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
37 changes: 6 additions & 31 deletions storage/iordf/pom.xml
View file
Expand Up @@ -14,10 +14,6 @@

<name>cdk-iordf</name>
<dependencies>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
Expand Down Expand Up @@ -80,21 +76,6 @@
<artifactId>cdk-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-standard</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-atomtype</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-io</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-diff</artifactId>
Expand All @@ -115,36 +96,30 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-test</artifactId>
<artifactId>cdk-datadebug</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-io</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-datadebug</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-testdata</artifactId>
<artifactId>cdk-test</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-isomorphism</artifactId>
<artifactId>cdk-testdata</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
12 changes: 0 additions & 12 deletions storage/libiocml/pom.xml
View file
Expand Up @@ -120,24 +120,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-atomtype</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-silent</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-pdb</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-testdata</artifactId>
Expand Down
17 changes: 5 additions & 12 deletions storage/libiomd/pom.xml
View file
Expand Up @@ -41,14 +41,13 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<scope>test</scope>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-core</artifactId>
<version>${project.parent.version}</version>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -82,12 +81,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cdk-formula</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>

0 comments on commit d1dfe3a

Please sign in to comment.