diff --git a/build.gradle.kts b/build.gradle.kts index 8edfafe..e39e473 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.24" - kotlin("plugin.spring") version "1.9.24" - kotlin("plugin.jpa") version "1.9.24" - id("org.springframework.boot") version "3.2.5" + kotlin("jvm") version "2.0.0" + kotlin("plugin.spring") version "2.0.0" + kotlin("plugin.jpa") version "2.0.0" + id("org.springframework.boot") version "3.3.1" id("io.spring.dependency-management") version "1.1.5" id("org.sonarqube") version "5.0.0.4638" jacoco @@ -59,10 +59,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-validation") - implementation("org.springframework.boot:spring-boot-starter-web") { - //exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat") - } - //implementation("org.springframework.boot:spring-boot-starter-jetty") + implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework:spring-aspects") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") testImplementation("org.springframework.boot:spring-boot-starter-test") { @@ -81,6 +78,7 @@ dependencies { // Database runtimeOnly("org.postgresql:postgresql:$postgresqlVersion") implementation("org.flywaydb:flyway-core") + implementation("org.flywaydb:flyway-database-postgresql") testImplementation("org.testcontainers:junit-jupiter:$testcontainersVersion") testImplementation("org.testcontainers:postgresql:$testcontainersVersion") diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index ebd24e9..8604bda 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -15,11 +15,11 @@ spring: mvc: log-request-details: true datasource: - url: jdbc:tc:postgresql:12:/// + url: jdbc:tc:postgresql:15:/// driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver jpa: show-sql: true - database-platform: org.hibernate.dialect.PostgreSQL12Dialect + database-platform: org.hibernate.dialect.PostgreSQL15Dialect kafka: bootstrap-servers: ${kafka-servers}