summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorIgor Dysko <igor1.dysko@orange.com>2020-08-25 20:06:23 +0200
committerIgor Dysko <igor1.dysko@orange.com>2020-08-25 20:06:23 +0200
commit3029b6b3043e6dbe4c7090384a8e49b0b00081a6 (patch)
tree6c4c41f6e35bb42dc9fbf09ba234462f60041633 /src/main
parentda13873cf332205f83dda4d8763f02d40cfb5a0d (diff)
Update to spring boot 2guilin
Update of dependencies and source code to spring boot 2 Issue-ID: AAI-3106 Signed-off-by: Igor Dysko <igor1.dysko@orange.com> Change-Id: Ie12c330af37d3cc841913c22a3703bcc3ae8a5d5
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/aai/validation/ValidationCmd.java2
-rw-r--r--src/main/java/org/onap/aai/validation/ValidationServiceApplication.java2
-rw-r--r--src/main/resources/application.properties3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/onap/aai/validation/ValidationCmd.java b/src/main/java/org/onap/aai/validation/ValidationCmd.java
index 92ed5ad..c8d33cc 100644
--- a/src/main/java/org/onap/aai/validation/ValidationCmd.java
+++ b/src/main/java/org/onap/aai/validation/ValidationCmd.java
@@ -33,7 +33,7 @@ import org.onap.aai.validation.result.ValidationResult;
import org.onap.aai.validation.result.Violation;
import org.onap.aai.validation.ruledriven.RuleDrivenValidator;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java b/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java
index 52cb339..45d93c4 100644
--- a/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java
+++ b/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java
@@ -30,7 +30,7 @@ import org.onap.aai.validation.util.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ImportResource;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2c93762..905d920 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -45,4 +45,5 @@ publisher.topic.names=poa-audit-result
topics.properties.location=${CONFIG_HOME}/topics/
schema.translator.list=schema-service
-spring.application.name=aai-validation \ No newline at end of file
+spring.application.name=aai-validation
+spring.main.allow-bean-definition-overriding=true