summaryrefslogtreecommitdiffstats
path: root/zte
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2018-10-10 06:07:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-10 06:07:37 +0000
commit284c5ab4bcc396a1b191e3c02507a1712af163fe (patch)
tree4a185eda8760af4c3323663a36c1a6a36b1a289f /zte
parent2e07978c045362e5fce86976b2c508efe05dca60 (diff)
parenta6cedf98718ad85e7610e6bd298197772184f10a (diff)
Merge "Update pom and docker version of zte-sfc-driver"3.0.1-ONAP3.0.0-ONAP1.2.0casablanca
Diffstat (limited to 'zte')
-rw-r--r--zte/sfc-driver/plugin-standalone/pom.xml4
-rwxr-xr-xzte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh2
-rw-r--r--zte/sfc-driver/pom.xml2
-rw-r--r--zte/sfc-driver/sfc-driver/pom.xml4
-rw-r--r--zte/sfc-driver/version.properties2
5 files changed, 7 insertions, 7 deletions
diff --git a/zte/sfc-driver/plugin-standalone/pom.xml b/zte/sfc-driver/plugin-standalone/pom.xml
index fa83788..6a6f8e5 100644
--- a/zte/sfc-driver/plugin-standalone/pom.xml
+++ b/zte/sfc-driver/plugin-standalone/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.sfc</groupId>
<artifactId>sfc-driver-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone</groupId>
<artifactId>vfc-nfvo-driver-sfc-zte-sfc-driver</artifactId>
<name>vfc/nfvo/driver/sfc/zte/sfc-driver/plugin-standalone</name>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh
index 062714f..b6655d5 100755
--- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh
+++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.1.0"
+VERSION="1.2.0"
PROJECT="vfc"
IMAGE="ztesdncdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/zte/sfc-driver/pom.xml b/zte/sfc-driver/pom.xml
index e5acb1f..cbdabdc 100644
--- a/zte/sfc-driver/pom.xml
+++ b/zte/sfc-driver/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.sfc</groupId>
<artifactId>sfc-driver-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>vfc-nfvo-driver-sfc</name>
<packaging>pom</packaging>
<modules>
diff --git a/zte/sfc-driver/sfc-driver/pom.xml b/zte/sfc-driver/sfc-driver/pom.xml
index 44fca21..030bbf7 100644
--- a/zte/sfc-driver/sfc-driver/pom.xml
+++ b/zte/sfc-driver/sfc-driver/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.sfc</groupId>
<artifactId>sfc-driver-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver</groupId>
<artifactId>sfc-driver</artifactId>
<name>vfc/nfvo/driver/sfc/zte/sfc-driver/sfc-driver</name>
<packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<properties>
<dropwizard.version>0.8.0</dropwizard.version>
<jetty.version>9.2.9.v20150224</jetty.version>
diff --git a/zte/sfc-driver/version.properties b/zte/sfc-driver/version.properties
index 7f86aa1..faf06bb 100644
--- a/zte/sfc-driver/version.properties
+++ b/zte/sfc-driver/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}