Update to springboot 2.1.0

Issue-ID: OPTFRA-397
Change-Id: I62f861e09b18514795e1a51967a2797ded40b089
Signed-off-by: Jerry Flood <jflood@att.com>

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 33fc812..6eec9a5 100644 (file)
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -58,7 +58,7 @@
 \r
                <java.version>1.8</java.version>\r
         <spring.version>5.0.10.RELEASE</spring.version>\r
-               <spring.boot.version>2.0.6.RELEASE</spring.boot.version>\r
+               <spring.boot.version>2.1.0.RELEASE</spring.boot.version>\r
 \r
                <maven.compiler.target>1.8</maven.compiler.target>\r
                <maven.compiler.source>1.8</maven.compiler.source>\r

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index ff72c1c..42ec87e 100644 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -63,7 +63,7 @@
                <eelf.version>1.0.0</eelf.version>\r
                <pact.version>3.3.9</pact.version>\r
         <spring.version>5.0.10.RELEASE</spring.version>\r
-               <spring.boot.version>2.0.6.RELEASE</spring.boot.version>\r
+               <spring.boot.version>2.1.0.RELEASE</spring.boot.version>\r
                <springfox.swagger2.version>2.9.2</springfox.swagger2.version>\r
 \r
                <maven.compiler.target>1.8</maven.compiler.target>\r

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java b/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
index 8d9cb60..9b10d51 100644 (file)
--- a/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
@@ -1,6 +1,6 @@
 /*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
+ * Copyright © 2017-2019 AT&T Intellectual Property.\r
+ * Modifications Copyright © 2018 IBM.\r
  * \r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r

diff --git a/cmso-service/src/main/resources/application.properties b/cmso-service/src/main/resources/application.properties
index 25c5b10..fb3ee01 100644 (file)
--- a/cmso-service/src/main/resources/application.properties
+++ b/cmso-service/src/main/resources/application.properties
@@ -37,6 +37,7 @@ info.build.version=@project.version@
 spring.jersey.type=filter\r
 spring.mvc.urls=swagger,docs,prometheus\r
 server.servlet.context-path=/cmso\r
+spring.main.allow-bean-definition-overriding=true\r
 \r
 #This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma\r
 #tomcat.connector.attributes=allowTrace-true\r