personalweb

commit 282cf816583f35136f70157b7da41e671a4714e6
parent a6d032ad65c6f0f913ede4dac4b4d2a0943740c8
Author: WimDupont <WimDupont@users.noreply.gitlab.com>
Date:   Thu, 30 Dec 2021 15:57:19 +0100

fix flyway plugin


Former-commit-id: 97fe6621ecf2c317724f09bf00a222c321619b95
Diffstat:
M
pom.xml
 | 
12
+++++-------
M
src/main/resources/db/migration/V1_0__db-init.sql
 | 
2
+-
M
src/main/resources/templates/contact.html
 | 
2
+-

3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <java.version>11</java.version>
-        <flyway.maven.plugin.version>8.3.0</flyway.maven.plugin.version>
         <asciidoctorj.version>2.5.2</asciidoctorj.version>
         <rome.version>1.0</rome.version>
         <rome.rometools.version>1.17.0</rome.rometools.version>
@@ -85,11 +84,6 @@
             <artifactId>flyway-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-maven-plugin</artifactId>
-            <version>${flyway.maven.plugin.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctorj</artifactId>
             <version>${asciidoctorj.version}</version>
@@ -120,9 +114,13 @@
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
-                <version>${flyway.maven.plugin.version}</version>
+                <version>8.3.0</version>
                 <configuration>
                     <url>jdbc:mariadb://localhost:3306/sxcyweb</url>
+                    <!--                Run mvn flwyway plugin commands with following parameters: -->
+                    <!--                -Ddb.user=XXX -Ddb.user=YYY-->
+                    <user>${db.user}</user>
+                    <password>${db.pwd}</password>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/resources/db/migration/V1_0__db-init.sql b/src/main/resources/db/migration/V1_0__db-init.sql
@@ -1,4 +1,4 @@
-CREATE TABLE book (
+CREATE TABLE IF NOT EXISTS book (
     id VARCHAR(36) primary key NOT NULL,
     title VARCHAR(200) NOT NULL,
     author VARCHAR(500) NOT NULL,
diff --git a/src/main/resources/templates/contact.html b/src/main/resources/templates/contact.html
@@ -13,7 +13,7 @@
     </header>
     <p>I do not use any social media websites, nor do I have accounts on any of those platforms (such as Facebook,
         LinkedIn, Twitter,...).
-        If you have any suggestions or questions either technical or in any way related to the content on the site,
+        If you have any suggestions or questions - either technical or in any way related to the content on the site -
         please send an email to <a href="mailto: wim@wimdupont.com">wim@wimdupont.com</a>.</p>
     <p>You can use GPG to encrypt the email:</p>
     <ul>