[JAVA-36508] Upgrade Kotlin parent-boot-2 and parent-boot-3 to the latest version of Boot

Author: timis1

parent-boot-2/README.md

@@ -82,11 +82,11 @@
 
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
         <rest-assured.version>3.3.0</rest-assured.version>
-        <logback.version>1.4.4</logback.version>
+        <logback.version>1.5.6</logback.version>
         <org.slf4j.version>2.0.3</org.slf4j.version>
         <!-- for spring-boot 3 we need java 17 minimum -->
         <java.version>17</java.version>
-        <spring-boot.version>3.2.4</spring-boot.version>
+        <spring-boot.version>3.3.0</spring-boot.version>
 
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>

parent-boot-2/pom.xml

@@ -485,7 +485,6 @@
             </build>
 
             <modules>
-                <module>parent-boot-2</module>
                 <module>parent-boot-3</module>
 
                 <module>core-kotlin-companion</module>
@@ -567,7 +566,6 @@
             </build>
 
             <modules>
-                <module>parent-boot-2</module>
                 <module>parent-boot-3</module>
 
                 <module>core-kotlin-companion</module>

parent-boot-3/pom.xml

@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -52,9 +52,13 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient5.version}</version>
+        </dependency>
     </dependencies>
 
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
@@ -111,6 +115,7 @@
 
     <properties>
         <kotlin.version>1.9.24</kotlin.version>
+        <httpclient5.version>5.3.1</httpclient5.version>
     </properties>
 
 </project>

pom.xml

@@ -1,10 +1,9 @@
 package com.baeldung.configurationproperties.config
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
+import org.springframework.boot.context.properties.bind.ConstructorBinding
 
 @ConfigurationProperties(prefix = "api")
-@ConstructorBinding
-data class ApiConfiguration(
+data class ApiConfiguration /*@ConstructorBinding constructor*/(
     val clientId: String,
     val url: String,
     val key: String

spring-boot-kotlin-2/pom.xml

@@ -1,20 +1,23 @@
 package com.baeldung.resttemplate.config
 
+import org.springframework.boot.web.client.RestTemplateBuilder
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory
 import org.springframework.web.client.RestTemplate
+import java.time.Duration
 
 @Configuration
 class RestTemplateConfig {
 
     @Bean("restTemplateCustom")
     fun restTemplate(): RestTemplate {
-        val restTemplate = RestTemplate()
         val requestFactory = HttpComponentsClientHttpRequestFactory()
-        requestFactory.setConnectTimeout(5000)
-        requestFactory.setReadTimeout(5000)
-        restTemplate.requestFactory = requestFactory;
+        val restTemplateBuilder = RestTemplateBuilder()
+        restTemplateBuilder.setReadTimeout(Duration.ofMillis(5_000))
+        restTemplateBuilder.setReadTimeout(Duration.ofMillis(5_000))
+        val restTemplate = restTemplateBuilder.build()
+        restTemplate.requestFactory = requestFactory
 
         return restTemplate;
     }