Merges from 1.1.0

Issue-Id: CLI-66

Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

11 files changed, 11 insertions, 11 deletions

diff --git a/plugins/onap-1.0/features/aai/pom.xml b/plugins/onap-1.0/features/aai/pom.xml
index 236517ea..587d554b 100644
--- a/plugins/onap-1.0/features/aai/pom.xml
+++ b/plugins/onap-1.0/features/aai/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-plugins-onap-1.0-features</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-plugins-onap-1.0-features-aai</artifactId>
diff --git a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
index 9b267481..b448c8cc 100644
--- a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: cloud-list
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/pom.xml b/plugins/onap-1.0/features/pom.xml
index 8c9592c2..0dfd033e 100644
--- a/plugins/onap-1.0/features/pom.xml
+++ b/plugins/onap-1.0/features/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-plugins-onap-1.0</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-plugins-onap-1.0-features</artifactId>
diff --git a/plugins/onap-1.0/features/sdc/pom.xml b/plugins/onap-1.0/features/sdc/pom.xml
index de46a506..275cae52 100644
--- a/plugins/onap-1.0/features/sdc/pom.xml
+++ b/plugins/onap-1.0/features/sdc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-plugins-onap-1.0-features</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-plugins-onap-1.0-features-sdc</artifactId>
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
index 43023fe6..9dfe035f 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-checkin
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
index d7a9e375..32f2de93 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-checkout
 version: onap-1.1
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
index d5b7432f..3b4ce7b5 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-create
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
index fe494ace..f1fff560 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-list
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
index 99cd88ed..880608c5 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-show
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
index 55ceaf32..4f4e15c0 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-submit
 version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
index 344dcc9e..d3fc41be 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 
 name: vsp-upload
 version: onap-1.0