update vfc version to 1.3.30

Change-Id: I62a2974154fab6d8cb26740610d734cb5a1f886a
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Issue-ID: VFC-1252

diff --git a/INFO.yaml b/INFO.yaml
index 07f4c32..4fbe669 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -88,11 +88,6 @@ committers:
       company: 'Boco'
       id: 'Wang_Guirong'
       timezone: 'Asia/Shanghai'
-    - name: 'Xiaodong Ning'
-      email: 'ningxiaodong2017@boco.com.cn'
-      company: 'Boco'
-      id: 'ningxiaodong2017'
-      timezone: 'Asia/Shanghai'
     - name: 'Adityakar Jha'
       email: 'Adityakar.Jha@ril.com'
       company: 'Ril'
@@ -103,11 +98,6 @@ committers:
       company: 'Raisecom'
       id: 'donghu1102'
       timezone: 'Asia/Shanghai'
-    - name: 'Yufei Zhou'
-      email: 'yufei.zhou@nokia-sbell.com'
-      company: 'Nokia'
-      id: 'yufei_zhou'
-      timezone: 'Asia/Shanghai'
     - name: 'Denes Nemeth'
       email: 'denes.nemeth@nokia.com'
       company: 'Nokia'
@@ -118,6 +108,22 @@ committers:
       company: 'Intel'
       id: 'haibin'
       timezone: 'Asia/Shanghai'
+    - name: 'LiLai'
+      email: 'lai.li@zte.com.cn'
+      company: 'ZTE'
+      id: 'laili'
+      timezone: 'Asia/Nanjing'
+    - name: 'Bharath Thiruveedula'
+      email: 'bharath.thiruveedula@verizon.com'
+      company: 'Verizon'
+      id: 'bharaththiruveedula'
+      timezone: 'Asia/Hyderabad'
+    - name: 'Ruoyu Ying'
+      email: 'ruoyu.ying@intel.com'
+      company: 'Intel'
+      id: 'Ruoyu'
+      timezone: 'Asia/ShangHai'
+
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:

diff --git a/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml
index 7f2d6b2..9d6325f 100644 (file)
--- a/ResmanagementService/deployment/pom.xml
+++ b/ResmanagementService/deployment/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <artifactId>vfc-nfvo-resmanagement-deployment</artifactId>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/docker/build_image.sh b/ResmanagementService/docker/build_image.sh
index 41e6dce..7cc91f8 100644 (file)
--- a/ResmanagementService/docker/build_image.sh
+++ b/ResmanagementService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.2"
+VERSION="1.3.0"
 PROJECT="vfc"
 IMAGE="resmanagement"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/ResmanagementService/pom.xml b/ResmanagementService/pom.xml
index 78b2eeb..80dc20b 100644 (file)
--- a/ResmanagementService/pom.xml
+++ b/ResmanagementService/pom.xml
@@ -19,11 +19,11 @@
         <parent>
         <artifactId>vfc-nfvo-resmanagement</artifactId>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService</name>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index ca57ab6..b64e50a 100644 (file)
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>vfc-nfvo-resmanagement-service</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService/service</name>
     <packaging>war</packaging>
     <dependencies>

diff --git a/pom.xml b/pom.xml
index ba24ac2..d4651fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
     <artifactId>vfc-nfvo-resmanagement</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-resmanagement</name>
     <description>vfc nfvo resmanagement</description>

diff --git a/version.properties b/version.properties
index 80d2dbd..864741a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
 major=1\r
-minor=2\r
-patch=2\r
+minor=3\r
+patch=0\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r