summaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/parent
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-11-10 11:54:05 -0500
committerMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-11-10 15:55:03 -0500
commit6488fc3cdaf0ea48687f98acc14f689c42f64427 (patch)
tree1b94b5d76c61fff6103e8dabda10b98a1a1d3d7d /ms/controllerblueprints/parent
parente2d5b0447398832d8a04f94da8b58a830c6742d9 (diff)
Controller Design Studio
Upgrade Spring Boot and Kotlin versions. Change-Id: If0d7d0f476d8cfd23916013ff1ab554b26bc6b7a Issue-ID: CCSDK-658 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
Diffstat (limited to 'ms/controllerblueprints/parent')
-rw-r--r--ms/controllerblueprints/parent/pom.xml26
1 files changed, 20 insertions, 6 deletions
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index a9e7cfa52..76ea4dcb3 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -28,13 +28,16 @@
<name>Controller Blueprints Parent</name>
<packaging>pom</packaging>
<properties>
- <spring.boot.version>2.0.5.RELEASE</spring.boot.version>
- <spring.version>5.0.8.RELEASE</spring.version>
- <kotlin.version>1.2.70</kotlin.version>
+ <spring.boot.version>2.0.6.RELEASE</spring.boot.version>
+ <spring.version>5.0.10.RELEASE</spring.version>
+ <kotlin.version>1.3.0</kotlin.version>
+ <kotlin.couroutines.version>1.0.1</kotlin.couroutines.version>
<eelf.version>1.0.0</eelf.version>
+ <guava.version>26.0-jre</guava.version>
<springfox.swagger2.version>2.9.2</springfox.swagger2.version>
<h2database.version>1.4.197</h2database.version>
<onap.logger.slf4j>1.2.2</onap.logger.slf4j>
+ <powermock.version>1.7.4</powermock.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -93,7 +96,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>26.0-jre</version>
+ <version>${guava.version}</version>
</dependency>
<!-- Kotlin Dependencies -->
@@ -104,6 +107,11 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlinx-couroutines-core</artifactId>
+ <version>${kotlin.couroutines.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
</dependency>
@@ -112,6 +120,12 @@
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jdk7</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+
<!-- Database -->
@@ -148,12 +162,12 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>1.7.4</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test</artifactId>
+ <artifactId>kotlin-test-junit</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>