From 134ca0a1494ebd664ab2985c1018627624f29f02 Mon Sep 17 00:00:00 2001
From: "Maharajh, Robby (rx2202)" <rx2202@us.att.com>
Date: Wed, 9 Sep 2020 19:57:16 -0400
Subject: Update traversal to use spring boot 2

Issue-ID: AAI-2886
Issue-ID: AAI-2527
Change-Id: Id6432ff82b0377ff44115d5b42607d1926431f7b
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>
---
 aai-traversal/src/main/resources/application.properties | 7 ++++---
 aai-traversal/src/main/resources/logback.xml            | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'aai-traversal/src/main/resources')

diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index 6e4f3be..a538a58 100644
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -6,8 +6,9 @@ info.build.version=1.1.0
 
 spring.application.name=aai-traversal
 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
 
 spring.jersey.application-path=${schema.uri.base.path}
@@ -46,7 +47,7 @@ server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 server.ssl.trust-store=${server.certs.location}${server.truststore.name}
 server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21
 # Specifies which component should the oxm be looking at
 schema.source.name=onap
 # End of Internal Specific Properties
@@ -83,7 +84,7 @@ schema.version.namespace.change.start=v12
 # Specifies from which version should the client start seeing the edge label in payload
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
-schema.version.api.default=v20	
+schema.version.api.default=v21
 
 schema.translator.list=config
 schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
diff --git a/aai-traversal/src/main/resources/logback.xml b/aai-traversal/src/main/resources/logback.xml
index c6fe5c7..877876e 100644
--- a/aai-traversal/src/main/resources/logback.xml
+++ b/aai-traversal/src/main/resources/logback.xml
@@ -324,6 +324,7 @@
 	<logger name="org.onap.aai" level="DEBUG" additivity="false">
 		<appender-ref ref="asyncDEBUG" />
 		<appender-ref ref="asyncSANE" />
+		<appender-ref ref="STDOUT" />
 	</logger>
 	<logger name="org.onap.aai.aaf" level="DEBUG" additivity="false">
 		<appender-ref ref="asyncAUTH" />
@@ -360,5 +361,6 @@
 
 	<root level="DEBUG">
 		<appender-ref ref="external" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
-- 
cgit 1.2.3-korg