summaryrefslogtreecommitdiffstats
path: root/validate
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-14 11:50:31 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-21 18:07:52 +0530
commit9a7c3f58efc9a4fcff5052700457cf6f7565cf39 (patch)
treeca515d799e405788914f837a09a780fc5c95781e /validate
parente61a25554503eca7ae758318651551e6e3b6eaca (diff)
Merges from 1.1.0
Issue-Id: CLI-66 Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'validate')
-rw-r--r--validate/pom.xml2
-rw-r--r--validate/sample-mock-generator/pom.xml2
-rw-r--r--validate/sample-yaml-generator/pom.xml2
-rw-r--r--validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java2
-rw-r--r--validate/validation/pom.xml33
-rw-r--r--validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java2
-rw-r--r--validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml (renamed from validate/validation/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml)2
7 files changed, 37 insertions, 8 deletions
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/open-cli-sample/customer/customer-create-sample-1.1.yaml
index 30b5b303..51d4fca3 100644
--- a/validate/validation/src/test/resources/onap-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
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: customer-create
version: onap-1.1