diff --git a/pom.xml b/pom.xml
index 4df8163..614d0f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,14 @@
2.0.5-SNAPSHOT
war
uoa-admin-tools
-
- org.springframework.boot
- spring-boot-starter-parent
- 1.5.8.RELEASE
-
+ eu.dnetlib
+ uoa-spring-boot-parent
+ 1.0.0-SNAPSHOT
UTF-8
UTF-8
- 1.8
${maven.build.timestamp}
E MMM dd HH:mm:ss z yyyy
@@ -26,77 +23,39 @@
org.springframework.boot
spring-boot-starter-data-mongodb
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- provided
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
-
- org.springframework.boot
- spring-boot-starter-security
-
-
-
- log4j
- log4j
- 1.2.17
-
-
- com.google.code.gson
- gson
- 2.8.2
-
javax.mail
mail
1.5.0-b01
-
- commons-io
- commons-io
- 20030203.000550
-
+
+
+
+
+
eu.dnetlib
uoa-admin-tools-library
- 1.0.5
+ 1.0.6-SNAPSHOT
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
-
-
-
-
-
-
-
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ eu.dnetlib.uoaadmintools.UoaAdminToolsApplication
+ true
+
+
+
+
+ repackage
+
+
+
+
org.apache.maven.plugins
maven-war-plugin
@@ -107,27 +66,5 @@
uoa-admin-tools
-
-
- src/main/resources
- true
-
-
-
-
-
- dnet45-releases
- D-Net 45 Releases
- http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases
-
- true
-
-
- false
-
- default
-
-
-
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
index cd91dd8..dd2706c 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
@@ -7,7 +7,8 @@ import eu.dnetlib.uoaadmintools.configuration.GlobalVars;
import eu.dnetlib.uoaadmintools.configuration.mongo.MongoConnection;
import eu.dnetlib.uoaadmintools.configuration.properties.ManagersApiConfig;
import eu.dnetlib.uoaadmintools.configuration.properties.MongoConfig;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,7 +24,7 @@ import java.util.Map;
@RestController
@CrossOrigin(origins = "*")
public class AdminToolsCheckDeployController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private MongoConnection mongoConnection;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/BrowserCacheController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/BrowserCacheController.java
index 6b78e6f..dc4bb3a 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/BrowserCacheController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/BrowserCacheController.java
@@ -1,19 +1,18 @@
package eu.dnetlib.uoaadmintools.controllers;
import eu.dnetlib.uoaadmintools.configuration.properties.BrowserCacheConfig;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
@RestController
@RequestMapping("/cache")
@CrossOrigin(origins = "*")
public class BrowserCacheController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private RestTemplate restTemplate;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java
index 2e1ef8b..f09979c 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java
@@ -8,7 +8,8 @@ import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +20,7 @@ import java.util.List;
@RequestMapping("/community")
@CrossOrigin(origins = "*")
public class CommunityController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private RolesUtils rolesUtils;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java
index 9420b5b..3da4d68 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java
@@ -7,7 +7,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +19,7 @@ import java.util.List;
@RequestMapping("/connect")
@CrossOrigin(origins = "*")
public class ConnectController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private LayoutService layoutService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CuratorController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CuratorController.java
index 6a46990..02bac7e 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CuratorController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CuratorController.java
@@ -5,7 +5,8 @@ import eu.dnetlib.uoaadmintools.entities.curator.CuratorResponse;
import eu.dnetlib.uoaadmintools.services.CuratorService;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +16,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class CuratorController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private CuratorService curatorService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/EmailController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/EmailController.java
index 6153771..291e839 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/EmailController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/EmailController.java
@@ -12,7 +12,8 @@ import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.InvalidReCaptchaException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoaadmintoolslibrary.recaptcha.VerifyRecaptcha;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +22,7 @@ import java.util.*;
@RestController
@CrossOrigin(origins = "*")
public class EmailController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private EmailSender emailSender;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java
index 9b8ac06..a9b06c0 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java
@@ -5,7 +5,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +18,7 @@ import java.util.List;
@CrossOrigin(origins = "*")
@PreAuthorize("hasAnyAuthority(@AuthorizationService.PORTAL_ADMIN)")
public class ExploreController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalService portalService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/MenuController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/MenuController.java
index 7110434..a4f2071 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/MenuController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/MenuController.java
@@ -10,7 +10,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +21,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class MenuController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private MenuService menuService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/NotificationsController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/NotificationsController.java
index 75fac21..ddf021c 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/NotificationsController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/NotificationsController.java
@@ -7,7 +7,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +21,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class NotificationsController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private NotificationsDAO notificationsDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/PortalSubscribersController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/PortalSubscribersController.java
index 05ce988..86356ae 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/PortalSubscribersController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/PortalSubscribersController.java
@@ -5,7 +5,8 @@ import eu.dnetlib.uoaadmintools.entities.subscriber.PortalSubscribers;
import eu.dnetlib.uoaadmintoolslibrary.dao.PortalDAO;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.responses.SingleValueWrapperResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -26,7 +27,7 @@ public class PortalSubscribersController {
// @Autowired
// private SecurityConfig securityConfig;
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@RequestMapping(value = "/community/{pid}/subscribers/count", method = RequestMethod.GET)
public SingleValueWrapperResponse getNumberOfSubscribersPerPortal(@PathVariable(value="pid", required = true) String pid) throws ContentNotFoundException {
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/SubscriberController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/SubscriberController.java
index 9510a55..f42a32b 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/SubscriberController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/SubscriberController.java
@@ -3,7 +3,8 @@ package eu.dnetlib.uoaadmintools.controllers;
import eu.dnetlib.uoaadmintools.dao.SubscriberDAO;
import eu.dnetlib.uoaadmintools.entities.subscriber.Subscriber;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +16,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class SubscriberController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private SubscriberDAO subscriberDAO;
@RequestMapping(value = "/subscriber", method = RequestMethod.GET)
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/CuratorService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/CuratorService.java
index 85e5247..cfe78ad 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/CuratorService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/CuratorService.java
@@ -5,7 +5,8 @@ import eu.dnetlib.uoaadmintools.dao.CuratorDAO;
import eu.dnetlib.uoaadmintools.entities.Manager;
import eu.dnetlib.uoaadmintools.entities.curator.Curator;
import eu.dnetlib.uoaadmintools.entities.curator.CuratorResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,7 +16,7 @@ import java.util.List;
@Service
public class CuratorService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private CuratorDAO curatorDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/LayoutService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/LayoutService.java
index 429acb7..a110d14 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/LayoutService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/LayoutService.java
@@ -3,15 +3,16 @@ package eu.dnetlib.uoaadmintools.services;
import eu.dnetlib.uoaadmintools.dao.LayoutDAO;
import eu.dnetlib.uoaadmintools.entities.Layout;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.apache.logging.log4j.LogManager;
import java.util.List;
@Service
public class LayoutService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private LayoutDAO layoutDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/MenuService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/MenuService.java
index fbec4ed..c65a5b2 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/MenuService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/MenuService.java
@@ -8,7 +8,8 @@ import eu.dnetlib.uoaadmintools.entities.menu.MenuItem;
import eu.dnetlib.uoaadmintools.entities.menu.MenuItemFull;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@ import java.util.List;
@Service
public class MenuService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private MenuDAO menuDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/NotificationsService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/NotificationsService.java
index 81ec8db..7442679 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/NotificationsService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/NotificationsService.java
@@ -2,7 +2,8 @@ package eu.dnetlib.uoaadmintools.services;
import eu.dnetlib.uoaadmintools.dao.NotificationsDAO;
import eu.dnetlib.uoaadmintools.entities.Notifications;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,7 +11,7 @@ import java.util.List;
@Service
public class NotificationsService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private NotificationsDAO notificationsDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/StatisticsService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/StatisticsService.java
index afccd59..001445e 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/StatisticsService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/StatisticsService.java
@@ -2,13 +2,14 @@ package eu.dnetlib.uoaadmintools.services;
import eu.dnetlib.uoaadmintools.dao.StatisticsDAO;
import eu.dnetlib.uoaadmintools.entities.statistics.Statistics;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class StatisticsService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private StatisticsDAO statisticsDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/services/SubscriberService.java b/src/main/java/eu/dnetlib/uoaadmintools/services/SubscriberService.java
index 798a032..235e4a5 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/services/SubscriberService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/services/SubscriberService.java
@@ -2,13 +2,14 @@ package eu.dnetlib.uoaadmintools.services;
import eu.dnetlib.uoaadmintools.dao.PortalSubscribersDAO;
import eu.dnetlib.uoaadmintools.entities.subscriber.PortalSubscribers;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SubscriberService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalSubscribersDAO portalSubscribersDAO;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index de1e5d7..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.rootLogger = DEBUG, R
-
-log4j.logger.eu.dnetlib = DEBUG
-log4j.logger.org.springframework = DEBUG, S
-
-log4j.additivity.org.springframework = false
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/var/log/dnet/uoa-admin-tools/uoa-admin-tools.log
-log4j.appender.R.MaxFileSize=10MB
-log4j.appender.R.MaxBackupIndex=10
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
-
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.S.File=/var/log/dnet/uoa-admin-tools/uoa-admin-tools-spring.log
-log4j.appender.S.MaxFileSize=10MB
-log4j.appender.S.MaxBackupIndex=10
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..4ec29fc
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ %d %p %t [%c] - %m%n
+
+
+
+
+
+
+ ${LOG_PATTERN}
+
+
+
+
+
+
+
+
+ ${LOG_PATTERN}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file