Fix optf-cmso sonar reports

Change-Id: Ie4bae1ac7c4732c82023aba9adcee7c110145257
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-694

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 4d27a21..fa600dd 100644 (file)
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -93,6 +93,11 @@
                        <groupId>org.mariadb.jdbc</groupId>\r
                        <artifactId>mariadb-java-client</artifactId>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>org.yaml</groupId>\r
+                       <artifactId>snakeyaml</artifactId>\r
+                       <version>1.26</version>\r
+               </dependency>\r
        </dependencies>\r
 \r
        <build>\r

diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 1ce329d..bf6e3eb 100644 (file)
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -185,6 +185,7 @@
                <dependency>
                        <groupId>org.yaml</groupId>
                        <artifactId>snakeyaml</artifactId>
+                       <version>1.26</version>
                </dependency>
 
                <!-- <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> 

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index fdb0077..db8d37e 100644 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -192,6 +192,11 @@
 \r
                        </exclusions>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>org.yaml</groupId>\r
+                       <artifactId>snakeyaml</artifactId>\r
+                       <version>1.26</version>\r
+               </dependency>\r
                <!-- <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> \r
                        <version>2.1.1</version> </dependency> -->\r
                <dependency>\r

diff --git a/cmso-sonar/docker/integration/docker-compose.yml b/cmso-sonar/docker/integration/docker-compose.yml
index 448d970..df0e2d9 100644 (file)
--- a/cmso-sonar/docker/integration/docker-compose.yml
+++ b/cmso-sonar/docker/integration/docker-compose.yml
@@ -13,6 +13,7 @@ services:
 
   db-init-svc:
     image: onap/optf-cmso-dbinit
+    user: root
     volumes:
       - "./cmso-service/etc:/share/etc:rw"
       - "./cmso-service/logs:/share/logs:rw"
@@ -25,6 +26,7 @@ services:
 
   db-init-opt:
     image: onap/optf-cmso-dbinit
+    user: root
     volumes:
       - "./cmso-optimizer/etc:/share/etc:rw"
       - "./cmso-optimizer/logs:/share/logs:rw"
@@ -38,6 +40,7 @@ services:
 
   cmso-service:
     image: onap/optf-cmso-service
+    user: root
     volumes:
       - "./cmso-service/etc:/share/etc:rw"
       - "./cmso-service/logs:/share/logs:rw"
@@ -55,6 +58,7 @@ services:
 
   cmso-ticketmgt:
     image: onap/optf-cmso-ticketmgt
+    user: root
     volumes:
       - "./cmso-ticketmgt/etc:/share/etc:rw"
       - "./cmso-ticketmgt/logs:/share/logs:rw"
@@ -65,6 +69,7 @@ services:
 
   cmso-topology:
     image: onap/optf-cmso-topology
+    user: root
     volumes:
       - "./cmso-topology/etc:/share/etc:rw"
       - "./cmso-topology/logs:/share/logs:rw"
@@ -75,6 +80,7 @@ services:
 
   cmso-optimizer:
     image: onap/optf-cmso-optimizer
+    user: root
     volumes:
       - "./cmso-optimizer/etc:/share/etc:rw"
       - "./cmso-optimizer/logs:/share/logs:rw"
@@ -93,6 +99,7 @@ services:
 
   cmso-robot:
     image: onap/optf-cmso-robot
+    user: root
     volumes:
       - "./cmso-robot/logs:/share:rw"
     depends_on:

diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 1569d92..7ba9a83 100644 (file)
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -152,6 +152,12 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.dataformat</groupId>
                        <artifactId>jackson-dataformat-yaml</artifactId>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.yaml</groupId>
+                                       <artifactId>snakeyaml</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
@@ -219,6 +225,11 @@
                        <artifactId>commons-text</artifactId>
                        <version>1.6</version>
                </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.26</version>
+               </dependency>
                <!-- Testing Dependencies -->
                <!-- <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito2</artifactId> 
                        <version>1.7.4</version> <scope>test</scope> </dependency> -->
@@ -327,11 +338,9 @@
                                                                        <name>onap-cmso-tm</name>
                                                                </assembly>
                                                                <args>
-                                                                       <!-- plugin cannot handle empty (no proxy) arguments
-                                                                       <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
-                                                                       <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
-                                                                       -->
-                                                               </args> 
+                                                                       <!-- plugin cannot handle empty (no proxy) arguments <http_proxy_arg>${docker.http_proxy}</http_proxy_arg> 
+                                                                               <https_proxy_arg>${docker.https_proxy}</https_proxy_arg> -->
+                                                               </args>
                                                        </build>
                                                </image>
                                        </images>

diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index ba39fa3..756d75b 100644 (file)
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -171,6 +171,11 @@
 
                        </exclusions>
                </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.26</version>
+               </dependency>
                <!-- <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> 
                        <version>2.1.1</version> </dependency> -->
                <dependency>