summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml25
-rw-r--r--pom.xml2
-rwxr-xr-xres/docker/build_image.sh2
-rw-r--r--res/pom.xml4
-rw-r--r--version.properties4
5 files changed, 21 insertions, 16 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 62f2606..bf34842 100644
--- 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,21 @@ 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/pom.xml b/pom.xml
index 4a9d0f5..4e50669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.gvnfm.vnfres</groupId>
<artifactId>vfc-gvnfm-vnfres</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-gvnfm-vnfres</name>
<description>vfc gvnfm vnfres</description>
diff --git a/res/docker/build_image.sh b/res/docker/build_image.sh
index c1c0783..f8212ff 100755
--- a/res/docker/build_image.sh
+++ b/res/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="vnfres"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/res/pom.xml b/res/pom.xml
index 21be9e9..efb748b 100644
--- a/res/pom.xml
+++ b/res/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.onap.vfc.gvnfm.vnfres</groupId>
<artifactId>vfc-gvnfm-vnfres</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.gvnfm.vnfres.res</groupId>
<artifactId>vfc-gvnfm-vnfres-res</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-gvnfm-vnfres-res</name>
<description>vfc gvnfm vnfres res</description>
diff --git a/version.properties b/version.properties
index 6d6c581..75e785b 100644
--- a/version.properties
+++ b/version.properties
@@ -18,8 +18,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=2
-patch=2
+minor=3
+patch=0
base_version=${major}.${minor}.${patch}