From: Yan Yang <yangyanyj@chinamobile.com>
Date: Wed, 10 Oct 2018 06:07:37 +0000 (+0000)
Subject: Merge "Update pom and docker version of zte-sfc-driver"
X-Git-Tag: 1.2.0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Ftags%2F1.2.0;hp=2e07978c045362e5fce86976b2c508efe05dca60;p=vfc%2Fnfvo%2Fdriver%2Fsfc.git

Merge "Update pom and docker version of zte-sfc-driver"
---

diff --git a/pom.xml b/pom.xml
index e7eb7b6..dead916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.sfc</groupId>
        <artifactId>sfc-driver-root</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
+       <version>1.2.0-SNAPSHOT</version>
        <name>vfc-nfvo-driver-sfc</name>
        <packaging>pom</packaging>
 </project>
diff --git a/version.properties b/version.properties
index 7f86aa1..faf06bb 100644
--- a/version.properties
+++ b/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}
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}