diff --git a/annotation/pom.xml b/annotation/pom.xml index a9225984b57559648a4da39b5f52cf283bb1ddf7..9db1f508603b899ad2c5a28b2ccc82d5538ee40a 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -80,13 +80,14 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.11.2</version> + <version>${log4j-jcl-version}</version> + </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.7</version> + <version>${mail-version}</version> </dependency> <dependency> diff --git a/converter-SBGNML/pom.xml b/converter-SBGNML/pom.xml index 1d761858303d2df02eee7b70aa59f9b346b9ad63..44f829a127997c4d868458f25101ea51e06f8f2d 100644 --- a/converter-SBGNML/pom.xml +++ b/converter-SBGNML/pom.xml @@ -106,7 +106,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.11.2</version> + <version>${log4j-jcl-version}</version> </dependency> <!-- Commons CLI by Apache --> diff --git a/persist/pom.xml b/persist/pom.xml index 4cff11c4c82ea593e4a57808fa53502139ef8703..1cd475a7c2fc433bcf38725a17f8eb30ce260b5b 100644 --- a/persist/pom.xml +++ b/persist/pom.xml @@ -94,24 +94,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.11.2</version> - </dependency> - <!-- Log4J2 --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> - <!-- Spring uses commons-logging, so: https://stackoverflow.com/a/41475146/1127920 --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>2.11.2</version> + <version>${log4j-jcl-version}</version> </dependency> <!-- Spring --> diff --git a/pom.xml b/pom.xml index 6d93399883dcef882e549b4ac04de2c253a36340..5e3329c8451a797d5f3e80de1a8d9ea97debb152 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,9 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <log4j2.version>2.11.2</log4j2.version> + <log4j-jcl-version>2.11.2</log4j-jcl-version> + + <mail-version>1.4.7</mail-version> <xercesImp.version>2.12.0</xercesImp.version> diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/functions/FunctionsRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/functions/FunctionsRestImpl.java index 435a8baf0af597539581f3aeda26541fb1c8d8c0..403b39d01be327bba06d0c69d055b0ce155b2dc3 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/functions/FunctionsRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/functions/FunctionsRestImpl.java @@ -1,6 +1,7 @@ package lcsb.mapviewer.api.projects.models.functions; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -16,8 +17,8 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.xpath.XPathExpressionException; -import org.apache.axis.utils.ByteArrayOutputStream; -import org.apache.logging.log4j.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.w3c.dom.Document;