From 0c9f44cbea909dc63e1c062b8466b2b96c39e395 Mon Sep 17 00:00:00 2001
From: Ethan Lynn <ethanlynnl@vmware.com>
Date: Thu, 25 Jul 2019 14:04:30 +0800
Subject: Bump version to 1.4.1

Bump version to 1.4.1

Change-Id: Idc51d1be3d0a6d9fb0b030974881aa99ec922c16
Issue-ID: MULTICLOUD-706
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
---
 pom.xml                   |  4 ++--
 version.properties        |  2 +-
 vio/docker/Dockerfile     |  2 +-
 vio/docker/build_image.sh |  4 ++--
 vio/pom.xml               | 59 +++++++++++++++++++++++++++++++++++++++++++----
 vio/sonar.sh              |  3 +--
 vio/version.properties    |  2 +-
 7 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18841bb..2006d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
     <artifactId>multicloud-openstack-vmware-root</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>multicloud-openstack-vmware</name>
+    <name>multicloud-openstack-vmware-root</name>
     <description>multicloud openstack vmware</description>
     <modules>
         <module>vio</module>
diff --git a/version.properties b/version.properties
index 8081980..7694f9c 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index 8253270..2bd40aa 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
 RUN apk update && \
     apk add uwsgi unzip wget curl gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
-    wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.0-SNAPSHOT&e=zip' && \
+    wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.1-SNAPSHOT&e=zip' && \
     unzip multicloud-vio.zip && \
     rm -rf multicloud-vio.zip && \
     pip install -r /opt/vio/requirements.txt && \
diff --git a/vio/docker/build_image.sh b/vio/docker/build_image.sh
index 2a40090..729a860 100755
--- a/vio/docker/build_image.sh
+++ b/vio/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.4.0-SNAPSHOT"
-STAGING="1.4.0-STAGING"
+VERSION="1.4.1-SNAPSHOT"
+STAGING="1.4.1-STAGING"
 PROJECT="multicloud"
 IMAGE="vio"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/vio/pom.xml b/vio/pom.xml
index 260bdab..1209357 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -15,14 +15,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.multicloud.openstack.vmware</groupId>
+        <artifactId>multicloud-openstack-vmware-root</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
     <artifactId>multicloud-openstack-vmware</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-vmware</name>
     <description>multicloud openstack vmware vio</description>
@@ -42,7 +42,58 @@
         <sonar.exclusions>**/tests/*,setup.py</sonar.exclusions>
     </properties>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.1.1</version>
+                    <configuration>
+                        <executable>${project.basedir}/sonar.sh</executable>
+                        <environmentVariables>
+                            <!-- make mvn properties as env for our script -->
+                            <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                            <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                            <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                        </environmentVariables>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <id>clean phase script</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>
+                                <argument>__</argument>
+                                <argument>clean</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test script</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>
+                                <argument>__</argument>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
diff --git a/vio/sonar.sh b/vio/sonar.sh
index 91f09f0..941f1a9 100755
--- a/vio/sonar.sh
+++ b/vio/sonar.sh
@@ -45,7 +45,6 @@ echo "MVN_PROJECT_VERSION is             [$MVN_PROJECT_VERSION]"
 run_tox_test()
 {
   set -x
-  cd vio
   CURDIR=$(pwd)
   TOXINIS=$(find . -name "tox.ini")
   cd ..
@@ -58,7 +57,7 @@ run_tox_test()
     pip install --upgrade pip
     pip install --upgrade tox argparse
     pip freeze
-    cd vio
+    cd ${CURDIR}
     tox -e cover
     deactivate
     cd ..
diff --git a/vio/version.properties b/vio/version.properties
index 8081980..7694f9c 100644
--- a/vio/version.properties
+++ b/vio/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg