[DEPENDENCY] Spring Boot 4.0

geminiKim · geminiKim · commit e764b797908e · 2025-12-03T01:59:37.000+09:00
kotlinVersion=2.2.21
asciidoctorConvertVersion=4.0.5
ktlintVersion=14.0.1
springBootVersion=4.0.0
springCloudDependenciesVersion=2025.1.0
springMockkVersion=5.0.1
sentryVersion=8.27.1
gradle=9.2.1
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     kotlin("jvm")
-    kotlin("kapt")
     kotlin("plugin.spring") apply false
     kotlin("plugin.jpa") apply false
     id("org.springframework.boot") apply false
@@ -11,8 +8,6 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") apply false
 }
 
-java.sourceCompatibility = JavaVersion.valueOf("VERSION_${property("javaVersion")}")
-
 allprojects {
     group = "${property("projectGroup")}"
     version = "${property("applicationVersion")}"
@@ -24,7 +19,6 @@ allprojects {
 
 subprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
-    apply(plugin = "org.jetbrains.kotlin.kapt")
     apply(plugin = "org.jetbrains.kotlin.plugin.spring")
     apply(plugin = "org.jetbrains.kotlin.plugin.jpa")
     apply(plugin = "org.springframework.boot")
@@ -40,28 +34,32 @@ subprojects {
 
     dependencies {
         implementation("org.jetbrains.kotlin:kotlin-reflect")
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
         implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-        testImplementation("org.springframework.boot:spring-boot-starter-test")
-        testImplementation("com.ninja-squad:springmockk:${property("springMockkVersion")}")
         annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-        kapt("org.springframework.boot:spring-boot-configuration-processor")
+        testImplementation("org.springframework.boot:spring-boot-test")
+        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+        testImplementation("org.assertj:assertj-core")
+        testImplementation("com.ninja-squad:springmockk:${property("springMockkVersion")}")
     }
 
-    tasks.getByName("bootJar") {
-        enabled = false
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of("${property("javaVersion")}")
+        }
     }
 
-    tasks.getByName("jar") {
-        enabled = true
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs.addAll("-Xjsr305=strict", "-Xannotation-default-target=param-property")
+        }
     }
 
-    java.sourceCompatibility = JavaVersion.valueOf("VERSION_${property("javaVersion")}")
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = "${project.property("javaVersion")}"
-        }
+    tasks.named<Jar>("bootJar").configure {
+        enabled = false
+    }
+
+    tasks.named<Jar>("jar").configure {
+        enabled = true
     }
 
     tasks.test {
@@ -98,7 +96,7 @@ subprojects {
         }
     }
 
-    tasks.getByName("asciidoctor") {
+    tasks.named("asciidoctor").configure {
         dependsOn("restDocsTest")
     }
 }
diff --git a/core/core-api/build.gradle.kts b/core/core-api/build.gradle.kts
@@ -1,8 +1,8 @@
-tasks.getByName("bootJar") {
+tasks.named<Jar>("bootJar").configure {
     enabled = true
 }
 
-tasks.getByName("jar") {
+tasks.named<Jar>("jar").configure {
     enabled = false
 }
 
@@ -15,5 +15,5 @@ dependencies {
 
     testImplementation(project(":tests:api-docs"))
 
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
 }
diff --git a/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/config/AsyncConfig.kt b/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/config/AsyncConfig.kt
@@ -11,7 +11,6 @@ import java.util.concurrent.Executor
 @Configuration
 @EnableAsync
 class AsyncConfig : AsyncConfigurer {
-
     @Bean
     override fun getAsyncExecutor(): Executor {
         val executor = ThreadPoolTaskExecutor()
diff --git a/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/controller/v1/ExampleController.kt b/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/controller/v1/ExampleController.kt
@@ -1,6 +1,7 @@
 package io.dodn.springboot.core.api.controller.v1
 
 import io.dodn.springboot.core.api.controller.v1.request.ExampleRequestDto
+import io.dodn.springboot.core.api.controller.v1.response.ExampleItemResponseDto
 import io.dodn.springboot.core.api.controller.v1.response.ExampleResponseDto
 import io.dodn.springboot.core.domain.ExampleData
 import io.dodn.springboot.core.domain.ExampleService
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 @RestController
 class ExampleController(
@@ -22,14 +25,14 @@ class ExampleController(
         @RequestParam exampleParam: String,
     ): ApiResponse<ExampleResponseDto> {
         val result = exampleExampleService.processExample(ExampleData(exampleValue, exampleParam))
-        return ApiResponse.success(ExampleResponseDto(result.data))
+        return ApiResponse.success(ExampleResponseDto(result.data, LocalDate.now(), LocalDateTime.now(), ExampleItemResponseDto.build()))
     }
 
     @PostMapping("/post")
     fun examplePost(
         @RequestBody request: ExampleRequestDto,
     ): ApiResponse<ExampleResponseDto> {
         val result = exampleExampleService.processExample(request.toExampleData())
-        return ApiResponse.success(ExampleResponseDto(result.data))
+        return ApiResponse.success(ExampleResponseDto(result.data, LocalDate.now(), LocalDateTime.now(), ExampleItemResponseDto.build()))
     }
 }
diff --git a/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.kt b/core/core-api/src/main/kotlin/io/dodn/springboot/core/api/controller/v1/response/ExampleResponseDto.kt
@@ -1,5 +1,21 @@
 package io.dodn.springboot.core.api.controller.v1.response
 
+import java.time.LocalDate
+import java.time.LocalDateTime
+
 data class ExampleResponseDto(
     val result: String,
+    val date: LocalDate,
+    val datetime: LocalDateTime,
+    val items: List<ExampleItemResponseDto>,
 )
+
+data class ExampleItemResponseDto(
+    val key: String,
+) {
+    companion object {
+        fun build(): List<ExampleItemResponseDto> {
+            return listOf(ExampleItemResponseDto("1"), ExampleItemResponseDto("2"))
+        }
+    }
+}
diff --git a/core/core-api/src/main/kotlin/io/dodn/springboot/core/support/error/ErrorMessage.kt b/core/core-api/src/main/kotlin/io/dodn/springboot/core/support/error/ErrorMessage.kt
@@ -1,6 +1,6 @@
 package io.dodn.springboot.core.support.error
 
-data class ErrorMessage private constructor(
+class ErrorMessage private constructor(
     val code: String,
     val message: String,
     val data: Any? = null,
diff --git a/core/core-api/src/main/kotlin/io/dodn/springboot/core/support/response/ApiResponse.kt b/core/core-api/src/main/kotlin/io/dodn/springboot/core/support/response/ApiResponse.kt
@@ -3,7 +3,7 @@ package io.dodn.springboot.core.support.response
 import io.dodn.springboot.core.support.error.ErrorMessage
 import io.dodn.springboot.core.support.error.ErrorType
 
-data class ApiResponse<T> private constructor(
+class ApiResponse<T> private constructor(
     val result: ResultType,
     val data: T? = null,
     val error: ErrorMessage? = null,
diff --git a/core/core-api/src/test/kotlin/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.kt b/core/core-api/src/test/kotlin/io/dodn/springboot/core/api/controller/v1/ExampleControllerTest.kt
@@ -1,25 +1,27 @@
 package io.dodn.springboot.core.api.controller.v1
 
+import com.fasterxml.jackson.module.kotlin.jsonMapper
 import io.dodn.springboot.core.api.controller.v1.request.ExampleRequestDto
 import io.dodn.springboot.core.domain.ExampleResult
 import io.dodn.springboot.core.domain.ExampleService
 import io.dodn.springboot.test.api.RestDocsTest
-import io.dodn.springboot.test.api.RestDocsUtils.requestPreprocessor
-import io.dodn.springboot.test.api.RestDocsUtils.responsePreprocessor
 import io.mockk.every
 import io.mockk.mockk
-import io.restassured.http.ContentType
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document
+import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get
+import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post
+import org.springframework.restdocs.operation.preprocess.Preprocessors
 import org.springframework.restdocs.payload.JsonFieldType
 import org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath
 import org.springframework.restdocs.payload.PayloadDocumentation.requestFields
 import org.springframework.restdocs.payload.PayloadDocumentation.responseFields
 import org.springframework.restdocs.request.RequestDocumentation
 import org.springframework.restdocs.request.RequestDocumentation.parameterWithName
 import org.springframework.restdocs.request.RequestDocumentation.queryParameters
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
 class ExampleControllerTest : RestDocsTest() {
     private lateinit var exampleService: ExampleService
@@ -34,19 +36,19 @@ class ExampleControllerTest : RestDocsTest() {
 
     @Test
     fun exampleGet() {
-        every { exampleService.processExample(any()) } returns ExampleResult("BYE")
+        every { exampleService.processExample(any()) } returns ExampleResult("BYE_GET")
 
-        given()
-            .contentType(ContentType.JSON)
-            .queryParam("exampleParam", "HELLO_PARAM")
-            .get("/get/{exampleValue}", "HELLO_PATH")
-            .then()
-            .status(HttpStatus.OK)
-            .apply(
+        mockMvc.perform(
+            get("/get/{exampleValue}", "HELLO_PATH")
+                .param("exampleParam", "HELLO_PARAM")
+                .contentType(MediaType.APPLICATION_JSON),
+        )
+            .andExpect(status().isOk)
+            .andDo(
                 document(
                     "exampleGet",
-                    requestPreprocessor(),
-                    responsePreprocessor(),
+                    Preprocessors.preprocessRequest(Preprocessors.prettyPrint()),
+                    Preprocessors.preprocessResponse(Preprocessors.prettyPrint()),
                     RequestDocumentation.pathParameters(
                         parameterWithName("exampleValue").description("ExampleValue"),
                     ),
@@ -55,7 +57,11 @@ class ExampleControllerTest : RestDocsTest() {
                     ),
                     responseFields(
                         fieldWithPath("result").type(JsonFieldType.STRING).description("ResultType"),
-                        fieldWithPath("data.result").type(JsonFieldType.STRING).description("Result Date"),
+                        fieldWithPath("data.result").type(JsonFieldType.STRING).description("Result Data"),
+                        fieldWithPath("data.date").type(JsonFieldType.STRING).description("Result Date"),
+                        fieldWithPath("data.datetime").type(JsonFieldType.STRING).description("Result Datetime"),
+                        fieldWithPath("data.items").type(JsonFieldType.ARRAY).description("Result Items"),
+                        fieldWithPath("data.items[].key").type(JsonFieldType.STRING).description("Result Item"),
                         fieldWithPath("error").type(JsonFieldType.NULL).ignored(),
                     ),
                 ),
@@ -64,25 +70,29 @@ class ExampleControllerTest : RestDocsTest() {
 
     @Test
     fun examplePost() {
-        every { exampleService.processExample(any()) } returns ExampleResult("BYE")
+        every { exampleService.processExample(any()) } returns ExampleResult("BYE_POST")
 
-        given()
-            .contentType(ContentType.JSON)
-            .body(ExampleRequestDto("HELLO_BODY"))
-            .post("/post")
-            .then()
-            .status(HttpStatus.OK)
-            .apply(
+        mockMvc.perform(
+            post("/post")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(jsonMapper().writeValueAsString(ExampleRequestDto("HELLO_BODY"))),
+        )
+            .andExpect(status().isOk)
+            .andDo(
                 document(
                     "examplePost",
-                    requestPreprocessor(),
-                    responsePreprocessor(),
+                    Preprocessors.preprocessRequest(Preprocessors.prettyPrint()),
+                    Preprocessors.preprocessResponse(Preprocessors.prettyPrint()),
                     requestFields(
                         fieldWithPath("data").type(JsonFieldType.STRING).description("ExampleBody Data Field"),
                     ),
                     responseFields(
                         fieldWithPath("result").type(JsonFieldType.STRING).description("ResultType"),
-                        fieldWithPath("data.result").type(JsonFieldType.STRING).description("Result Date"),
+                        fieldWithPath("data.result").type(JsonFieldType.STRING).description("Result Data"),
+                        fieldWithPath("data.date").type(JsonFieldType.STRING).description("Result Date"),
+                        fieldWithPath("data.datetime").type(JsonFieldType.STRING).description("Result Datetime"),
+                        fieldWithPath("data.items").type(JsonFieldType.ARRAY).description("Result Items"),
+                        fieldWithPath("data.items[].key").type(JsonFieldType.STRING).description("Result Item"),
                         fieldWithPath("error").type(JsonFieldType.STRING).ignored(),
                     ),
                 ),
diff --git a/gradle.properties b/gradle.properties
@@ -5,18 +5,18 @@ applicationVersion=0.0.1-SNAPSHOT
 projectGroup=io.dodn.springboot
 
 ### Project dependency versions ###
-kotlinVersion=1.9.25
+kotlinVersion=2.2.21
 javaVersion=21
 
 ### Plugin dependency versions ###
-asciidoctorConvertVersion=3.3.2
-ktlintVersion=13.0.0
+asciidoctorConvertVersion=4.0.5
+ktlintVersion=14.0.1
 
 ### Spring dependency versions ###
-springBootVersion=3.5.3
+springBootVersion=4.0.0
 springDependencyManagementVersion=1.1.7
-springCloudDependenciesVersion=2025.0.0
+springCloudDependenciesVersion=2025.1.0
 
 ### External dependency versions ###
-springMockkVersion=4.0.2
-sentryVersion=8.17.0
+springMockkVersion=5.0.1
+sentryVersion=8.27.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,7 +21,6 @@ pluginManagement {
         eachPlugin {
             when (requested.id.id) {
                 "org.jetbrains.kotlin.jvm" -> useVersion(kotlinVersion)
-                "org.jetbrains.kotlin.kapt" -> useVersion(kotlinVersion)
                 "org.jetbrains.kotlin.plugin.spring" -> useVersion(kotlinVersion)
                 "org.jetbrains.kotlin.plugin.jpa" -> useVersion(kotlinVersion)
                 "org.springframework.boot" -> useVersion(springBootVersion)
diff --git a/storage/db-core/src/main/kotlin/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.kt b/storage/db-core/src/main/kotlin/io/dodn/springboot/storage/db/core/config/CoreJpaConfig.kt
@@ -1,6 +1,6 @@
 package io.dodn.springboot.storage.db.core.config
 
-import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.persistence.autoconfigure.EntityScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.transaction.annotation.EnableTransactionManagement
diff --git a/support/logging/build.gradle.kts b/support/logging/build.gradle.kts
diff --git a/support/monitoring/build.gradle.kts b/support/monitoring/build.gradle.kts
diff --git a/tests/api-docs/build.gradle.kts b/tests/api-docs/build.gradle.kts
diff --git a/tests/api-docs/src/main/kotlin/io/dodn/springboot/test/api/RestDocsTest.kt b/tests/api-docs/src/main/kotlin/io/dodn/springboot/test/api/RestDocsTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-tasks.getByName("bootJar") {`
	`1`	`+tasks.named<Jar>("bootJar").configure {`
`2`	`2`	`enabled = true`
`3`	`3`	`}`
`4`	`4`
`5`		`-tasks.getByName("jar") {`
	`5`	`+tasks.named<Jar>("jar").configure {`
`6`	`6`	`enabled = false`
`7`	`7`	`}`
`8`	`8`
`@@ -15,5 +15,5 @@ dependencies {`
`15`	`15`
`16`	`16`	`testImplementation(project(":tests:api-docs"))`
`17`	`17`
`18`		`- implementation("org.springframework.boot:spring-boot-starter-web")`
	`18`	`+ implementation("org.springframework.boot:spring-boot-starter-webmvc")`
`19`	`19`	`}`