From: Igor Dysko <igor1.dysko@orange.com>
Date: Tue, 7 Jul 2020 12:15:29 +0000 (+0200)
Subject: Update to spring boot 2
X-Git-Tag: 1.7.0~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=31c7747f1050c5a64320b655d838fcc3624b43a0;p=aai%2Fresources.git

Update to spring boot 2

Replaced unsupported property

Issue-ID: AAI-2526
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: I98bde0863a4c473175f5f19c19f9b36d101a2ec1
---

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index e26199cd..0366e33f 100644
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -8,7 +8,7 @@ spring.application.name=Resources Microservice
 spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 
-server.contextPath=/
+server.servlet.context-path=/
 spring.autoconfigure.exclude=\
   org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
   org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
diff --git a/aai-resources/src/test/resources/application-test.properties b/aai-resources/src/test/resources/application-test.properties
index 320b8e17..e8a4703f 100644
--- a/aai-resources/src/test/resources/application-test.properties
+++ b/aai-resources/src/test/resources/application-test.properties
@@ -7,7 +7,7 @@ info.build.version=1.1.0
 spring.application.name=aai-resources
 spring.jersey.type=filter
 
-server.contextPath=/
+server.servlet.context-path=/
 
 spring.jersey.application-path=${schema.uri.base.path}