From 827fd60a8753163861ec4f2c0db0bf1c2d644957 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 7 Dec 2021 09:30:43 +0000 Subject: [PATCH] Add idea files to ignore svn list. Update notification and admin tools library --- pom.xml | 4 ++-- .../UoaMonitorServiceApplication.java | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d1295d2..17b5dfb 100644 --- a/pom.xml +++ b/pom.xml @@ -84,12 +84,12 @@ eu.dnetlib uoa-admin-tools-library - 1.0.3 + 1.0.4 eu.dnetlib uoa-notification-service - 1.0.3 + 1.0.4 org.springframework.boot diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java index 1233a02..e1412bc 100644 --- a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java +++ b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java @@ -1,8 +1,10 @@ package eu.dnetlib.uoamonitorservice; +import eu.dnetlib.uoaadmintoolslibrary.UoaAdminToolsLibraryConfiguration; import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration; import eu.dnetlib.uoamonitorservice.configuration.GlobalVars; import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig; +import eu.dnetlib.uoanotificationservice.configuration.NotificationConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -10,9 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySources; //uoahelptexts -@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary", "eu.dnetlib.uoanotificationservice" -// , "eu.dnetlib.uoaauthorizationlibrary" -}) +@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice"}) @PropertySources({ @PropertySource("classpath:authorization.properties"), @PropertySource("classpath:admintoolslibrary.properties"), @@ -20,11 +20,8 @@ import org.springframework.context.annotation.PropertySources; @PropertySource("classpath:monitorservice.properties"), @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) }) - -//SecurityConfig.class, @EnableConfigurationProperties({ MongoConfig.class, GlobalVars.class}) - -@Import(AuthorizationConfiguration.class) +@Import({AuthorizationConfiguration.class, UoaAdminToolsLibraryConfiguration.class, NotificationConfiguration.class}) public class UoaMonitorServiceApplication { public static void main(String[] args) { SpringApplication.run(UoaMonitorServiceApplication.class, args);