Merge "bump version to 1.2.5"

diff --combined apiroute/pom.xml
index 908cd8c,f9ec0bd..7262554
--- 1/apiroute/pom.xml
--- 2/apiroute/pom.xml
+++ b/apiroute/pom.xml
@@@ -11,14 -11,14 +11,14 @@@
        <parent>
                <groupId>org.onap.msb.apigateway</groupId>
                <artifactId>msb-apigateway-parent</artifactId>
-               <version>1.2.4-SNAPSHOT</version>
+               <version>1.2.5-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.msb.apigateway.apiroute</groupId>
        <artifactId>apiroute-parent</artifactId>
        <name>onap/msb/apigateway/apiroute</name>
        <packaging>pom</packaging>
-       <version>1.2.4-SNAPSHOT</version>
+       <version>1.2.5-SNAPSHOT</version>
  
        <modules>
                <module>apiroute-service</module>
@@@ -50,7 -50,7 +50,7 @@@
                <dropwizard.version>1.3.5</dropwizard.version>
                <guava.version>26.0-jre</guava.version>
                <jersey.version>2.25.1</jersey.version>
 -              <jackson.version>2.9.4</jackson.version>
 +              <jackson.version>2.9.8</jackson.version>
                <jetty.version>9.4.14.v20181114</jetty.version>
                <servlet.version>3.0.0.v201112011016</servlet.version>
                <metrics3.version>4.0.2</metrics3.version>

diff --combined build4docker.sh
index f0c3f49,93b7f86..4329646
--- 1/build4docker.sh
--- 2/build4docker.sh
+++ b/build4docker.sh
@@@ -36,7 -36,7 +36,7 @@@ mkdir  $RELEASE_DIR -
  DOCKER_RUN_NAME=msb_apigateway
  DOCKER_IMAGE_NAME=msb_apigateway
  DOCKER_LATEST_VERSION=latest
- DOCKER_RELEASE_VERSION=1.2.4
+ DOCKER_RELEASE_VERSION=1.2.5
  DOCKER_REPOSITORY=nexus3.onap.org:10003
  TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
  
@@@ -48,9 -48,9 +48,9 @@@ chmod 777 build_docker_image.s
  
  
  docker rm -f ${DOCKER_RUN_NAME}
 -docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}
 -docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-STAGING-latest
 -docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-SNAPSHOT-latest
 +docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}
 +docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-STAGING-latest
 +docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-SNAPSHOT-latest
  
  ./build_docker_image.sh -n=${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME} -v=${DOCKER_LATEST_VERSION} -d=./docker