summaryrefslogtreecommitdiffstats
path: root/springboot/spring-boot-setup/src
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-03-22 15:20:25 -0400
committerDan Timoney <dtimoney@att.com>2023-03-22 15:20:25 -0400
commit5bbe40c0b730546839626fa2ccf73d23570a277b (patch)
tree000fa2765a3b5af186ed168dbebe9c462e8a62a7 /springboot/spring-boot-setup/src
parentad2ed126ffe2e4d81caa9059c229fd7eb314bf25 (diff)
Fix generated file springboot26/pom.xml
Changes in earlier commit were made directly to a generated pom file and thus were lost at compile time. This change makes the changes to the template and properties files used to generate that pom Issue-ID: CCSDK-3813 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ieb3bacfe29d7834bdc049023a2beefbf39d87ab1
Diffstat (limited to 'springboot/spring-boot-setup/src')
-rw-r--r--springboot/spring-boot-setup/src/main/properties/springboot25.properties6
-rw-r--r--springboot/spring-boot-setup/src/main/properties/springboot26.properties8
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml12
3 files changed, 19 insertions, 7 deletions
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot25.properties b/springboot/spring-boot-setup/src/main/properties/springboot25.properties
index c275a27f..4f3ee92f 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot25.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot25.properties
@@ -12,3 +12,9 @@ springboot.jersey.version=2.33
springboot.slf4j.version=1.7.36
springboot.springfox.version=3.0.0
springboot.tomcat.jdbc.version=9.0.58
+springboot.jacoco.version=0.8.5
+springboot.kotlin.version=1.5.32
+springboot.kotlin.maven.version=1.5.32
+springboot.kotlin.coroutines.version=1.5.2
+springboot.kotlinpoet.version=1.5.0
+springboot.mockk.version=1.9.3
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot26.properties b/springboot/spring-boot-setup/src/main/properties/springboot26.properties
index 216d1071..b9704ccc 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot26.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot26.properties
@@ -11,4 +11,10 @@ springboot.netty.ssl.version=2.0.50.Final
springboot.jersey.version=2.33
springboot.slf4j.version=1.7.36
springboot.springfox.version=3.0.0
-springboot.tomcat.jdbc.version=9.0.58 \ No newline at end of file
+springboot.tomcat.jdbc.version=9.0.58
+springboot.jacoco.version=0.8.8
+springboot.kotlin.version=1.6.21
+springboot.kotlin.maven.version=1.6.21
+springboot.kotlin.coroutines.version=1.6.4
+springboot.kotlinpoet.version=1.11.0
+springboot.mockk.version=1.12.8 \ No newline at end of file
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 93304de0..b90995f4 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
@@ -51,7 +51,7 @@
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<!-- Jacoco properties -->
- <jacoco.version>0.8.5</jacoco.version>
+ <jacoco.version>${springboot.jacoco.version}</jacoco.version>
<!-- properties from oparent -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -107,14 +107,14 @@
<!-- Kotlin versions -->
<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>
+ <kotlin.version>${springboot.kotlin.version}</kotlin.version>
+ <kotlin.maven.version>${springboot.kotlin.maven.version}</kotlin.maven.version>
+ <kotlin.couroutines.version>${springboot.kotlin.coroutines.version}</kotlin.couroutines.version>
+ <kotlinpoet.version>${springboot.kotlinpoet.version}</kotlinpoet.version>
<kroto-plus.version>0.5.0</kroto-plus.version>
<nats.version>2.6.6</nats.version>
<nats.streaming.version>2.2.3</nats.streaming.version>
- <mockk.version>1.9.3</mockk.version>
+ <mockk.version>${springboot.mockk.version}</mockk.version>
<!-- Managed dependency versions -->
<antlr.version>4.8-1</antlr.version>