summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliangke <lokyse@163.com>2018-01-03 11:39:39 +0800
committerliangke <lokyse@163.com>2018-01-03 11:45:03 +0800
commit2b354ac832492da320f5e921041dafbee6c3f64b (patch)
tree3124c83a7b55803ba86713994a783f8b702e4d84
parentc88997385a2a0172ae01fd83a6d9fbce2e653266 (diff)
Fix some issues
Modify groupId and artifactId that make sure we use the correct properties.Also It need to change the vio snapshots path in dockerfile. Change-Id: Id4e5cde6e0225f56217a874cdfbfcbbd9408cc70 Issue-ID: MULTICLOUD-135 Signed-off-by: liangke <lokyse@163.com>
-rw-r--r--pom.xml1
-rw-r--r--vio/docker/Dockerfile2
-rw-r--r--vio/pom.xml13
3 files changed, 9 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index ca13564..1aef33d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
<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>
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index 80fa427..3879b1c 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=snapshots&g=org.onap.multicloud.openstack.vmware.vio&a=multicloud-vio-plugin&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&a=multicloud-openstack-vmware&v=LATEST&e=zip' && \
unzip multicloud-vio.zip && \
rm -rf multicloud-vio.zip && \
pip install -r vio/requirements.txt
diff --git a/vio/pom.xml b/vio/pom.xml
index 2198d97..57b341f 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -16,16 +16,17 @@
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.multicloud.openstack.vmware</groupId>
- <artifactId>multicloud-openstack-vmware</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <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.vio</groupId>
- <artifactId>multicloud-vio-plugin</artifactId>
+ <groupId>org.onap.multicloud.openstack.vmware</groupId>
+ <artifactId>multicloud-openstack-vmware</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>multicloud-openstack-vmware-vio</name>
+ <name>multicloud-openstack-vmware</name>
<description>multicloud openstack vmware vio</description>
<properties>
<encoding>UTF-8</encoding>