Merge pull request #59 from cj848/feature/support-boot-2.7.0

Support Spring Boot 2.7.0

Author: Hyunsik Kang

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
 allprojects {
     group = "com.linecorp.kotlin-jdsl"
-    version = "2.0.2.RELEASE"
+    version = "2.0.3.RELEASE"
 
     repositories {
         mavenCentral()

buildSrc/src/main/kotlin/Dependencies.kt

@@ -4,9 +4,9 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 
 object Dependencies {
     const val kotlinVersion = "1.6.21"
-    const val springCoreVersion = "5.3.19"
-    const val springBootVersion = "2.6.7"
-    const val springDataJpaVersion = "2.6.4"
+    const val springCoreVersion = "5.3.20"
+    const val springBootVersion = "2.7.0"
+    const val springDataJpaVersion = "2.7.0"
     const val coroutineVersion = "1.6.1"
 
     // kotlin
@@ -17,12 +17,12 @@ object Dependencies {
     const val javaPersistenceApi = "javax.persistence:javax.persistence-api:2.2"
     const val slf4j = "org.slf4j:slf4j-api:1.7.36"
     const val logback = "ch.qos.logback:logback-classic:1.2.11"
-    const val hibernate = "org.hibernate:hibernate-core:5.6.8.Final"
-    const val hibernateReactive = "org.hibernate.reactive:hibernate-reactive-core:1.1.4.Final"
+    const val hibernate = "org.hibernate:hibernate-core:5.6.9.Final"
+    const val hibernateReactive = "org.hibernate.reactive:hibernate-reactive-core:1.1.6.Final"
     const val eclipselink = "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10"
     const val jacksonKotlinModule = "com.fasterxml.jackson.module:jackson-module-kotlin"
-    const val agroalPool = "io.agroal:agroal-pool:1.14"
-    const val vertxJdbcClient = "io.vertx:vertx-jdbc-client:4.2.7"
+    const val agroalPool = "io.agroal:agroal-pool:2.0"
+    const val vertxJdbcClient = "io.vertx:vertx-jdbc-client:4.3.1"
     const val coroutineJdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutineVersion"
     const val coroutineReactor = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutineVersion"
 
@@ -42,16 +42,16 @@ object Dependencies {
     const val springCore = "org.springframework:spring-core:${springCoreVersion}"
     const val springBeans = "org.springframework:spring-beans:${springCoreVersion}"
     const val springJpa = "org.springframework.data:spring-data-jpa:${springDataJpaVersion}"
-    const val springBatchInfrastructure = "org.springframework.batch:spring-batch-infrastructure:4.3.5"
+    const val springBatchInfrastructure = "org.springframework.batch:spring-batch-infrastructure:4.3.6"
 
     // Test
     const val junit = "org.junit.jupiter:junit-jupiter:5.8.2"
     const val assertJ = "org.assertj:assertj-core:3.22.0"
-    const val mockk = "io.mockk:mockk:1.12.3"
+    const val mockk = "io.mockk:mockk:1.12.4"
 
-    const val h2 = "com.h2database:h2:1.4.200"
+    const val h2 = "com.h2database:h2:2.1.212"
 
-    const val mutinyVersion = "1.4.0"
+    const val mutinyVersion = "1.5.0"
     const val mutinyCore = "io.smallrye.reactive:mutiny:$mutinyVersion"
     const val mutinyKotlin = "io.smallrye.reactive:mutiny-kotlin:$mutinyVersion"
     val mutiny = listOf(mutinyCore, mutinyKotlin)

eclipselink/src/test/resources/META-INF/persistence.xml

@@ -26,11 +26,13 @@
         <properties>
             <property name="eclipselink.logging.level" value="INFO" />
             <property name="eclipselink.logging.level.sql" value="FINE" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE"/>
             <property name="javax.persistence.jdbc.user" value="sa"/>
             <property name="javax.persistence.jdbc.password" value=""/>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
             <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="eclipselink.target-database" value="org.eclipse.persistence.platform.database.MySQLPlatform"/>
+            <property name="eclipselink.target-database-properties" value="shouldBindLiterals=false"/>
         </properties>
     </persistence-unit>
 

examples/eclipselink/src/main/resources/META-INF/persistence.xml

@@ -8,7 +8,7 @@
         <class>com.linecorp.kotlinjdsl.eclipselink.example.entity.Book</class>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE"/>
             <property name="javax.persistence.jdbc.user" value="sa"/>
             <property name="javax.persistence.jdbc.password" value=""/>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>

examples/hibernate/src/main/resources/META-INF/persistence.xml

@@ -8,7 +8,7 @@
         <class>com.linecorp.kotlinjdsl.hibernate.example.entity.Book</class>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE"/>
             <property name="javax.persistence.jdbc.user" value="sa"/>
             <property name="javax.persistence.jdbc.password" value=""/>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>

examples/spring-boot-2.3/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:test;MODE=MYSQL
+    url: jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
     username: sa
     password: password
 

examples/spring-boot-2.4/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:test;MODE=MYSQL
+    url: jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
     username: sa
     password: password
 

examples/spring-boot-2.5/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.5.8"
+    id("org.springframework.boot") version "2.5.14"
     kotlin("plugin.spring")
     kotlin("plugin.jpa")
 }
@@ -24,7 +24,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation(Dependencies.jacksonKotlinModule)
     implementation(Dependencies.h2)
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:2.5.8"))
+    implementation(platform("org.springframework.boot:spring-boot-dependencies:2.5.14"))
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }

examples/spring-boot-2.5/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:test;MODE=MYSQL
+    url: jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
     username: sa
     password: password
 

examples/spring-boot-2.6/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version Dependencies.springBootVersion
+    id("org.springframework.boot") version "2.6.8"
     kotlin("plugin.spring")
     kotlin("plugin.jpa")
 }
@@ -16,11 +16,11 @@ dependencies {
     // implementation("com.linecorp.kotlin-jdsl:spring-data-kotlin-jdsl-starter:x.y.z")
     implementation(Modules.springDataStarter)
 
-    implementation(Dependencies.springBootWeb)
-    implementation(Dependencies.springBootJpa)
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation(Dependencies.jacksonKotlinModule)
     implementation(Dependencies.h2)
-    implementation(platform(Dependencies.springBootBom))
+    implementation(platform("org.springframework.boot:spring-boot-dependencies:2.6.8"))
 
-    testImplementation(Dependencies.springBootTest)
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }