imp: upgrade boot3 and jdk 17

ok-su-su · Nov 15, 2023 · 78b450d · 78b450d
1 parent 5e8fad4
commit 78b450d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         kotlin-version: [ "1.8.22" ]
-        java-version: [ "11" ]
+        java-version: [ "17" ]
 
     steps:
       - name: Checkout code
@@ -46,4 +46,4 @@ jobs:
         run: ./gradlew test sonar --info
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Spring Webflux + Coroutine Boilerplate
 
 ### Spec
-- SpringBoot v2.7.17
-- jdk 11
+- SpringBoot v3.1.5
+- jdk 17
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     val kotlinVersion = "1.8.22"
 
-    id("org.springframework.boot") version "2.7.17"
-    id("io.spring.dependency-management") version "1.0.15.RELEASE"
+    id("org.springframework.boot") version "3.1.5"
+    id("io.spring.dependency-management") version "1.1.3"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
     kotlin("plugin.jpa") version kotlinVersion
@@ -23,7 +23,7 @@ plugins {
 }
 
 group = "com.goofy"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
@@ -56,7 +56,7 @@ object DependencyVersion {
     /** external */
     const val QUERYDSL_VERSION = "5.0.0"
     const val ARROW_FX_VERSION = "1.1.3"
-    const val SPRINGDOC_VERSION = "1.6.15"
+    const val SPRINGDOC_VERSION = "2.2.0"
     const val JAVADOC_SCRIBE_VERSION = "0.15.0"
     const val KOTLIN_LOGGING_VERSION = "2.0.11"
     const val LOGBACK_ENCODER_VERSION = "6.6"
@@ -92,9 +92,7 @@ dependencies {
     implementation("io.arrow-kt:arrow-fx-stm:${DependencyVersion.ARROW_FX_VERSION}")
 
     /** swagger */
-    implementation("org.springdoc:springdoc-openapi-webflux-ui:${DependencyVersion.SPRINGDOC_VERSION}")
-    implementation("org.springdoc:springdoc-openapi-kotlin:${DependencyVersion.SPRINGDOC_VERSION}")
-    implementation("org.springdoc:springdoc-openapi-javadoc:${DependencyVersion.SPRINGDOC_VERSION}")
+    implementation("org.springdoc:springdoc-openapi-starter-webflux-ui:${DependencyVersion.SPRINGDOC_VERSION}")
     kapt("com.github.therapi:therapi-runtime-javadoc-scribe:${DependencyVersion.JAVADOC_SCRIBE_VERSION}")
 
     /** database */
@@ -127,7 +125,7 @@ tasks.getByName<Jar>("jar") {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 
@@ -210,7 +208,10 @@ sonarqube {
         property("sonar.language", "Kotlin")
         property("sonar.sourceEncoding", "UTF-8")
         property("sonar.test.inclusions", "**/*Test.java")
-        property("sonar.exclusions", "**/test/**, **/Q*.kt, **/*Doc*.kt, **/resources/** ,**/*Application*.kt , **/*Config*.kt, **/*Dto*.kt, **/*Request*.kt, **/*Response*.kt ,**/*Exception*.kt ,**/*ErrorCode*.kt")
+        property(
+            "sonar.exclusions",
+            "**/test/**, **/Q*.kt, **/*Doc*.kt, **/resources/** ,**/*Application*.kt , **/*Config*.kt, **/*Dto*.kt, **/*Request*.kt, **/*Response*.kt ,**/*Exception*.kt ,**/*ErrorCode*.kt"
+        )
         property("sonar.java.coveragePlugin", "jacoco")
         property("sonar.java.binaries", "$buildDir/classes")
         property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco.xml")

diff --git a/src/main/kotlin/com/goofy/boilerplate/common/dto/ErrorResponse.kt b/src/main/kotlin/com/goofy/boilerplate/common/dto/ErrorResponse.kt
@@ -1,12 +1,12 @@
 package com.goofy.boilerplate.common.dto
 
 import com.goofy.boilerplate.exception.ErrorCode
+import jakarta.validation.ConstraintViolationException
 import kotlinx.coroutines.CancellationException
 import org.hibernate.TypeMismatchException
 import org.springframework.core.codec.DecodingException
 import org.springframework.web.bind.support.WebExchangeBindException
 import org.springframework.web.server.ServerWebInputException
-import javax.validation.ConstraintViolationException
 
 data class ErrorResponse(
     val errorCode: String,

diff --git a/src/main/kotlin/com/goofy/boilerplate/config/database/BoilerPlateDatabaseConfig.kt b/src/main/kotlin/com/goofy/boilerplate/config/database/BoilerPlateDatabaseConfig.kt
@@ -1,6 +1,7 @@
 package com.goofy.boilerplate.config.database
 
 import com.zaxxer.hikari.HikariDataSource
+import jakarta.persistence.EntityManagerFactory
 import org.hibernate.cfg.AvailableSettings
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory
@@ -19,7 +20,6 @@ import org.springframework.orm.jpa.JpaTransactionManager
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.EnableTransactionManagement
-import javax.persistence.EntityManagerFactory
 import javax.sql.DataSource
 
 @Configuration

diff --git a/...ain/kotlin/com/goofy/boilerplate/config/validation/CoroutinesLocalValidatorFactoryBean.kt b/...ain/kotlin/com/goofy/boilerplate/config/validation/CoroutinesLocalValidatorFactoryBean.kt
@@ -1,5 +1,7 @@
 package com.goofy.boilerplate.config.validation
 
+import jakarta.validation.ClockProvider
+import jakarta.validation.ParameterNameProvider
 import org.hibernate.validator.internal.engine.DefaultClockProvider
 import org.springframework.core.KotlinReflectionParameterNameDiscoverer
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer
@@ -9,16 +11,14 @@ import org.springframework.core.StandardReflectionParameterNameDiscoverer
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
-import javax.validation.ClockProvider
-import javax.validation.ParameterNameProvider
 import kotlin.reflect.jvm.kotlinFunction
 
 class CoroutinesLocalValidatorFactoryBean : LocalValidatorFactoryBean() {
     override fun getClockProvider(): ClockProvider {
         return DefaultClockProvider.INSTANCE
     }
 
-    override fun postProcessConfiguration(configuration: javax.validation.Configuration<*>) {
+    override fun postProcessConfiguration(configuration: jakarta.validation.Configuration<*>) {
         super.postProcessConfiguration(configuration)
 
         val discoverer = PrioritizedParameterNameDiscoverer().apply {

diff --git a/src/main/kotlin/com/goofy/boilerplate/config/web/SpringDocConfig.kt b/src/main/kotlin/com/goofy/boilerplate/config/web/SpringDocConfig.kt
@@ -2,7 +2,7 @@ package com.goofy.boilerplate.config.web
 
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
-import org.springdoc.core.SpringDocUtils
+import org.springdoc.core.utils.SpringDocUtils
 import org.springframework.boot.info.BuildProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

diff --git a/src/main/kotlin/com/goofy/boilerplate/exception/advice/ExceptionHandler.kt b/src/main/kotlin/com/goofy/boilerplate/exception/advice/ExceptionHandler.kt
@@ -1,6 +1,7 @@
 package com.goofy.boilerplate.exception.advice
 
 import com.goofy.boilerplate.common.dto.ErrorResponse
+import jakarta.validation.ConstraintViolationException
 import kotlinx.coroutines.CancellationException
 import mu.KotlinLogging
 import org.hibernate.TypeMismatchException
@@ -13,7 +14,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.bind.support.WebExchangeBindException
 import org.springframework.web.server.ServerWebExchange
 import org.springframework.web.server.ServerWebInputException
-import javax.validation.ConstraintViolationException
 
 @RestControllerAdvice
 class ExceptionHandler {