diff options
Diffstat (limited to 'so-monitoring')
3 files changed, 6 insertions, 8 deletions
diff --git a/so-monitoring/so-monitoring-service/pom.xml b/so-monitoring/so-monitoring-service/pom.xml index ff70a77239..762e3a5ee6 100644 --- a/so-monitoring/so-monitoring-service/pom.xml +++ b/so-monitoring/so-monitoring-service/pom.xml @@ -37,15 +37,10 @@ <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> diff --git a/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringApplication.java b/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringApplication.java index 7c5a8965b7..aff4fecfdc 100644 --- a/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringApplication.java +++ b/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringApplication.java @@ -22,11 +22,12 @@ package org.onap.so.monitoring.rest.api; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; /** * @author waqas.ikram@ericsson.com */ -@SpringBootApplication(scanBasePackages = {"org.onap"}) +@SpringBootApplication(scanBasePackages = {"org.onap"}, exclude = SecurityAutoConfiguration.class) public class SoMonitoringApplication { public static void main(String[] args) { diff --git a/so-monitoring/so-monitoring-ui/pom.xml b/so-monitoring/so-monitoring-ui/pom.xml index a5f1a6c18e..c362a83a9b 100644 --- a/so-monitoring/so-monitoring-ui/pom.xml +++ b/so-monitoring/so-monitoring-ui/pom.xml @@ -28,7 +28,9 @@ </parent> <artifactId>so-monitoring-ui</artifactId> - + <properties> + <yarn.proxy>false</yarn.proxy> + </properties> <build> <plugins> <plugin> @@ -66,7 +68,7 @@ <goal>yarn</goal> </goals> <configuration> - <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven> + <yarnInheritsProxyConfigFromMaven>${yarn.proxy}</yarnInheritsProxyConfigFromMaven> <arguments>build</arguments> </configuration> </execution> |