diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-11-13 10:59:02 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-11-13 12:00:27 +0100 |
| commit | d63391e88b8f87a169e3468669cd6268014b1da8 (patch) | |
| tree | 0fa14fdd79213f22ef3424d643d0ee3ca1b5de32 /aai-traversal/src/test/resources | |
| parent | 818806ec5b3810da0599aa0a7538583cdcc0bfca (diff) | |
Update spring-boot to 2.2
- upgrade spring-boot from 2.1 to 2.2
- change logging level in tests from debug to info
- do not version .classpath in git since it's dynamically generated
Issue-ID: AAI-3679
Change-Id: I4b0378880a0670d522903d44dbe7e1b144b51177
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'aai-traversal/src/test/resources')
3 files changed, 13 insertions, 10 deletions
diff --git a/aai-traversal/src/test/resources/application-onap-test.properties b/aai-traversal/src/test/resources/application-onap-test.properties index 7d70fac..24bff05 100644 --- a/aai-traversal/src/test/resources/application-onap-test.properties +++ b/aai-traversal/src/test/resources/application-onap-test.properties @@ -7,7 +7,7 @@ info.build.version=1.1.0 spring.application.name=aai-traversal spring.jersey.type=filter -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} @@ -25,14 +25,14 @@ server.context_parameters.p-name=value #context parameter with p-name as key and # If you get an application startup failure that the port is already taken # If thats not it, please check if the key-store file path makes sense -server.local.startpath=src/main/resources/ -server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties +server.local.startpath=src/main/resources +server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties server.port=8446 server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 -server.ssl.key-store=${server.local.startpath}etc/auth/aai-client-cert.p12 +server.ssl.key-store=${server.local.startpath}/etc/auth/aai-client-cert.p12 server.ssl.key-store-password=password(1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o) -server.ssl.trust-store=${server.local.startpath}etc/auth/tomcat_keystore +server.ssl.trust-store=${server.local.startpath}/etc/auth/tomcat_keystore server.ssl.trust-store-password=password(1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o) server.ssl.client-auth=want server.ssl.key-store-type=JKS diff --git a/aai-traversal/src/test/resources/application-test.properties b/aai-traversal/src/test/resources/application-test.properties index 72f28b7..d2ad6a6 100644 --- a/aai-traversal/src/test/resources/application-test.properties +++ b/aai-traversal/src/test/resources/application-test.properties @@ -30,14 +30,14 @@ server.context_parameters.p-name=value #context parameter with p-name as key and # If you get an application startup failure that the port is already taken # If thats not it, please check if the key-store file path makes sense -server.local.startpath=src/main/resources/ -server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties +server.local.startpath=src/main/resources +server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties server.port=8446 security.require-ssl=false server.ssl.enabled=false #server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 -#server.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore +#server.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore #server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) #server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) #server.ssl.client-auth=want diff --git a/aai-traversal/src/test/resources/logback.xml b/aai-traversal/src/test/resources/logback.xml index 4b969b1..fc275dd 100644 --- a/aai-traversal/src/test/resources/logback.xml +++ b/aai-traversal/src/test/resources/logback.xml @@ -299,7 +299,7 @@ <logger name="org.zookeeper" level="OFF" /> - <logger name="org.onap.aai" level="DEBUG" additivity="false"> + <logger name="org.onap.aai" level="INFO" additivity="false"> <appender-ref ref="asyncDEBUG" /> <appender-ref ref="asyncSANE" /> <appender-ref ref="STDOUT" /> @@ -338,6 +338,9 @@ <appender-ref ref="dmaapAAIEventConsumerInfo" /> </logger> + <logger name="org.onap.aai.dbgen" level="WARN"/> + <logger name="org.onap.aai.aailog" level="WARN"/> + <!-- ============================================================================ --> <!-- General EELF logger --> <!-- ============================================================================ --> @@ -347,7 +350,7 @@ <appender-ref ref="asyncMETRIC" /> </logger> - <root level="DEBUG"> + <root level="INFO"> <appender-ref ref="external" /> <appender-ref ref="STDOUT" /> </root> |