diff --git a/build.gradle b/build.gradle index 8a094c5..563c6c1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.spring' version '1.9.25' id 'org.springframework.boot' version '3.5.7' id 'io.spring.dependency-management' version '1.1.7' - id 'org.flywaydb.flyway' version '10.15.2' + //id 'org.flywaydb.flyway' version '10.15.2' } group = 'com.test' @@ -37,7 +37,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation("org.flywaydb:flyway-database-postgresql:10.10.0") + //implementation("org.flywaydb:flyway-database-postgresql:10.10.0") runtimeOnly("org.postgresql:postgresql") @@ -56,8 +56,8 @@ tasks.named('test') { useJUnitPlatform() } -flyway { - url = 'jdbc:postgresql://localhost:5432/app_db' - user = 'root' - password = 'root' -} +//flyway { +// url = 'jdbc:postgresql://localhost:5432/app_db' +// user = 'root' +// password = 'root' +//} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index debd64b..9ddab7d 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -11,14 +11,15 @@ spring: # Datasource datasource: - hikari: - connection-timeout: 30000 - minimum-idle: 5 - maximum-pool-size: 20 - connection-init-sql: SELECT 1 - validation-timeout: 5000 - max-lifetime: 1800000 - idle-timeout: 600000 +# hikari: +# connection-timeout: 30000 +# minimum-idle: 5 +# maximum-pool-size: 20 +# connection-init-sql: SELECT 1 +# validation-timeout: 5000 +# max-lifetime: 1800000 +# idle-timeout: 600000 +# initialization-fail-timeout: 0 url: jdbc:postgresql://192.168.2.101:5432/test_db username: postgres password: ${SPRING_DATASOURCE_PASSWORD} @@ -32,7 +33,7 @@ spring: properties: hibernate: format_sql: true - database: postgres + # database: postgres database-platform: org.hibernate.dialect.PostgreSQLDialect # Keycloak Security @@ -52,8 +53,8 @@ logging: org.springframework.security: DEBUG - # Flyway +# # Flyway flyway: - enabled: true - locations: classpath:db/migration - baseline-on-migrate: true \ No newline at end of file + enabled: false +# locations: classpath:db/migration +# baseline-on-migrate: true \ No newline at end of file