summaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorSangalang, Felix <felix.sangalang@att.com>2019-07-25 10:07:49 -0500
committerBenjamin, Max (mb388a) <mb388a@att.com>2019-07-26 15:04:41 -0400
commit5ed9813a96c39439d85ad40992cd2f65bb6a170b (patch)
treef9d0e58aa00db29e5970715b0acd9f65589fcbf2 /adapters
parent5128f152409017604d97b1e2f711a77a4c3acdf3 (diff)
Upgrade springboot.version from 2.0.5 to 2.1.5.
Upgrade springboot.version from 2.0.5 to 2.1.5. Fixed APIHandler junit test cases with expected DB error messages. Issue-ID: SO-2157 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I77ce873018b88268b9221226b95c9c106f93a8d0
Diffstat (limited to 'adapters')
-rw-r--r--adapters/mso-catalog-db-adapter/src/main/resources/application.yaml2
-rw-r--r--adapters/mso-openstack-adapters/src/main/resources/application.yaml2
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/application.yaml2
-rw-r--r--adapters/mso-sdnc-adapter/src/main/resources/application.yaml4
4 files changed, 10 insertions, 0 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
index bcf5429789..1487cb21b2 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -41,6 +41,8 @@ spring:
jackson:
serialization:
fail-on-empty-beans: false
+ main:
+ allow-bean-definition-overriding: true
#Actuator
management:
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application.yaml b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
index 1c4de2daa1..ba31daaeaf 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
@@ -33,6 +33,8 @@ spring:
ddl-auto: none
naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
enable-lazy-load-no-trans: true
+ main:
+ allow-bean-definition-overriding: true
org:
onap:
so:
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
index 7234733b95..17b014b993 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -47,6 +47,8 @@ spring:
username: mso_admin
password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
role: ACTUATOR
+ main:
+ allow-bean-definition-overriding: true
#Actuator
management:
diff --git a/adapters/mso-sdnc-adapter/src/main/resources/application.yaml b/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
index 9be0a257c9..2ef721fca5 100644
--- a/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
@@ -11,6 +11,10 @@ mso:
max-pool-size: 50
queue-capacity: 500
+spring:
+ main:
+ allow-bean-definition-overriding: true
+
#Actuator
management:
endpoints: