From 9a7c3f58efc9a4fcff5052700457cf6f7565cf39 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 14 Nov 2017 11:50:31 +0530
Subject: Merges from 1.1.0

Issue-Id: CLI-66

Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 validate/pom.xml                                   |  2 +-
 validate/sample-mock-generator/pom.xml             |  2 +-
 validate/sample-yaml-generator/pom.xml             |  2 +-
 .../onap/cli/sample/yaml/SampleYamlGenerator.java  |  2 +-
 validate/validation/pom.xml                        | 33 ++++++++++++++++++++--
 .../onap/cli/moco/OnapCommandHttpMocoServer.java   |  2 +-
 .../customer/customer-create-sample-1.1.yaml       |  9 ------
 .../customer/customer-create-sample-1.1.yaml       |  9 ++++++
 8 files changed, 45 insertions(+), 16 deletions(-)
 delete mode 100644 validate/validation/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml
 create mode 100644 validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml

(limited to 'validate')

diff --git a/validate/pom.xml b/validate/pom.xml
index 2d75b23d..6a395ae2 100644
--- a/validate/pom.xml
+++ b/validate/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-validate</artifactId>
diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml
index a4985c93..d9cdc46e 100644
--- a/validate/sample-mock-generator/pom.xml
+++ b/validate/sample-mock-generator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-validate</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-sample-mock-generator</artifactId>
diff --git a/validate/sample-yaml-generator/pom.xml b/validate/sample-yaml-generator/pom.xml
index 638d79d5..553c00cd 100644
--- a/validate/sample-yaml-generator/pom.xml
+++ b/validate/sample-yaml-generator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-validate</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-sample-yaml-generator</artifactId>
diff --git a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
index d45b50a4..179eaa36 100644
--- a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
+++ b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
@@ -33,7 +33,7 @@ public class SampleYamlGenerator {
         String cmdName = input.get(0);
 
         PrintWriter writer = new PrintWriter(targetPath, "UTF-8");
-        writeKeyValuePair(writer, "onap_cli_sample_version", "1.0");
+        writeKeyValuePair(writer, "open_cli_sample_version", "1.0");
         writeKeyValuePair(writer, "name", cmdName);
         writeKeyValuePair(writer, "version", version);
 
diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml
index 8c204d87..cdbf43c2 100644
--- a/validate/validation/pom.xml
+++ b/validate/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli-validate</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-validation</artifactId>
@@ -53,7 +53,36 @@
             <artifactId>cli-plugins-sample</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-catalog</artifactId>
+            <version>${project.version}</version>
+        </dependency> 
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-auth</artifactId>
+            <version>${project.version}</version>
+        </dependency>                 
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-features-so</artifactId>
+            <version>${project.version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-features-sdc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-features-msb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.cli</groupId>
+            <artifactId>cli-plugins-onap-1.1-features-aai</artifactId>
+            <version>${project.version}</version>
+        </dependency>                
   </dependencies>
 <!--   <build>
         <plugins>
diff --git a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
index cb64b106..533742ab 100644
--- a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
+++ b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
@@ -53,7 +53,7 @@ public class OnapCommandHttpMocoServer {
 
     public static final String SAMPLE_PATTERN = "onap-cli-sample/**/";
 
-    public static final String SAMPLE_VERSION = "onap_cli_sample_version";
+    public static final String SAMPLE_VERSION = "open_cli_sample_version";
     public static final String SAMPLE_VERSION_1_0 = "1.0";
 
     public static final String SAMPLE_COMMAND_NAME = "name";
diff --git a/validate/validation/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml b/validate/validation/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml
deleted file mode 100644
index 30b5b303..00000000
--- a/validate/validation/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: customer-create
-version: onap-1.1
-samples:
-  sample1:
-    name: Create a customer
-    input: -m http://locahost:8141 -u AAI -p AAI --customer-name test --subscriber-name test
-    moco: customer-create-sample-1.1-moco.json
\ No newline at end of file
diff --git a/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml b/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
new file mode 100644
index 00000000..51d4fca3
--- /dev/null
+++ b/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+
+name: customer-create
+version: onap-1.1
+samples:
+  sample1:
+    name: Create a customer
+    input: -m http://locahost:8141 -u AAI -p AAI --customer-name test --subscriber-name test
+    moco: customer-create-sample-1.1-moco.json
\ No newline at end of file
-- 
cgit 1.2.3-korg