summaryrefslogtreecommitdiffstats
path: root/springboot/spring-boot-setup/src
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2024-09-23 13:29:42 +0000
committerGerrit Code Review <gerrit@onap.org>2024-09-23 13:29:42 +0000
commit8bd1f626640d452d92926957db39e9eeaa01d96c (patch)
tree69b99af32ec3c79be821de4a6139efebd169f7df /springboot/spring-boot-setup/src
parent9998f9dc585e50d18cc279e3d103aef079078610 (diff)
parentf2e52deb999b971a1048f303b8ef89111869f97c (diff)
Merge "Upgrade for Java 17 with Kotlin 1.7"
Diffstat (limited to 'springboot/spring-boot-setup/src')
-rw-r--r--springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties11
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml16
2 files changed, 19 insertions, 8 deletions
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties b/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties
new file mode 100644
index 00000000..ab2ad432
--- /dev/null
+++ b/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties
@@ -0,0 +1,11 @@
+springbootparent.artifactId=spring-boot-starter-parent
+springbootparent.groupId=org.springframework.boot
+springbootparent.version=2.7.18
+springboot.project.artifactId=spring-boot-27-jdk-17-starter-parent
+spring.version=6.1.10
+springboot.httpcomponents.core.version=4.5.16
+springboot.httpcomponents.client.version=4.5.14
+springboot.jackson.version=2.15.0
+springboot.logback.version=1.4.14
+springboot.slf4j.version=2.19.0
+springboot.antlr.version=4.12.0
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml
index db3e8837..394ab82d 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml
@@ -103,15 +103,15 @@
<spring.version>${spring.version}</spring.version>
<!-- 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>
- <kroto-plus.version>0.5.0</kroto-plus.version>
- <nats.version>2.6.6</nats.version>
+ <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
+ <kotlin.version>1.7.0</kotlin.version>
+ <kotlin.maven.version>1.7.0</kotlin.maven.version>
+ <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version>
+ <kotlinpoet.version>1.11.0</kotlinpoet.version>
+ <kroto-plus.version>0.6.1</kroto-plus.version>
+ <nats.version>2.15.0</nats.version>
<nats.streaming.version>2.2.3</nats.streaming.version>
- <mockk.version>1.9.3</mockk.version>
+ <mockk.version>1.13.12</mockk.version>
<antlr.version>${springboot.antlr.version}</antlr.version>