From dff6a11d425677eec5909d2cdab9cc1c277719c7 Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Mon, 4 Sep 2017 18:03:15 +0800
Subject: Add gvnfm vnfmgr version.properties

In order to build docker image,
add gvnfm vnfmgr version.properties
 and root pom files.

Change-Id: Ica64fd67f533614fe5c43b9740e85b1bbec2888b
Issue-ID: VFC-267
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 mgr/.gitignore   |  2 +-
 mgr/assembly.xml |  8 ++++++++
 mgr/pom.xml      | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'mgr')

diff --git a/mgr/.gitignore b/mgr/.gitignore
index 8f76200..b013899 100644
--- a/mgr/.gitignore
+++ b/mgr/.gitignore
@@ -1,4 +1,4 @@
-../.idea
+.idea
 logs/runtime_mgr.log
 *.pyc
 bash.exe.stackdump
diff --git a/mgr/assembly.xml b/mgr/assembly.xml
index 10e67b1..7535d59 100644
--- a/mgr/assembly.xml
+++ b/mgr/assembly.xml
@@ -36,6 +36,14 @@
                 <include>*.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>docker</directory>
+            <outputDirectory>/docker</outputDirectory>
+            <includes>
+                <include>*.sh</include>
+                <include>Dockerfile</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>.</directory>
             <outputDirectory>/</outputDirectory>
diff --git a/mgr/pom.xml b/mgr/pom.xml
index a5b8e04..7cd1c1a 100644
--- a/mgr/pom.xml
+++ b/mgr/pom.xml
@@ -16,17 +16,17 @@
 -->
 <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>
+        <groupId>org.onap.vfc.gvnfm.vnfmgr</groupId>
+        <artifactId>vfc-gvnfm-vnfmgr</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.vfc.gvnfm.vnfmgr</groupId>
-    <artifactId>vfc-gvnfm-vnfmgr</artifactId>
+    <groupId>org.onap.vfc.gvnfm.vnfmgr.mgr</groupId>
+    <artifactId>vfc-gvnfm-vnfmgr-mgr</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc/gvnfm/vnfmgr/mgr</name>
-    <description>vfc gvnfm vnfmgr</description>
+    <description>vfc gvnfm vnfmgr mgr</description>
     <build>
       <plugins>
         <plugin>
-- 
cgit 1.2.3-korg