Add idea files to ignore svn list. Update notification and admin tools library
This commit is contained in:
parent
feb43d186c
commit
827fd60a87
4
pom.xml
4
pom.xml
|
@ -84,12 +84,12 @@
|
||||||
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-admin-tools-library</artifactId>
|
<artifactId>uoa-admin-tools-library</artifactId>
|
||||||
<version>1.0.3</version>
|
<version>1.0.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-notification-service</artifactId>
|
<artifactId>uoa-notification-service</artifactId>
|
||||||
<version>1.0.3</version>
|
<version>1.0.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
package eu.dnetlib.uoamonitorservice;
|
package eu.dnetlib.uoamonitorservice;
|
||||||
|
|
||||||
|
import eu.dnetlib.uoaadmintoolslibrary.UoaAdminToolsLibraryConfiguration;
|
||||||
import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
|
import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
|
||||||
import eu.dnetlib.uoamonitorservice.configuration.GlobalVars;
|
import eu.dnetlib.uoamonitorservice.configuration.GlobalVars;
|
||||||
import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig;
|
import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig;
|
||||||
|
import eu.dnetlib.uoanotificationservice.configuration.NotificationConfiguration;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
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.PropertySource;
|
||||||
import org.springframework.context.annotation.PropertySources;
|
import org.springframework.context.annotation.PropertySources;
|
||||||
//uoahelptexts
|
//uoahelptexts
|
||||||
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary", "eu.dnetlib.uoanotificationservice"
|
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice"})
|
||||||
// , "eu.dnetlib.uoaauthorizationlibrary"
|
|
||||||
})
|
|
||||||
@PropertySources({
|
@PropertySources({
|
||||||
@PropertySource("classpath:authorization.properties"),
|
@PropertySource("classpath:authorization.properties"),
|
||||||
@PropertySource("classpath:admintoolslibrary.properties"),
|
@PropertySource("classpath:admintoolslibrary.properties"),
|
||||||
|
@ -20,11 +20,8 @@ import org.springframework.context.annotation.PropertySources;
|
||||||
@PropertySource("classpath:monitorservice.properties"),
|
@PropertySource("classpath:monitorservice.properties"),
|
||||||
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
||||||
})
|
})
|
||||||
|
|
||||||
//SecurityConfig.class,
|
|
||||||
@EnableConfigurationProperties({ MongoConfig.class, GlobalVars.class})
|
@EnableConfigurationProperties({ MongoConfig.class, GlobalVars.class})
|
||||||
|
@Import({AuthorizationConfiguration.class, UoaAdminToolsLibraryConfiguration.class, NotificationConfiguration.class})
|
||||||
@Import(AuthorizationConfiguration.class)
|
|
||||||
public class UoaMonitorServiceApplication {
|
public class UoaMonitorServiceApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication.run(UoaMonitorServiceApplication.class, args);
|
SpringApplication.run(UoaMonitorServiceApplication.class, args);
|
||||||
|
|
Loading…
Reference in New Issue