From 15bb5432dfd686e844bccd60e3fee21a08fc26cc Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 06:48:24 +0100 Subject: [PATCH 01/19] work --- liquibase.properties | 11 +++++++++ src/main/resources/db/liquibase-changelog.xml | 23 +++++++++++++++++++ .../resources/db/liquibase-diff-changelog.xml | 7 ++++++ 3 files changed, 41 insertions(+) create mode 100644 liquibase.properties create mode 100644 src/main/resources/db/liquibase-changelog.xml create mode 100644 src/main/resources/db/liquibase-diff-changelog.xml diff --git a/liquibase.properties b/liquibase.properties new file mode 100644 index 00000000..3cd87adb --- /dev/null +++ b/liquibase.properties @@ -0,0 +1,11 @@ +changeLogFile=src/main/resources/db/liquibase-changelog.xml +diffChangeLogFile=src/main/resources/db/liquibase-diff-changelog.xml +classpath=target/dependency/postgresql-42.5.1.jar +driver=org.postgresql.Driver +url=jdbc:postgresql://localhost:5432/simpleworklist +username=simpleworklist +password=simpleworklistpwd +referenceDriver=org.postgresql.Driver +referenceUrl=jdbc:postgresql://localhost:5432/simpleworklistref +referenceUsername=simpleworklist +referencePassword=simpleworklistpwd diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml new file mode 100644 index 00000000..96ed835a --- /dev/null +++ b/src/main/resources/db/liquibase-changelog.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/liquibase-diff-changelog.xml b/src/main/resources/db/liquibase-diff-changelog.xml new file mode 100644 index 00000000..4411f2d9 --- /dev/null +++ b/src/main/resources/db/liquibase-diff-changelog.xml @@ -0,0 +1,7 @@ + + + + From 5aab71856fedb987ecce6c7e899a38b7b0933863 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 06:55:59 +0100 Subject: [PATCH 02/19] work --- pom.xml | 24 ++++ src/test/resources/application-test.yml | 4 + src/test/resources/application.yml | 184 ------------------------ 3 files changed, 28 insertions(+), 184 deletions(-) create mode 100644 src/test/resources/application-test.yml delete mode 100644 src/test/resources/application.yml diff --git a/pom.xml b/pom.xml index aa326e54..31d3c151 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,11 @@ 3.0.0-M7 1.13.0 + + 42.5.1 + 4.16.1 + ${project.basedir}/liquibase.properties + 1.5.2 1.2022.6 @@ -1047,6 +1052,11 @@ maven-failsafe-plugin ${version.maven-failsafe-plugin} + + org.liquibase + liquibase-maven-plugin + ${version.liquibase-maven-plugin} + @@ -1331,6 +1341,20 @@ org.apache.maven.plugins maven-pmd-plugin + + org.liquibase + liquibase-maven-plugin + + liquibase.properties + + + + org.postgresql + postgresql + ${version.org.postgresql} + + + diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml new file mode 100644 index 00000000..e7adb242 --- /dev/null +++ b/src/test/resources/application-test.yml @@ -0,0 +1,4 @@ +spring: + config: + activate: + on-profile: default diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml deleted file mode 100644 index 966d75d2..00000000 --- a/src/test/resources/application.yml +++ /dev/null @@ -1,184 +0,0 @@ -server: - port: ${SIMPLEWORKLIST_PORT} - error: - path: /fehler - compression: - enabled: false - min-response-size: 2048 - servlet: - context-path: "/simpleworklist" -spring: - config: - name: simpleworklist - liquibase: - enabled: false - devtools: - livereload: - enabled: ${SIMPLEWORKLIST_DEV_TESTING} - application: - admin: - enabled: ${SIMPLEWORKLIST_DEV_TESTING} - datasource: - url: jdbc:postgresql://${SIMPLEWORKLIST_DS_HOST}:${SIMPLEWORKLIST_DS_PORT}/${SIMPLEWORKLIST_DS_DB} - username: ${SIMPLEWORKLIST_DS_USR} - password: ${SIMPLEWORKLIST_DS_PWD} - driverClassName: org.postgresql.Driver - jpa: - show-sql: true - open-in-view: true - generate-ddl: true - hibernate: - ddl-auto: ${SIMPLEWORKLIST_JPA_DLL_AUTO} - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQL95Dialect - temp: - use_jdbc_metadata_defaults: false - search: - default: - indexBase: ~/.config/simpleworklist - session: - store-type: jdbc - jdbc: - initialize-schema: always - thymeleaf: - cache: false - main: - allow-bean-definition-overriding: true - sql: - init: - platform: postgresql - continue-on-error: true -org: - woehlke: - java: - simpleworklist: - mail: - host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST} - port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT} - username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME} - password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD} - auth: true - sslEnable: true - socketFactoryPort: 465 - socketFactoryClass: javax.net.ssl.SSLSocketFactory - registration: - maxRetries: 5 - ttlEmailVerificationRequest: 86400000 - urlHost: ${SIMPLEWORKLIST_URL_APP_HOST} - mailFrom: ${SIMPLEWORKLIST_MAIL_FROM} - webMvc: - controllerPageSize: 10 - staticResourceHandler: - - "/css" - - "/img" - - "/js" - dynamicResourceHandler: - - "/webjars" - webSecurity: - strengthBCryptPasswordEncoder: 10 - # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS} - # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH} - # secret: ${SIMPLEWORKLIST_USER_SECRET} - loginProcessingUrl: "/j_spring_security_check" - logoutUrl: "/user/logout" - cookieNamesToClear: - - "JSESSIONID" - invalidateHttpSession: true - defaultSuccessUrl: "/" - failureForwardUrl: "/user/login?login_error=1" - usernameParameter: "j_username" - passwordParameter: "j_password" - loginPage: "/user/login" - antPatternsPublic: - - "/webjars/**" - - "/css/**" - - "/img/**" - - "/js/**" - - "/favicon.ico" - - "/user/login*" - - "/user/register*" - - "/user/register/**" - - "/user/register/confirm/**" - - "/user/resetPassword*" - - "/user/resetPassword/**" - - "/user/resetPassword/confirm/**" - - "/error*" -logging: - level: - root: INFO - javax: INFO - jakartaee: INFO - com: - atomikos: INFO - org: - thymeleaf: - dialect: - springdata: INFO - apache: - commons: - logging: WARN - h2: INFO - springframework: - data: - jdbc: INFO - jpa: INFO - relational: INFO - security: - web: INFO - context: INFO - boot: INFO - beans: INFO - jdbc: INFO - orm: INFO - session: WARN - test: INFO - mock: WARN - transaction: INFO - jca: INFO - web: INFO - remoting: INFO - http: INFO - expression: INFO - util: INFO - lang: INFO - core: INFO - cglib: WARN - hibernate: - sql: INFO - query: INFO - mapping: INFO - jpa: INFO - id: INFO - graph: INFO - cfg: INFO - service: INFO - result: INFO - engine: - internal: WARN - ch: - qos: WARN - woehlke: - java: - simpleworklist: INFO ---- -spring: - datasource: - url: jdbc:postgresql://localhost:5432/simpleworklist - profiles: - active: default -logging: - level: - root: INFO - org: - springframework: INFO - hibernate: - SQL: INFO - engine: - internal: WARN - ch: - qos: WARN - postgresql: WARN - woehlke: - java: - simpleworklist: INFO From 0135b671a5249263c9168c1161f2c187ba4de7ec Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 06:59:10 +0100 Subject: [PATCH 03/19] work --- src/main/resources/db/liquibase-changelog.xml | 6 ++++-- src/main/resources/db/liquibase-diff-changelog.xml | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 96ed835a..a72e1581 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -3,8 +3,10 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" - xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd - http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> diff --git a/src/main/resources/db/liquibase-diff-changelog.xml b/src/main/resources/db/liquibase-diff-changelog.xml index 4411f2d9..fd930f38 100644 --- a/src/main/resources/db/liquibase-diff-changelog.xml +++ b/src/main/resources/db/liquibase-diff-changelog.xml @@ -1,7 +1,11 @@ + xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> From 1bc3a5f717dcc200f51b902a396286c74dbf696d Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 07:03:29 +0100 Subject: [PATCH 04/19] work --- .idea/dataSources.local.xml | 19 ++++++++++--------- .idea/dataSources.xml | 3 +++ liquibase.properties | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index dacf69da..6dc24800 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -2,25 +2,26 @@ - + " master_key + pgpass simpleworklist - - - + - - - - - + + + + + + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 75961aff..48c78ed0 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -6,6 +6,9 @@ true org.postgresql.Driver jdbc:postgresql://localhost:5432/simpleworklist + + + \ No newline at end of file diff --git a/liquibase.properties b/liquibase.properties index 3cd87adb..a9ee75bf 100644 --- a/liquibase.properties +++ b/liquibase.properties @@ -2,10 +2,10 @@ changeLogFile=src/main/resources/db/liquibase-changelog.xml diffChangeLogFile=src/main/resources/db/liquibase-diff-changelog.xml classpath=target/dependency/postgresql-42.5.1.jar driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/simpleworklist +url=jdbc:postgresql://localhost:5432/simpleworklistref username=simpleworklist password=simpleworklistpwd referenceDriver=org.postgresql.Driver -referenceUrl=jdbc:postgresql://localhost:5432/simpleworklistref +referenceUrl=jdbc:postgresql://localhost:5432/simpleworklist referenceUsername=simpleworklist referencePassword=simpleworklistpwd From 521546fed7b9b580d785fc76bf3d00662f339ea5 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 07:07:18 +0100 Subject: [PATCH 05/19] work --- src/main/resources/docker-compose.yml => docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/docker-compose.yml => docker-compose.yml (100%) diff --git a/src/main/resources/docker-compose.yml b/docker-compose.yml similarity index 100% rename from src/main/resources/docker-compose.yml rename to docker-compose.yml From ba7cac28af9d3adcd361568d36d21fe90750e2aa Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 07:14:23 +0100 Subject: [PATCH 06/19] work --- src/main/resources/db/liquibase-changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index a72e1581..8987424a 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -13,7 +13,7 @@ - 42.5.1 - 4.16.1 + 4.17.2 ${project.basedir}/liquibase.properties From 5d69365542463770c63d1a4a4f8fc97029e3ae50 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:16:15 +0100 Subject: [PATCH 08/19] work --- pom.xml | 6 ------ src/main/resources/db/liquibase-changelog.xml | 2 +- src/main/resources/db/liquibase-diff-changelog.xml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 887bf001..0ef896fd 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,6 @@ 42.5.1 - 4.17.2 ${project.basedir}/liquibase.properties @@ -1052,11 +1051,6 @@ maven-failsafe-plugin ${version.maven-failsafe-plugin} - - org.liquibase - liquibase-maven-plugin - ${version.liquibase-maven-plugin} - diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 8987424a..2043666a 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> diff --git a/src/main/resources/db/liquibase-diff-changelog.xml b/src/main/resources/db/liquibase-diff-changelog.xml index fd930f38..0aca40f9 100644 --- a/src/main/resources/db/liquibase-diff-changelog.xml +++ b/src/main/resources/db/liquibase-diff-changelog.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> From 93162493d9a4bfef6f3afccf85a8485e218b8602 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:19:49 +0100 Subject: [PATCH 09/19] work --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ef896fd..360eaac7 100644 --- a/pom.xml +++ b/pom.xml @@ -1100,11 +1100,12 @@ ${project.basedir}/build.sh ${project.basedir}/etc/run.sh ${project.basedir}/etc/bash/psql.sh - ${project.basedir}/src/main/resources/docker-compose.yml ${project.basedir}/etc/docker-start.sh ${project.basedir}/etc/docker-stop.sh + ${project.basedir}/docker-compose.yml ${project.basedir}/etc/sql/db-createdb-and-user-linux.sql ${project.basedir}/etc/sql/db-createdb-and-user-win10.sql + ${project.basedir}/liquibase.properties From fcadff7ffeeefdedc61ab63df1a2fa4d7e57caab Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:27:06 +0100 Subject: [PATCH 10/19] work --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 360eaac7..44dc97ca 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 11 + 17 3.6.3 ${version.java} ${version.java} From 8045c1ec7cdc9ae9b779c303b4a9f935bc75e228 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:30:00 +0100 Subject: [PATCH 11/19] work --- liquibase.properties | 4 ++-- src/main/resources/db/liquibase-changelog.xml | 2 +- src/main/resources/db/liquibase-diff-changelog.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/liquibase.properties b/liquibase.properties index a9ee75bf..3cd87adb 100644 --- a/liquibase.properties +++ b/liquibase.properties @@ -2,10 +2,10 @@ changeLogFile=src/main/resources/db/liquibase-changelog.xml diffChangeLogFile=src/main/resources/db/liquibase-diff-changelog.xml classpath=target/dependency/postgresql-42.5.1.jar driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/simpleworklistref +url=jdbc:postgresql://localhost:5432/simpleworklist username=simpleworklist password=simpleworklistpwd referenceDriver=org.postgresql.Driver -referenceUrl=jdbc:postgresql://localhost:5432/simpleworklist +referenceUrl=jdbc:postgresql://localhost:5432/simpleworklistref referenceUsername=simpleworklist referencePassword=simpleworklistpwd diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 2043666a..7a5ffcd7 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> diff --git a/src/main/resources/db/liquibase-diff-changelog.xml b/src/main/resources/db/liquibase-diff-changelog.xml index 0aca40f9..12905b9d 100644 --- a/src/main/resources/db/liquibase-diff-changelog.xml +++ b/src/main/resources/db/liquibase-diff-changelog.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> From bd2a4059a523bfe419320194d0927eb86290a842 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:36:35 +0100 Subject: [PATCH 12/19] work --- src/main/resources/db/liquibase-changelog.xml | 12 +++++------- src/main/resources/db/liquibase-diff-changelog.xml | 6 ++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 7a5ffcd7..04de7379 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -1,12 +1,10 @@ + xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> diff --git a/src/main/resources/db/liquibase-diff-changelog.xml b/src/main/resources/db/liquibase-diff-changelog.xml index 12905b9d..c14480fb 100644 --- a/src/main/resources/db/liquibase-diff-changelog.xml +++ b/src/main/resources/db/liquibase-diff-changelog.xml @@ -3,9 +3,7 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" - xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd - http://www.liquibase.org/xml/ns/dbchangelog-ext - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> From f9d30934de415e0f6c9561c2b03fd173cddb5fb4 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:44:52 +0100 Subject: [PATCH 13/19] work --- liquibase.properties | 4 ++-- src/main/resources/application.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/liquibase.properties b/liquibase.properties index 3cd87adb..a9ee75bf 100644 --- a/liquibase.properties +++ b/liquibase.properties @@ -2,10 +2,10 @@ changeLogFile=src/main/resources/db/liquibase-changelog.xml diffChangeLogFile=src/main/resources/db/liquibase-diff-changelog.xml classpath=target/dependency/postgresql-42.5.1.jar driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/simpleworklist +url=jdbc:postgresql://localhost:5432/simpleworklistref username=simpleworklist password=simpleworklistpwd referenceDriver=org.postgresql.Driver -referenceUrl=jdbc:postgresql://localhost:5432/simpleworklistref +referenceUrl=jdbc:postgresql://localhost:5432/simpleworklist referenceUsername=simpleworklist referencePassword=simpleworklistpwd diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 546a984b..a9c03dda 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: config: name: simpleworklist liquibase: - enabled: false + enabled: true devtools: livereload: enabled: ${SIMPLEWORKLIST_DEV_TESTING} From 21b3396cf1fcf94413eb0c5ecbd307e53e402119 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:48:20 +0100 Subject: [PATCH 14/19] work --- src/main/resources/db/liquibase-changelog.xml | 1 - src/main/resources/db/liquibase-diff-changelog.tmp.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/liquibase-diff-changelog.tmp.xml diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 04de7379..7e24a756 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -15,7 +15,6 @@ initial data structure - --> diff --git a/src/main/resources/db/liquibase-diff-changelog.tmp.xml b/src/main/resources/db/liquibase-diff-changelog.tmp.xml new file mode 100644 index 00000000..c14480fb --- /dev/null +++ b/src/main/resources/db/liquibase-diff-changelog.tmp.xml @@ -0,0 +1,9 @@ + + + + From 10b1e3f5451a6cf039f3b889e5e953c4d9c30d91 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:49:03 +0100 Subject: [PATCH 15/19] work --- src/main/resources/db/liquibase-changelog.xml | 8 -------- src/main/resources/db/liquibase-diff-changelog.tmp.xml | 9 --------- 2 files changed, 17 deletions(-) delete mode 100644 src/main/resources/db/liquibase-diff-changelog.tmp.xml diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 7e24a756..5d27f406 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -11,12 +11,4 @@ - - diff --git a/src/main/resources/db/liquibase-diff-changelog.tmp.xml b/src/main/resources/db/liquibase-diff-changelog.tmp.xml deleted file mode 100644 index c14480fb..00000000 --- a/src/main/resources/db/liquibase-diff-changelog.tmp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - From 523a94c7123fcca2715b68c80caa8a8e68d52bd1 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 09:59:34 +0100 Subject: [PATCH 16/19] work --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44dc97ca..6ec8a2a1 100644 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,12 @@ org.postgresql postgresql - 42.5.0 + 42.5.1 + + + net.sf.saxon + saxon-dom + 8.7 @@ -686,10 +691,18 @@ thymeleaf-testing test + + javax.xml.bind + jaxb-api + org.postgresql postgresql + + net.sf.saxon + saxon-dom + com.zaxxer HikariCP From 41bce97021fbd825b795420c05693adf67e4abd3 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 10:07:47 +0100 Subject: [PATCH 17/19] work --- src/main/resources/db/liquibase-changelog.xml | 700 ++++++++++++++++++ 1 file changed, 700 insertions(+) diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml index 5d27f406..3673b64f 100644 --- a/src/main/resources/db/liquibase-changelog.xml +++ b/src/main/resources/db/liquibase-changelog.xml @@ -11,4 +11,704 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 19f9c40ab5ec06cd12f01745a3c26cbc04af00cb Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 10:14:08 +0100 Subject: [PATCH 18/19] work --- liquibase.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liquibase.properties b/liquibase.properties index a9ee75bf..3cd87adb 100644 --- a/liquibase.properties +++ b/liquibase.properties @@ -2,10 +2,10 @@ changeLogFile=src/main/resources/db/liquibase-changelog.xml diffChangeLogFile=src/main/resources/db/liquibase-diff-changelog.xml classpath=target/dependency/postgresql-42.5.1.jar driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/simpleworklistref +url=jdbc:postgresql://localhost:5432/simpleworklist username=simpleworklist password=simpleworklistpwd referenceDriver=org.postgresql.Driver -referenceUrl=jdbc:postgresql://localhost:5432/simpleworklist +referenceUrl=jdbc:postgresql://localhost:5432/simpleworklistref referenceUsername=simpleworklist referencePassword=simpleworklistpwd From 8ea7f0b4cbcafd6b4ce07ae5a5fd42637df65e17 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Wed, 7 Dec 2022 10:20:17 +0100 Subject: [PATCH 19/19] work --- src/main/resources/application.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a9c03dda..deda881c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -33,7 +33,7 @@ spring: generate-ddl: true database-platform: POSTGRESQL hibernate: - #ddl-auto: create-drop update + #ddl-auto: create-drop update validate ddl-auto: ${BLOODMONEY_HIBERNATE_DDL_AUTO} naming: implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl @@ -152,7 +152,8 @@ spring: log-dir: transaction-logs/tx-logs-simpleworklist jpa: hibernate: - ddl-auto: update + #ddl-auto: create-drop update validate + ddl-auto: validate server: port: ${PORT} compression: