diff --git a/pom.xml b/pom.xml index cee017e..1d4745f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,11 @@ 4.0.0 - eu.dnetlib uoa-admin-tools - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT war - uoa-admin-tools - org.springframework.boot @@ -17,14 +14,6 @@ 1.5.8.RELEASE - - - - - - - - UTF-8 UTF-8 @@ -32,20 +21,6 @@ ${maven.build.timestamp} E MMM dd HH:mm:ss z yyyy - - - - - - - - - - - - - - org.springframework.boot @@ -101,10 +76,9 @@ eu.dnetlib uoa-admin-tools-library - 1.0.3 + 1.0.4 - @@ -123,7 +97,6 @@ - org.apache.maven.plugins maven-war-plugin diff --git a/src/main/java/eu/dnetlib/uoaadmintools/UoaAdminToolsApplication.java b/src/main/java/eu/dnetlib/uoaadmintools/UoaAdminToolsApplication.java index 333d9f3..db773a6 100644 --- a/src/main/java/eu/dnetlib/uoaadmintools/UoaAdminToolsApplication.java +++ b/src/main/java/eu/dnetlib/uoaadmintools/UoaAdminToolsApplication.java @@ -4,8 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.uoaadmintools.configuration.GlobalVars; import eu.dnetlib.uoaadmintools.configuration.properties.ManagersApiConfig; import eu.dnetlib.uoaadmintools.configuration.properties.MongoConfig; -//import eu.dnetlib.uoaadmintools.configuration.properties.SecurityConfig; -//import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration; +import eu.dnetlib.uoaadmintoolslibrary.UoaAdminToolsLibraryConfiguration; import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,7 +16,7 @@ import org.springframework.context.annotation.PropertySources; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.client.RestTemplate; -@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoaadmintools", "eu.dnetlib.uoaadmintoolslibrary"}) +@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoaadmintools"}) @PropertySources({ @PropertySource("classpath:authorization.properties"), @PropertySource("classpath:admintoolslibrary.properties"), @@ -25,7 +24,7 @@ import org.springframework.web.client.RestTemplate; @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) }) @EnableConfigurationProperties({MongoConfig.class, ManagersApiConfig.class, GlobalVars.class}) -@Import(AuthorizationConfiguration.class) +@Import({AuthorizationConfiguration.class, UoaAdminToolsLibraryConfiguration.class}) public class UoaAdminToolsApplication { public static void main(String[] args) {