Merge "Fix deploy failure and other test cases."

8 files changed, 9 insertions, 9 deletions

diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml
index 8b59b17f7..9613030cd 100644
--- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml
+++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml
@@ -24,6 +24,7 @@
 
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
     <artifactId>ansible-awx-executor</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Blueprints Processor Function - Ansible AWX Executor</name>
     <description>Blueprints Processor Function - Ansible Executor</description>
 
diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml
index 89f409a70..b45fdb3f8 100644
--- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml
+++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml
@@ -23,6 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
     <artifactId>cli-executor</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Blueprints Processor Function - CLI Executor</name>
     <description>Blueprints Processor Function - CLI Executor</description>
 
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml
index f163c0e1a..a10dfba38 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml
+++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml
@@ -23,6 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
     <artifactId>netconf-executor</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Blueprints Processor Function - Netconf Executor</name>
     <description>Blueprints Processor Function - Netconf Executor</description>
 
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
index be524fe22..66210f258 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
+++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
@@ -23,6 +23,7 @@
     </parent>
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
     <artifactId>resource-resolution</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Blueprints Processor Function - Resource Resolution</name>
     <description>Blueprints Processor Function - Resource Resolution</description>
diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml
index c1dd50126..2872a5a8f 100644
--- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml
+++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml
@@ -23,6 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
     <artifactId>restconf-executor</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Blueprints Processor Function - Restconf Executor</name>
     <description>Blueprints Processor Function - Restconf Executor</description>
 
diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
index b09a8ac41..d4d030772 100644
--- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
@@ -21,8 +21,6 @@
         <artifactId>inbounds</artifactId>
         <version>0.7.0-SNAPSHOT</version>
     </parent>
-
-    <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
     <artifactId>configs-api</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt
index 599987361..10bf887f6 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt
@@ -22,13 +22,12 @@ import org.junit.Before
 import org.junit.Test
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.mock.MockFilePart
 import org.onap.ccsdk.cds.controllerblueprints.core.*
-import java.nio.file.Paths
 import java.util.*
 import kotlin.test.assertTrue
 
 class BluePrintEnhancerUtilsTest {
 
-    private val blueprintDir = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
+    private val blueprintDir = "./../../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
     private val blueprintArchivePath: String = "./target/blueprints/archive"
     private val blueprintEnrichmentPath: String = "./target/blueprints/enrichment"
     private var zipBlueprintFileName =  normalizedPathName(blueprintArchivePath, "test.zip")
@@ -39,7 +38,7 @@ class BluePrintEnhancerUtilsTest {
         assertTrue(archiveDir.exists(), "failed to create archiveDir(${archiveDir.absolutePath}")
         val enhancerDir = normalizedFile(blueprintEnrichmentPath).reCreateDirs()
         assertTrue(enhancerDir.exists(), "failed to create enhancerDir(${enhancerDir.absolutePath}")
-        val blueprintFile = Paths.get(blueprintDir).toFile().normalize()
+        val blueprintFile = normalizedFile(blueprintDir)
         val testZipFile = blueprintFile.compress(zipBlueprintFileName)
         assertTrue(testZipFile.exists(), "Failed to create blueprint test zip(${testZipFile.absolutePath}")
     }
diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
index 964de1e3c..6037804af 100644
--- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
@@ -21,14 +21,12 @@
   <parent>
     <artifactId>inbounds</artifactId>
     <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-    <version>0.6.1-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
   <artifactId>health-api</artifactId>
-  <!--<version>0.0.1-SNAPSHOT</version>-->
 
   <packaging>jar</packaging>
-  <name>health api for checking the system</name>
+  <name>Blueprints Processor Health API</name>
   <description>checking system check health endpoints</description>
 
   <dependencies>