Update dependencies

nk2IsHere · Aug 4, 2023 · f2f3e44 · f2f3e44
1 parent a9e33ea
commit f2f3e44
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 13 deletions.
diff --git a/autoconfigure-adapter-mongo/build.gradle.kts b/autoconfigure-adapter-mongo/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 	api("org.springframework.boot:spring-boot")
 	api("org.springframework.boot:spring-boot-autoconfigure")
 
-	compileOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
+	compileOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.7.0")
 	compileOnly("org.mongodb:mongodb-driver-legacy")
 	compileOnly("org.mongodb:mongodb-driver-reactivestreams")
 	compileOnly("org.springframework.data:spring-data-mongodb")

diff --git a/autoconfigure-adapter-r2dbc/build.gradle.kts b/autoconfigure-adapter-r2dbc/build.gradle.kts
@@ -9,9 +9,6 @@ dependencies {
 
 	compileOnly("org.springframework.data:spring-data-r2dbc")
 	compileOnly("org.springframework:spring-r2dbc")
-	compileOnly("io.r2dbc:r2dbc-postgresql")
-	compileOnly("io.r2dbc:r2dbc-h2")
-	compileOnly("io.r2dbc:r2dbc-mssql")
 }
 
 repositories {

diff --git a/autoconfigure-adapter-security/build.gradle.kts b/autoconfigure-adapter-security/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
 	api("org.springframework.boot:spring-boot-autoconfigure")
 
 	compileOnly("org.springframework:spring-webmvc")
-	compileOnly("javax.servlet:javax.servlet-api")
+	compileOnly("jakarta.servlet:jakarta.servlet-api")
 	compileOnly("org.springframework:spring-webflux")
 	compileOnly("org.springframework.security:spring-security-web")
 	compileOnly("org.springframework.security:spring-security-config")

diff --git a/autoconfigure-adapter-thymeleaf/build.gradle.kts b/autoconfigure-adapter-thymeleaf/build.gradle.kts
@@ -10,8 +10,7 @@ dependencies {
 	compileOnly("org.springframework:spring-webmvc")
 	compileOnly("org.springframework:spring-webflux")
 	compileOnly("org.thymeleaf:thymeleaf")
-	compileOnly("org.thymeleaf:thymeleaf-spring5")
-	compileOnly("org.thymeleaf.extras:thymeleaf-extras-java8time")
+	compileOnly("org.thymeleaf:thymeleaf-spring6")
 }
 
 repositories {

diff --git a/autoconfigure-adapter-web-servlet/build.gradle.kts b/autoconfigure-adapter-web-servlet/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
 	api("org.springframework.boot:spring-boot-autoconfigure")
 
 	compileOnly("org.springframework:spring-webmvc")
-	compileOnly("javax.servlet:javax.servlet-api")
+	compileOnly("jakarta.servlet:jakarta.servlet-api")
 	compileOnly("com.fasterxml.jackson.core:jackson-databind")
 }
 

diff --git a/kofu-mongo/build.gradle.kts b/kofu-mongo/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
-    compileOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
+    compileOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.7.0")
     compileOnly("org.mongodb:mongodb-driver-legacy")
     compileOnly("org.mongodb:mongodb-driver-reactivestreams")
     implementation("org.springframework.data:spring-data-mongodb")
@@ -25,7 +25,7 @@ dependencies {
     testImplementation("org.testcontainers:testcontainers")
 
     testImplementation("org.springframework.boot:spring-boot-starter-data-mongodb-reactive")
-    testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
+    testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.7.0")
     testImplementation("org.mongodb:mongodb-driver-legacy")
     testImplementation("org.mongodb:mongodb-driver-reactivestreams")
 }
diff --git a/kofu-mongo/src/main/kotlin/org/springframework/fu/kofu/mongo/AbstractMongoDsl.kt b/kofu-mongo/src/main/kotlin/org/springframework/fu/kofu/mongo/AbstractMongoDsl.kt
@@ -47,7 +47,7 @@ abstract class AbstractMongoDsl(private val init: MongoDsl.() -> Unit) : Abstrac
     /**
      * Enable MongoDB embedded webFlux.
      *
-     * Require `de.flapdoodle.embed:de.flapdoodle.embed.mongo` dependency.
+     * Require `de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.7.0` dependency.
      *
      * @sample org.springframework.fu.kofu.samples.mongoEmbedded
      */

diff --git a/kofu-webmvc/build.gradle.kts b/kofu-webmvc/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
-    compileOnly("javax.servlet:javax.servlet-api")
+    compileOnly("jakarta.servlet:jakarta.servlet-api")
     implementation("org.springframework:spring-webmvc")
     implementation("org.springframework.security:spring-security-web")
     implementation("org.springframework.security:spring-security-config")
@@ -28,7 +28,7 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testImplementation("org.testcontainers:testcontainers")
 
-    testImplementation("javax.servlet:javax.servlet-api")
+    testImplementation("jakarta.servlet:jakarta.servlet-api")
     testImplementation("org.springframework.boot:spring-boot-starter-web")
     testImplementation("org.springframework.boot:spring-boot-starter-security")
     testImplementation("org.springframework.security:spring-security-test")