Merge "Improve logging in NCMP"

diff --combined cps-service/pom.xml
index 0c75564,b875bbb..bfc3931
--- 1/cps-service/pom.xml
--- 2/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@@ -103,17 -103,16 +103,21 @@@
        <groupId>com.google.code.gson</groupId>\r
        <artifactId>gson</artifactId>\r
      </dependency>\r
+     <dependency>\r
+       <groupId>org.springframework.boot</groupId>\r
+       <artifactId>spring-boot-starter-aop</artifactId>\r
+     </dependency>\r
      <!-- T E S T   D E P E N D E N C I E S -->\r
      <dependency>\r
        <groupId>org.codehaus.groovy</groupId>\r
        <artifactId>groovy</artifactId>\r
        <scope>test</scope>\r
      </dependency>\r
 +    <dependency>\r
 +      <groupId>org.codehaus.groovy</groupId>\r
 +      <artifactId>groovy-json</artifactId>\r
 +      <scope>test</scope>\r
 +    </dependency>\r
      <dependency>\r
        <groupId>org.spockframework</groupId>\r
        <artifactId>spock-core</artifactId>\r
@@@ -144,5 -143,10 +148,10 @@@
        <artifactId>spring-kafka-test</artifactId>\r
        <scope>test</scope>\r
      </dependency>\r
+     <dependency>\r
+       <groupId>org.aspectj</groupId>\r
+       <artifactId>aspectjrt</artifactId>\r
+       <scope>test</scope>\r
+     </dependency>\r
    </dependencies>\r
  </project>\r