Update dependencies

Update dependencies to remove some issues reported by Nexus-IQ.

Issue-ID: POLICY-3169
Issue-ID: POLICY-3120
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia8939f0c85ac4087c3fc2c71b66914d6c7178347

2 files changed, 82 insertions, 81 deletions

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 7129c2828..fe94460c4 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -23,7 +23,7 @@
                         <log loggingLevel="ERROR"
                              message="GET All Loop names FAILED: ${exception.stacktrace}"/>
 
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -56,7 +56,7 @@
                         <log loggingLevel="ERROR"
                              message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
 
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -77,7 +77,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setHeader headerName="GlobalPropertiesJson">
+                    <setHeader name="GlobalPropertiesJson">
                         <simple>${body}</simple>
                     </setHeader>
                     <to uri="direct:load-loop"/>
@@ -97,7 +97,7 @@
                         <log loggingLevel="ERROR"
                              message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
 
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -117,7 +117,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setHeader headerName="OperationalPoliciesArray">
+                    <setHeader name="OperationalPoliciesArray">
                         <simple>${body}</simple>
                     </setHeader>
                     <to uri="direct:load-loop"/>
@@ -139,7 +139,7 @@
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
 
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -161,7 +161,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setProperty propertyName="MicroServicePolicyObject">
+                    <setProperty name="MicroServicePolicyObject">
                         <simple>${body}</simple>
                     </setProperty>
 
@@ -183,7 +183,7 @@
                              message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -200,9 +200,6 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="DCAE DEPLOY request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
                     <to
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')"/>
                     <to
@@ -210,7 +207,6 @@
                     <to uri="direct:load-loop"/>
                     <to
                             uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})"/>
-
                     <to uri="direct:deploy-loop"/>
 
                     <log loggingLevel="INFO"
@@ -230,7 +226,7 @@
                              message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -273,7 +269,7 @@
                              message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -316,7 +312,7 @@
                              message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -333,9 +329,6 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="DCAE UNDEPLOY request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
                     <to
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')"/>
                     <to
@@ -362,7 +355,7 @@
                              message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -379,7 +372,7 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="STOP request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">true</simple>
                     </setProperty>
                     <to
@@ -408,7 +401,7 @@
                              message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -425,9 +418,6 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="RESTART request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
                     <to
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')"/>
                     <to
@@ -455,7 +445,7 @@
                              message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -472,7 +462,7 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="POLICY SUBMIT request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">true</simple>
                     </setProperty>
                     <to
@@ -482,7 +472,7 @@
                     <to uri="direct:load-loop"/>
                     <to
                             uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">false</simple>
                     </setProperty>
                     <to uri="direct:remove-all-policy-from-active-pdp-group"/>
@@ -491,12 +481,12 @@
                     <split>
                         <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
                         </simple>
-                        <setProperty propertyName="policy">
+                        <setProperty name="policy">
                             <simple>${body}</simple>
                         </setProperty>
                         <log loggingLevel="INFO"
                              message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty propertyName="raiseHttpExceptionFlag">
+                        <setProperty name="raiseHttpExceptionFlag">
                             <simple resultType="java.lang.Boolean">false</simple>
                         </setProperty>
                         <to uri="direct:delete-policy-from-loop-object"/>
@@ -507,12 +497,12 @@
                     <split>
                         <simple>${exchangeProperty[loopObject].getOperationalPolicies()}
                         </simple>
-                        <setProperty propertyName="policy">
+                        <setProperty name="policy">
                             <simple>${body}</simple>
                         </setProperty>
                         <log loggingLevel="INFO"
                              message="Processing Operational Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty propertyName="raiseHttpExceptionFlag">
+                        <setProperty name="raiseHttpExceptionFlag">
                             <simple resultType="java.lang.Boolean">false</simple>
                         </setProperty>
 
@@ -543,7 +533,7 @@
                              message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -559,7 +549,7 @@
                 <doTry>
                     <log loggingLevel="INFO"
                          message="DELETE request for loop: ${header.loopName}"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">true</simple>
                     </setProperty>
                     <to
@@ -576,12 +566,12 @@
                     <split>
                         <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
                         </simple>
-                        <setProperty propertyName="policy">
+                        <setProperty name="policy">
                             <simple>${body}</simple>
                         </setProperty>
                         <log loggingLevel="INFO"
                              message="Deleting Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty propertyName="raiseHttpExceptionFlag">
+                        <setProperty name="raiseHttpExceptionFlag">
                             <simple resultType="java.lang.Boolean">false</simple>
                         </setProperty>
                         <to uri="direct:delete-policy-from-loop-object"/>
@@ -591,12 +581,12 @@
                     <split>
                         <simple>${exchangeProperty[loopObject].getOperationalPolicies()}
                         </simple>
-                        <setProperty propertyName="policy">
+                        <setProperty name="policy">
                             <simple>${body}</simple>
                         </setProperty>
                         <log loggingLevel="INFO"
                              message="Deleting Operational Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty propertyName="raiseHttpExceptionFlag">
+                        <setProperty name="raiseHttpExceptionFlag">
                             <simple resultType="java.lang.Boolean">false</simple>
                         </setProperty>
                         <to uri="direct:delete-policy-from-loop-object"/>
@@ -618,7 +608,7 @@
                              message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -666,7 +656,7 @@
                         <setBody>
                             <simple>${exchangeProperty[loopObject]}</simple>
                         </setBody>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>200</constant>
                         </setHeader>
                     </doFinally>
@@ -701,7 +691,7 @@
                              message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -724,17 +714,17 @@
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
                     <to uri="direct:load-loop"/>
-                    <setProperty propertyName="policyName">
+                    <setProperty name="policyName">
                         <simple>${header.policyName}</simple>
                     </setProperty>
-                    <setProperty propertyName="policy">
+                    <setProperty name="policy">
                         <simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
                     </setProperty>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">false</simple>
                     </setProperty>
                     <to uri="direct:remove-one-policy-from-active-pdp-group"/>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">false</simple>
                     </setProperty>
                     <to uri="direct:delete-policy-from-loop-object"/>
@@ -755,7 +745,7 @@
                              message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -793,7 +783,7 @@
                              message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
                         <to
                                 uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -826,7 +816,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET ALL templates request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -860,7 +850,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -892,7 +882,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET All Template names request failed for template:  ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -926,7 +916,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Dictionary request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -959,7 +949,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Dictionary request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -992,7 +982,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1011,7 +1001,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty propertyName="DictionaryObject">
+                    <setProperty name="DictionaryObject">
                         <simple>${body}</simple>
                     </setProperty>
                     <to
@@ -1027,7 +1017,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="PUT Dictionary request failed for: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1049,7 +1039,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty propertyName="DictionaryObject">
+                    <setProperty name="DictionaryObject">
                         <simple>${body}</simple>
                     </setProperty>
                     <to
@@ -1065,7 +1055,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1097,7 +1087,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1131,7 +1121,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1165,7 +1155,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Policy Models request failed for: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1198,7 +1188,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1231,7 +1221,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1253,7 +1243,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty propertyName="PolicyModelTosca">
+                    <setProperty name="PolicyModelTosca">
                         <simple>${body}</simple>
                     </setProperty>
                     <to
@@ -1269,7 +1259,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="POST Policy Model YAML request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1291,7 +1281,7 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty propertyName="PolicyModelTosca">
+                    <setProperty name="PolicyModelTosca">
                         <simple>${body}</simple>
                     </setProperty>
                     <to
@@ -1307,7 +1297,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1327,13 +1317,15 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Policies List ')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','read')"/>
-
+                    <setProperty name="raiseHttpExceptionFlag">
+                        <simple resultType="java.lang.Boolean">true</simple>
+                    </setProperty>
                     <to uri="direct:get-all-policies"/>
-                    <setProperty propertyName="policiesListResponse">
+                    <setProperty name="policiesListResponse">
                         <simple>${body}</simple>
                     </setProperty>
                     <to uri="direct:get-all-pdp-groups"/>
-                    <setProperty propertyName="pdpGroupInfoResponse">
+                    <setProperty name="pdpGroupInfoResponse">
                         <simple>${body}</simple>
                     </setProperty>
                     <setBody>
@@ -1351,7 +1343,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="GET Policies list JSON request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1376,13 +1368,16 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'CREATE a new Policy ')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setProperty propertyName="policyModelType">
+                    <setProperty name="raiseHttpExceptionFlag">
+                        <simple resultType="java.lang.Boolean">true</simple>
+                    </setProperty>
+                    <setProperty name="policyModelType">
                         <simple>${header.policyModelType}</simple>
                     </setProperty>
-                    <setProperty propertyName="policyModelVersion">
+                    <setProperty name="policyModelVersion">
                         <simple>${header.policyModelVersion}</simple>
                     </setProperty>
-                    <setProperty propertyName="policyProperties">
+                    <setProperty name="policyProperties">
                         <simple>${body}</simple>
                     </setProperty>
                     <to
@@ -1404,7 +1399,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="CREATE Policy request failed for type: ${header.policyModelType}/${header.policyModelVersion}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1424,19 +1419,22 @@
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DELETE a Policy ')"/>
                     <to
                             uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setProperty propertyName="policyModelType">
+                    <setProperty name="raiseHttpExceptionFlag">
+                        <simple resultType="java.lang.Boolean">true</simple>
+                    </setProperty>
+                    <setProperty name="policyModelType">
                         <simple>${header.policyModelType}</simple>
                     </setProperty>
-                    <setProperty propertyName="policyModelVersion">
+                    <setProperty name="policyModelVersion">
                         <simple>${header.policyModelVersion}</simple>
                     </setProperty>
-                    <setProperty propertyName="policyName">
+                    <setProperty name="policyName">
                         <simple>${header.policyName}</simple>
                     </setProperty>
-                    <setProperty propertyName="policyVersion">
+                    <setProperty name="policyVersion">
                         <simple>${header.policyVersion}</simple>
                     </setProperty>
-                    <setProperty propertyName="raiseHttpExceptionFlag">
+                    <setProperty name="raiseHttpExceptionFlag">
                         <simple resultType="java.lang.Boolean">false</simple>
                     </setProperty>
                     <to uri="direct:undeploy-one-policy-from-pap"/>
@@ -1452,7 +1450,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="DELETE Policy request failed for policy: ${header.policyName}/${header.policyVersion}, ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
@@ -1478,6 +1476,9 @@
                     </setBody>
                     <log loggingLevel="INFO"
                          message="PDP Group DEPLOY request payload: ${body}"/>
+                    <setProperty name="raiseHttpExceptionFlag">
+                        <simple resultType="java.lang.Boolean">false</simple>
+                    </setProperty>
                     <to uri="direct:add-multiple-policies-to-pdp-group"/>
                     <to
                             uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
@@ -1490,7 +1491,7 @@
                                 uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
                         <log loggingLevel="ERROR"
                              message="PDP Group deployment request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
+                        <setHeader name="CamelHttpResponseCode">
                             <constant>500</constant>
                         </setHeader>
                         <setBody>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index 61e1efbdc..aa4c3cbee 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -9,7 +9,7 @@
 				</setBody>
 				<when>
 					<simple> ${body} == 'NOT-OK'</simple>
-					<setHeader headerName="CamelHttpResponseCode">
+					<setHeader name="CamelHttpResponseCode">
 						<constant>404</constant>
 					</setHeader>
 					<log loggingLevel="ERROR" message="HealthCheck failed" />