diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-11-15 20:35:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-15 20:35:12 +0000 |
| commit | 8e2f54808446119be1fc4fa2a8f3cf089aeabd46 (patch) | |
| tree | b72f9e4ec923101220bb7bb1a22ad53e9adb3360 /components/core | |
| parent | 452a3c355a74436457bd526e08c08583e64a7ae0 (diff) | |
| parent | a9bf0541c65d8bb81b814bd85253cf4518fcb52b (diff) | |
Merge "Controller Design Studio"
Diffstat (limited to 'components/core')
| -rw-r--r-- | components/core/pom.xml | 6 | ||||
| -rw-r--r-- | components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/components/core/pom.xml b/components/core/pom.xml index 7c411656..2e0ab54a 100644 --- a/components/core/pom.xml +++ b/components/core/pom.xml @@ -55,13 +55,9 @@ </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test</artifactId>
+ <artifactId>kotlin-test-junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt index d4bd20a6..2590d6dc 100644 --- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt +++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt @@ -60,7 +60,7 @@ object BluePrintConstants { const val PATH_ATTRIBUTES: String = "attributes"
const val PATH_ARTIFACTS: String = "artifacts"
- const val MODEL_DIR_MODEL_TYPE: String = "model_type"
+ const val MODEL_DIR_MODEL_TYPE: String = "definition-type"
const val MODEL_DEFINITION_TYPE_NODE_TYPE: String = "node_type"
const val MODEL_DEFINITION_TYPE_ARTIFACT_TYPE: String = "artifact_type"
|