1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/status-control/pom.xml b/status-control/pom.xml
index 5a507929e7..4bf64ac657 100644
--- a/status-control/pom.xml
+++ b/status-control/pom.xml
@@ -6,7 +6,7 @@
     <parent>

         <groupId>org.openecomp.so</groupId>

         <artifactId>so</artifactId>

-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>

     </parent>

 

     <groupId>org.openecomp.so</groupId>

@@ -15,12 +15,6 @@
     <description>Contains classes to update and query the MSO status per site</description>

 

     <dependencies>

-    <dependency>

-             <groupId>org.evosuite</groupId>

-             <artifactId>evosuite-standalone-runtime</artifactId>

-             <version>${evosuiteVersion}</version>

-             <scope>test</scope>

-        </dependency>

         <dependency>

             <groupId>org.openecomp.so</groupId>

             <artifactId>common</artifactId>

@@ -70,4 +64,4 @@
         </dependency>

 

     </dependencies>

-</project>
+</project>