Update version to 1.2.1

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

diff --git a/huawei/pom.xml b/huawei/pom.xml
index e771ae0..eff4ceb 100644 (file)
--- a/huawei/pom.xml
+++ b/huawei/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm-huawei</name>
     <description>vfc-nfvo-driver-vnfm-svnfm-huawei</description>

diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
index 092bd2f..6401298 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
         <artifactId>vnfmadapter-service-root</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>hw-vnfmadapter-deployment</artifactId>

diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
index fe0260a..eae0fb0 100755 (executable)
--- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.1"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="nfvo/svnfm/huawei"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/huawei/vnfmadapter/VnfmadapterService/pom.xml b/huawei/vnfmadapter/VnfmadapterService/pom.xml
index 6a2f915..d6952bb 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
         <artifactId>vnfmadapter</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>    
     <artifactId>vnfmadapter-service-root</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService</name>
     <packaging>pom</packaging>
 

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index 7a409e1..ac7e754 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
         <artifactId>vnfmadapter-service-root</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vnfmadapter-service</artifactId>

diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml
index 9aa7bae..2b829a8 100644 (file)
--- a/huawei/vnfmadapter/pom.xml
+++ b/huawei/vnfmadapter/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
     <artifactId>vnfmadapter</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm</name>
     <description>nfvo vnfmadapter</description>

diff --git a/nokia/pom.xml b/nokia/pom.xml
index 507b203..2a576e6 100644 (file)
--- a/nokia/pom.xml
+++ b/nokia/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokia</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm-nokia</name>
     <description>vfc-nfvo-driver-vnfm-svnfm-nokia</description>

diff --git a/nokia/vnfmdriver/pom.xml b/nokia/vnfmdriver/pom.xml
index 8245a88..77cf0d9 100644 (file)
--- a/nokia/vnfmdriver/pom.xml
+++ b/nokia/vnfmdriver/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokia</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
     <artifactId>vnfmdriver</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm-nokia-vnfmdriver</name>
     <description>nfvo vnfmdriver</description>

diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml
index 014a020..633e378 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vfcadaptor-service</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vfcadaptor-deployment</artifactId>

diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
index a3c0a45..1f0d864 100755 (executable)
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
@@ -22,7 +22,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.1"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="nfvo/svnfm/nokia"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/nokia/vnfmdriver/vfcadaptorservice/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/pom.xml
index 83b8f8f..66f5661 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <artifactId>vnfmdriver</artifactId>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
   
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
     <artifactId>vfcadaptor-service</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice</name>
     <packaging>pom</packaging>
 

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
index 4e608aa..6fe3f2c 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
@@ -18,7 +18,7 @@
        <modelVersion>4.0.0</modelVersion>
 
        <artifactId>vfcadaptor</artifactId>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.2.1-SNAPSHOT</version>
        <packaging>war</packaging>
 
        <name>vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor</name>
@@ -27,7 +27,7 @@
   <parent>
                <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
                <artifactId>vfcadaptor-service</artifactId>
-               <version>1.3.1-SNAPSHOT</version>
+               <version>1.2.1-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml
index 6622a2f..4e2df7a 100644 (file)
--- a/nokiav2/deployment/pom.xml
+++ b/nokiav2/deployment/pom.xml
@@ -17,14 +17,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deployment</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment</name>
   <description>Nokia SVNFM driver deployment files</description>
   <parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <build>
     <plugins>

diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index abaef17..6d1d465 100644 (file)
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -17,14 +17,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>driver</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driver</name>
   <description>svnfm vnfm driver</description>
   <parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
       <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml
index 5742cc7..a09382d 100644 (file)
--- a/nokiav2/driverwar/pom.xml
+++ b/nokiav2/driverwar/pom.xml
@@ -18,14 +18,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
   <artifactId>driverwar</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar</name>
   <description>svnfm vnfm driver</description>
   <parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
       <artifactId>driver</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml
index 7a7c5eb..b2b0ecf 100644 (file)
--- a/nokiav2/generatedapis/pom.xml
+++ b/nokiav2/generatedapis/pom.xml
@@ -18,12 +18,12 @@
   <parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
   <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis</name>
   <properties>

diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml
index e9dfd78..8c59c34 100644 (file)
--- a/nokiav2/pom.xml
+++ b/nokiav2/pom.xml
@@ -18,12 +18,12 @@
   <parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
   <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>vfc-nfvo-driver-vnfm-svnfm-nokiav2</name>
   <properties>

diff --git a/pom.xml b/pom.xml
index 870cf70..8d0b5a9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
   <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>vfc-nfvo-driver-vnfm-svnfm</name>
   <description>vfc-nfvo-driver-vnfm-svnfm</description>

diff --git a/version.properties b/version.properties
index 3566fa0..502454f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=3
+minor=2
 patch=1
 
 base_version=${major}.${minor}.${patch}

diff --git a/zte/pom.xml b/zte/pom.xml
index 449b006..44fcd22 100644 (file)
--- a/zte/pom.xml
+++ b/zte/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc/nfvo/driver/vnfm/svnfm/zte</name>
     <description>vfc-nfvo-driver-vnfm-svnfm-zte</description>

diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index 27d42e9..4f1c99c 100755 (executable)
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.1"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="ztevnfmdriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/zte/vmanager/pom.xml b/zte/vmanager/pom.xml
index b4cf94f..e84bd6e 100644 (file)
--- a/zte/vmanager/pom.xml
+++ b/zte/vmanager/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte-vmanager</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-svnfm-zte</name>
     <properties>