Merge "Upgrade for Java 17 with Kotlin 1.7"

3 files changed, 54 insertions, 8 deletions

diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index 7dcadebe..a737b682 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -120,6 +120,30 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>create-springboot27-jdk17-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../springboot27-jdk17</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template-jdk17.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/springboot27-jdk17.properties</filter>
+                            </filters>
+                            <encoding>UTF-8</encoding>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>create-springboot30-parent-pom</id>
                         <goals>
                             <goal>copy-resources</goal>
@@ -267,6 +291,17 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>rename-springboot27-jdk17-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../springboot27-jdk17/pom-template-jdk17.xml</sourceFile>
+                            <destinationFile>../springboot27-jdk17/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>rename-springboot30-parent-pom</id>
                         <phase>validate</phase>
                         <goals>
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>