Update vfc-resmgr version

Change-Id: I83fef261e53daacdcd3fb80d29d65d75d86a5e71
Issue-ID: VFC-614
Signed-off-by: luxin <luxin7@huawei.com>

diff --git a/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml
index 0f7b895..8679022 100644 (file)
--- a/ResmanagementService/deployment/pom.xml
+++ b/ResmanagementService/deployment/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <artifactId>vfc-nfvo-resmanagement-deployment</artifactId>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/deployment/version.properties b/ResmanagementService/deployment/version.properties
deleted file mode 100644 (file)
index 0a53751..0000000
--- a/ResmanagementService/deployment/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################\r
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=1\r
-minor=0\r
-patch=0\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file

diff --git a/ResmanagementService/pom.xml b/ResmanagementService/pom.xml
index 410ffa6..55dcc2f 100644 (file)
--- a/ResmanagementService/pom.xml
+++ b/ResmanagementService/pom.xml
@@ -19,11 +19,11 @@
         <parent>
         <artifactId>vfc-nfvo-resmanagement</artifactId>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService</name>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index 8d391d2..383e966 100644 (file)
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>vfc-nfvo-resmanagement-service</artifactId>
-     <version>1.0.0-SNAPSHOT</version>
+     <version>1.1.0-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService/service</name>
     <packaging>war</packaging>
     <dependencies>

diff --git a/ResmanagementService/service/version.properties b/ResmanagementService/service/version.properties
deleted file mode 100644 (file)
index 0a53751..0000000
--- a/ResmanagementService/service/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################\r
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=1\r
-minor=0\r
-patch=0\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file

diff --git a/ResmanagementService/version.properties b/ResmanagementService/version.properties
deleted file mode 100644 (file)
index 0a53751..0000000
--- a/ResmanagementService/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################\r
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=1\r
-minor=0\r
-patch=0\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 08cfaf5..6b570d1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
     <artifactId>vfc-nfvo-resmanagement</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-resmanagement</name>
     <description>vfc nfvo resmanagement</description>

diff --git a/version.properties b/version.properties
index 0a53751..453f98d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
 major=1\r
-minor=0\r
+minor=1\r
 patch=0\r
 \r
 base_version=${major}.${minor}.${patch}\r