summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2019-01-24 16:15:42 +0800
committerYan Yang <yangyanyj@chinamobile.com>2019-01-24 09:29:28 +0000
commit3a81613baa7d0e8ef4e5b8a7fe68deb76ce51b12 (patch)
tree68a51025c7cc2e4a9eb3bf42623c8c61556cc14f
parent4fe7fe12d19105f1b90a00e2b5d89d31fd94d87c (diff)
update vfc version to 1.3.0
Change-Id: If67db85afcf943f689d491847ab1354fe95d7faf Signed-off-by: yangyan <yangyanyj@chinamobile.com> Issue-ID: VFC-1252
-rw-r--r--INFO.yaml26
-rwxr-xr-xgvnfmadapter/docker/build_image.sh2
-rw-r--r--gvnfmadapter/pom.xml4
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml2
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh2
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml2
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml2
-rw-r--r--juju/juju-vnfmadapter/pom.xml4
-rw-r--r--juju/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
11 files changed, 30 insertions, 24 deletions
diff --git a/INFO.yaml b/INFO.yaml
index e37b58d..558e12c 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,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/gvnfmadapter/docker/build_image.sh b/gvnfmadapter/docker/build_image.sh
index 7b52001..e4559ea 100755
--- a/gvnfmadapter/docker/build_image.sh
+++ b/gvnfmadapter/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="gvnfmdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/gvnfmadapter/pom.xml b/gvnfmadapter/pom.xml
index c97ad16..7086d7d 100644
--- a/gvnfmadapter/pom.xml
+++ b/gvnfmadapter/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter</groupId>
<artifactId>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</name>
<properties>
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
index db91137..44002a8 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>juju-vnfmadapter-service-root</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>juju-vnfmadapterservice-deployment</artifactId>
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
index 8b1ef15..fe5e0cb 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/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="jujudriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
index 3df80c2..e459604 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>juju-vnfmadapter</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>juju-vnfmadapter-service-root</artifactId>
<name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter-vnfmadapterService</name>
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
index 8334792..3728790 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>juju-vnfmadapter-service-root</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>juju-vnfmadapter-service</artifactId>
diff --git a/juju/juju-vnfmadapter/pom.xml b/juju/juju-vnfmadapter/pom.xml
index 3c39821..b3727f2 100644
--- a/juju/juju-vnfmadapter/pom.xml
+++ b/juju/juju-vnfmadapter/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>juju</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>juju-vnfmadapter</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter</name>
<description>nfvo juju-vnfmadapter</description>
diff --git a/juju/pom.xml b/juju/pom.xml
index 4515cb9..2ca1c45 100644
--- a/juju/pom.xml
+++ b/juju/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>juju</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-gvnfm-juju</name>
<description>nfvo juju-vnfmadapter</description>
diff --git a/pom.xml b/pom.xml
index 0f69606..3617049 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-gvnfm</name>
<description>vfc nfvo drivers-vnfm-gvnfm</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}