VIO 1.1.0 docker image

   Prepare docker images of VIO for Amsterdam
branching

Change-Id: I319aa1bfb51f8527d544cf791c2d8788b02f2b7a
Issue-ID: MULTICLOUD-135
Signed-off-by: liangke <lokyse@163.com>

5 files changed, 9 insertions, 22 deletions

diff --git a/pom.xml b/pom.xml
index 1aef33d..c978573 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,10 @@
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>0.1.1</version>
-        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
-    <artifactId>multicloud-openstack-vmware</artifactId>
+    <artifactId>multicloud-vio</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-opentack-vmware</name>
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index c437492..80fa427 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
 
 
 RUN  cd /opt/ && \
-    wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=LATEST&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.vio&a=multicloud-vio-plugin&v=LATEST&e=zip' && \
     unzip multicloud-vio.zip && \
     rm -rf multicloud-vio.zip && \
     pip install -r vio/requirements.txt
diff --git a/vio/docker/build_image.sh b/vio/docker/build_image.sh
index ff2fbdf..e7a652f 100755
--- a/vio/docker/build_image.sh
+++ b/vio/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
-STAGING="1.0.0-STAGING"
+VERSION="1.1.0-SNAPSHOT"
+STAGING="1.1.0-STAGING"
 PROJECT="multicloud"
 IMAGE="vio"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/vio/pom.xml b/vio/pom.xml
index e68c132..5b23dfa 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -19,15 +19,14 @@
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>0.1.1</version>
-        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.multicloud.openstack.vmware</groupId>
-    <artifactId>multicloud-openstack-vmware</artifactId>
+    <groupId>org.onap.multicloud.openstack.vmware.vio</groupId>
+    <artifactId>multicloud-vio-plugin</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>multicloud-openstack-vmware</name>
-    <description>multicloud openstack vmware</description>
+    <name>multicloud-openstack-vmware-vio</name>
+    <description>multicloud openstack vmware vio</description>
     <properties>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,17 +35,6 @@
     </properties>
     <build>
       <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-                <nexusUrl>${nexusproxy}</nexusUrl>
-                <stagingProfileId>176c31dfe190a</stagingProfileId>
-                <serverId>ecomp-staging</serverId>
-            </configuration>
-            </plugin>
         <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
diff --git a/vio/version.properties b/vio/version.properties
index 5128787..7f86aa1 100644
--- a/vio/version.properties
+++ b/vio/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=0
+minor=1
 patch=0
 
 base_version=${major}.${minor}.${patch}