Bring up mock server in robot docker

Also Update springboot to 2.1.6

Issue-ID: OPTFRA-509
Change-Id: I04374a934926c198d496d5fe35282595e2e34580
Signed-off-by: Jerry Flood <jflood@att.com>

diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 1371805..12188bc 100644 (file)
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -43,7 +43,6 @@
                <java.version>1.8</java.version>
                <eelf.version>1.0.0</eelf.version>
                <spring.version>5.1.5.RELEASE</spring.version>
-               <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
                <swagger.core.version>2.0.0</swagger.core.version>
 
                <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/cmso-robot/docker/Dockerfile b/cmso-robot/docker/Dockerfile
index 91630a9..7f8eb81 100644 (file)
--- a/cmso-robot/docker/Dockerfile
+++ b/cmso-robot/docker/Dockerfile
@@ -46,8 +46,8 @@ RUN pip install selenium
 RUN pip install robotframework-sshlibrary
 RUN pip install robotframework-requests
 
-###Just to keep it running
-CMD ["/usr/bin/python", "/opt/cmso-robot/server.py"]
+### Start up the mock server for 
+CMD ["/usr/bin/python", "/opt/cmso-robot/mocking/mock.py"]
 
 ### Use --entrypoint to override to run the tests test and exit
 ### --entrypoint /opt/cmso-robot/ete.sh

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index bdd7dde..6609836 100644 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -54,7 +54,6 @@
                <java.version>1.8</java.version>\r
                <eelf.version>1.0.0</eelf.version>\r
         <spring.version>5.1.5.RELEASE</spring.version>\r
-               <spring.boot.version>2.1.3.RELEASE</spring.boot.version>\r
                <swagger.core.version>2.0.0</swagger.core.version>\r
 \r
                <maven.compiler.target>1.8</maven.compiler.target>\r

diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 9a636b9..80b1c76 100644 (file)
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -42,7 +42,6 @@
                <java.version>1.8</java.version>
                <eelf.version>1.0.0</eelf.version>
                <spring.version>5.1.5.RELEASE</spring.version>
-               <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
                <swagger.core.version>2.0.0</swagger.core.version>
 
                <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index c0de88b..15d25a7 100644 (file)
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -43,7 +43,6 @@
                <java.version>1.8</java.version>
                <eelf.version>1.0.0</eelf.version>
                <spring.version>5.1.5.RELEASE</spring.version>
-               <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
                <swagger.core.version>2.0.0</swagger.core.version>
 
                <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/pom.xml b/pom.xml
index 7944c79..b0aea83 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
                <maven.compiler.target>1.8</maven.compiler.target>\r
                <maven.compiler.source>1.8</maven.compiler.source>\r
         <spring.version>5.1.5.RELEASE</spring.version>\r
-               <spring.boot.version>2.1.3.RELEASE</spring.boot.version>\r
+               <spring.boot.version>2.1.6.RELEASE</spring.boot.version>\r
                <release-tag>Dublin</release-tag>\r
                <name.space>org.onap.optf</name.space>\r
        </properties>\r