summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt4
-rw-r--r--components/model-catalog/proto-definition/pom.xml7
-rw-r--r--components/parent/pom.xml7
-rw-r--r--ms/blueprintsprocessor/parent/pom.xml7
-rw-r--r--ms/controllerblueprints/parent/pom.xml7
5 files changed, 24 insertions, 8 deletions
diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
index 143c4a84..59a03719 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
@@ -27,7 +27,7 @@ class BluePrintFileUtilsTest {
@Test
fun testNewBlueprint() = runBlocking {
- val targetPath: String = Paths.get("target").toUri().toURL().path.plus("bp-new-test")
+ val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-new-test")
BluePrintFileUtils.createEmptyBluePrint(targetPath)
}
@@ -36,7 +36,7 @@ class BluePrintFileUtilsTest {
fun testBlueprintCopy() = runBlocking {
val sourcePath: String = "./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
- val targetPath: String = Paths.get("target").toUri().toURL().path.plus("bp-copy-test")
+ val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-copy-test")
val targetDir = File(targetPath)
targetDir.deleteOnExit()
diff --git a/components/model-catalog/proto-definition/pom.xml b/components/model-catalog/proto-definition/pom.xml
index 859038c4..c9289392 100644
--- a/components/model-catalog/proto-definition/pom.xml
+++ b/components/model-catalog/proto-definition/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2019 Bell Canada
-*
+ * Modifications Copyright © 2017-2018 AT&T Intellectual Property.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -60,11 +61,11 @@
<version>0.6.1</version>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
- io.grpc:protoc-gen-grpc-java:1.16.1:exe:${os.detected.classifier}
+ io.grpc:protoc-gen-grpc-java:1.18.0:exe:${os.detected.classifier}
</pluginArtifact>
<protoSourceRoot>proto</protoSourceRoot>
</configuration>
diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index 365515aa..b53f9f11 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -34,7 +34,7 @@
<kotlin.version>1.3.11</kotlin.version>
<kotlin.maven.version>1.3.11</kotlin.maven.version>
<kotlin.couroutines.version>1.1.0</kotlin.couroutines.version>
- <grpc.version>1.17.1</grpc.version>
+ <grpc.version>1.18.0</grpc.version>
<protobuff.java.utils.version>3.6.1</protobuff.java.utils.version>
<eelf.version>1.0.0</eelf.version>
<guava.version>27.0.1-jre</guava.version>
@@ -117,6 +117,11 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>${kotlin.version}</version>
</dependency>
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index f694ac12..d64258e7 100644
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -35,7 +35,7 @@
<kotlin.version>1.3.11</kotlin.version>
<kotlin.maven.version>1.3.11</kotlin.maven.version>
<kotlin.couroutines.version>1.1.0</kotlin.couroutines.version>
- <grpc.version>1.17.1</grpc.version>
+ <grpc.version>1.18.0</grpc.version>
<protobuff.java.utils.version>3.6.1</protobuff.java.utils.version>
<eelf.version>1.0.0</eelf.version>
<sli.version>0.4.1-SNAPSHOT</sli.version>
@@ -126,6 +126,11 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>${kotlin.version}</version>
</dependency>
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 9042318d..578a0c7e 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -33,7 +33,7 @@
<kotlin.version>1.3.11</kotlin.version>
<kotlin.maven.version>1.3.11</kotlin.maven.version>
<kotlin.couroutines.version>1.1.0</kotlin.couroutines.version>
- <grpc.version>1.17.1</grpc.version>
+ <grpc.version>1.18.0</grpc.version>
<protobuff.java.utils.version>3.6.1</protobuff.java.utils.version>
<eelf.version>1.0.0</eelf.version>
<guava.version>27.0.1-jre</guava.version>
@@ -110,6 +110,11 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>${kotlin.version}</version>
</dependency>