diff --git a/pom.xml b/pom.xml
index a257c4e..e592c52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,48 +4,57 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- eu.dnetlib
- dnet45-parent
- 1.0.0-SNAPSHOT
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.5.4
+
4.0.0
+ eu.dnetlib
uoa-repository-manager-service
1.0.0-SNAPSHOT
war
+
+ 2.5.4
+
- org.springframework
- spring-webmvc
- ${spring.version}
+ org.springframework.boot
+ spring-boot-starter-web
+ ${spring.boot.version}
- org.hibernate
- hibernate-validator-annotation-processor
- 4.1.0.Final
+ org.springframework.boot
+ spring-boot-starter-data-jdbc
+ ${spring.boot.version}
- log4j
- log4j
- ${log4j.version}
+ org.springframework.boot
+ spring-boot-actuator-autoconfigure
+ ${spring.boot.version}
eu.dnetlib
- dnet-runtime
- [1.0.0-SNAPSHOT, 2.0.0)
-
-
- org.apache.geronimo.specs
- geronimo-javamail_1.4_spec
-
-
-
-
- eu.dnetlib
- uoa-utils
+ uoa-clients
[2.0.0-SNAPSHOT, 3.0.0)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
eu.dnetlib
uoa-domain
@@ -79,22 +88,6 @@
2.2
-
- eu.dnetlib
- uoa-commons
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-clients
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-hcm
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
commons-io
commons-io
@@ -106,17 +99,17 @@
oai4j
[0.6b1,)
-
- xalan
- xalan
- 2.7.2
-
+
+
+
+
+
-
- xerces
- xercesImpl
- 2.11.0
-
+
+
+
+
+
com.fasterxml.jackson.core
@@ -131,17 +124,17 @@
compile
-
- org.springframework
- spring-context
- ${spring.version}
-
+
+
+
+
+
-
- org.springframework
- spring-jdbc
- ${spring.version}
-
+
+
+
+
+
com.sun.jersey
@@ -185,11 +178,11 @@
-
- org.apache.tomcat
- tomcat-catalina
- 9.0.22
-
+
+
+
+
+
commons-fileupload
@@ -297,21 +290,21 @@
-
- org.springframework.boot
- spring-boot-actuator
- 1.3.5.RELEASE
-
+
+
+
+
+
-
- io.micrometer
- micrometer-core
- 1.7.2
-
+
+
+
+
+
io.micrometer
micrometer-registry-prometheus
@@ -377,5 +370,30 @@
-
-
+
+
+ dnet-deps
+ dnet-dependencies
+ https://maven.d4science.org/nexus/content/repositories/dnet-deps
+ default
+
+
+ dnet45-snapshots
+ D-Net 45 Snapshots
+ https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots
+ default
+
+ true
+
+
+
+ dnet45-releases
+ D-Net 45 Releases
+ https://maven.d4science.org/nexus/content/repositories/dnet45-releases
+ default
+
+ true
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java
deleted file mode 100644
index 875b2a1..0000000
--- a/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.PublicMetricsAutoConfiguration;
-import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
-import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping;
-import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
-import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import java.util.Collection;
-
-@Configuration
-@EnableWebMvc
-@Import({
- EndpointAutoConfiguration.class,
- PublicMetricsAutoConfiguration.class,
-// HealthIndicatorAutoConfiguration.class
-})
-
-public class ActuatorConfig { // TODO: remove this with migration to Spring Boot 2
-
- @Bean
- @Autowired
- public EndpointHandlerMapping endpointHandlerMapping(Collection extends MvcEndpoint> endpoints) {
- return new EndpointHandlerMapping(endpoints);
- }
-
- @Bean
- @Autowired
- public EndpointMvcAdapter metricsEndPoint(MetricsEndpoint delegate) {
- return new EndpointMvcAdapter(delegate);
- }
-}