Skip to content

Commit

Permalink
Ensure there is only one version of Log4J coming in.
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnmay
johnmay committed Dec 13, 2021
1 parent 21898b3 commit e05f6f1
Show file tree
Hide file tree
Showing 11 changed files with 144 additions and 5 deletions.
14 changes: 14 additions & 0 deletions descriptor/qsarcml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
16 changes: 16 additions & 0 deletions misc/test-extra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</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-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 14 additions & 0 deletions storage/inchi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@
<dependency>
<groupId>net.sf.jni-inchi</groupId>
<artifactId>jni-inchi</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
16 changes: 16 additions & 0 deletions storage/io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</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-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
16 changes: 16 additions & 0 deletions storage/ioformats/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</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-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 10 additions & 0 deletions storage/iordf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,22 @@
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.10</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 14 additions & 0 deletions storage/libiocml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,20 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
14 changes: 14 additions & 0 deletions storage/libiomd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
14 changes: 14 additions & 0 deletions storage/pdbcml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
16 changes: 16 additions & 0 deletions storage/smiles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@
<groupId>org.blueobelisk</groupId>
<artifactId>cmlxom</artifactId>
<version>3.2</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-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 0 additions & 5 deletions tool/tautomer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
<artifactId>vecmath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.jni-inchi</groupId>
<artifactId>jni-inchi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.ac.ebi.beam</groupId>
<artifactId>beam-core</artifactId>
Expand Down

0 comments on commit e05f6f1

Please sign in to comment.