diff --git a/pom.xml b/pom.xml
index 63e0458..8b48dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.springframework.boot
- spring-boot-starter
+ spring-boot-starter-web
org.springframework.boot
@@ -30,15 +30,10 @@
-
org.springframework.boot
spring-boot-starter-log4j2
-
- org.springframework.boot
- spring-boot-starter-web
-
org.springframework.boot
spring-boot-starter-data-jdbc
@@ -47,11 +42,6 @@
org.springframework.boot
spring-boot-actuator-autoconfigure
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
org.springframework.boot
spring-boot-starter-data-redis
@@ -60,20 +50,7 @@
org.springframework.boot
spring-boot-starter-validation
-
-
+
eu.dnetlib.dhp
@@ -123,36 +100,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
eu.dnetlib
dnet-openaire-usage-stats-sushilite
@@ -192,38 +139,6 @@
2.7.2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
com.sun.jersey
jersey-client
@@ -265,13 +180,6 @@
9.1-901.jdbc3
-
-
-
-
-
-
-
commons-fileupload
commons-fileupload
@@ -293,14 +201,6 @@
org.springframework.session
spring-session-data-redis
-
@@ -324,13 +224,7 @@
cors-filter
2.5
-
+
javax.xml.ws
@@ -384,30 +278,6 @@
test
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- io.micrometer
- micrometer-registry-prometheus
- 1.7.2
- compile
-
-
-
diff --git a/settings-dnet45.xml b/settings-dnet45.xml
deleted file mode 100644
index 6b67467..0000000
--- a/settings-dnet45.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- ${env.HOME}/.m2/repository-dnet45
-
- org.apache.tomcat.maven
-
-
-
- dnet4.0
-
- true
-
-
-
- dnet45-bootstrap-snapshot
- D-Net 45 Bootstrap Snapshot
- https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-snapshot
-
- false
-
-
- true
-
- default
-
-
- dnet45-bootstrap-release
- D-Net 45 Bootstrap Release
- https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-release
-
- true
-
-
- false
-
- default
-
-
-
-
-
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
index fea620a..e2689eb 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
@@ -1,6 +1,7 @@
package eu.dnetlib.repo.manager.config;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
@@ -15,7 +16,7 @@ public class AsyncConfiguration implements AsyncConfigurer {
@Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return new AsyncUncaughtExceptionHandler() {
- private final Logger logger = Logger.getLogger(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
@Override
public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
index 14b5d23..d7d7b89 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
@@ -1,7 +1,8 @@
package eu.dnetlib.repo.manager.config;
import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement
public class DatasourceConfiguration {
- private static Logger logger = Logger.getLogger(DatasourceConfiguration.class);
+ private static Logger logger = LoggerFactory.getLogger(DatasourceConfiguration.class);
@Value("${services.provide.db.driverClassName}")
private String driverClassname;
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
index e942444..d93d44f 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
@@ -1,8 +1,9 @@
package eu.dnetlib.repo.manager.config;
import com.google.gson.JsonParser;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
import org.mitre.openid.connect.model.OIDCAuthenticationToken;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
@@ -22,7 +23,7 @@ public class FrontEndLinkURIAuthenticationSuccessHandler implements Authenticati
private String frontEndURI;
- private static final Logger logger = Logger.getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class);
public void init() {
logger.debug("Front end uri : " + frontEndURI);
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java b/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java
index c992e17..c08e982 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java
@@ -3,9 +3,10 @@ package eu.dnetlib.repo.manager.config;
import com.google.gson.JsonArray;
import com.nimbusds.jwt.JWT;
import eu.dnetlib.repo.manager.service.security.AuthoritiesMapper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
import org.mitre.openid.connect.client.OIDCAuthoritiesMapper;
import org.mitre.openid.connect.model.UserInfo;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -18,7 +19,7 @@ import java.util.Set;
@Component
public class OpenAIREAuthoritiesMapper implements OIDCAuthoritiesMapper {
- private static final Logger logger = Logger.getLogger(OpenAIREAuthoritiesMapper.class);
+ private static final Logger logger = LoggerFactory.getLogger(OpenAIREAuthoritiesMapper.class);
@Value("${services.provide.adminEmail}")
String adminEmail;
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java
index 8949665..11ee4cd 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java
@@ -1,6 +1,7 @@
package eu.dnetlib.repo.manager.config;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -15,7 +16,7 @@ import javax.annotation.PostConstruct;
@EnableRedisHttpSession
public class RedisConfiguration {
- private static Logger logger = Logger.getLogger(RedisConfiguration.class);
+ private static final Logger logger = LoggerFactory.getLogger(RedisConfiguration.class);
@Value("${services.provide.redis.host}")
private String host;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
index d71797c..9c9174d 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
@@ -6,9 +6,9 @@ import eu.dnetlib.repo.manager.exception.BrokerException;
import eu.dnetlib.repo.manager.exception.EndPointException;
import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
import eu.dnetlib.repo.manager.exception.ServerError;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
import org.json.JSONException;
+import org.slf4j.LoggerFactory;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpStatus;
@@ -26,7 +26,7 @@ import java.net.UnknownHostException;
@Order(Ordered.HIGHEST_PRECEDENCE)
public class GenericControllerAdvice {
- private Logger logger = LogManager.getLogger(GenericControllerAdvice.class);
+ private Logger logger = LoggerFactory.getLogger(GenericControllerAdvice.class);
@ResponseStatus(HttpStatus.NOT_FOUND)
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
index 11df575..b2354cb 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
@@ -6,9 +6,10 @@ import eu.dnetlib.repo.manager.domain.JobsOfUser;
import eu.dnetlib.repo.manager.service.MonitorServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
import org.json.JSONException;
import org.mitre.openid.connect.model.OIDCAuthenticationToken;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
@Api(description = "Monitor API", tags = {"monitor"})
public class MonitorController {
- private static final Logger logger = Logger.getLogger(MonitorController.class);
+ private static final Logger logger = LoggerFactory.getLogger(MonitorController.class);
@Autowired
private MonitorServiceImpl monitorService;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
index 3727b27..395856c 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
@@ -9,7 +9,8 @@ import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.MediaType;
@@ -33,7 +34,7 @@ import java.util.List;
@Api(description = "Piwik API", tags = {"piwik"})
public class PiWikController {
- private static final Logger logger = Logger.getLogger(PiWikController.class);
+ private static final Logger logger = LoggerFactory.getLogger(PiWikController.class);
@Autowired
private PiWikServiceImpl piWikService;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java
index 3c147f8..28102ea 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java
@@ -11,7 +11,8 @@ import io.micrometer.core.instrument.binder.system.UptimeMetrics;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.prometheus.client.exporter.common.TextFormat;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +25,7 @@ import java.io.File;
@RestController
@RequestMapping("/actuator/prometheus")
public class PrometheusController { // TODO: remove this with migration to Spring Boot 2
- private static final Logger logger = Logger.getLogger(PrometheusController.class);
+ private static final Logger logger = LoggerFactory.getLogger(PrometheusController.class);
private final PiWikService piWikService;
private final RepositoryService repositoryService;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
index 1a26f4c..1a3713e 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
@@ -11,9 +11,10 @@ import eu.dnetlib.repo.manager.service.RepositoryService;
import eu.dnetlib.repo.manager.service.security.AuthorizationService;
import eu.dnetlib.repo.manager.utils.JsonUtils;
import io.swagger.annotations.Api;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
import org.json.JSONException;
import org.mitre.openid.connect.model.OIDCAuthenticationToken;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -35,7 +36,7 @@ import java.util.Map;
@Api(description = "Repository API", tags = {"repositories"})
public class RepositoryController {
- private static final Logger logger = Logger.getLogger(RepositoryController.class);
+ private static final Logger logger = LoggerFactory.getLogger(RepositoryController.class);
private final RepositoryService repositoryService;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java
index d4add2b..507dc93 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java
@@ -3,7 +3,8 @@ package eu.dnetlib.repo.manager.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.dnetlib.enabling.datasources.common.AggregationInfo;
import eu.dnetlib.repo.manager.domain.AggregationHistoryResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
@@ -22,7 +23,7 @@ import static eu.dnetlib.repo.manager.utils.DateUtils.getYear;
@Service("aggregationService")
public class AggregationServiceImpl implements AggregationService {
- private static final Logger logger = Logger.getLogger(AggregationServiceImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(AggregationServiceImpl.class);
@Value("${services.provide.clients.dsm}")
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
index fcbf4a5..ee32c5c 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
@@ -9,6 +9,8 @@ import eu.dnetlib.repo.manager.domain.broker.*;
import eu.dnetlib.repo.manager.exception.BrokerException;
import org.apache.commons.lang.NotImplementedException;
import org.json.JSONException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
@@ -40,7 +42,7 @@ public class BrokerServiceImpl implements BrokerService {
@Value("${services.provide.topic_types.url}")
private String topicsURL;
- private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(BrokerServiceImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(BrokerServiceImpl.class);
@Autowired
RestTemplate restTemplate;
@@ -212,7 +214,7 @@ public class BrokerServiceImpl implements BrokerService {
UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(openairePath + service)
.queryParam("email", userEmail);
- logger.debug(builder.build().encode().toUri());
+ logger.debug("{}", builder.build().encode().toUri());
ResponseEntity