From 054f1d1e13b4a7f0dc3a84d4c282019a3c528043 Mon Sep 17 00:00:00 2001 From: xg353y Date: Mon, 23 Jul 2018 16:02:28 +0200 Subject: Upgrade spring/camel versions Upgrade the spring/camel dependency versions in order to solve the security issue Issue-ID: CLAMP-188 Change-Id: I80c28a4d9c142b89463ad3a6a00761e5495adda8 Signed-off-by: xg353y --- src/main/resources/application-noaaf.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'src/main/resources/application-noaaf.properties') diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index 8d0395b4..1fd347a0 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -51,19 +51,9 @@ info.build.version=@project.version@ ### server.ssl.key-store=file:/tmp/mykey.jks ### server.ssl.key-store-password=mypass ### server.ssl.key-password=mypass -server.port=8443 -server.ssl.client-auth=want -server.ssl.key-store=file:/opt/clamp/config/org.onap.clamp.p12 -server.ssl.key-store-password=China in the Spring -server.ssl.key-password=China in the Spring -server.ssl.key-store-type=PKCS12 -server.ssl.trust=/opt/clamp/config/truststoreONAPall.jks -server.ssl.trust-pass=changeit -server.ssl.trust-type=JKS -server.ssl.key-alias=clamp@clamp.onap.org -server.http-to-https-redirection.port=8080 - -server.contextPath=/ +server.port=8080 + +server.servlet.context-path=/ #Modified engine-rest applicationpath spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller @@ -86,7 +76,8 @@ camel.defaultthreadpool.maxqueuesize=1000 camel.defaultthreadpool.keepaliveTime=60 camel.defaultthreadpool.rejectpolicy=CallerRuns #camel.springboot.xmlRoutes = false -camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml +camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml +camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml #camel.springboot.typeConversion = false #clds datasource connection details -- cgit 1.2.3-korg