Update kotlin versions

Update kotlin versions in springboot 2.5 and 2.6 parent poms

Change-Id: I9ff9ee224795de252225cc0517bd40b4802b6a7f
Issue-ID: CCSDK-3771
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

4 files changed, 25 insertions, 16 deletions

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index be290e2e..e223b90f 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.9</version>
+                <version>2.9.0</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
index 6718d610..04074043 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
@@ -80,6 +80,9 @@
         <java.version>11</java.version>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -103,10 +106,10 @@
         <spring.version>${spring.version}</spring.version>
 
         <!-- Kotlin versions -->
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.3.61</kotlin.version>
-        <kotlin.maven.version>1.3.61</kotlin.maven.version>
-        <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version>
+        <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
+        <kotlin.version>1.5.32</kotlin.version>
+        <kotlin.maven.version>1.5.32</kotlin.maven.version>
+        <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version>
         <kotlinpoet.version>1.5.0</kotlinpoet.version>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <nats.version>2.6.6</nats.version>
@@ -881,7 +884,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
+                        <version>${maven-antrun-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>initialize</phase>
diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index b8cacf4f..d62bc64f 100644
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -80,6 +80,9 @@
         <java.version>11</java.version>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -103,10 +106,10 @@
         <spring.version>5.3.16</spring.version>
 
         <!-- Kotlin versions -->
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.3.61</kotlin.version>
-        <kotlin.maven.version>1.3.61</kotlin.maven.version>
-        <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version>
+        <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
+        <kotlin.version>1.5.32</kotlin.version>
+        <kotlin.maven.version>1.5.32</kotlin.maven.version>
+        <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version>
         <kotlinpoet.version>1.5.0</kotlinpoet.version>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <nats.version>2.6.6</nats.version>
@@ -881,7 +884,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
+                        <version>${maven-antrun-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>initialize</phase>
diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml
index 30d689a0..e96825f5 100644
--- a/springboot/springboot26/pom.xml
+++ b/springboot/springboot26/pom.xml
@@ -80,6 +80,9 @@
         <java.version>11</java.version>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -103,10 +106,10 @@
         <spring.version>5.3.22</spring.version>
 
         <!-- Kotlin versions -->
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.3.61</kotlin.version>
-        <kotlin.maven.version>1.3.61</kotlin.maven.version>
-        <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version>
+        <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
+        <kotlin.version>1.5.32</kotlin.version>
+        <kotlin.maven.version>1.5.32</kotlin.maven.version>
+        <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version>
         <kotlinpoet.version>1.5.0</kotlinpoet.version>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <nats.version>2.6.6</nats.version>
@@ -881,7 +884,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
+                        <version>${maven-antrun-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>initialize</phase>