From 10810a8a632877c542a626c985eca32f3718beec Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 15 May 2019 16:37:57 +0200
Subject: [PATCH] versions of libraries moved to global pom.xml
---
annotation/pom.xml | 5 +++--
converter-SBGNML/pom.xml | 2 +-
persist/pom.xml | 19 +------------------
pom.xml | 3 +++
.../models/functions/FunctionsRestImpl.java | 5 +++--
5 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/annotation/pom.xml b/annotation/pom.xml
index a9225984b5..9db1f50860 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 1d76185830..44f829a127 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 4cff11c4c8..1cd475a7c2 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 6d93399883..5e3329c845 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 435a8baf0a..403b39d01b 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;
--
GitLab