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 <xg353y@intl.att.com>

2 files changed, 95 insertions, 0 deletions

diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
new file mode 100644
index 000000000..1ea8213f5
--- /dev/null
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -0,0 +1,95 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+		<rest>
+				<get uri="/clds/cldsDetails" outType="org.onap.clamp.clds.model.CldsMonitoringDetails" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getCLDSDetails()" />
+				</get>
+				<get uri="/clds/cldsInfo" outType="org.onap.clamp.clds.model.CldsInfo" produces="application/json">
+					<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getCldsInfo()" />
+				</get>
+				<get uri="/healthcheck" produces="application/json">
+					<to
+								uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
+				</get>
+				<get uri="/clds/model/bpmn/{modelName}" produces="text/xml">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getBpmnXml(${header.modelName})" />
+				</get>
+				<get uri="/clds/model/image/{modelName}" produces="text/xml">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getImageXml(${header.modelName})" />
+				</get>
+				<get uri="/clds/model/{modelName}" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModel(${header.modelName})" />
+				</get>
+				<put uri="/clds/model/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModel(${header.modelName},${body})" />
+				</put>
+				<get uri="/clds/model-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModelNames()" />
+				</get>
+				<put uri="/clds/action/{action}/{modelName}?test={test}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModelAndProcessAction(${header.action},${header.modelName},${header.test},${body})" />
+				</put>
+				<post uri="/clds/dcae/event?test={test}" type="org.onap.clamp.clds.model.DcaeEvent" consumes="application/json" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=postDcaeEvent(${header.test},${body})" />
+				</post>
+				<get uri="/clds/sdc/services" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcServices()" />
+				</get>
+				<get uri="/clds/properties" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcProperties()" />
+				</get>
+				<get uri="/clds/properties/{serviceInvariantUUID}?refresh={refresh}" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcPropertiesByServiceUUIDForRefresh(${header.serviceInvariantUUID},${header.refresh})" />
+				</get>
+				<put uri="/clds/deploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=deployModel(${header.modelName},${body})" />
+				</put>
+				<put uri="/clds/undeploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsService?method=unDeployModel(${header.modelName},${body})" />
+				</put>
+				
+				
+				
+				
+				<get uri="/cldsTempate/template/bpmn/{templateName}" produces="text/xml">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getBpmnTemplate(${header.templateName})" />
+				</get>
+				<get uri="/cldsTempate/template/image/{templateName}" produces="text/xml">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getImageXml(${header.templateName})" />
+				</get>
+				<get uri="/cldsTempate/template/{templateName}" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplate(${header.templateName})" />
+				</get>
+				<put uri="/cldsTempate/template/{templateName}" type="org.onap.clamp.clds.model.CldsTemplate" consumes="application/json" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=putTemplate(${header.templateName},${body})" />
+				</put>
+				<get uri="/cldsTempate/template-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
+						<to
+								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplateNames()" />
+				</get>
+				
+				
+				
+				<get uri="/user/getUser" produces="text/plain">
+						<to
+								uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
+				</get>
+		</rest>
+</rests>
diff --git a/src/main/resources/clds/camel/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
index 8305c2e49..8305c2e49 100644
--- a/src/main/resources/clds/camel/flexible-flow.xml
+++ b/src/main/resources/clds/camel/routes/flexible-flow.xml