From f168a37fc269e58e77ad10969960ef84446a47ee Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Mon, 11 Feb 2019 11:26:23 -0500
Subject: Update to springboot 2.1.0

Issue-ID: OPTFRA-397
Change-Id: I62f861e09b18514795e1a51967a2797ded40b089
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-service/pom.xml                                                  | 2 +-
 .../src/main/java/org/onap/optf/cmso/JerseyConfiguration.java         | 4 ++--
 cmso-service/src/main/resources/application.properties                | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'cmso-service')

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index ff72c1c..42ec87e 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -63,7 +63,7 @@
 		<eelf.version>1.0.0</eelf.version>
 		<pact.version>3.3.9</pact.version>
         <spring.version>5.0.10.RELEASE</spring.version>
-		<spring.boot.version>2.0.6.RELEASE</spring.boot.version>
+		<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
 		<springfox.swagger2.version>2.9.2</springfox.swagger2.version>
 
 		<maven.compiler.target>1.8</maven.compiler.target>
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
--- 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 @@
 /*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
+ * Copyright © 2017-2019 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/cmso-service/src/main/resources/application.properties b/cmso-service/src/main/resources/application.properties
index 25c5b10..fb3ee01 100644
--- 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
 spring.mvc.urls=swagger,docs,prometheus
 server.servlet.context-path=/cmso
+spring.main.allow-bean-definition-overriding=true
 
 #This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma
 #tomcat.connector.attributes=allowTrace-true
-- 
cgit 1.2.3-korg