Sync Integ to Master

Change-Id: I662b43d0cf25adcc0dd14d332997ef8999862987
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index a6dd88a..ba8a2ed 100644 (file)
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -11,9 +11,6 @@
                <version>1.2.0-SNAPSHOT</version>
        </parent>
 
-       <properties>
-               <sonar.skip>true</sonar.skip>
-       </properties>
        <dependencies>
                <!-- Common of SDC -->
                <dependency>

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index ef12ad6..8e90417 100644 (file)
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -12,9 +12,6 @@
                <version>1.2.0-SNAPSHOT</version>
        </parent>
 
-       <properties>
-               <sonar.skip>true</sonar.skip>
-       </properties>
        <dependencies>
                <!-- Common of SDC -->
                <dependency>

diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 9d23ead..a8eee71 100644 (file)
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -10,10 +10,7 @@
                <artifactId>sdc-main</artifactId>
                <version>1.2.0-SNAPSHOT</version>
        </parent>
-
-       <properties>
-               <sonar.skip>true</sonar.skip>
-       </properties>
+       
        <dependencies>
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>

diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index a6e9bef..56a02fe 100644 (file)
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -11,10 +11,6 @@
                <version>1.2.0-SNAPSHOT</version>
        </parent>
 
-       <properties>
-               <sonar.skip>true</sonar.skip>
-       </properties>
-
        <dependencies>
 
                <dependency>

diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index ef0eff4..d603c27 100644 (file)
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -10,7 +10,11 @@
         <artifactId>sdc-main</artifactId>
         <version>1.2.0-SNAPSHOT</version>
     </parent>
-
+       
+       <properties>
+               <sonar.skip>true</sonar.skip>
+       </properties>
+       
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 1fc9f70..8fd1970 100644 (file)
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -13,6 +13,7 @@
        </parent>
 
        <properties>
+               <sonar.skip>true</sonar.skip>
                <jacoco.skip>true</jacoco.skip>
                <aspectj.version>1.8.10</aspectj.version>
        </properties>