summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-09-04 18:03:15 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-09-04 18:03:15 +0800
commitdff6a11d425677eec5909d2cdab9cc1c277719c7 (patch)
tree3527a92f668adbdd2b697fe8509c0fa2a20d9f8f
parent4905b80544ac1c6e2020f0745688dd9cd57e1860 (diff)
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>
-rw-r--r--mgr/.gitignore2
-rw-r--r--mgr/assembly.xml8
-rw-r--r--mgr/pom.xml10
-rw-r--r--pom.xml33
-rw-r--r--version.properties28
5 files changed, 75 insertions, 6 deletions
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
@@ -37,6 +37,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>docker</directory>
+ <outputDirectory>/docker</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ <include>Dockerfile</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
<includes>
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>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..766a27e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2017 ZTE Corporation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.vfc.gvnfm.vnfmgr</groupId>
+ <artifactId>vfc-gvnfm-vnfmgr</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>vfc/gvnfm/vnfmgr</name>
+ <description>vfc gvnfm vnfmgr</description>
+ <modules>
+ <module>mgr</module>
+ </modules>
+</project>
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..d7c69cd
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=1
+minor=1
+patch=0
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT