From 74a209f6222315c123abf3293568d9fd54310837 Mon Sep 17 00:00:00 2001 From: maikel-maas <86769796+maikel-maas@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:39:59 +0200 Subject: [PATCH] Revert "Feature/oidf 46" --- gradle/libs.versions.toml | 2 -- modules/admin-server/build.gradle.kts | 2 -- .../src/main/resources/application.properties | 9 +-------- .../src/main/resources/db/migration/V0.1.0__Account.sql | 7 ------- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 modules/admin-server/src/main/resources/db/migration/V0.1.0__Account.sql diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d12cf57e..19b09680 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,8 +38,6 @@ springboot-web = { group = "org.springframework.boot", name = "spring-boot-start springboot-data-jdbc = { group = "org.springframework.boot", name = "spring-boot-starter-data-jdbc" } springboot-devtools = { group = "org.springframework.boot", name = "spring-boot-devtools" } springboot-test = { group = "org.springframework.boot", name = "spring-boot-starter-test" } -flyway-core = { module = "org.flywaydb:flyway-core" } -flyway-postgres = { module = "org.flywaydb:flyway-database-postgresql" } postgres = { module = "org.postgresql:postgresql" } [plugins] diff --git a/modules/admin-server/build.gradle.kts b/modules/admin-server/build.gradle.kts index 7973d79b..8abb8cef 100644 --- a/modules/admin-server/build.gradle.kts +++ b/modules/admin-server/build.gradle.kts @@ -22,8 +22,6 @@ dependencies { implementation(libs.springboot.data.jdbc) implementation(libs.kotlin.reflect) testImplementation(libs.springboot.test) - implementation(libs.flyway.core) - implementation(libs.flyway.postgres) runtimeOnly(libs.postgres) runtimeOnly(libs.springboot.devtools) } diff --git a/modules/admin-server/src/main/resources/application.properties b/modules/admin-server/src/main/resources/application.properties index 0142bc6f..683495f2 100644 --- a/modules/admin-server/src/main/resources/application.properties +++ b/modules/admin-server/src/main/resources/application.properties @@ -7,13 +7,6 @@ spring.datasource.username=${DATASOURCE_USER} spring.datasource.password=${DATASOURCE_PASSWORD} spring.datasource.driver-class-name=org.postgresql.Driver -# Flyway -spring.flyway.enabled=false -spring.flyway.baseline-on-migrate = true -spring.flyway.clean-on-validation-error=true -spring.flyway.clean-disabled=false -spring.flyway.baseline-version=0 - # Mapping /actuator/health to /status management.endpoints.web.base-path=/ -management.endpoints.web.path-mapping.health=status +management.endpoints.web.path-mapping.health=status \ No newline at end of file diff --git a/modules/admin-server/src/main/resources/db/migration/V0.1.0__Account.sql b/modules/admin-server/src/main/resources/db/migration/V0.1.0__Account.sql deleted file mode 100644 index 2a3e2eb7..00000000 --- a/modules/admin-server/src/main/resources/db/migration/V0.1.0__Account.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TYPE "KMS_TYPE" AS ENUM ('LOCAL'); - -CREATE TABLE "account" ( - id SERIAL PRIMARY KEY, - username VARCHAR(255) UNIQUE NOT NULL, - kms "KMS_TYPE" NOT NULL DEFAULT 'LOCAL' -);