diff --git a/.gitignore b/.gitignore
index 30f536eb..61e333ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ target
 /x.txt
 /transaction-logs/
 /xx.txt
+/.factorypath
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 98ada7ed..0dbab5c8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -19,7 +19,7 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="simpleworklist" target="11" />
+      <module name="simpleworklist" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index ee702648..fed02620 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-222.4167.29">
+  <component name="dataSourceStorageLocal" created-in="IU-223.8214.52">
     <data-source name="simpleworklist@localhost" uuid="a4579979-885b-41d4-b0b0-f3b5b3d5c6f2">
-      <database-info product="PostgreSQL" version="14.5 (Debian 14.5-1.pgdg110+1)" jdbc-version="4.2" driver-name="PostgreSQL JDBC Driver" driver-version="42.5.0" dbms="POSTGRES" exact-version="14.5" exact-driver-version="42.5">
+      <database-info product="PostgreSQL" version="14.6 (Ubuntu 14.6-1.pgdg22.04+1)" jdbc-version="4.2" driver-name="PostgreSQL JDBC Driver" driver-version="42.5.0" dbms="POSTGRES" exact-version="14.6" exact-driver-version="42.5">
         <identifier-quote-string>&quot;</identifier-quote-string>
       </database-info>
       <case-sensitivity plain-identifiers="lower" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>
+      <auth-provider>pgpass</auth-provider>
       <user-name>simpleworklist</user-name>
       <schema-mapping>
         <introspection-scope>
           <node negative="1">
-            <node kind="database" qname="@">
-              <node kind="schema" qname="@" />
-            </node>
             <node kind="database">
+              <name qname="@" />
               <name qname="simpleworklist" />
-              <name qname="simpleworklist_branch_master" />
-              <name qname="simpleworklist_default" />
-              <name qname="simpleworklist_heroku" />
-              <name qname="simpleworklist_qa" />
-              <name qname="simpleworklist_testing" />
+              <node kind="schema" qname="@" />
+            </node>
+            <node kind="database" qname="simpleworklistref">
+              <node kind="schema">
+                <name qname="@" />
+                <name qname="public" />
+              </node>
             </node>
           </node>
         </introspection-scope>
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 @@
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
       <jdbc-url>jdbc:postgresql://localhost:5432/simpleworklist</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="database.postgres.introspect.system.schemas" value="true" />
+      </jdbc-additional-properties>
     </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 98b0187f..1a612636 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,6 +26,11 @@
       <option name="name" value="Spring Lib M Repository" />
       <option name="url" value="http://tw-thinkpad:8081/artifactory/all" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="adobe-public" />
+      <option name="name" value="AdobePublic Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="sonatype-releases" />
       <option name="name" value="Sonatype Repository" />
@@ -41,6 +46,16 @@
       <option name="name" value="Spring Plugins Repository" />
       <option name="url" value="http://tw-asus7:8081/artifactory/mvn" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="sonatype-releases" />
+      <option name="name" value="Sonatype Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="libs-snapshot" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="sonatype-releases" />
       <option name="name" value="Sonatype Repository" />
@@ -76,6 +91,11 @@
       <option name="name" value="JBossEA Repository" />
       <option name="url" value="http://tw-thinkpad:8081/artifactory/libs-release" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="atlassian-public" />
+      <option name="name" value="Atlassian Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -106,6 +126,11 @@
       <option name="name" value="Spring Lib Release Repository" />
       <option name="url" value="https://repo.spring.io/libs-release/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="wso2-public" />
+      <option name="name" value="WSO2 Public Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="apache-releases" />
       <option name="name" value="Apache Releases" />
@@ -141,6 +166,11 @@
       <option name="name" value="JCenter Repository" />
       <option name="url" value="http://tw-vivo:8081/artifactory/libs-release" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="atlassian-3rdparty" />
+      <option name="name" value="Atlassian 3rd-P Old Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="atlassian-3rdparty" />
       <option name="name" value="Atlassian 3rd-P Old Repository" />
@@ -311,6 +341,11 @@
       <option name="name" value="WSO2 Public Repository" />
       <option name="url" value="http://tw-vivo:8081/artifactory/libs-release" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss-ea" />
+      <option name="name" value="JBossEA Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss-releases" />
       <option name="name" value="JBoss Releases Repository" />
@@ -371,6 +406,11 @@
       <option name="name" value="Hortonworks Repository" />
       <option name="url" value="http://tw-asus7:8081/artifactory/all" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="libs-release" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="apache-releases" />
       <option name="name" value="Apache Releases" />
@@ -486,6 +526,11 @@
       <option name="name" value="Spring Lib M Repository" />
       <option name="url" value="http://tw-asus7:8081/artifactory/mvn" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="apache-releases" />
+      <option name="name" value="Apache Releases" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="spring-snapshots" />
       <option name="name" value="spring-snapshots" />
@@ -531,6 +576,11 @@
       <option name="name" value="Atlassian Repository" />
       <option name="url" value="http://tw-thinkpad:8081/artifactory/libs-snapshot" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss-releases" />
+      <option name="name" value="JBoss Releases Repository" />
+      <option name="url" value="http://localhost:8081/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss-releases" />
       <option name="name" value="JBoss Releases Repository" />
diff --git a/LICENSE b/LICENSE.txt
similarity index 99%
rename from LICENSE
rename to LICENSE.txt
index 8dada3ed..ff773796 100644
--- a/LICENSE
+++ b/LICENSE.txt
@@ -1,6 +1,7 @@
+
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/README.md b/README.md
index 9b4a89cb..b733fb8b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
 [![OSSAR](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/OSSAR/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
 [![Travis CI Build Status](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist.svg?branch=master)](https://app.travis-ci.com/github/Spring-Framework-Java-Apps/simpleworklist)
-[![Maven Project Reports](src/site/resources/img/maven-feather.png)](https://bloodmoneyapp.github.io/simpleworklist/)
+[![Maven Project Reports](src/site/resources/img/maven-feather.png)](https://java.woehlke.org/simpleworklist/)
 
 Your Todo List for Getting Things Done
 
@@ -25,7 +25,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 ## Functional Requirements
 
 ### Functional Requirements 001 - Start
-![Functional Requirements 001 - Start](src/site/plantuml/Simpleworklist__Use_Cases__001__Start.png)
+![Functional Requirements 001 - Start](src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png)
 #### F001 Server Starts
 #### F002 Home Page rendered
 #### F003 Registration
@@ -35,7 +35,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F007 Logout
 
 ### Functional Requirements 002 - Show TaskstateTab
-![Functional Requirements 002 - Show TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png)
+![Functional Requirements 002 - Show TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png)
 #### F010 show /taskstate/inbox
 #### F011 show /taskstate/today
 #### F012 show /taskstate/next
@@ -47,7 +47,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F018 show /taskstate/trash
 
 ### Functional Requirements 003 - TaskstateTab
-![Functional Requirements 003 - TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png)
+![Functional Requirements 003 - TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png)
 #### F040 Taskstate: Add Task to Inbox
 #### F041 Taskstate: Add Task to Inbox again
 #### F042 Taskstate: Task Edit
@@ -62,7 +62,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F051 Taskstate: Task undelete
 
 ### Functional Requirements 004 - Project/Root
-![Functional Requirements 004 - Project/Root](src/site/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png)
+![Functional Requirements 004 - Project/Root](src/site/resources/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png)
 #### F060 Project/Root: Add Task
 #### F061 Project/Root: Add SubProject
 #### F062 Project/Root: Task Edit
@@ -77,7 +77,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F071 Project/Root: Task undelete
 
 ### Functional Requirements 005 - Project/id
-![Functional Requirements 005 - Project/id](src/site/plantuml/Simpleworklist__Use_Cases__005__Project_id.png)
+![Functional Requirements 005 - Project/id](src/site/resources/plantuml/Simpleworklist__Use_Cases__005__Project_id.png)
 #### F080 Project/id: Add Task
 #### F081 Project/id: Add SubProject
 #### F082 Project/id: Task Edit
@@ -92,7 +92,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F091 Project/id: Task undelete
 
 ### Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab
-![Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png)
+![Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png)
 #### F120 Drag and Drop: Task move to /taskstate/inbox
 #### F121 Drag and Drop: Task move to /taskstate/today
 #### F122 Drag and Drop: Task move to /taskstate/next
@@ -104,30 +104,57 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 #### F128 Drag and Drop: Task move to /taskstate/trash
 
 ### Functional Requirements 007 - Drag and Drop Move to Project
-![Functional Requirements 007 - Drag and Drop Move to Project](src/site/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png)
+![Functional Requirements 007 - Drag and Drop Move to Project](src/site/resources/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png)
 #### F129 Drag and Drop: Task move to Project
 #### F130 Drag and Drop: Project move to Project
 
 ### Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order
-![Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order](src/site/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png)
+![Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order](src/site/resources/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png)
 #### F131 Drag and Drop: Move Task to Change Task-Order in TaskstateTab
 #### F132 Drag and Drop: Move Task to Change Task-Order in Project/Root
 #### F133 Drag and Drop: Move Task to Change Task-Order in Project/id
 
 ### Functional Requirements 009 - Search
-![Functional Requirements 009 - Search](src/site/plantuml/Simpleworklist__Use_Cases__009__Search.png)
+![Functional Requirements 009 - Search](src/site/resources/plantuml/Simpleworklist__Use_Cases__009__Search.png)
 #### F200 Search Request
 
+## Functional Requirements - User
+
+### Functional Requirements 001 - Start
+![Functional Requirements 001 - Start](src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png)
+#### F003 Registration
+#### F004 Password Recovery
+#### F005 Login
+#### F007 Logout
+
+### Functional Requirements 010 - User Profile
+![Functional Requirements 010 - User Profile](src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
+#### F200 List of other Users and New Messages received from them
+#### F201 Chat Messages shared with one other User
+#### F202 Send New Chat Message to one other User
+#### F220 Menu Selfservice: Change Username
+#### F221 Menu Selfservice: Change Password
+#### F222 Menu Selfservice: Change Contexts
+#### F223 Menu Selfservice: Set Default Language
+#### F224 Menu Selfservice: Create Test Data
+
+### Functional Requirements 011 - On every Page behind Login
+![Functional Requirements 012 - User Profile](src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
+#### F250 Number of new incoming Messages from other Users
+
+
 ### Domain Class Modell
 #### Domain Class Modell - Persistent
-![Domain_Class_Modell_Persistent](src/site/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png)
-#### Domain Class Modell - Transient ( TODO )
-![Domain_Class_Modell_Persistent](src/site/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png)
+![Domain_Class_Modell_Persistent](src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png)
+#### Domain Class Modell - Transient
+![Domain_Class_Modell_Persistent](src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png)
 
 ## Software Design
-### Service Classes Controller ( TODO )
-![Service_Classes_Controller](src/site/plantuml/Simpleworklist__Service_Classes_Controller.png)
-### Service Classes DB ( TODO )
-![Service_Classes_DB](src/site/plantuml/Simpleworklist__Service_Classes_DB.png)
-### Service Classes Meso ( TODO )
-![Service_Classes_Meso](src/site/plantuml/Simpleworklist__Service_Classes_Meso.png)
+### Service Classes Controller
+![Service_Classes_Controller](src/site/resources/plantuml/Simpleworklist__Service_Classes_Controller.png)
+### Service Classes DB data
+![Service_Classes_DB](src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_data.png)
+### Service Classes DB user
+![Service_Classes_DB](src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_user.png)
+### Service Classes Meso
+![Service_Classes_Meso](src/site/resources/plantuml/Simpleworklist__Service_Classes_Meso.png)
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
diff --git a/etc/TODO.md b/etc/TODO.md
index 95663a68..d275e26b 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -88,25 +88,30 @@
 * fixed #390 refactor integration tests: One Test class for each Controller Class
 * fixed #391 refactor integration tests: One Test class for each Service Class in package meso
 
-
 ## 2.4.10-SNAPSHOT
-* #389 apply Database Schema Evolution for: 386 make Project Navigation collapsible
+*
 
 ## 2.4.11-SNAPSHOT
-* #386 make Project Navigation collapsible
+* fixed #380 add User Use Cases to UML Documentation
+* fixed #393 UML Documentation: Service Classes DB
+* fixed #394 UML Documentation: Service Classes Meso
 
 ## 2.4.12-SNAPSHOT
-* #388 make task.taskstate, task.duedate and taskstate workflow independent to each other
+* fixed #388 make task.taskstate, task.duedate and taskstate workflow independent to each other
+*
 
 ## 2.4.13-SNAPSHOT
 * #377 add List of URL (Patterns) to Documentation
-* #380 add User Use Cases to UML Documentation
-* #393 UML Documentation: Service Classes DB ( TODO )
-* #394 UML Documentation: Service Classes Meso ( TODO )
+* #392 refactor integration tests: add Unit Tests for Beans and Entities
+*
 
 ## 2.4.14-SNAPSHOT
-* #392 refactor integration tests: add Unit Tests for Beans and Entities
+* #386 make Project Navigation collapsible
+* #389 apply Database Schema Evolution for: 386 make Project Navigation collapsible
+*
 
 ## 2.4.15-SNAPSHOT
 * #378 Add Search Index and search functionality
-* 
+
+## 2.4.16-SNAPSHOT
+*
diff --git a/etc/db/setup-postgresql-account-and-db.sql b/etc/db/setup-postgresql-account-and-db.sql
index 97fc0614..87669e54 100644
--- a/etc/db/setup-postgresql-account-and-db.sql
+++ b/etc/db/setup-postgresql-account-and-db.sql
@@ -1,28 +1,20 @@
 CREATE ROLE simpleworklist LOGIN
     PASSWORD 'simpleworklistpwd'
     SUPERUSER INHERIT CREATEDB CREATEROLE REPLICATION;
+
 GRANT pg_monitor TO simpleworklist;
 GRANT pg_read_all_settings TO simpleworklist;
 GRANT pg_read_all_stats TO simpleworklist;
 GRANT pg_signal_backend TO simpleworklist;
 GRANT pg_stat_scan_tables TO simpleworklist;
 
-CREATE ROLE simpleworklistref LOGIN
-    PASSWORD 'simpleworklistrefpwd'
-    SUPERUSER INHERIT CREATEDB CREATEROLE REPLICATION;
-GRANT pg_monitor TO simpleworklistref;
-GRANT pg_read_all_settings TO simpleworklistref;
-GRANT pg_read_all_stats TO simpleworklistref;
-GRANT pg_signal_backend TO simpleworklistref;
-GRANT pg_stat_scan_tables TO simpleworklistref;
-
 CREATE TABLESPACE tablespace_simpleworklist
     OWNER tw
     LOCATION '/opt/postgresql/tablespace_simpleworklist';
 
-CREATE TABLESPACE tablespace_simpleworklist
-    OWNER tw
-    LOCATION 'C:\tablespace_pg\simpleworklist';
+-- CREATE TABLESPACE tablespace_simpleworklist
+--    OWNER tw
+--    LOCATION 'C:\tablespace_pg\simpleworklist';
 
 ALTER TABLESPACE tablespace_simpleworklist
     OWNER TO simpleworklist;
@@ -34,7 +26,7 @@ CREATE DATABASE simpleworklist
     CONNECTION LIMIT = -1;
 
 CREATE DATABASE simpleworklistref
-    WITH OWNER = simpleworklistref
+    WITH OWNER = simpleworklist
     ENCODING = 'UTF8'
     TABLESPACE = tablespace_simpleworklist
     CONNECTION LIMIT = -1;
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/pom.xml b/pom.xml
index 45c859fb..4de1673c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,1558 +1,1697 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.woehlke</groupId>
-  <artifactId>simpleworklist</artifactId>
-  <version>2.4.11-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <groupId>org.woehlke</groupId>
+    <artifactId>simpleworklist</artifactId>
+    <version>2.4.21-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.3</version>
-  </parent>
-
-  <scm>
-    <connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
-    <developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
-    <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
-    <tag>v2.4.10</tag>
-  </scm>
-
-  <name>simpleworklist</name>
-  <description>Your Todo-List for Getting Things Done</description>
-  <url>https://woehlke.org/java/simpleworklist</url>
-  <inceptionYear>2012</inceptionYear>
-
-  <organization>
-    <name>Spring-Framework-Java-Apps</name>
-    <url>https://github.com/Spring-Framework-Java-Apps/</url>
-  </organization>
-
-  <developers>
-    <developer>
-      <name>Thomas Wöhlke</name>
-      <email>github@woehlke.org</email>
-      <url>https://github.com/thomaswoehlke/</url>
-    </developer>
-  </developers>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-
-  <issueManagement>
-    <system>Github</system>
-    <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues</url>
-  </issueManagement>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.7.7</version>
+    </parent>
 
-  <distributionManagement>
-    <site>
-      <id>org.woehlke.java.simpleworklist</id>
-      <url>file://${user.home}/public_html/java/simpleworklist</url>
-      <!--
-      <url>https://woehlke.org/java/simpleworklist</url>
-      -->
-    </site>
-    <repository>
-      <id>central</id>
-      <name>tw-thinkpad-releases</name>
-      <url>file://${user.home}/public_html/java/libs-release-local</url>
-    </repository>
-    <snapshotRepository>
-      <id>snapshots</id>
-      <name>tw-thinkpad-snapshots</name>
-      <url>file://${user.home}/public_html/java/libs-snapshot-local</url>
-    </snapshotRepository>
-  </distributionManagement>
+    <scm>
+        <connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
+        <developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
+        <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
+        <tag>HEAD</tag>
+    </scm>
 
-  <properties>
-    <java.version>11</java.version>
-    <version.maven>3.6.3</version.maven>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
-    <version.spring-boot-maven-plugin>${project.parent.version}</version.spring-boot-maven-plugin>
-    <version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
-    <version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
+    <name>simpleworklist</name>
+    <description>Your Todo-List for Getting Things Done</description>
+    <url>https://java.woehlke.org/simpleworklist</url>
+    <inceptionYear>2012</inceptionYear>
 
-    <!-- Webjars -->
-    <webjars.jquery.version>3.6.1</webjars.jquery.version>
-    <webjars.popper.js.version>2.9.3</webjars.popper.js.version>
-    <webjars.bootstrap.version>5.2.0</webjars.bootstrap.version>
-    <webjars.font-awesome.version>6.1.2</webjars.font-awesome.version>
-    <opencsv.version>5.7.0</opencsv.version>
+    <organization>
+        <name>Spring-Framework-Java-Apps</name>
+        <url>https://github.com/Spring-Framework-Java-Apps/</url>
+    </organization>
 
-    <!-- Unit and Integration Testing -->
-    <skipTests>false</skipTests>
-    <skipIntegrationTests>${skipTests}</skipIntegrationTests>
-    <dockerCompose.skip>${skipTests}</dockerCompose.skip>
-    <xmlunit.version>2.9.0</xmlunit.version>
-    <htmlunit.version>2.64.0</htmlunit.version>
-    <version.groovy-all>3.0.12</version.groovy-all>
-    <hamcrest.version>2.2</hamcrest.version>
-    <jsoup.version>1.15.3</jsoup.version>
-    <pmdVersion>6.49.0</pmdVersion>
+    <developers>
+        <developer>
+            <id>thomaswoehlke</id>
+            <name>Thomas Woehlke</name>
+            <email>thomas.woehlke@gmail.com</email>
+            <url>https://github.com/thomaswoehlke</url>
+            <timezone>Europe/Paris</timezone>
+        </developer>
+    </developers>
 
-    <!-- Docker -->
-    <version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
-    <docker-compose-maven-plugin.composeFile>${project.basedir}/src/main/resources/docker-compose.yml</docker-compose-maven-plugin.composeFile>
-    <docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
-    <docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
-    <docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
-    <docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
-    <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
-    <docker-compose-maven-plugin.projectName>simplgtd</docker-compose-maven-plugin.projectName>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-    <!-- SCM and Releasing -->
-    <version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
-    <version.maven-release-plugin>3.0.0-M6</version.maven-release-plugin>
+    <issueManagement>
+        <system>Github</system>
+        <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues</url>
+    </issueManagement>
 
-    <!-- UML -->
-    <version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
-    <version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
+    <distributionManagement>
+        <site>
+            <id>simpleworklist.public_html</id>
+            <url>file://${user.home}/public_html/java/simpleworklist</url>
+        </site>
+        <repository>
+            <id>central</id>
+            <name>libs-release-local</name>
+            <url>file://${user.home}/public_html/java/libs-release-local</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>libs-snapshot-local</name>
+            <url>file://${user.home}/public_html/java/libs-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
 
-    <version.maven-invoker-plugin>3.3.0</version.maven-invoker-plugin>
-    <version.maven-clean-plugin>3.2.0</version.maven-clean-plugin>
-    <version.maven-dependency-plugin>3.3.0</version.maven-dependency-plugin>
-    <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
-    <version.maven-install-plugin>3.0.1</version.maven-install-plugin>
-    <version.maven-deploy-plugin>3.0.0</version.maven-deploy-plugin>
-    <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin>
-    <version.maven-source-plugin>3.2.1</version.maven-source-plugin>
-    <version.maven-surefire-plugin>3.0.0-M7</version.maven-surefire-plugin>
-    <version.maven-failsafe-plugin>3.0.0-M7</version.maven-failsafe-plugin>
-    <version.maven-site-plugin>3.12.0</version.maven-site-plugin>
-    <version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
-    <version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
-    <version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
-    <version.maven-pmd-plugin>3.17.0</version.maven-pmd-plugin>
-    <version.spotbugs-maven-plugin>4.7.0.0</version.spotbugs-maven-plugin>
-    <version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
-    <version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
-    <version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
-    <version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
-  </properties>
+    <properties>
+        <version.java>17</version.java>
+        <version.maven>3.6.3</version.maven>
+        <maven.compiler.source>${version.java}</maven.compiler.source>
+        <maven.compiler.target>${version.java}</maven.compiler.target>
+        <java.version>${version.java}</java.version>
+        <spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
+        <version.spring-boot-maven-plugin>${project.parent.version}</version.spring-boot-maven-plugin>
+        <version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
+        <version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <name>Central</name>
-      <url>https://repo1.maven.org/maven2/</url>
-    </repository>
-    <repository>
-      <id>sonatype-releases</id>
-      <name>Sonatype Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>apache-releases</id>
-      <name>Apache Releases</name>
-      <url>https://repository.apache.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>atlassian-public</id>
-      <name>Atlassian Repository</name>
-      <url>https://maven.atlassian.com/content/repositories/atlassian-public/</url>
-    </repository>
-    <repository>
-      <id>jboss-releases</id>
-      <name>JBoss Releases Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>jboss-ea</id>
-      <name>JBossEA Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/ea/</url>
-    </repository>
-    <repository>
-      <id>wso2-public</id>
-      <name>WSO2 Public Repository</name>
-      <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
-    </repository>
-    <repository>
-      <id>adobe-public</id>
-      <name>AdobePublic Repository</name>
-      <url>https://repo.adobe.com/nexus/content/repositories/public/</url>
-    </repository>
-    <repository>
-      <id>atlassian-3rdparty</id>
-      <name>Atlassian 3rd-P Old Repository</name>
-      <url>https://packages.atlassian.com/3rdparty/</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>central</id>
-      <name>Central</name>
-      <url>https://repo1.maven.org/maven2/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>sonatype-releases</id>
-      <name>Sonatype Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/releases/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache-releases</id>
-      <name>Apache Releases</name>
-      <url>https://repository.apache.org/content/repositories/releases/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>atlassian-public</id>
-      <name>Atlassian Repository</name>
-      <url>https://maven.atlassian.com/content/repositories/atlassian-public/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>jboss-releases</id>
-      <name>JBoss Releases Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>jboss-ea</id>
-      <name>JBossEA Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/ea/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>wso2-public</id>
-      <name>WSO2 Public Repository</name>
-      <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>adobe-public</id>
-      <name>AdobePublic Repository</name>
-      <url>https://repo.adobe.com/nexus/content/repositories/public/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>atlassian-3rdparty</id>
-      <name>Atlassian 3rd-P Old Repository</name>
-      <url>https://packages.atlassian.com/3rdparty/</url>
-    </pluginRepository>
-  </pluginRepositories>
+        <!-- Webjars -->
+        <webjars.jquery.version>3.6.1</webjars.jquery.version>
+        <webjars.popper.js.version>2.9.3</webjars.popper.js.version>
+        <webjars.bootstrap.version>5.2.2</webjars.bootstrap.version>
+        <webjars.font-awesome.version>6.2.0</webjars.font-awesome.version>
+        <opencsv.version>5.7.1</opencsv.version>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.junit</groupId>
-        <artifactId>junit-bom</artifactId>
-        <version>${junit-jupiter.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.session</groupId>
-        <artifactId>spring-session-bom</artifactId>
-        <version>${spring-session-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>${spring-framework.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-bom</artifactId>
-        <version>${spring-security.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <!-- Unit and Integration Testing -->
+        <skipTests>false</skipTests>
+        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+        <dockerCompose.skip>${skipTests}</dockerCompose.skip>
+        <xmlunit.version>2.9.0</xmlunit.version>
+        <htmlunit.version>2.64.0</htmlunit.version>
+        <version.groovy-all>3.0.12</version.groovy-all>
+        <hamcrest.version>2.2</hamcrest.version>
+        <jsoup.version>1.15.3</jsoup.version>
+        <pmdVersion>6.49.0</pmdVersion>
 
-      <!-- webjars -->
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>jquery</artifactId>
-        <version>${webjars.jquery.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>popper.js</artifactId>
-        <version>${webjars.popper.js.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>bootstrap</artifactId>
-        <version>${webjars.bootstrap.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>font-awesome</artifactId>
-        <version>${webjars.font-awesome.version}</version>
-      </dependency>
+        <!-- Docker -->
+        <version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
+        <docker-compose-maven-plugin.composeFile>${project.basedir}/src/main/resources/docker-compose.yml
+        </docker-compose-maven-plugin.composeFile>
+        <docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
+        <docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
+        <docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
+        <docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
+        <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
+        <docker-compose-maven-plugin.projectName>simplgtd</docker-compose-maven-plugin.projectName>
 
-      <!-- Thymeleaf -->
-      <dependency>
-        <groupId>org.thymeleaf</groupId>
-        <artifactId>thymeleaf-testing</artifactId>
-        <version>${version.thymeleaf-testing}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.github.jpenren</groupId>
-        <artifactId>thymeleaf-spring-data-dialect</artifactId>
-        <version>${version.thymeleaf-spring-data-dialect}</version>
-      </dependency>
+        <!-- SCM and Releasing -->
+        <version.maven-release-plugin>3.0.0-M7</version.maven-release-plugin>
+        <version.maven-release-plugin.scm>1.13.0</version.maven-release-plugin.scm>
 
-      <!-- compile -->
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>${lombok.version}</version>
-        <optional>false</optional>
-      </dependency>
+        <!-- Database Evolution -->
+        <version.org.postgresql>42.5.1</version.org.postgresql>
+        <liquibase.propertyFile>${project.basedir}/liquibase.properties</liquibase.propertyFile>
 
-      <dependency>
-        <groupId>org.postgresql</groupId>
-        <artifactId>postgresql</artifactId>
-        <version>42.5.0</version>
-      </dependency>
+        <!-- UML -->
+        <version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
+        <version.plantuml-maven-plugin.plantuml>1.2022.14</version.plantuml-maven-plugin.plantuml>
 
-      <!-- SCM -->
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-providers-standard</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-provider-svnexe</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-provider-svn-commons</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-provider-gitexe</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-provider-git-commons</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-manager-plexus</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.scm</groupId>
-        <artifactId>maven-scm-client</artifactId>
-        <version>${version.org.apache.maven.scm}</version>
-        <scope>provided</scope>
-      </dependency>
+        <version.maven-invoker-plugin>3.3.0</version.maven-invoker-plugin>
+        <version.maven-clean-plugin>3.2.0</version.maven-clean-plugin>
+        <version.maven-dependency-plugin>3.3.0</version.maven-dependency-plugin>
+        <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
+        <version.maven-install-plugin>3.0.1</version.maven-install-plugin>
+        <version.maven-deploy-plugin>3.0.0</version.maven-deploy-plugin>
+        <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin>
+        <version.maven-source-plugin>3.2.1</version.maven-source-plugin>
+        <version.maven-surefire-plugin>3.0.0-M7</version.maven-surefire-plugin>
+        <version.maven-failsafe-plugin>3.0.0-M7</version.maven-failsafe-plugin>
+        <version.maven-site-plugin>3.12.0</version.maven-site-plugin>
+        <version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
+        <version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
+        <version.maven-checkstyle-plugin.checkstyle>10.4</version.maven-checkstyle-plugin.checkstyle>
+        <version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
+        <version.maven-pmd-plugin>3.17.0</version.maven-pmd-plugin>
+        <version.maven-pmd-plugin.pmd>6.51.0</version.maven-pmd-plugin.pmd>
+        <version.spotbugs-maven-plugin>4.7.3.0</version.spotbugs-maven-plugin>
+        <version.spotbugs-maven-plugin.spotbugs>4.7.0.0</version.spotbugs-maven-plugin.spotbugs>
+        <version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
+        <version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
+        <version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
+        <version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
+    </properties>
 
-      <!-- maven plugins -->
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${version.maven-enforcer-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>4.3</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <version>${version.maven-invoker-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.dkanejs.maven.plugins</groupId>
-        <artifactId>docker-compose-maven-plugin</artifactId>
-        <version>${version.docker-compose-maven-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>${version.maven-clean-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>${version.maven-dependency-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${version.maven-compiler-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${version.spring-boot-maven-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>${version.maven-site-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${version.maven-project-info-reports-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>${version.maven-jxr-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${version.maven-checkstyle-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>${version.maven-pmd-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${version.maven-surefire-report-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-        <version>${version.asciidoctor-maven-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>${version.maven-release-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>${version.maven-deploy-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>${version.maven-install-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${version.maven-javadoc-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>${version.maven-source-plugin}</version>
-        <type>maven-plugin</type>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Central</name>
+            <url>https://repo1.maven.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>sonatype-releases</id>
+            <name>Sonatype Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>apache-releases</id>
+            <name>Apache Releases</name>
+            <url>https://repository.apache.org/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>atlassian-public</id>
+            <name>Atlassian Repository</name>
+            <url>https://maven.atlassian.com/content/repositories/atlassian-public/</url>
+        </repository>
+        <repository>
+            <id>jboss-releases</id>
+            <name>JBoss Releases Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>jboss-ea</id>
+            <name>JBossEA Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/ea/</url>
+        </repository>
+        <repository>
+            <id>wso2-public</id>
+            <name>WSO2 Public Repository</name>
+            <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
+        </repository>
+        <repository>
+            <id>adobe-public</id>
+            <name>AdobePublic Repository</name>
+            <url>https://repo.adobe.com/nexus/content/repositories/public/</url>
+        </repository>
+        <repository>
+            <id>atlassian-3rdparty</id>
+            <name>Atlassian 3rd-P Old Repository</name>
+            <url>https://packages.atlassian.com/3rdparty/</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <name>Central</name>
+            <url>https://repo1.maven.org/maven2/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>sonatype-releases</id>
+            <name>Sonatype Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>apache-releases</id>
+            <name>Apache Releases</name>
+            <url>https://repository.apache.org/content/repositories/releases/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>atlassian-public</id>
+            <name>Atlassian Repository</name>
+            <url>https://maven.atlassian.com/content/repositories/atlassian-public/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>jboss-releases</id>
+            <name>JBoss Releases Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>jboss-ea</id>
+            <name>JBossEA Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/ea/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>wso2-public</id>
+            <name>WSO2 Public Repository</name>
+            <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>adobe-public</id>
+            <name>AdobePublic Repository</name>
+            <url>https://repo.adobe.com/nexus/content/repositories/public/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>atlassian-3rdparty</id>
+            <name>Atlassian 3rd-P Old Repository</name>
+            <url>https://packages.atlassian.com/3rdparty/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <scope>provided</scope>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-devtools</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>nz.net.ultraq.thymeleaf</groupId>
-          <artifactId>thymeleaf-layout-dialect</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-mail</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.junit.vintage</groupId>
-          <artifactId>junit-vintage-engine</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-logging</artifactId>
-    </dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.session</groupId>
+                <artifactId>spring-session-bom</artifactId>
+                <version>${spring-session-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring-framework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-bom</artifactId>
+                <version>${spring-security.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
-      <scope>test</scope>
-    </dependency>
+            <!-- webjars -->
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery</artifactId>
+                <version>${webjars.jquery.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>popper.js</artifactId>
+                <version>${webjars.popper.js.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${webjars.bootstrap.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>font-awesome</artifactId>
+                <version>${webjars.font-awesome.version}</version>
+            </dependency>
 
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>jquery</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>popper.js</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>bootstrap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>font-awesome</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>jul-to-slf4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-spring5</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-java8time</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.mxab.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-data-attribute</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.github.jpenren</groupId>
-      <artifactId>thymeleaf-spring-data-dialect</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
+            <!-- Thymeleaf -->
+            <dependency>
+                <groupId>org.thymeleaf</groupId>
+                <artifactId>thymeleaf-testing</artifactId>
+                <version>${version.thymeleaf-testing}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.github.jpenren</groupId>
+                <artifactId>thymeleaf-spring-data-dialect</artifactId>
+                <version>${version.thymeleaf-spring-data-dialect}</version>
+            </dependency>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <!-- scm -->
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-svnexe</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-svn-commons</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-gitexe</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-git-commons</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-manager-plexus</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
+            <!-- compile -->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+                <optional>false</optional>
+            </dependency>
 
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-enforcer-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-invoker-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.dkanejs.maven.plugins</groupId>
-      <artifactId>docker-compose-maven-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-clean-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-dependency-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-compiler-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-maven-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-site-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-project-info-reports-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-jxr-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-checkstyle-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-pmd-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-report-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctor-maven-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-release-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-deploy-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-install-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-javadoc-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-source-plugin</artifactId>
-      <type>maven-plugin</type>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.5.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.saxon</groupId>
+                <artifactId>saxon-dom</artifactId>
+                <version>8.7</version>
+            </dependency>
 
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <defaultGoal>clean package spring-boot:run</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>${version.maven-enforcer-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-invoker-plugin</artifactId>
-          <version>${version.maven-invoker-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>com.dkanejs.maven.plugins</groupId>
-          <artifactId>docker-compose-maven-plugin</artifactId>
-          <version>${version.docker-compose-maven-plugin}</version>
-            <executions>
-                <execution>
-                    <id>maven-docker-up</id>
-                    <phase>test-compile</phase>
-                    <goals>
-                        <goal>up</goal>
-                    </goals>
-                    <configuration>
-                        <composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
-                        <verbose>${docker-compose-maven-plugin.verbose}</verbose>
-                        <removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
-                        <removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
-                        <ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}</ignorePullFailures>
-                        <detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
-                        <projectName>${docker-compose-maven-plugin.projectName}</projectName>
-                    </configuration>
-                </execution>
-                <execution>
-                    <id>maven-docker-down</id>
-                    <phase>pre-site</phase>
-                    <goals>
-                        <goal>down</goal>
-                    </goals>
-                    <configuration>
-                        <composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
-                        <verbose>${docker-compose-maven-plugin.verbose}</verbose>
-                        <removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
-                        <removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
-                        <ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}</ignorePullFailures>
-                        <detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
-                        <projectName>${docker-compose-maven-plugin.projectName}</projectName>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>${version.maven-clean-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>${version.maven-dependency-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${version.maven-compiler-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>${version.spring-boot-maven-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>${version.maven-install-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>${version.maven-project-info-reports-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jxr-plugin</artifactId>
-          <version>${version.maven-jxr-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${version.maven-checkstyle-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>com.github.spotbugs</groupId>
-          <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>${version.spotbugs-maven-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${version.maven-surefire-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>${version.maven-surefire-report-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>${version.maven-release-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.asciidoctor</groupId>
-          <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>${version.asciidoctor-maven-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${version.maven-javadoc-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>${version.maven-pmd-plugin}</version>
-          <dependencies>
+            <!-- SCM -->
             <dependency>
-              <groupId>net.sourceforge.pmd</groupId>
-              <artifactId>pmd-core</artifactId>
-              <version>${pmdVersion}</version>
-              <scope>compile</scope>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-providers-standard</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <type>pom</type>
             </dependency>
             <dependency>
-              <groupId>net.sourceforge.pmd</groupId>
-              <artifactId>pmd-java</artifactId>
-              <version>${pmdVersion}</version>
-              <scope>compile</scope>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-svnexe</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
-              <groupId>net.sourceforge.pmd</groupId>
-              <artifactId>pmd-javascript</artifactId>
-              <version>${pmdVersion}</version>
-              <scope>compile</scope>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-svn-commons</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
-              <groupId>net.sourceforge.pmd</groupId>
-              <artifactId>pmd-jsp</artifactId>
-              <version>${pmdVersion}</version>
-              <scope>compile</scope>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-gitexe</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-git-commons</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-manager-plexus</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-client</artifactId>
+                <version>${version.maven-release-plugin.scm}</version>
+                <scope>provided</scope>
             </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>${version.maven-source-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>${version.maven-site-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>${version.maven-deploy-plugin}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${version.maven-failsafe-plugin}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-versions</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedPlugins>
-                  <level>ERROR</level>
-                  <excludes>
-                    <exclude>org.apache.maven.plugins:maven-verifier-plugin</exclude>
-                  </excludes>
-                  <message>
-                    Please consider using the maven-invoker-plugin
-                    (http://maven.apache.org/plugins/maven-invoker-plugin/)!
-                  </message>
-                </bannedPlugins>
-                <requireMavenVersion>
-                  <version>${version.maven}</version>
-                </requireMavenVersion>
-                <requireJavaVersion>
-                  <version>${java.version}</version>
-                </requireJavaVersion>
-                <requireFilesExist>
-                  <files>
-                    <file>${project.basedir}/README.md</file>
-                    <file>${project.basedir}/LICENSE</file>
-                    <file>${project.basedir}/app.json</file>
-                    <file>${project.basedir}/_config.yml</file>
-                    <file>${project.basedir}/Procfile</file>
-                    <file>${project.basedir}/src/site/markdown/ABOUT.md</file>
-                    <file>${project.basedir}/src/site/markdown/CHANGELOG.md</file>
-                    <file>${project.basedir}/src/site/markdown/CLOUD_DEPLOYMENT.md</file>
-                    <file>${project.basedir}/src/site/markdown/DEVELOPMENT.md</file>
-                    <file>${project.basedir}/src/site/markdown/HOWTO.md</file>
-                    <file>${project.basedir}/src/site/markdown/MAVEN_PLUGINS.md</file>
-                    <file>${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md</file>
-                    <file>${project.basedir}/src/site/markdown/TODO.md</file>
-                    <file>${project.basedir}/src/site/site.xml</file>
-                    <file>${project.basedir}/build.sh</file>
-                    <file>${project.basedir}/etc/run.sh</file>
-                    <file>${project.basedir}/etc/bash/psql.sh</file>
-                    <file>${project.basedir}/src/main/resources/docker-compose.yml</file>
-                    <file>${project.basedir}/etc/docker-start.sh</file>
-                    <file>${project.basedir}/etc/docker-stop.sh</file>
-                    <file>${project.basedir}/etc/sql/db-createdb-and-user-linux.sql</file>
-                    <file>${project.basedir}/etc/sql/db-createdb-and-user-win10.sql</file>
-                  </files>
-                </requireFilesExist>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>install</goal>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
-              <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <layout>JAR</layout>
-          <executable>true</executable>
-          <addResources>true</addResources>
-          <excludeGroupIds>org.eclipse.aether,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module</excludeGroupIds>
-          <excludes>
-            <exclude>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-configuration-processor</artifactId>
-            </exclude>
-            <exclude>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-devtools</artifactId>
-            </exclude>
-          </excludes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>unpack-dependency-classes-install</id>
-            <phase>install</phase>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>id-build-info</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>build-info</goal>
-            </goals>
-            <configuration>
-              <additionalProperties>
-                <encoding.source>${project.build.sourceEncoding}</encoding.source>
-                <encoding.reporting>${project.reporting.outputEncoding}</encoding.reporting>
-                <java.source>${maven.compiler.source}</java.source>
-                <java.target>${maven.compiler.target}</java.target>
-              </additionalProperties>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.dkanejs.maven.plugins</groupId>
-        <artifactId>docker-compose-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <includeScope>compile</includeScope>
-          <excludeTypes>maven-plugin</excludeTypes>
-          <excludeScope>test,provided</excludeScope>
-          <excludeGroupIds>org.eclipse.aether,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module,  </excludeGroupIds>
-          <excludeArtifactIds>jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api</excludeArtifactIds>
-        </configuration>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
-          <compilerArgs>
-            <arg>-Xlint:all,-options,-path</arg>
-          </compilerArgs>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>true</showDeprecation>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>org.projectlombok</groupId>
-              <artifactId>lombok</artifactId>
-              <version>${lombok.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile-classes</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <linksource>true</linksource>
-          <maxmemory>1024m</maxmemory>
-          <source>${java.version}</source>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagNameFormat>v@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipTests}</skipTests>
-          <systemPropertyVariables>
-            <spring.profiles.active>default</spring.profiles.active>
-            <skipIntegrationTests>${skipTests}</skipIntegrationTests>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipTests}</skipTests>
-          <systemPropertyVariables>
-            <spring.profiles.active>default</spring.profiles.active>
-            <skipIntegrationTests>${skipTests}</skipIntegrationTests>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>com.dkanejs.maven.plugins</groupId>
-        <artifactId>docker-compose-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <linksource>true</linksource>
-          <maxmemory>1024m</maxmemory>
-          <source>${java.version}</source>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <configuration>
-          <skipEmptyReport>true</skipEmptyReport>
-          <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <enableRulesSummary>true</enableRulesSummary>
-          <enableSeveritySummary>true</enableSeveritySummary>
-          <enableFilesSummary>true</enableFilesSummary>
-          <failOnViolation>false</failOnViolation>
-          <failsOnError>false</failsOnError>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-maven-plugin</artifactId>
-        <configuration>
-          <failOnError>false</failOnError>
-          <detail>true</detail>
-          <relaxed>true</relaxed>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <minimumTokens>100</minimumTokens>
-          <targetJdk>${java.version}</targetJdk>
-          <excludeRoots>
-            <excludeRoot>target</excludeRoot>
-          </excludeRoots>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipTests}</skipTests>
-          <includes>
-            <include>**/*Tests.java</include>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/Abstract*.java</exclude>
-          </excludes>
-          <systemPropertyVariables>
-            <spring.profiles.active>default</spring.profiles.active>
-            <skipIntegrationTests>${skipTests}</skipIntegrationTests>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <skipTests>${skipTests}</skipTests>
-          <systemPropertyVariables>
-            <spring.profiles.active>default</spring.profiles.active>
-            <skipIntegrationTests>${skipTests}</skipIntegrationTests>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <configuration>
-          <skipFailsafeReport>${skipTests}</skipFailsafeReport>
-          <skipSurefireReport>${skipTests}</skipSurefireReport>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 
+            <!-- maven plugins -->
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${version.maven-enforcer-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>4.3</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>${version.maven-invoker-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.dkanejs.maven.plugins</groupId>
+                <artifactId>docker-compose-maven-plugin</artifactId>
+                <version>${version.docker-compose-maven-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>${version.maven-clean-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${version.maven-dependency-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.maven-compiler-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${version.spring-boot-maven-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>${version.maven-site-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>${version.maven-project-info-reports-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>${version.maven-jxr-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${version.maven-checkstyle-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${version.maven-pmd-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.beust</groupId>
+                        <artifactId>jcommander</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.pmd</groupId>
+                <artifactId>pmd</artifactId>
+                <version>${version.maven-pmd-plugin.pmd}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>${version.maven-surefire-report-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>${version.asciidoctor-maven-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>${version.maven-release-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.jcraft</groupId>
+                        <artifactId>jsch</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>${version.maven-deploy-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>${version.maven-install-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${version.maven-javadoc-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${version.maven-source-plugin}</version>
+                <type>maven-plugin</type>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-  <profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+            <optional>false</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>nz.net.ultraq.thymeleaf</groupId>
+                    <artifactId>thymeleaf-layout-dialect</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
 
-    <profile>
-      <id>jar</id>
-      <properties>
-        <skip.unit.tests>true</skip.unit.tests>
-        <skip.integration.tests>true</skip.integration.tests>
-      </properties>
-      <build>
-        <finalName>${project.artifactId}</finalName>
-          <defaultGoal>clean dependency:purge-local-repository install spring-boot:repackage</defaultGoal>
-      </build>
-    </profile>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    <profile>
-      <id>cloud</id>
-      <properties>
-        <skip.unit.tests>true</skip.unit.tests>
-        <skip.integration.tests>true</skip.integration.tests>
-      </properties>
-      <build>
-        <finalName>${project.artifactId}</finalName>
-        <defaultGoal>clean dependency:list install spring-boot:repackage</defaultGoal>
-      </build>
-    </profile>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>popper.js</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>font-awesome</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jul-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-java8time</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.mxab.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-data-attribute</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.jpenren</groupId>
+            <artifactId>thymeleaf-spring-data-dialect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>saxon-dom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
 
-      <profile>
-          <id>test</id>
-          <properties>
-              <skipTests>false</skipTests>
-              <skip.unit.tests>false</skip.unit.tests>
-              <skip.integration.tests>false</skip.integration.tests>
-          </properties>
-          <build>
-              <finalName>${project.artifactId}</finalName>
-              <defaultGoal>clean dependency:purge-local-repository dependency:list install spring-boot:repackage</defaultGoal>
-          </build>
-      </profile>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- scm -->
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-svnexe</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-svn-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-gitexe</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-git-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-manager-plexus</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-    <profile>
-      <id>uml</id>
-      <properties>
-        <skip.unit.tests>true</skip.unit.tests>
-        <skip.integration.tests>true</skip.integration.tests>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>com.github.funthomas424242</groupId>
-            <artifactId>plantuml-maven-plugin</artifactId>
-            <version>${version.plantuml-maven-plugin}</version>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
             <type>maven-plugin</type>
-            <exclusions>
-              <exclusion>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>net.sourceforge.plantuml</groupId>
-            <artifactId>plantuml</artifactId>
-            <version>${version.net.sourceforge.plantuml}</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.dkanejs.maven.plugins</groupId>
+            <artifactId>docker-compose-maven-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-clean-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-maven-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
-          <groupId>com.github.funthomas424242</groupId>
-          <artifactId>plantuml-maven-plugin</artifactId>
-          <type>maven-plugin</type>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jxr-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-report-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>net.sourceforge.plantuml</groupId>
-          <artifactId>plantuml</artifactId>
-          <scope>runtime</scope>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctor-maven-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
         </dependency>
-      </dependencies>
-      <build>
-        <defaultGoal>clean com.github.funthomas424242:plantuml-maven-plugin:generate</defaultGoal>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-release-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-install-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <type>maven-plugin</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <defaultGoal>clean package liquibase:validate liquibase:update spring-boot:run</defaultGoal>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>${version.maven-enforcer-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-invoker-plugin</artifactId>
+                    <version>${version.maven-invoker-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.dkanejs.maven.plugins</groupId>
+                    <artifactId>docker-compose-maven-plugin</artifactId>
+                    <version>${version.docker-compose-maven-plugin}</version>
+                    <executions>
+                        <execution>
+                            <id>maven-docker-up</id>
+                            <phase>test-compile</phase>
+                            <goals>
+                                <goal>up</goal>
+                            </goals>
+                            <configuration>
+                                <composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
+                                <verbose>${docker-compose-maven-plugin.verbose}</verbose>
+                                <removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
+                                <removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
+                                <ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}
+                                </ignorePullFailures>
+                                <detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
+                                <projectName>${docker-compose-maven-plugin.projectName}</projectName>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>maven-docker-down</id>
+                            <phase>pre-site</phase>
+                            <goals>
+                                <goal>down</goal>
+                            </goals>
+                            <configuration>
+                                <composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
+                                <verbose>${docker-compose-maven-plugin.verbose}</verbose>
+                                <removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
+                                <removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
+                                <ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}
+                                </ignorePullFailures>
+                                <detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
+                                <projectName>${docker-compose-maven-plugin.projectName}</projectName>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>${version.maven-clean-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${version.maven-dependency-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${version.maven-compiler-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${version.spring-boot-maven-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>${version.maven-install-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>${version.maven-project-info-reports-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jxr-plugin</artifactId>
+                    <version>${version.maven-jxr-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${version.maven-checkstyle-plugin}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>${version.maven-checkstyle-plugin.checkstyle}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>${version.spotbugs-maven-plugin}</version>
+                    <dependencies>
+
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${version.maven-surefire-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>${version.maven-surefire-report-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${version.maven-release-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId>
+                    <version>${version.asciidoctor-maven-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${version.maven-javadoc-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>${version.maven-pmd-plugin}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-core</artifactId>
+                            <version>${pmdVersion}</version>
+                            <scope>compile</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-java</artifactId>
+                            <version>${pmdVersion}</version>
+                            <scope>compile</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-javascript</artifactId>
+                            <version>${pmdVersion}</version>
+                            <scope>compile</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-jsp</artifactId>
+                            <version>${pmdVersion}</version>
+                            <scope>compile</scope>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${version.maven-source-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${version.maven-site-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${version.maven-deploy-plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${version.maven-failsafe-plugin}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedPlugins>
+                                    <level>ERROR</level>
+                                    <excludes>
+                                        <exclude>org.apache.maven.plugins:maven-verifier-plugin</exclude>
+                                    </excludes>
+                                    <message>
+                                        Please consider using the maven-invoker-plugin
+                                        (http://maven.apache.org/plugins/maven-invoker-plugin/)!
+                                    </message>
+                                </bannedPlugins>
+                                <requireMavenVersion>
+                                    <version>${version.maven}</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>${version.java}</version>
+                                </requireJavaVersion>
+                                <requireFilesExist>
+                                    <files>
+                                        <file>${project.basedir}/README.md</file>
+                                        <file>${project.basedir}/LICENSE.txt</file>
+                                        <file>${project.basedir}/app.json</file>
+                                        <file>${project.basedir}/_config.yml</file>
+                                        <file>${project.basedir}/Procfile</file>
+                                        <file>${project.basedir}/src/site/markdown/index.md</file>
+                                        <file>${project.basedir}/src/site/markdown/CHANGELOG.md</file>
+                                        <file>${project.basedir}/src/site/markdown/DEPLOYMENTS.md</file>
+                                        <file>${project.basedir}/src/site/markdown/DEVELOPMENT.md</file>
+                                        <file>${project.basedir}/src/site/markdown/HOWTO.md</file>
+                                        <file>${project.basedir}/src/site/markdown/MAVEN_PLUGINS.md</file>
+                                        <file>${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md</file>
+                                        <file>${project.basedir}/src/site/markdown/TODO.md</file>
+                                        <file>${project.basedir}/src/site/site.xml</file>
+                                        <file>${project.basedir}/build.sh</file>
+                                        <file>${project.basedir}/etc/run.sh</file>
+                                        <file>${project.basedir}/etc/bash/psql.sh</file>
+                                        <file>${project.basedir}/etc/docker-start.sh</file>
+                                        <file>${project.basedir}/etc/docker-stop.sh</file>
+                                        <file>${project.basedir}/docker-compose.yml</file>
+                                        <file>${project.basedir}/etc/sql/db-createdb-and-user-linux.sql</file>
+                                        <file>${project.basedir}/etc/sql/db-createdb-and-user-win10.sql</file>
+                                        <file>${project.basedir}/liquibase.properties</file>
+                                    </files>
+                                </requireFilesExist>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>install</goal>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <settingsFile>src/it/settings.xml</settingsFile>
+                            <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                            <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
+                            <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <layout>JAR</layout>
+                    <executable>true</executable>
+                    <addResources>true</addResources>
+                    <excludeGroupIds>
+                        org.eclipse.aether,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module
+                    </excludeGroupIds>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-configuration-processor</artifactId>
+                        </exclude>
+                        <exclude>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-devtools</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>unpack-dependency-classes-install</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>id-build-info</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                        <configuration>
+                            <additionalProperties>
+                                <encoding.source>${project.build.sourceEncoding}</encoding.source>
+                                <encoding.reporting>${project.reporting.outputEncoding}</encoding.reporting>
+                                <java.source>${maven.compiler.source}</java.source>
+                                <java.target>${maven.compiler.target}</java.target>
+                            </additionalProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <includeScope>compile</includeScope>
+                    <excludeTypes>maven-plugin</excludeTypes>
+                    <excludeScope>test,provided</excludeScope>
+                    <excludeGroupIds>
+                        org.eclipse.aether,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module,
+                    </excludeGroupIds>
+                    <excludeArtifactIds>
+                        jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api
+                    </excludeArtifactIds>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${version.java}</source>
+                    <target>${version.java}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <compilerArgs>
+                        <arg>-Xlint:all,-options,-path</arg>
+                    </compilerArgs>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compile-classes</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <linksource>true</linksource>
+                    <source>${version.java}</source>
+                    <failOnError>false</failOnError>
+                    <failOnWarnings>false</failOnWarnings>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <configuration>
+                    <linkJavadoc>true</linkJavadoc>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <tagNameFormat>v@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <systemPropertyVariables>
+                        <spring.profiles.active>default</spring.profiles.active>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <systemPropertyVariables>
+                        <spring.profiles.active>default</spring.profiles.active>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>${version.maven-checkstyle-plugin.checkstyle}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <xmlOutputDirectory>target/site</xmlOutputDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.liquibase</groupId>
+                <artifactId>liquibase-maven-plugin</artifactId>
+                <configuration>
+                    <propertyFile>liquibase.properties</propertyFile>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
+                        <version>${version.org.postgresql}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
         <plugins>
-          <plugin>
-            <groupId>com.github.funthomas424242</groupId>
-            <artifactId>plantuml-maven-plugin</artifactId>
-            <version>${version.plantuml-maven-plugin}</version>
-            <configuration>
-              <truncatePattern>src/main/*</truncatePattern>
-              <sourceFiles>
-                <directory>${basedir}</directory>
-                <includes>
-                  <include>src/main/plantuml/**/*.puml</include>
-                </includes>
-              </sourceFiles>
-            </configuration>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <linksource>true</linksource>
+                    <source>${version.java}</source>
+                    <failOnError>false</failOnError>
+                    <failOnWarnings>false</failOnWarnings>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <configuration>
+                    <linkJavadoc>true</linkJavadoc>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <configuration>
+                    <skipEmptyReport>true</skipEmptyReport>
+                    <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <enableRulesSummary>true</enableRulesSummary>
+                    <enableSeveritySummary>true</enableSeveritySummary>
+                    <enableFilesSummary>true</enableFilesSummary>
+                    <failOnViolation>false</failOnViolation>
+                    <failsOnError>false</failsOnError>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <detail>true</detail>
+                    <relaxed>true</relaxed>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <configuration>
+                    <minimumTokens>100</minimumTokens>
+                    <targetJdk>${version.java}</targetJdk>
+                    <excludeRoots>
+                        <excludeRoot>target</excludeRoot>
+                    </excludeRoots>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <includes>
+                        <include>**/*Tests.java</include>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <spring.profiles.active>default</spring.profiles.active>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <systemPropertyVariables>
+                        <spring.profiles.active>default</spring.profiles.active>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <configuration>
+                    <skipFailsafeReport>${skipTests}</skipFailsafeReport>
+                    <skipSurefireReport>${skipTests}</skipSurefireReport>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+
+
+    <profiles>
+
+        <profile>
+            <id>run</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skip.unit.tests>true</skip.unit.tests>
+                <skip.integration.tests>true</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>clean install spring-boot:run</defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
+            <id>build</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>false</skipTests>
+                <skip.unit.tests>false</skip.unit.tests>
+                <skip.integration.tests>false</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>
+                    clean dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources install spring-boot:repackage site site:deploy
+                </defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
+            <id>jar</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skip.unit.tests>true</skip.unit.tests>
+                <skip.integration.tests>true</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>
+                    clean dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources install spring-boot:repackage
+                </defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>false</skipTests>
+                <skip.unit.tests>false</skip.unit.tests>
+                <skip.integration.tests>false</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>clean dependency:purge-local-repository install spring-boot:repackage</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>com.dkanejs.maven.plugins</groupId>
+                        <artifactId>docker-compose-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>cloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skip.unit.tests>true</skip.unit.tests>
+                <skip.integration.tests>true</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>clean dependency:list install spring-boot:repackage</defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>false</skipTests>
+                <skip.unit.tests>false</skip.unit.tests>
+                <skip.integration.tests>false</skip.integration.tests>
+            </properties>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <defaultGoal>clean dependency:purge-local-repository dependency:list install spring-boot:repackage
+                </defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
+            <id>uml</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skip.unit.tests>true</skip.unit.tests>
+                <skip.integration.tests>true</skip.integration.tests>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.funthomas424242</groupId>
+                        <artifactId>plantuml-maven-plugin</artifactId>
+                        <version>${version.plantuml-maven-plugin}</version>
+                        <type>maven-plugin</type>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>javax.enterprise</groupId>
+                                <artifactId>cdi-api</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                    <dependency>
+                        <groupId>net.sourceforge.plantuml</groupId>
+                        <artifactId>plantuml</artifactId>
+                        <version>${version.plantuml-maven-plugin.plantuml}</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
             <dependencies>
-              <dependency>
-                <groupId>net.sourceforge.plantuml</groupId>
-                <artifactId>plantuml</artifactId>
-                <version>${version.net.sourceforge.plantuml}</version>
-                <scope>runtime</scope>
-              </dependency>
+                <dependency>
+                    <groupId>com.github.funthomas424242</groupId>
+                    <artifactId>plantuml-maven-plugin</artifactId>
+                    <type>maven-plugin</type>
+                </dependency>
+                <dependency>
+                    <groupId>net.sourceforge.plantuml</groupId>
+                    <artifactId>plantuml</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
             </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+            <build>
+                <defaultGoal>clean com.github.funthomas424242:plantuml-maven-plugin:generate</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.funthomas424242</groupId>
+                        <artifactId>plantuml-maven-plugin</artifactId>
+                        <version>${version.plantuml-maven-plugin}</version>
+                        <configuration>
+                            <truncatePattern>src/*</truncatePattern>
+                            <sourceFiles>
+                                <directory>${basedir}</directory>
+                                <includes>
+                                    <include>src/plantuml/**/*.puml</include>
+                                </includes>
+                            </sourceFiles>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>net.sourceforge.plantuml</groupId>
+                                <artifactId>plantuml</artifactId>
+                                <version>${version.plantuml-maven-plugin.plantuml}</version>
+                                <scope>runtime</scope>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-  </profiles>
+    </profiles>
 
 </project>
diff --git a/site.sh b/site.sh
new file mode 100755
index 00000000..e24cc000
--- /dev/null
+++ b/site.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+#source src/main/bash/setenv.sh
+source ~/.bash_aliases_simpleworklist
+
+./mvnw site site:deploy
diff --git a/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java b/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java
index 4234fa82..918e1528 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java
@@ -5,89 +5,50 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
 
+import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
 
 @Configuration
 @EnableAsync
 @EnableJpaAuditing
 @EnableWebMvc
 @EnableSpringDataWebSupport
-@EnableWebSecurity
 @ImportAutoConfiguration({
     WebMvcConfig.class
 })
 @EnableConfigurationProperties({
     SimpleworklistProperties.class
 })
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements WebSecurityConfigurer<WebSecurity> {
+@EnableWebSecurity
+@EnableMethodSecurity(securedEnabled = true)
+public class WebSecurityConfig {
 
-    private final AuthenticationManagerBuilder authenticationManagerBuilder;
-    private final AuthenticationSuccessHandler authenticationSuccessHandler;
     private final ApplicationUserDetailsService applicationUserDetailsService;
     private final SimpleworklistProperties simpleworklistProperties;
 
     @Autowired
     public WebSecurityConfig(
-        AuthenticationManagerBuilder auth,
-        AuthenticationSuccessHandler authenticationSuccessHandler,
         ApplicationUserDetailsService applicationUserDetailsService,
-        SimpleworklistProperties simpleworklistProperties) {
-        this.authenticationManagerBuilder = auth;
-        this.authenticationSuccessHandler = authenticationSuccessHandler;
+        SimpleworklistProperties simpleworklistProperties
+    ) {
         this.applicationUserDetailsService = applicationUserDetailsService;
         this.simpleworklistProperties = simpleworklistProperties;
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .headers()
-            .disable()
-            .authorizeRequests()
-            .antMatchers(HttpMethod.GET,simpleworklistProperties.getWebSecurity().getAntPatternsPublic())
-            .permitAll()
-            .anyRequest()
-            .fullyAuthenticated()
-            .and()
-            .csrf()
-            .and()
-            .formLogin()
-            .loginPage(simpleworklistProperties.getWebSecurity().getLoginPage())
-            .usernameParameter(simpleworklistProperties.getWebSecurity().getUsernameParameter())
-            .passwordParameter(simpleworklistProperties.getWebSecurity().getPasswordParameter())
-            .loginProcessingUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl())
-            .failureForwardUrl(simpleworklistProperties.getWebSecurity().getFailureForwardUrl())
-            .defaultSuccessUrl(simpleworklistProperties.getWebSecurity().getDefaultSuccessUrl())
-            //.successHandler(authenticationSuccessHandler)
-            .permitAll()
-            .and()
-            .csrf()
-            .and()
-            .logout()
-            .logoutUrl(simpleworklistProperties.getWebSecurity().getLogoutUrl())
-            .deleteCookies(simpleworklistProperties.getWebSecurity().getCookieNamesToClear())
-            .invalidateHttpSession(simpleworklistProperties.getWebSecurity().getInvalidateHttpSession())
-            .permitAll();
-    }
-
     @Bean
     public UserDetailsService userDetailsService(){
         return this.applicationUserDetailsService;
@@ -104,17 +65,46 @@ public PasswordEncoder encoder(){
     }
 
     @Bean
-    public AuthenticationManager authenticationManager() throws Exception {
-        return authenticationManagerBuilder
-            .userDetailsService(userDetailsService())
-            .passwordEncoder(encoder()).and().build();
+    public AuthenticationProvider authenticationProvider(){
+        DaoAuthenticationProvider d = new DaoAuthenticationProvider();
+        d.setPasswordEncoder(encoder());
+        d.setUserDetailsService(userDetailsService());
+        return d;
     }
 
     @Bean
-    public UsernamePasswordAuthenticationFilter authenticationFilter() throws Exception {
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(authenticationManager());
-        filter.setFilterProcessesUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl());
-        return filter;
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+            .headers((headers) -> headers.disable() )
+            .authorizeRequests((authorizeRequests) -> authorizeRequests
+                .antMatchers(
+                    simpleworklistProperties.getWebSecurity().getAntPatternsPublic()
+                )
+                .permitAll()
+                .anyRequest()
+                .fullyAuthenticated()
+            )
+            .csrf()
+            .and()
+            .formLogin((formLogin) -> formLogin
+                .loginPage(simpleworklistProperties.getWebSecurity().getLoginPage())
+                .usernameParameter(simpleworklistProperties.getWebSecurity().getUsernameParameter())
+                .passwordParameter(simpleworklistProperties.getWebSecurity().getPasswordParameter())
+                .loginProcessingUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl())
+                .failureForwardUrl(simpleworklistProperties.getWebSecurity().getFailureForwardUrl())
+                .defaultSuccessUrl(simpleworklistProperties.getWebSecurity().getDefaultSuccessUrl())
+                //.successHandler(authenticationSuccessHandler)
+                .permitAll()
+            )
+            .csrf()
+            .and()
+            .logout((logout) ->  logout
+                .logoutUrl(simpleworklistProperties.getWebSecurity().getLogoutUrl())
+                .deleteCookies(simpleworklistProperties.getWebSecurity().getCookieNamesToClear())
+                .invalidateHttpSession(simpleworklistProperties.getWebSecurity().getInvalidateHttpSession())
+                .permitAll()
+            );
+        return http.build();
     }
+
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java
index caed59aa..b0c3f288 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java
@@ -21,7 +21,7 @@ public final String renderPageInformation(
     @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
     Locale locale, Model model
   ) {
-    log.info("addNewTaskToInboxGet");
+    log.info("renderPageInformation");
     return "pages/information";
   }
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
index 69fa46a4..6c9d5202 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
@@ -46,7 +46,13 @@ public class ProjectIdController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public ProjectIdController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService, TaskService taskService, ContextService contextService, BreadcrumbService breadcrumbService) {
+  public ProjectIdController(
+      ProjectControllerService projectControllerService,
+      TaskMoveService taskMoveService,
+      TaskService taskService,
+      ContextService contextService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.projectControllerService = projectControllerService;
     this.taskMoveService = taskMoveService;
     this.taskService = taskService;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java
index 2921be64..dee81f45 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java
@@ -41,7 +41,13 @@ public class ProjectIdTaskController extends AbstractController {
   private final ContextService contextService;
 
   @Autowired
-  public ProjectIdTaskController(ProjectControllerService projectControllerService, ProjectService projectService, TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService, ContextService contextService) {
+  public ProjectIdTaskController(
+      ProjectControllerService projectControllerService,
+      ProjectService projectService,
+      TaskLifecycleService taskLifecycleService,
+      BreadcrumbService breadcrumbService,
+      ContextService contextService
+  ) {
     this.projectControllerService = projectControllerService;
     this.projectService = projectService;
     this.taskLifecycleService = taskLifecycleService;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootTaskController.java
index 54e74bb8..8af46e90 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootTaskController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootTaskController.java
@@ -43,7 +43,11 @@ public class ProjectRootTaskController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public ProjectRootTaskController(ProjectControllerService projectControllerService, TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService) {
+  public ProjectRootTaskController(
+      ProjectControllerService projectControllerService,
+      TaskLifecycleService taskLifecycleService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.projectControllerService = projectControllerService;
     this.taskLifecycleService = taskLifecycleService;
     this.breadcrumbService = breadcrumbService;
@@ -54,7 +58,9 @@ public final String projectRootTaskAddGet(
     @ModelAttribute("userSession") UserSessionBean userSession,
     Locale locale, Model model
   ) {
+    log.info("------------------------------------------------------");
     log.info("/project/root/add/task (GET)");
+    log.info("------------------------------------------------------");
     Context context = super.getContext(userSession);
     UserAccount userAccount = context.getUserAccount();
     Task thisTask = new Task();
@@ -62,28 +68,29 @@ public final String projectRootTaskAddGet(
     thisTask.setTaskEnergy(TaskEnergy.NONE);
     thisTask.setTaskTime(TaskTime.NONE);
     thisTask.unsetFocus();
-    Project thisProject;
     Boolean mustChooseContext = false;
-    thisProject = new Project();
-    thisProject.setId(0L);
+    Context projectsContext;
     if(userSession.getLastContextId() == 0L){
       mustChooseContext = true;
-      thisTask.setContext(userAccount.getDefaultContext());
-      thisProject.setContext(userAccount.getDefaultContext());
+      projectsContext = userAccount.getDefaultContext();
     } else {
-      thisTask.setContext(context);
-      thisProject.setContext(context);
+        projectsContext = context;
     }
+    Project thisProject = Project.getRootProject(projectsContext);
+    thisTask.setContext(projectsContext);
+    List<Project> rootProjects = projectControllerService.findRootProjectsByContext(context);
     Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject,locale,userSession);
     model.addAttribute("breadcrumb", breadcrumb);
-    model.addAttribute("mustChooseContext", mustChooseContext); //TODO: rename mustChooseArea -> mustChooseContext
-    model.addAttribute("thisProject", thisProject);
+    //TODO: rename mustChooseArea -> mustChooseContext
+    model.addAttribute("mustChooseContext", mustChooseContext);
+    model.addAttribute("thisProject", null);
     model.addAttribute("thisProjectId", thisProject.getId());
     model.addAttribute("breadcrumb", breadcrumb);
     model.addAttribute("task", thisTask);
     model.addAttribute("userSession", userSession);
     model.addAttribute("taskstateType",PROJECTS.getSlug());
     model.addAttribute("dataPage", true);
+    model.addAttribute("rootProjects",rootProjects);
     return "project/root/task/add";
   }
 
@@ -95,7 +102,9 @@ public final String projectRootTaskAddPost(
     Locale locale,
     Model model
   ) {
+    log.info("------------------------------------------------------");
     log.info("/project/root/task/add (POST)");
+    log.info("------------------------------------------------------");
     Context context = super.getContext(userSession);
     model.addAttribute("dataPage", true);
     model.addAttribute("addProjectToTask", false);
@@ -107,10 +116,14 @@ public final String projectRootTaskAddPost(
       Boolean mustChooseArea = false;
       task.setContext(context);
       Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(TaskState.INBOX,locale,userSession);
+      List<Project> rootProjects = projectControllerService.findRootProjectsByContext(context);
+      Project thisProject = null;
       model.addAttribute("mustChooseArea", mustChooseArea);
       model.addAttribute("breadcrumb", breadcrumb);
       model.addAttribute("task", task);
       model.addAttribute("userSession", userSession);
+      model.addAttribute("thisProject", thisProject);
+      model.addAttribute("rootProjects", rootProjects);
       return "project/root/task/add";
     } else {
       task.setContext(context);
@@ -127,13 +140,15 @@ public final String editTaskGet(
     @ModelAttribute("userSession") UserSessionBean userSession,
     Locale locale, Model model
   ) {
+    log.info("------------------------------------------------------");
     log.info("editTaskGet");
+    log.info("------------------------------------------------------");
     List<Context> contexts = super.getContexts();
     Context thisContext = thisTask.getContext();
     Project thisProject = taskLifecycleService.addProjectFromTaskToModel( thisTask, model );
     Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(thisTask.getTaskState(),locale,userSession);
     model.addAttribute("breadcrumb", breadcrumb);
-    model.addAttribute("thisProject", thisProject); //TODO: remove?
+    model.addAttribute("thisProject", thisProject);
     model.addAttribute("thisContext", thisContext);
     model.addAttribute("task", thisTask);
     model.addAttribute("contexts", contexts);
@@ -153,7 +168,9 @@ public final String editTaskPost(
     Locale locale,
     Model model
   ) {
+    log.info("------------------------------------------------------");
     log.info("editTaskPost");
+    log.info("------------------------------------------------------");
     model.addAttribute("taskstateType",PROJECTS.getSlug());
     model.addAttribute("dataPage", true);
     model.addAttribute("addProjectToTask", true);
@@ -168,7 +185,9 @@ public final String editTaskPost(
       result.addError(error);
     }
     if (result.hasErrors() ) {
+      log.info("------------------------------------------------------");
       log.warn("result.hasErrors");
+      log.info("------------------------------------------------------");
       for (ObjectError e : result.getAllErrors()) {
         log.warn(e.toString());
       }
@@ -231,7 +250,9 @@ public final String deleteTaskGet(
     @ModelAttribute("userSession") UserSessionBean userSession,
     Model model
   ) {
+    log.info("------------------------------------------------------");
     log.info("deleteTaskGet");
+    log.info("------------------------------------------------------");
     if(task!= null){
       task.delete();
       taskLifecycleService.updatedViaProjectRoot(task);
@@ -251,7 +272,9 @@ public final String undeleteTaskGet(
     @ModelAttribute("userSession") UserSessionBean userSession,
     Model model
   ) {
+      log.info("------------------------------------------------------");
     log.info("undeleteTaskGet");
+      log.info("------------------------------------------------------");
     task.undelete();
     taskLifecycleService.updatedViaProjectRoot(task);
     userSession.setLastProjectId(Project.rootProjectId);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskLifecycleController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskLifecycleController.java
index 8f4921e9..28d4a6a9 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskLifecycleController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskLifecycleController.java
@@ -42,7 +42,11 @@ public class TaskLifecycleController extends AbstractController {
     private final ContextService contextService;
 
     @Autowired
-    public TaskLifecycleController(TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService, ContextService contextService) {
+    public TaskLifecycleController(
+        TaskLifecycleService taskLifecycleService,
+        BreadcrumbService breadcrumbService,
+        ContextService contextService
+    ) {
       this.taskLifecycleService = taskLifecycleService;
       this.breadcrumbService = breadcrumbService;
       this.contextService = contextService;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskMoveController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskMoveController.java
index b80e6835..c32c83c8 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskMoveController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskMoveController.java
@@ -107,6 +107,19 @@ public final String moveTaskToWaiting(
     return task.getTaskState().getUrlPathRedirect();
   }
 
+    @RequestMapping(path = "/{taskId}/move/to/taskstate/scheduled", method = RequestMethod.GET)
+    public final String moveTaskToScheduled(
+        @NotNull @PathVariable("taskId") Task task,
+        @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
+        Model model
+    ) {
+        log.info("dragged and dropped "+task.getId()+" to scheduled");
+        task = taskMoveService.moveTaskToScheduled(task);
+        model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
+        return task.getTaskState().getUrlPathRedirect();
+    }
+
   @RequestMapping(path = "/{taskId}/move/to/taskstate/someday", method = RequestMethod.GET)
   public final String moveTaskToSomeday(
     @NotNull @PathVariable("taskId") Task task,
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/UserChatMessageController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserChatMessageController.java
index a3ee9c95..d0e4ad97 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/UserChatMessageController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserChatMessageController.java
@@ -41,7 +41,10 @@ public class UserChatMessageController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public UserChatMessageController(UserChatMessageControllerService userChatMessageControllerService, BreadcrumbService breadcrumbService) {
+  public UserChatMessageController(
+      UserChatMessageControllerService userChatMessageControllerService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.userChatMessageControllerService = userChatMessageControllerService;
     this.breadcrumbService = breadcrumbService;
   }
@@ -69,9 +72,8 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
     log.info(chatMessageForm.toString());
     log.info("-----------------------------------------------------------------------------------------------");
     log.info("Page<UserAccountChatMessage> user2UserMessagePage");
-    Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(
-      thisUser, otherUser, request
-    );
+    Page<UserAccountChatMessage> user2UserMessagePage =
+        userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
     for (UserAccountChatMessage o : user2UserMessagePage) {
       log.info(o.toString());
     }
@@ -112,7 +114,8 @@ public final String sendNewMessageToOtherUser(
       for (ObjectError objectError : result.getAllErrors()) {
         log.info("result.hasErrors: " + objectError.toString());
       }
-      Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
+      Page<UserAccountChatMessage> user2UserMessagePage =
+          userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
       model.addAttribute("otherUser", otherUser);
       model.addAttribute("user2UserMessagePage", user2UserMessagePage);
       model.addAttribute("userSession", userSession);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
index 9820e3d4..f58f1573 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
@@ -1,6 +1,7 @@
 package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -28,7 +29,10 @@ public class UserPasswordRecoveryController {
     private final UserAccountPasswordRecoveryService userAccountPasswordRecoveryService;
 
     @Autowired
-    public UserPasswordRecoveryController(UserAccountService userAccountService, UserAccountPasswordRecoveryService userAccountPasswordRecoveryService) {
+    public UserPasswordRecoveryController(
+        UserAccountService userAccountService,
+        UserAccountPasswordRecoveryService userAccountPasswordRecoveryService
+    ) {
         this.userAccountService = userAccountService;
         this.userAccountPasswordRecoveryService = userAccountPasswordRecoveryService;
     }
@@ -40,6 +44,7 @@ public UserPasswordRecoveryController(UserAccountService userAccountService, Use
      * @param model
      * @return a Formular for entering the email-adress.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path="/resetPassword", method = RequestMethod.GET)
     public final String passwordForgottenForm(Model model) {
         UserAccountRegistrationForm userAccountRegistrationForm = new UserAccountRegistrationForm();
@@ -55,6 +60,7 @@ public final String passwordForgottenForm(Model model) {
      * @param model
      * @return info page if without errors or formular again displaying error messages.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path="/resetPassword", method = RequestMethod.POST)
     public final String passwordForgottenPost(
         @Valid UserAccountRegistrationForm userAccountRegistrationForm,
@@ -93,12 +99,14 @@ public final String passwordForgottenPost(
      * @param model
      * @return a Formular for entering the new Password.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path = "/resetPassword/confirm/{confirmId}", method = RequestMethod.GET)
     public final String enterNewPasswordFormular(
         @PathVariable String confirmId,
         Model model
     ) {
-        UserAccountPasswordRecovery oUserAccountPasswordRecovery = userAccountPasswordRecoveryService.findByToken(confirmId);
+        UserAccountPasswordRecovery oUserAccountPasswordRecovery =
+            userAccountPasswordRecoveryService.findByToken(confirmId);
         if (oUserAccountPasswordRecovery != null) {
             userAccountPasswordRecoveryService.passwordRecoveryClickedInEmail(oUserAccountPasswordRecovery);
             UserAccount ua = userAccountService.findByUserEmail(oUserAccountPasswordRecovery.getEmail());
@@ -121,6 +129,7 @@ public final String enterNewPasswordFormular(
      * @param model
      * @return Info Page for success or back to formular with error messages.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path =  "/resetPassword/confirm/{confirmId}", method = RequestMethod.POST)
     public final String enterNewPasswordPost(
         @Valid UserAccountForm userAccountForm,
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
index 59fbbf14..0368e227 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -26,7 +27,10 @@ public class UserRegistrationController {
     private final UserAccountRegistrationService userAccountRegistrationService;
 
     @Autowired
-    public UserRegistrationController(UserAccountService userAccountService, UserAccountRegistrationService userAccountRegistrationService) {
+    public UserRegistrationController(
+        UserAccountService userAccountService,
+        UserAccountRegistrationService userAccountRegistrationService
+    ) {
         this.userAccountService = userAccountService;
         this.userAccountRegistrationService = userAccountRegistrationService;
     }
@@ -38,6 +42,7 @@ public UserRegistrationController(UserAccountService userAccountService, UserAcc
      * @param model Model
      * @return Formular for entering Email-Address for Registration
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path = "/", method = RequestMethod.GET)
     public final String registerGet(Model model) {
         log.info("registerGet");
@@ -54,6 +59,7 @@ public final String registerGet(Model model) {
      * @param model Model
      * @return info page at success or return to form with error messages.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path = "/", method = RequestMethod.POST)
     public final String registerPost(
             @Valid UserAccountRegistrationForm userAccountRegistrationForm,
@@ -66,7 +72,11 @@ public final String registerPost(
         } else {
             userAccountRegistrationService.registrationCheckIfResponseIsInTime(userAccountRegistrationForm.getEmail());
             if (userAccountService.isEmailAvailable(userAccountRegistrationForm.getEmail())) {
-                if (userAccountRegistrationService.registrationIsRetryAndMaximumNumberOfRetries(userAccountRegistrationForm.getEmail())) {
+                boolean registrationIsRetryAndMaximumNumberOfRetries =
+                    userAccountRegistrationService.registrationIsRetryAndMaximumNumberOfRetries(
+                        userAccountRegistrationForm.getEmail()
+                    );
+                if (registrationIsRetryAndMaximumNumberOfRetries) {
                     String objectName = "userAccountRegistrationForm";
                     String field = "email";
                     String defaultMessage = "Maximum Number of Retries reached.";
@@ -95,6 +105,7 @@ public final String registerPost(
      * @param model Model
      * @return Formular for Entering Account Task or Error Messages.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.GET)
     public final String registerConfirmGet(
         @PathVariable String confirmId,
@@ -123,6 +134,7 @@ public final String registerConfirmGet(
      * @param model Model
      * @return login page at success or page with error messages.
      */
+    @PreAuthorize("isAnonymous()")
     @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.POST)
     public final String registerConfirmPost(
         @PathVariable String confirmId,
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
index 0974365f..1561ee45 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
@@ -49,7 +49,12 @@ public class UserSelfserviceController extends AbstractController {
     private final ContextService contextService;
 
     @Autowired
-    public UserSelfserviceController(UserAuthorizationService userAuthorizationService, BreadcrumbService breadcrumbService, UserAccountService userAccountService, ContextService contextService) {
+    public UserSelfserviceController(
+        UserAuthorizationService userAuthorizationService,
+        BreadcrumbService breadcrumbService,
+        UserAccountService userAccountService,
+        ContextService contextService
+    ) {
         this.userAuthorizationService = userAuthorizationService;
         this.breadcrumbService = breadcrumbService;
         this.userAccountService = userAccountService;
@@ -183,7 +188,8 @@ public String userPasswordStore(
                 return "user/selfservice/password";
             }
             if(!userAuthorizationService.confirmUserByLoginAndPassword(
-                user.getUserEmail(), userChangePasswordForm.getOldUserPassword())
+                user.getUserEmail(),
+                userChangePasswordForm.getOldUserPassword())
             ){
                 log.info("old Password is wrong");
                 String objectName = "userChangePasswordForm";
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java
index 5516db90..5a5685e3 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java
@@ -1,5 +1,6 @@
 package org.woehlke.java.simpleworklist.domain.db.data;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -14,10 +15,7 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 import static java.lang.Boolean.FALSE;
 
@@ -91,6 +89,22 @@ public class Project extends AuditModel implements Serializable, ComparableById<
     @Column(name = "collapsed", nullable = false)
     private Boolean collapsed = FALSE;
 
+    public static Project getRootProject(Context projectsContext) {
+        List<Project> children = new ArrayList<>();
+        Date now = new Date();
+        Project thisProject = new Project();
+        thisProject.setId(0L);
+        thisProject.setContext(projectsContext);
+        thisProject.setName("");
+        thisProject.setDescription("");
+        thisProject.setCollapsed(FALSE);
+        thisProject.setChildren(children);
+        thisProject.setUuid(UUID.randomUUID());
+        thisProject.setRowCreatedAt(now);
+        thisProject.setRowUpdatedAt(now);
+        return thisProject;
+    }
+
     @Transient
     public String getUrlRoot() {
       return "redirect:/project/root";
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java
index 9dca6f07..d443324d 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java
@@ -305,33 +305,24 @@ private void pushProject(Project newProject){
         this.project = newProject;
     }
 
-    //TODO: delete Due Date
     public void moveToInbox(){
         pushTaskstate(TaskState.INBOX);
     }
 
-    //TODO: Due Date = Date of Today
-    public void moveToToday(){
-        pushTaskstate(TaskState.TODAY);
-        this.dueDate = new Date();
-    }
+    public void moveToToday(){ pushTaskstate(TaskState.TODAY); }
 
-    //TODO: delete Due Date
     public void moveToNext(){
         pushTaskstate(TaskState.NEXT);
     }
 
-    //TODO: delete Due Date
     public void moveToWaiting(){
         pushTaskstate(TaskState.WAITING);
     }
 
-    //TODO: Due Date = Date of Tomorrow
     public void moveToScheduled(){
         pushTaskstate(TaskState.SCHEDULED);
     }
 
-    //TODO: delete Due Date
     public void moveToSomeday(){
         pushTaskstate(TaskState.SOMEDAY);
     }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/user/accountpassword/UserAccountPasswordServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/user/accountpassword/UserAccountPasswordServiceImpl.java
index 76785de4..e3738403 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/user/accountpassword/UserAccountPasswordServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/user/accountpassword/UserAccountPasswordServiceImpl.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -22,20 +23,26 @@ public class UserAccountPasswordServiceImpl implements UserAccountPasswordServic
 
     private final UserAccountRepository userAccountRepository;
     private final PasswordEncoder encoder;
-    private final AuthenticationManager authenticationManager;
+    //private final AuthenticationManager authenticationManager;
+    private final AuthenticationProvider authenticationProvider;
 
     @Autowired
-    public UserAccountPasswordServiceImpl(UserAccountRepository userAccountRepository, AuthenticationManager authenticationManager) {
+    public UserAccountPasswordServiceImpl(
+        UserAccountRepository userAccountRepository,
+        //AuthenticationManager authenticationManager,
+        AuthenticationProvider authenticationProvider
+    ) {
         this.userAccountRepository = userAccountRepository;
+        this.authenticationProvider = authenticationProvider;
         int strength = 10;
         this.encoder = new BCryptPasswordEncoder(strength);
-        this.authenticationManager = authenticationManager;
+        //this.authenticationManager = authenticationManager;
     }
 
     @Override
     public UserDetails updatePassword(UserDetails user, String newPassword) {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user.getUsername(), user.getPassword());
-        Authentication authenticationResult = authenticationManager.authenticate(token);
+        Authentication authenticationResult = authenticationProvider.authenticate(token);
         if (authenticationResult.isAuthenticated()) {
             UserAccount ua = userAccountRepository.findByUserEmail(user.getUsername());
             String pwEncoded = encoder.encode(newPassword);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerService.java
new file mode 100644
index 00000000..c160d241
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerService.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.meso.context;
+
+public interface ContextControllerService {
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerServiceImpl.java
new file mode 100644
index 00000000..f10fd82d
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/context/ContextControllerServiceImpl.java
@@ -0,0 +1,9 @@
+package org.woehlke.java.simpleworklist.domain.meso.context;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ContextControllerServiceImpl implements ContextControllerService {
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerService.java
index 83c1eb16..3db6da31 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerService.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerService.java
@@ -68,4 +68,7 @@ Project getProject(
 
     Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
     Project moveProjectToAnotherContext(Project thisProject, Context newContext);
+
+    List<Project> findAllProjectsByContext(Context context);
+    List<Project> findRootProjectsByContext(Context context);
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java
index 1adfcf7d..c1986d79 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java
@@ -276,4 +276,14 @@ public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNul
     }
     return thisProject;
   }
+
+      @Override
+      public  List<Project> findAllProjectsByContext(Context context){
+        return projectService.findAllProjectsByContext(context);
+      }
+
+    @Override
+    public  List<Project> findRootProjectsByContext(Context context){
+        return projectService.findRootProjectsByContext(context);
+    }
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerService.java
new file mode 100644
index 00000000..143dd4e0
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerService.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.meso.task;
+
+public interface TaskControllerService {
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerServiceImpl.java
new file mode 100644
index 00000000..277e3622
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskControllerServiceImpl.java
@@ -0,0 +1,9 @@
+package org.woehlke.java.simpleworklist.domain.meso.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class TaskControllerServiceImpl implements TaskControllerService {
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java
index be49b718..5cedc627 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java
@@ -174,20 +174,18 @@ public Task updatedViaProject(Task task) {
     return task;
   }
 
-
     public Project addProjectFromTaskToModel(Task task, Model model){
+        log.info("addProjectFromTaskToModel");
       Project thisProject;
       if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
-        thisProject = new Project();
-        thisProject.setId(0L);
+        thisProject = Project.getRootProject(task.getContext());
       } else {
         thisProject = task.getProject();
       }
       model.addAttribute("thisProject", thisProject);
       Project lastProject;
       if (task.getLastProject() == null || task.getLastProject().getId() == null || task.getLastProject().getId() == 0L) {
-        lastProject = new Project();
-        lastProject.setId(0L);
+        lastProject = Project.getRootProject(task.getContext());
       } else {
         lastProject = task.getLastProject();
       }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveService.java
index ec80f6fa..f1fd87e2 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveService.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveService.java
@@ -18,6 +18,8 @@ public interface TaskMoveService {
 
   Task moveTaskToWaiting(Task task);
 
+  Task moveTaskToScheduled(Task task);
+
   Task moveTaskToSomeday(Task task);
 
   Task moveTaskToFocus(Task task);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java
index cb0b65b7..356cfce0 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java
@@ -90,6 +90,16 @@ public Task moveTaskToWaiting(Task task) {
     return task;
   }
 
+    @Override
+    public Task moveTaskToScheduled(Task task) {
+        long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SCHEDULED,task.getContext());
+        task.moveToScheduled();
+        task.setOrderIdTaskState(++newOrderIdTaskState);
+        task = taskService.saveAndFlush(task);
+        log.info("moved to scheduled: " + task.outTaskstate());
+        return task;
+    }
+
   @Override
   public Task moveTaskToSomeday(Task task) {
     long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SOMEDAY,task.getContext());
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/security/access/UserAuthorizationServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/security/access/UserAuthorizationServiceImpl.java
index 206a0205..23c7a31d 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/security/access/UserAuthorizationServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/security/access/UserAuthorizationServiceImpl.java
@@ -2,7 +2,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
+//import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -21,16 +22,18 @@
 public class UserAuthorizationServiceImpl implements UserAuthorizationService {
 
     private final UserAccountRepository userAccountRepository;
-    private final AuthenticationManager authenticationManager;
+    //private final AuthenticationManager authenticationManager;
+    private final AuthenticationProvider authenticationProvider;
     private final PasswordEncoder encoder;
 
     @Autowired
     public UserAuthorizationServiceImpl(
         UserAccountRepository userAccountRepository,
-        AuthenticationManager authenticationManager
-    ) {
+        //AuthenticationManager authenticationManager
+        AuthenticationProvider authenticationProvider) {
         this.userAccountRepository = userAccountRepository;
-        this.authenticationManager = authenticationManager;
+        this.authenticationProvider = authenticationProvider;
+        //this.authenticationManager = authenticationManager;
         int strength = 10;
         this.encoder = new BCryptPasswordEncoder(strength);
     }
@@ -46,7 +49,7 @@ public void changeUsersPassword(
             user.getUserEmail(),
             userAccountFormBean.getOldUserPassword()
         );
-        Authentication authenticationResult = authenticationManager.authenticate(token);
+        Authentication authenticationResult = authenticationProvider.authenticate(token);
         if(authenticationResult.isAuthenticated()){
             UserAccount ua = userAccountRepository.findByUserEmail(user.getUserEmail());
             String pwEncoded = this.encoder.encode(userAccountFormBean.getUserPassword());
@@ -64,7 +67,7 @@ public boolean confirmUserByLoginAndPassword(
             userEmail,
             oldUserPassword
         );
-        Authentication authenticationResult = authenticationManager.authenticate(token);
+        Authentication authenticationResult = authenticationProvider.authenticate(token);
         String oldPwEncoded = this.encoder.encode(oldUserPassword);
         log.info(userEmail+", "+oldPwEncoded);
         return authenticationResult.isAuthenticated();
diff --git a/src/main/plantuml/Simpleworklist__Service_Classes_DB.puml b/src/main/plantuml/Simpleworklist__Service_Classes_DB.puml
deleted file mode 100644
index 73297288..00000000
--- a/src/main/plantuml/Simpleworklist__Service_Classes_DB.puml
+++ /dev/null
@@ -1,32 +0,0 @@
-@startuml
-'https://plantuml.com/class-diagram
-
-left to right direction
-'top to bottom direction
-
-scale 1200 width
-
-abstract class AbstractList
-abstract AbstractCollection
-interface List
-interface Collection
-
-List <|-- AbstractList
-Collection <|-- AbstractCollection
-
-Collection <|- List
-AbstractCollection <|- AbstractList
-AbstractList <|-- ArrayList
-
-class ArrayList {
-Object[] elementData
-size()
-}
-
-enum TimeUnit {
-DAYS
-HOURS
-MINUTES
-}
-
-@enduml
diff --git a/src/main/plantuml/Simpleworklist__Service_Classes_Meso.puml b/src/main/plantuml/Simpleworklist__Service_Classes_Meso.puml
deleted file mode 100644
index 73297288..00000000
--- a/src/main/plantuml/Simpleworklist__Service_Classes_Meso.puml
+++ /dev/null
@@ -1,32 +0,0 @@
-@startuml
-'https://plantuml.com/class-diagram
-
-left to right direction
-'top to bottom direction
-
-scale 1200 width
-
-abstract class AbstractList
-abstract AbstractCollection
-interface List
-interface Collection
-
-List <|-- AbstractList
-Collection <|-- AbstractCollection
-
-Collection <|- List
-AbstractCollection <|- AbstractList
-AbstractList <|-- ArrayList
-
-class ArrayList {
-Object[] elementData
-size()
-}
-
-enum TimeUnit {
-DAYS
-HOURS
-MINUTES
-}
-
-@enduml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__010__user.puml b/src/main/plantuml/Simpleworklist__Use_Cases__010__user.puml
deleted file mode 100644
index 3d7d9ed7..00000000
--- a/src/main/plantuml/Simpleworklist__Use_Cases__010__user.puml
+++ /dev/null
@@ -1,44 +0,0 @@
-@startuml
-
-title Functional_Requirements - Simpleworklist Use Case Diagram
-
-left to right direction
-'top to bottom direction
-
-'https://plantuml.com/use-case-diagram
-
-scale 1200 width
-
-package Functional_Requirements {
-
-  package 001__Start {
-    SystemUser - (F001_Server_Starts)
-    User - (F002_Home_Page_rendered)
-    (F002_Home_Page_rendered) --> (F003_Registration)
-    (F002_Home_Page_rendered) --> (F004_Password_Recovery)
-    (F002_Home_Page_rendered) --> (F005_Login)
-    (F005_Login) ---> (F006_Page_after_first_successful_Login)
-    (F006_Page_after_first_successful_Login) -> (F007_Navigation)
-    (F007_Navigation) -> (F008_Logout)
-
-    User <|- SystemUser
-  }
-
-  package 010__user {
-    package access {
-    }
-    package account {
-    }
-    package accountpassword {
-    }
-    package accountselfservice {
-    }
-    package login {
-    }
-    package passwordrecovery {
-    }
-    package signup {
-    }
-  }
-}
-@enduml
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2d06f86..deda881c 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}
@@ -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
@@ -112,6 +112,7 @@ org:
             - "/pages/information"
             - "/pages/information*"
             - "/pages/information/**"
+            - "/pages/**"
             - "/user/login*"
             - "/user/register*"
             - "/user/register/**"
@@ -151,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:
diff --git a/src/main/resources/db/liquibase-changelog.xml b/src/main/resources/db/liquibase-changelog.xml
new file mode 100644
index 00000000..3673b64f
--- /dev/null
+++ b/src/main/resources/db/liquibase-changelog.xml
@@ -0,0 +1,714 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    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">
+
+  <preConditions>
+    <dbms type="postgresql" />
+    <runningAs username="simpleworklist" />
+  </preConditions>
+
+    <changeSet author="thomaswoehlke" failOnError="false" dbms="postgresql"  id="1">
+        <createTable tableName="spring_session">
+            <column name="primary_id" type="CHAR(36)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="spring_session_pk"/>
+            </column>
+            <column name="session_id" type="CHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="creation_time" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="last_access_time" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="max_inactive_interval" type="INTEGER">
+                <constraints nullable="false"/>
+            </column>
+            <column name="expiry_time" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="principal_name" type="VARCHAR(100)"/>
+        </createTable>
+        <createTable tableName="user_account_chat_message">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="user_account_chat_message_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="message_text" type="TEXT">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueBoolean="false" name="read_by_receiver" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_account_id_receiver" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_account_id_sender" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="version" type="BIGINT"/>
+        </createTable>
+        <createTable tableName="data_context">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="data_context_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="name_de" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="name_en" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_account_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="data_project">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="data_project_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="description" type="TEXT"/>
+            <column name="name" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_context_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="parent_id" type="BIGINT"/>
+            <column name="collapsed" type="BOOLEAN"/>
+        </createTable>
+        <createTable tableName="data_task">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="data_task_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="due_date" type="date"/>
+            <column name="focus" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="last_task_state" type="VARCHAR(255)"/>
+            <column name="order_id_project" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="order_id_task_state" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="task_energy" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="task_state" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="task_time" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="description" type="TEXT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="title" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="version" type="BIGINT"/>
+            <column name="data_context_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_project_last_id" type="BIGINT"/>
+            <column name="data_project_id" type="BIGINT"/>
+        </createTable>
+        <createTable tableName="search_request">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="search_request_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="searchterm" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_context_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="search_result">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="search_result_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="search_request_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="user_account">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="user_account_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="account_non_expired" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="account_non_locked" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="account_credentials_non_expired" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="default_language" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="account_enabled" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="last_login_timestamp" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_email" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_fullname" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_password" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="default_data_context_id" type="BIGINT"/>
+        </createTable>
+        <createTable tableName="user_account_password">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="user_account_password_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_password" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="user_account_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="user_account_password_recovery">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="user_account_password_recovery_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="double_optin_status" type="INTEGER">
+                <constraints nullable="false"/>
+            </column>
+            <column name="email" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="number_of_retries" type="INTEGER">
+                <constraints nullable="false"/>
+            </column>
+            <column name="token" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="user_account_registration">
+            <column name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="user_account_registration_pkey"/>
+            </column>
+            <column name="row_created_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="row_updated_at" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="uuid" type="UUID">
+                <constraints nullable="false"/>
+            </column>
+            <column name="double_optin_status" type="INTEGER">
+                <constraints nullable="false"/>
+            </column>
+            <column name="email" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="number_of_retries" type="INTEGER">
+                <constraints nullable="false"/>
+            </column>
+            <column name="token" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createIndex indexName="spring_session_ix1" tableName="spring_session" unique="true">
+            <column name="session_id"/>
+        </createIndex>
+        <createIndex indexName="spring_session_ix2" tableName="spring_session">
+            <column name="expiry_time"/>
+        </createIndex>
+        <createIndex indexName="spring_session_ix3" tableName="spring_session">
+            <column name="principal_name"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_chat_message_uuid"
+                     tableName="user_account_chat_message">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_chat_message_row_created_at"
+                     tableName="user_account_chat_message">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="row_created_at, user_account_id_sender, user_account_id_receiver"
+                             constraintName="ux_user_account_chat_message"
+                             tableName="user_account_chat_message"/>
+        <createIndex indexName="ix_context_uuid" tableName="data_context">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_context_row_created_at" tableName="data_context">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="uuid, user_account_id, name_de, name_en"
+                             constraintName="ux_context"
+                             tableName="data_context"/>
+        <createIndex indexName="ix_project_uuid" tableName="data_project">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_project_row_created_at" tableName="data_project">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="uuid, parent_id, data_context_id" constraintName="ux_project"
+                             tableName="data_project"/>
+        <createIndex indexName="ix_task_uuid" tableName="data_task">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_task_row_created_at" tableName="data_task">
+            <column name="row_created_at"/>
+        </createIndex>
+        <createIndex indexName="ix_task_title" tableName="data_task">
+            <column name="title"/>
+        </createIndex>
+        <createIndex indexName="ix_task_order_id_task_state" tableName="data_task">
+            <column name="order_id_task_state"/>
+        </createIndex>
+        <createIndex indexName="ix_task_order_id_project" tableName="data_task">
+            <column name="order_id_project"/>
+            <column name="data_project_id"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="uuid, data_context_id" constraintName="ux_task"
+                             tableName="data_task"/>
+        <createIndex indexName="ix_search_request_uuid" tableName="search_request">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_search_request_row_created_at" tableName="search_request">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="data_context_id, searchterm" constraintName="ux_search_request"
+                             tableName="search_request"/>
+        <createIndex indexName="ix_search_result_uuid" tableName="search_result">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_search_result_row_created_at" tableName="search_result">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="search_request_id" constraintName="ux_search_result"
+                             tableName="search_result"/>
+        <createIndex indexName="ix_user_account_uuid" tableName="user_account">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_row_created_at" tableName="user_account">
+            <column name="row_created_at"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_user_fullname" tableName="user_account">
+            <column name="user_fullname"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_last_login_timestamp" tableName="user_account">
+            <column name="last_login_timestamp"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="user_email" constraintName="ux_user_account"
+                             tableName="user_account"/>
+        <createIndex indexName="ix_user_account_password_uuid" tableName="user_account_password">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_password_row_created_at"
+                     tableName="user_account_password">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="user_account_id" constraintName="uk_dt6bpdg55c49jhq9cfq7a34wy"
+                             tableName="user_account_password"/>
+        <addUniqueConstraint columnNames="user_account_id, user_password"
+                             constraintName="ux_user_account_password"
+                             tableName="user_account_password"/>
+        <createIndex indexName="ix_user_account_password_recovery_uuid"
+                     tableName="user_account_password_recovery">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_password_recovery_row_created_at"
+                     tableName="user_account_password_recovery">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="email" constraintName="ux_user_account_password_recovery"
+                             tableName="user_account_password_recovery"/>
+        <addUniqueConstraint columnNames="token" constraintName="ux_user_account_password_recovery_token"
+                             tableName="user_account_password_recovery"/>
+        <createIndex indexName="ix_user_account_registration_uuid"
+                     tableName="user_account_registration">
+            <column name="uuid"/>
+        </createIndex>
+        <createIndex indexName="ix_user_account_registration_row_created_at"
+                     tableName="user_account_registration">
+            <column name="row_created_at"/>
+        </createIndex>
+        <addUniqueConstraint columnNames="email" constraintName="ux_user_account_registration"
+                             tableName="user_account_registration"/>
+        <addUniqueConstraint columnNames="token" constraintName="ux_user_account_registration_token"
+                             tableName="user_account_registration"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="data_context_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="data_project_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="data_task_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="search_request_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="search_result_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="user_account_chat_message_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="user_account_password_recovery_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="user_account_password_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="user_account_registration_sequence"
+                        startValue="1000"/>
+        <createSequence cacheSize="1" cycle="false" dataType="bigint" incrementBy="50"
+                        maxValue="9223372036854775807"
+                        minValue="1"
+                        sequenceName="user_account_sequence"
+                        startValue="1000"/>
+        <createTable tableName="search_result2project">
+            <column name="searchresult_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="resultlistproject_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="search_result_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="result_list_project_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="search_result2task">
+            <column name="searchresult_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="resultlisttasks_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="search_result_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="result_list_tasks_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <createTable tableName="spring_session_attributes">
+            <column name="session_primary_id" type="CHAR(36)">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="spring_session_attributes_pk"/>
+            </column>
+            <column name="attribute_name" type="VARCHAR(200)">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="spring_session_attributes_pk"/>
+            </column>
+            <column name="attribute_bytes" type="BYTEA">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        <addForeignKeyConstraint baseColumnNames="resultlistproject_id" baseTableName="search_result2project"
+                                 constraintName="fk1pghk1r09kfk1grs3wmaecyqx"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_project"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="data_project_id" baseTableName="data_task"
+                                 constraintName="fk3dxuijxe9o09le469kmmdnkq9"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_project"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="result_list_tasks_id" baseTableName="search_result2task"
+                                 constraintName="fk5cgcskny2bppgkekjia66rub4"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_task"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="searchresult_id" baseTableName="search_result2task"
+                                 constraintName="fk6d685ytfudryde37x9gewxjwx"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="search_result"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="data_context_id" baseTableName="data_project"
+                                 constraintName="fk6dfcvpsflg918l9v04swtri3w"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_context"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="search_result_id" baseTableName="search_result2task"
+                                 constraintName="fk83y9emo5tubfac9w76n77w1vu"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="search_result"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="parent_id" baseTableName="data_project"
+                                 constraintName="fk98lve3qk4605kan4qxft3ojat"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_project"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="search_result_id" baseTableName="search_result2project"
+                                 constraintName="fkaabvdl90fsql7nngynj417ih5"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="search_result"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="data_project_last_id" baseTableName="data_task"
+                                 constraintName="fkfneo56ta5l0lpjww4epnrb0vl"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_project"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="data_context_id" baseTableName="data_task"
+                                 constraintName="fkg3btoonnt4017fwthj6yiv2p"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_context"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="default_data_context_id" baseTableName="user_account"
+                                 constraintName="fkh65bimya9q5awi1wnmma0oq41"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_context"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="data_context_id" baseTableName="search_request"
+                                 constraintName="fkhyb6nky19v45w27nnonalum9c"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_context"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="user_account_id" baseTableName="user_account_password"
+                                 constraintName="fkjsymfqw8etucl8xvvydji8bo3"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="user_account"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="user_account_id" baseTableName="data_context"
+                                 constraintName="fkl84w6kypo39p4f6tiwpr2kbud"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="user_account"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="searchresult_id" baseTableName="search_result2project"
+                                 constraintName="fknbee86tddpa4dh25sxavueee8"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="search_result"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="user_account_id_receiver"
+                                 baseTableName="user_account_chat_message"
+                                 constraintName="fknmmqt08yp80tmx6qb1f0glg94"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="user_account"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="user_account_id_sender"
+                                 baseTableName="user_account_chat_message"
+                                 constraintName="fkorqlcfplplpqnrugidiygu6yx"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="user_account"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="resultlisttasks_id" baseTableName="search_result2task"
+                                 constraintName="fkqw59556q70tnp39ukwugfjpkv"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_task"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="result_list_project_id" baseTableName="search_result2project"
+                                 constraintName="fkrcpsnabxixmxvk1nbbykin03f"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="data_project"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="search_request_id" baseTableName="search_result"
+                                 constraintName="fkt6g19cci1c2qmwqahpkhsmxqu"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="NO ACTION"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="id"
+                                 referencedTableName="search_request"
+                                 validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="session_primary_id" baseTableName="spring_session_attributes"
+                                 constraintName="spring_session_attributes_fk"
+                                 deferrable="false"
+                                 initiallyDeferred="false"
+                                 onDelete="CASCADE"
+                                 onUpdate="NO ACTION"
+                                 referencedColumnNames="primary_id"
+                                 referencedTableName="spring_session"
+                                 validate="true"/>
+    </changeSet>
+
+</databaseChangeLog>
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..c14480fb
--- /dev/null
+++ b/src/main/resources/db/liquibase-diff-changelog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    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">
+
+</databaseChangeLog>
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Controller_Classes.png b/src/main/resources/static/img/plantuml/Simpleworklist__Controller_Classes.png
new file mode 100644
index 00000000..9b93cab0
Binary files /dev/null and b/src/main/resources/static/img/plantuml/Simpleworklist__Controller_Classes.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png b/src/main/resources/static/img/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png
index a9f26854..b9613d7a 100644
Binary files a/src/main/resources/static/img/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png and b/src/main/resources/static/img/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB.png b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB.png
index 84f74cc7..37a0fc6a 100644
Binary files a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB.png and b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_data.png b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_data.png
new file mode 100644
index 00000000..a4a62441
Binary files /dev/null and b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_data.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_user.png b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_user.png
new file mode 100644
index 00000000..e0593711
Binary files /dev/null and b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_DB_user.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_Meso.png b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_Meso.png
index 84f74cc7..d6b5d6ca 100644
Binary files a/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_Meso.png and b/src/main/resources/static/img/plantuml/Simpleworklist__Service_Classes_Meso.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png b/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png
new file mode 100644
index 00000000..613095cc
Binary files /dev/null and b/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png differ
diff --git a/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__user.png b/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__user.png
deleted file mode 100644
index 5b19817d..00000000
Binary files a/src/main/resources/static/img/plantuml/Simpleworklist__Use_Cases__010__user.png and /dev/null differ
diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html
index 87185569..10835a40 100644
--- a/src/main/resources/templates/layout/page.html
+++ b/src/main/resources/templates/layout/page.html
@@ -13,29 +13,29 @@
 	<meta name="author" content="Thomas Woehlke">
 	<meta name="description" content="Your Todo-List for Getting Things Done.">
 	<title th:replace="${headtitle}">SimpleWorklist</title>
-	<link th:href="@{/webjars/bootstrap/5.2.0/css/bootstrap.min.css}" rel="stylesheet"/>
-	<link th:href="@{/webjars/font-awesome/6.1.2/css/all.min.css}" rel="stylesheet"/>
+	<link th:href="@{/webjars/bootstrap/5.2.2/css/bootstrap.min.css}" rel="stylesheet"/>
+	<link th:href="@{/webjars/font-awesome/6.2.0/css/all.min.css}" rel="stylesheet"/>
 	<link href="https://fonts.googleapis.com/css?family=Lato|Varela+Round" rel="stylesheet">
 	<link th:href="@{/css/main.css}" rel="stylesheet"/>
-  <link rel="apple-touch-icon" sizes="57x57" th:href="@{/img/favicon/apple-icon-57x57.png}">
-  <link rel="apple-touch-icon" sizes="60x60" th:href="@{/img/favicon/apple-icon-60x60.png}">
-  <link rel="apple-touch-icon" sizes="72x72" th:href="@{/img/favicon/apple-icon-72x72.png}">
-  <link rel="apple-touch-icon" sizes="76x76" th:href="@{/img/favicon/apple-icon-76x76.png}">
-  <link rel="apple-touch-icon" sizes="114x114" th:href="@{/img/favicon/apple-icon-114x114.png}">
-  <link rel="apple-touch-icon" sizes="120x120" th:href="@{/img/favicon/apple-icon-120x120.png}">
-  <link rel="apple-touch-icon" sizes="144x144" th:href="@{/img/favicon/apple-icon-144x144.png}">
-  <link rel="apple-touch-icon" sizes="152x152" th:href="@{/img/favicon/apple-icon-152x152.png}">
-  <link rel="apple-touch-icon" sizes="180x180" th:href="@{/img/favicon/apple-icon-180x180.png}">
-  <link rel="icon" type="image/png" sizes="192x192" th:href="@{/img/favicon/android-icon-192x192.png}">
-  <link rel="icon" type="image/png" sizes="32x32" th:href="@{/img/favicon/favicon-32x32.png}">
-  <link rel="icon" type="image/png" sizes="96x96" th:href="@{/img/favicon/favicon-96x96.png}">
-  <link rel="icon" type="image/png" sizes="16x16" th:href="@{/img/favicon/favicon-16x16.png}">
-  <link rel="manifest" th:href="@{/img/favicon/manifest.json}">
-  <meta name="msapplication-TileColor" content="#ffffff">
-  <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
-  <meta name="theme-color" content="#ffffff">
-  <!--/* Per-page placeholder for additional links */-->
-  <th:block th:replace="${links}" />
+    <link rel="apple-touch-icon" sizes="57x57" th:href="@{/img/favicon/apple-icon-57x57.png}">
+    <link rel="apple-touch-icon" sizes="60x60" th:href="@{/img/favicon/apple-icon-60x60.png}">
+    <link rel="apple-touch-icon" sizes="72x72" th:href="@{/img/favicon/apple-icon-72x72.png}">
+    <link rel="apple-touch-icon" sizes="76x76" th:href="@{/img/favicon/apple-icon-76x76.png}">
+    <link rel="apple-touch-icon" sizes="114x114" th:href="@{/img/favicon/apple-icon-114x114.png}">
+    <link rel="apple-touch-icon" sizes="120x120" th:href="@{/img/favicon/apple-icon-120x120.png}">
+    <link rel="apple-touch-icon" sizes="144x144" th:href="@{/img/favicon/apple-icon-144x144.png}">
+    <link rel="apple-touch-icon" sizes="152x152" th:href="@{/img/favicon/apple-icon-152x152.png}">
+    <link rel="apple-touch-icon" sizes="180x180" th:href="@{/img/favicon/apple-icon-180x180.png}">
+    <link rel="icon" type="image/png" sizes="192x192" th:href="@{/img/favicon/android-icon-192x192.png}">
+    <link rel="icon" type="image/png" sizes="32x32" th:href="@{/img/favicon/favicon-32x32.png}">
+    <link rel="icon" type="image/png" sizes="96x96" th:href="@{/img/favicon/favicon-96x96.png}">
+    <link rel="icon" type="image/png" sizes="16x16" th:href="@{/img/favicon/favicon-16x16.png}">
+    <link rel="manifest" th:href="@{/img/favicon/manifest.json}">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
+    <!--/* Per-page placeholder for additional links */-->
+<th:block th:replace="${links}" />
 </head>
 <body th:fragment="tw-page-body(twcontent,twtitle,scripts)">
 
@@ -70,18 +70,18 @@
 			</div>
 		</div>
 		<div class="container" sec:authorize="isAuthenticated()">
-      <div class="row" th:if="${dataPage != null}">
-				<div class="col-md-8">
-					<th:block th:replace="${twcontent}" />
-				</div>
-				<div class="col-md-4">
-					<div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})"></div>
-				</div>
-      </div>
-      <div class="row" th:if="${dataPage == null}">
-        <div class="col">
-          <th:block th:replace="${twcontent}" />
-        </div>
+            <div class="row" th:if="${dataPage != null}">
+                <div class="col-md-8">
+                    <th:block th:replace="${twcontent}" />
+                </div>
+                <div class="col-md-4">
+                    <div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})"></div>
+                </div>
+            </div>
+            <div class="row" th:if="${dataPage == null}">
+            <div class="col">
+                <th:block th:replace="${twcontent}" />
+            </div>
 		</div>
     </div>
 	</section>
@@ -92,8 +92,8 @@
 			<div class="container">
         <div class="col nav-link"><a th:href="@{/pages/information}" class="nav-link">© 2022 Thomas Wöhlke</a></div>
         <div class="col nav-link">
-          <a href="https://twitter.com/GustaveSchiller" class="nav-link text-center">
-            <i class="fa-brands fa-twitter"></i> GustaveSchiller
+          <a href="https://twitter.com/ThomasWoehlke" class="nav-link text-center">
+            <i class="fa-brands fa-twitter"></i> ThomasWoehlke
           </a>
         </div>
         <div class="col nav-link">
@@ -105,11 +105,11 @@
 		</nav>
 	</footer>
 
-	  <script th:src="@{/js/google-analytics.js}"></script>
+	<script th:src="@{/js/google-analytics.js}"></script>
     <script th:src="@{/webjars/jquery/3.6.0/jquery.js}"></script>
     <script th:src="@{/webjars/popper.js/2.9.3/umd/popper.min.js}"></script>
-    <script th:src="@{/webjars/bootstrap/5.2.0/js/bootstrap.bundle.min.js}"></script>
-    <script th:src="@{/webjars/font-awesome/6.1.2/js/all.js}"></script>
+    <script th:src="@{/webjars/bootstrap/5.2.2/js/bootstrap.bundle.min.js}"></script>
+    <script th:src="@{/webjars/font-awesome/6.2.0/js/all.js}"></script>
     <script th:src="@{/js/application.js}"></script>
     <script th:inline="javascript">
         ClassicEditor
@@ -159,7 +159,14 @@
 			window.location.replace(myUrl);
 		}
 
-		function drop2someday(ev) {
+        function drop2scheduled(ev) {
+            ev.preventDefault();
+            var taskId = ev.dataTransfer.getData("task").split("_")[1];
+            var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/taskstate/scheduled';
+            window.location.replace(myUrl);
+        }
+
+        function drop2someday(ev) {
 			ev.preventDefault();
 			var taskId = ev.dataTransfer.getData("task").split("_")[1];
 			var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/taskstate/someday';
diff --git a/src/main/resources/templates/layout/taskstates.html b/src/main/resources/templates/layout/taskstates.html
index e139323f..bb3a64f8 100644
--- a/src/main/resources/templates/layout/taskstates.html
+++ b/src/main/resources/templates/layout/taskstates.html
@@ -63,7 +63,7 @@
                       <span th:text="#{layout.page.waiting}">Waiting</span>
                     </a>
                 </li>
-                <li class="nav-item">
+                <li class="nav-item" ondrop="drop2scheduled(event)" ondragover="allowDropOfTask(event)">
                     <a id="taskstate_scheduled" class="nav-link active link-dark"
                        th:href="@{/taskstate/scheduled}"
                        th:if="${taskstateType == 'scheduled'}">
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html
index 892bc3f4..35b834a4 100644
--- a/src/main/resources/templates/project/root/task/add.html
+++ b/src/main/resources/templates/project/root/task/add.html
@@ -7,7 +7,7 @@
 <head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
 	<title th:text="'SimpleWorklist | ' + #{task.add.h1}">Title</title>
 </head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},,scripts=~{::script})">
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
 
 <div th:fragment="mytwtitle">
 	<!-- New Task Form -->
diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index 5fb87cf3..3396993b 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -7,7 +7,7 @@
 <head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=true)">
   <title th:text="'SimpleWorklist | ' + #{user.loginForm.h2}">Title</title>
 </head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent}, twtitle=~{::mytwtitle},scripts=~{})">
 
 <div th:fragment="mytwtitle">
   <div class="container-md">
@@ -50,28 +50,28 @@ <h2><small th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Don
             </div>
           </div>
           <div class="card-footer">
-            <div class="m-md-2 pe-md-3 m-2 pe-2">
-            <button id="loginButton" type="submit" class="btn btn-block btn-primary">
-              <i class="fas fa-sign-in-alt"></i>
-              <span th:utext="#{user.loginForm.loginButton}"></span>
-            </button>
-            </div>
+            <span class="row">
+                <span class="col-md-3 col-3 m-2 pe-2 align-middle text-left">
+                    <button id="loginButton" type="submit" class="btn btn-block btn-primary align-middle text-left">
+                      <i class="fas fa-sign-in-alt"></i>
+                      <span th:utext="#{user.loginForm.loginButton}"></span>
+                    </button>
+                </span>
+                <span class="col-md-4 col-4 m-2 pe-2 align-middle text-right align-self-center">
+                    <a id="registerButton" th:href="@{/user/register/}"
+                       class="btn btn-outline-secondary btn-sm align-middle text-right">
+                      <i class="fas fa-user"></i><span th:utext="#{user.loginForm.register}"></span>
+                    </a>
+                </span>
+                <span class="col-md-4 col-4 m-2 pe-2 align-middle text-right align-self-center">
+                    <a id="passwordResetButton" th:href="@{/user/resetPassword}"
+                       class="btn btn-outline-secondary btn-sm align-middle text-right align-self-center">
+                      <i class="fas fa-question-circle"></i><span th:utext="#{user.loginForm.passwordReset}"></span>
+                    </a>
+                </span>
+            </span>
           </div>
         </div>
-        <div class="row">
-           <span class="col-md-4 col-4 text-left">
-            <a id="registerButton" th:href="@{/user/register/}"
-               class="link-secondary text-left  ms-md-1 my-md-1   ms-1 my-1  ps-md-4 py-md-2  ps-4 py-2">
-              <i class="fas fa-user"></i><span th:utext="#{user.loginForm.register}"></span>
-            </a>
-          </span>
-          <span class="col-md-8 col-8 text-right">
-            <a id="passwordResetButton" th:href="@{/user/resetPassword}"
-               class="link-secondary text-right  me-md-1 my-md-1  me-1 my-1   pe-md-4 py-md-2  pe-4 py-2">
-              <i class="fas fa-question-circle"></i><span th:utext="#{user.loginForm.passwordReset}"></span>
-            </a>
-          </span>
-        </div>
       </form>
   </div>
   <div class="col-3"></div>
diff --git a/src/main/plantuml/Simpleworklist__Service_Classes_Controller.puml b/src/plantuml/Simpleworklist__Controller_Classes.puml
similarity index 98%
rename from src/main/plantuml/Simpleworklist__Service_Classes_Controller.puml
rename to src/plantuml/Simpleworklist__Controller_Classes.puml
index 4c9bce6b..1a3076d4 100644
--- a/src/main/plantuml/Simpleworklist__Service_Classes_Controller.puml
+++ b/src/plantuml/Simpleworklist__Controller_Classes.puml
@@ -8,6 +8,7 @@ scale 1200 width
 
 ErrorController    <|-- ApplicationErrorController
 AbstractController <|-- ContextController
+AbstractController <|-- PagesController
 AbstractController <|-- ProjectIdController
 AbstractController <|-- ProjectIdTaskController
 AbstractController <|-- ProjectIdTaskMoveController
@@ -19,7 +20,11 @@ AbstractController <|-- TaskLifecycleController
 AbstractController <|-- TaskMove2TaskController
 AbstractController <|-- TaskMoveController
 AbstractController <|-- TaskStateTabController
+Class <|-- TestDataController
 AbstractController <|-- UserChatMessageController
+Class <|-- UserLoginController
+Class <|-- UserPasswordRecoveryController
+Class <|-- UserRegistrationController
 AbstractController <|-- UserSelfserviceController
 
 
diff --git a/src/main/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml b/src/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml
similarity index 82%
rename from src/main/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml
rename to src/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml
index 0ac467fc..a8f27e67 100644
--- a/src/main/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml
+++ b/src/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.puml
@@ -11,6 +11,8 @@ scale 1200 width
 
 package persistent {
 
+package data {
+
   entity Context {
        - String nameDe
        - String nameEn
@@ -38,6 +40,49 @@ package persistent {
       delete()
   }
 
+enum TaskTime {
+    MIN5
+    MIN10
+    MIN15
+    MIN30
+    MIN45
+    HOUR1
+    HOUR2
+    HOUR3
+    HOUR4
+    HOUR6
+    HOUR8
+    MORE
+    NONE
+}
+
+enum TaskEnergy {
+    LOW
+    MEDIUM
+    HIGH
+    NONE
+}
+
+enum TaskState {
+    INBOX
+    TODAY
+    NEXT
+    WAITING
+    SCHEDULED
+    SOMEDAY
+    FOCUS
+    COMPLETED
+    TRASH
+    DELETED
+    ALL
+    PROJECTS
+}
+Task --> TaskTime
+Task --> TaskEnergy
+Task --> TaskState
+}
+package user {
+
   entity ChatMessage {
      - String messageText
      - Boolean readByReceiver
diff --git a/src/main/plantuml/Simpleworklist__Domain_Class_Modell_Transient.puml b/src/plantuml/Simpleworklist__Domain_Class_Modell_Transient.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Domain_Class_Modell_Transient.puml
rename to src/plantuml/Simpleworklist__Domain_Class_Modell_Transient.puml
diff --git a/src/plantuml/Simpleworklist__Service_Classes_DB.puml b/src/plantuml/Simpleworklist__Service_Classes_DB.puml
new file mode 100644
index 00000000..3ada7149
--- /dev/null
+++ b/src/plantuml/Simpleworklist__Service_Classes_DB.puml
@@ -0,0 +1,342 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+left to right direction
+'top to bottom direction
+
+scale 1200 width
+
+package data {
+
+    entity Context {
+       - String nameDe
+       - String nameEn
+       Context[] list()
+       Context search()
+       Context addNew()
+       Context edit()
+       void delete()
+    }
+
+    entity Project {
+      - String name
+      - String description
+      listVisitsOfPet()
+      addNew()
+    }
+
+    entity Task {
+      - String name
+      - String description
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+    }
+
+    enum TaskTime {
+        MIN5
+        MIN10
+        MIN15
+        MIN30
+        MIN45
+        HOUR1
+        HOUR2
+        HOUR3
+        HOUR4
+        HOUR6
+        HOUR8
+        MORE
+        NONE
+    }
+
+    enum TaskEnergy {
+        LOW
+        MEDIUM
+        HIGH
+        NONE
+    }
+
+    enum TaskState {
+        INBOX
+        TODAY
+        NEXT
+        WAITING
+        SCHEDULED
+        SOMEDAY
+        FOCUS
+        COMPLETED
+        TRASH
+        DELETED
+        ALL
+        PROJECTS
+    }
+
+    class TaskRepository {
+        Page<Task> findByContext(Context context, Pageable request)
+        List<Task> findByContext(Context context)
+        Page<Task> findByTaskStateInbox(Context context, Pageable request)
+        List<Task> findByTaskStateInbox(Context context)
+
+        Page<Task> findByTaskStateToday(Context context, Pageable request)
+        List<Task> findByTaskStateToday(Context context)
+        Page<Task> findByTaskStateNext(Context context, Pageable request)
+        List<Task> findByTaskStateNext(Context context)
+        Page<Task> findByTaskStateWaiting(Context context, Pageable request)
+        List<Task> findByTaskStateWaiting(Context context)
+        Page<Task> findByTaskStateScheduled(Context context, Pageable request)
+        List<Task> findByTaskStateScheduled(Context context)
+        Page<Task> findByTaskStateSomeday(Context context, Pageable request)
+        List<Task> findByTaskStateSomeday(Context context)
+        Page<Task> findByFocusIsTrueAndContext(Context context, Pageable request)
+        List<Task> findByFocusIsTrueAndContext(Context context)
+        Page<Task> findByTaskStateCompleted(Context context, Pageable request)
+        List<Task> findByTaskStateCompleted(Context context)
+        Page<Task> findByTaskStateTrash(Context context, Pageable request)
+        List<Task> findByTaskStateTrash(Context context)
+        Page<Task> findByTaskStateDeleted(Context context, Pageable request)
+        List<Task> findByTaskStateDeleted(Context context)
+        Page<Task> findByTaskStateProjects(Context context, Pageable request)
+        List<Task> findByTaskStateProjects(Context context)
+
+        List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context)
+        List<Task> findByProject(Project thisProject)
+        Page<Task> findByProject(Project thisProject, Pageable pageable)
+        Page<Task> findByProjectIsNullAndContext(Context context, Pageable request)
+
+        Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context)
+        Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context)
+        Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context)
+
+        List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState,long higherOrderIdTaskState,TaskState taskState,Context context)
+        List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject,long higherOrderIdProject,Project project)
+        List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject,long higherOrderIdProject,Context context)
+    }
+
+    class TaskService {
+        Task findById(long taskId)
+
+        List<Task> findByTaskStateInbox(Context context)
+        List<Task> findByTaskStateToday(Context context)
+        List<Task> findByTaskStateNext(Context context)
+        List<Task> findByTaskStateWaiting(Context context)
+        List<Task> findByTaskStateScheduled(Context context)
+        List<Task> findByTaskStateSomeday(Context context)
+        List<Task> findByFocus(Context context)
+        List<Task> findByTaskStateCompleted(Context context)
+        List<Task> findByTaskStateTrash(Context context)
+        List<Task> findByTaskStateDeleted(Context context)
+        List<Task> findByTaskStateProjects(Context context)
+        List<Task> findByProjectId(Project thisProject)
+
+        Page<Task> findByTaskStateInbox(Context context, Pageable request)
+        Page<Task> findByTaskStateToday(Context context, Pageable request)
+        Page<Task> findByTaskStateNext(Context context, Pageable request)
+        Page<Task> findByTaskStateWaiting(Context context, Pageable request)
+        Page<Task> findByTaskStateScheduled(Context context, Pageable request)
+        Page<Task> findByTaskStateSomeday(Context context, Pageable request)
+        Page<Task> findByFocus(Context context, Pageable request)
+        Page<Task> findByTaskStateCompleted(Context context, Pageable request)
+        Page<Task> findByTaskStateTrash(Context context, Pageable request)
+        Page<Task> findByTaskStateDeleted(Context context, Pageable request)
+        Page<Task> findByTaskStateProjects(Context context, Pageable request)
+        Page<Task> findByTaskStateAll(Context context, Pageable pageRequest)
+
+        Page<Task> findByProjectId(Project thisProject, Pageable request)
+        Page<Task> findByProjectRoot(Context context, Pageable request)
+
+        boolean projectHasNoTasks(Project project)
+
+        Task saveAndFlush(Task task)
+        void saveAll(List<Task> taskListChanged)
+        void deleteAll(List<Task> taskListDeleted)
+
+        List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context)
+
+        Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context)
+        Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context)
+        Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context)
+
+        List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context)
+        List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context)
+        List<Task> getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project)
+    }
+
+    class ProjectRepository {
+        List<Project> findByContext(Context context)
+        Page<Project> findByContext(Context context, Pageable pageRequest)
+        List<Project> findByParentIsNullAndContext(Context context)
+        Page<Project> findByParentIsNullAndContext(Context context, Pageable pageRequest)
+    }
+
+    class ProjectService {
+        Project add(Project project)
+        Project update(Project project)
+        void delete(Project project)
+
+        List<Task> findByProject(Project thisProject)
+        List<Project> findRootProjectsByContext(Context context)
+        Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest)
+        List<Project> findAllProjectsByContext(Context context)
+        Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest)
+
+        Project getReferenceById(long projectId)
+        Project findByProjectId(long projectId)
+        List<Project> getAllChildrenOfProject(Project thisProject)
+    }
+
+    class ContextRepository {
+        List<Context> findByUserAccount(UserAccount user)
+        Context findByIdAndUserAccount(long newContextId, UserAccount userAccount)
+    }
+
+    class ContextService {
+        List<Context> getAllForUser(UserAccount user)
+        Context findByIdAndUserAccount(long newContextId, UserAccount userAccount)
+        Context createNewContext(NewContextForm newContext, UserAccount user)
+        Context updateContext(Context context)
+        boolean delete(Context context)
+        boolean contextHasItems(Context context)
+        Optional<Context> getContextFor(UserSessionBean userSession)
+    }
+
+    ContextService o--> ContextRepository: contextRepository
+    ProjectService o-->  ProjectRepository: projectRepository
+    TaskService o--> TaskRepository: taskRepository
+
+    ContextRepository o--> Context
+    ProjectRepository o--> Project
+    TaskRepository o--> Task
+
+    Task --> TaskTime
+    Task --> TaskEnergy
+    Task --> TaskState
+}
+
+package user {
+
+
+  entity UserAccountChatMessage {
+     - String messageText
+     - Boolean readByReceiver
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccount {
+      - String userEmail
+      - String userPassword
+      - String userFullname
+      - Language defaultLanguage
+      - Date lastLoginTimestamp
+      - Boolean accountNonExpired
+      - Boolean accountNonLocked
+      - Boolean credentialsNonExpired
+      - Boolean enabled
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountPassword {
+      - String userPassword
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountPasswordRecovery {
+      - String email
+      - String token
+      - Integer numberOfRetries
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountRegistration {
+      - String email
+      - String token
+      - Integer numberOfRetries
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  class UserAccountRepository {
+        UserAccount findByUserEmailAndUserPassword(String userEmail, String userPassword)
+        UserAccount findByUserEmail(String userEmail)
+    }
+    class UserAccountService {
+        boolean isEmailAvailable(String email)
+        void createUser(UserAccountForm userAccount)
+        UserAccount saveAndFlush(UserAccount u)
+        UserAccount findByUserEmail(String userEmail)
+        Page<UserAccount> findAll(Pageable request)
+        void changeUsersPassword(UserAccountForm userAccount)
+        UserAccount findById(long userId)
+        Map<Long,Integer> getNewIncomingMessagesForEachOtherUser(UserAccount receiver)
+    }
+    UserAccountService o--> UserAccountRepository: userAccountRepository
+    UserAccountRepository --> UserAccount
+
+    class UserAccountPasswordService{
+    }
+    class UserAccountPasswordRepository{
+    }
+    UserAccountPasswordService o--> UserAccountPasswordRepository: userAccountPasswordRepository
+    UserAccountPasswordRepository --> UserAccountPassword
+
+    class ChatMessageService {
+      int getNumberOfNewIncomingMessagesForUser(UserAccount user)
+      Page<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount sender,UserAccount receiver, Pageable request )
+      void saveAll(List<UserAccountChatMessage> user2UserMessageList)
+      UserAccountChatMessage saveAndFlush(UserAccountChatMessage m)
+      List<UserAccountChatMessage> findByReceiverAndReadByReceiver(UserAccount receiver, boolean readByReceiver)
+    }
+    class ChatMessageRepository {
+        Page<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount thisUser,UserAccount otherUser, Pageable request )
+        List<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount thisUser,UserAccount otherUser)
+        List<UserAccountChatMessage> findByReceiverAndReadByReceiver(UserAccount receiver, boolean readByReceiver)
+        List<UserAccountChatMessage> findBySenderAndReceiverAndReadByReceiver(UserAccount sender, UserAccount receiver, boolean readByReceiver)
+    }
+    ChatMessageService o--> ChatMessageRepository: chatMessageRepository
+    ChatMessageRepository --> UserAccountChatMessage
+
+    class UserAccountPasswordRecoveryService {}
+    class UserAccountPasswordRecoveryRepository {}
+    UserAccountPasswordRecoveryService o--> UserAccountPasswordRecoveryRepository: userAccountPasswordRecovery
+    UserAccountPasswordRecoveryRepository --> UserAccountPasswordRecovery
+
+    class UserAccountRegistrationService {
+        UserAccountRegistration findByToken(String confirmId)
+        boolean registrationIsRetryAndMaximumNumberOfRetries(String email)
+        void registrationCheckIfResponseIsInTime(String email)
+        void registrationSendEmailTo(String email)
+        void registrationSentEmail(UserAccountRegistration o)
+        void registrationClickedInEmail(UserAccountRegistration o)
+        void registrationUserCreated(UserAccountRegistration o)
+    }
+    class UserAccountRegistrationRepository {
+        UserAccountRegistration findByToken(String token)
+        UserAccountRegistration findByEmail(String email)
+    }
+    UserAccountRegistrationService o--> UserAccountRegistrationRepository: userAccountRegistrationRepository
+    UserAccountRegistrationRepository --> UserAccountRegistration
+
+    class TokenGeneratorService {}
+}
+
+@enduml
diff --git a/src/plantuml/Simpleworklist__Service_Classes_DB_data.puml b/src/plantuml/Simpleworklist__Service_Classes_DB_data.puml
new file mode 100644
index 00000000..a1d2af55
--- /dev/null
+++ b/src/plantuml/Simpleworklist__Service_Classes_DB_data.puml
@@ -0,0 +1,217 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+left to right direction
+'top to bottom direction
+
+scale 1200 width
+
+package data {
+
+    entity Context {
+       - String nameDe
+       - String nameEn
+       Context[] list()
+       Context search()
+       Context addNew()
+       Context edit()
+       void delete()
+    }
+
+    entity Project {
+      - String name
+      - String description
+      listVisitsOfPet()
+      addNew()
+    }
+
+    entity Task {
+      - String name
+      - String description
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+    }
+
+    enum TaskTime {
+        MIN5
+        MIN10
+        MIN15
+        MIN30
+        MIN45
+        HOUR1
+        HOUR2
+        HOUR3
+        HOUR4
+        HOUR6
+        HOUR8
+        MORE
+        NONE
+    }
+
+    enum TaskEnergy {
+        LOW
+        MEDIUM
+        HIGH
+        NONE
+    }
+
+    enum TaskState {
+        INBOX
+        TODAY
+        NEXT
+        WAITING
+        SCHEDULED
+        SOMEDAY
+        FOCUS
+        COMPLETED
+        TRASH
+        DELETED
+        ALL
+        PROJECTS
+    }
+
+    class TaskRepository {
+        Page<Task> findByContext(Context context, Pageable request)
+        List<Task> findByContext(Context context)
+        Page<Task> findByTaskStateInbox(Context context, Pageable request)
+        List<Task> findByTaskStateInbox(Context context)
+
+        Page<Task> findByTaskStateToday(Context context, Pageable request)
+        List<Task> findByTaskStateToday(Context context)
+        Page<Task> findByTaskStateNext(Context context, Pageable request)
+        List<Task> findByTaskStateNext(Context context)
+        Page<Task> findByTaskStateWaiting(Context context, Pageable request)
+        List<Task> findByTaskStateWaiting(Context context)
+        Page<Task> findByTaskStateScheduled(Context context, Pageable request)
+        List<Task> findByTaskStateScheduled(Context context)
+        Page<Task> findByTaskStateSomeday(Context context, Pageable request)
+        List<Task> findByTaskStateSomeday(Context context)
+        Page<Task> findByFocusIsTrueAndContext(Context context, Pageable request)
+        List<Task> findByFocusIsTrueAndContext(Context context)
+        Page<Task> findByTaskStateCompleted(Context context, Pageable request)
+        List<Task> findByTaskStateCompleted(Context context)
+        Page<Task> findByTaskStateTrash(Context context, Pageable request)
+        List<Task> findByTaskStateTrash(Context context)
+        Page<Task> findByTaskStateDeleted(Context context, Pageable request)
+        List<Task> findByTaskStateDeleted(Context context)
+        Page<Task> findByTaskStateProjects(Context context, Pageable request)
+        List<Task> findByTaskStateProjects(Context context)
+
+        List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context)
+        List<Task> findByProject(Project thisProject)
+        Page<Task> findByProject(Project thisProject, Pageable pageable)
+        Page<Task> findByProjectIsNullAndContext(Context context, Pageable request)
+
+        Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context)
+        Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context)
+        Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context)
+
+        List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState,long higherOrderIdTaskState,TaskState taskState,Context context)
+        List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject,long higherOrderIdProject,Project project)
+        List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject,long higherOrderIdProject,Context context)
+    }
+
+    class TaskService {
+        Task findById(long taskId)
+
+        List<Task> findByTaskStateInbox(Context context)
+        List<Task> findByTaskStateToday(Context context)
+        List<Task> findByTaskStateNext(Context context)
+        List<Task> findByTaskStateWaiting(Context context)
+        List<Task> findByTaskStateScheduled(Context context)
+        List<Task> findByTaskStateSomeday(Context context)
+        List<Task> findByFocus(Context context)
+        List<Task> findByTaskStateCompleted(Context context)
+        List<Task> findByTaskStateTrash(Context context)
+        List<Task> findByTaskStateDeleted(Context context)
+        List<Task> findByTaskStateProjects(Context context)
+        List<Task> findByProjectId(Project thisProject)
+
+        Page<Task> findByTaskStateInbox(Context context, Pageable request)
+        Page<Task> findByTaskStateToday(Context context, Pageable request)
+        Page<Task> findByTaskStateNext(Context context, Pageable request)
+        Page<Task> findByTaskStateWaiting(Context context, Pageable request)
+        Page<Task> findByTaskStateScheduled(Context context, Pageable request)
+        Page<Task> findByTaskStateSomeday(Context context, Pageable request)
+        Page<Task> findByFocus(Context context, Pageable request)
+        Page<Task> findByTaskStateCompleted(Context context, Pageable request)
+        Page<Task> findByTaskStateTrash(Context context, Pageable request)
+        Page<Task> findByTaskStateDeleted(Context context, Pageable request)
+        Page<Task> findByTaskStateProjects(Context context, Pageable request)
+        Page<Task> findByTaskStateAll(Context context, Pageable pageRequest)
+
+        Page<Task> findByProjectId(Project thisProject, Pageable request)
+        Page<Task> findByProjectRoot(Context context, Pageable request)
+
+        boolean projectHasNoTasks(Project project)
+
+        Task saveAndFlush(Task task)
+        void saveAll(List<Task> taskListChanged)
+        void deleteAll(List<Task> taskListDeleted)
+
+        List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context)
+
+        Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context)
+        Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context)
+        Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context)
+
+        List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context)
+        List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context)
+        List<Task> getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project)
+    }
+
+    class ProjectRepository {
+        List<Project> findByContext(Context context)
+        Page<Project> findByContext(Context context, Pageable pageRequest)
+        List<Project> findByParentIsNullAndContext(Context context)
+        Page<Project> findByParentIsNullAndContext(Context context, Pageable pageRequest)
+    }
+
+    class ProjectService {
+        Project add(Project project)
+        Project update(Project project)
+        void delete(Project project)
+
+        List<Task> findByProject(Project thisProject)
+        List<Project> findRootProjectsByContext(Context context)
+        Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest)
+        List<Project> findAllProjectsByContext(Context context)
+        Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest)
+
+        Project getReferenceById(long projectId)
+        Project findByProjectId(long projectId)
+        List<Project> getAllChildrenOfProject(Project thisProject)
+    }
+
+    class ContextRepository {
+        List<Context> findByUserAccount(UserAccount user)
+        Context findByIdAndUserAccount(long newContextId, UserAccount userAccount)
+    }
+
+    class ContextService {
+        List<Context> getAllForUser(UserAccount user)
+        Context findByIdAndUserAccount(long newContextId, UserAccount userAccount)
+        Context createNewContext(NewContextForm newContext, UserAccount user)
+        Context updateContext(Context context)
+        boolean delete(Context context)
+        boolean contextHasItems(Context context)
+        Optional<Context> getContextFor(UserSessionBean userSession)
+    }
+
+    ContextService o--> ContextRepository: contextRepository
+    ProjectService o-->  ProjectRepository: projectRepository
+    TaskService o--> TaskRepository: taskRepository
+
+    ContextRepository o--> Context
+    ProjectRepository o--> Project
+    TaskRepository o--> Task
+
+    Task --> TaskTime
+    Task --> TaskEnergy
+    Task --> TaskState
+}
+
+@enduml
diff --git a/src/plantuml/Simpleworklist__Service_Classes_DB_user.puml b/src/plantuml/Simpleworklist__Service_Classes_DB_user.puml
new file mode 100644
index 00000000..ff587039
--- /dev/null
+++ b/src/plantuml/Simpleworklist__Service_Classes_DB_user.puml
@@ -0,0 +1,133 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+left to right direction
+'top to bottom direction
+
+scale 1200 width
+
+package user {
+
+  entity UserAccountChatMessage {
+     - String messageText
+     - Boolean readByReceiver
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccount {
+      - String userEmail
+      - String userPassword
+      - String userFullname
+      - Language defaultLanguage
+      - Date lastLoginTimestamp
+      - Boolean accountNonExpired
+      - Boolean accountNonLocked
+      - Boolean credentialsNonExpired
+      - Boolean enabled
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountPassword {
+      - String userPassword
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountPasswordRecovery {
+      - String email
+      - String token
+      - Integer numberOfRetries
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  entity UserAccountRegistration {
+      - String email
+      - String token
+      - Integer numberOfRetries
+      list()
+      search()
+      addNew()
+      edit()
+      delete()
+  }
+
+  class UserAccountRepository {
+        UserAccount findByUserEmailAndUserPassword(String userEmail, String userPassword)
+        UserAccount findByUserEmail(String userEmail)
+    }
+    class UserAccountService {
+        boolean isEmailAvailable(String email)
+        void createUser(UserAccountForm userAccount)
+        UserAccount saveAndFlush(UserAccount u)
+        UserAccount findByUserEmail(String userEmail)
+        Page<UserAccount> findAll(Pageable request)
+        void changeUsersPassword(UserAccountForm userAccount)
+        UserAccount findById(long userId)
+        Map<Long,Integer> getNewIncomingMessagesForEachOtherUser(UserAccount receiver)
+    }
+    UserAccountService o--> UserAccountRepository: userAccountRepository
+    UserAccountRepository --> UserAccount
+
+    class UserAccountPasswordService{
+    }
+    class UserAccountPasswordRepository{
+    }
+    UserAccountPasswordService o--> UserAccountPasswordRepository: userAccountPasswordRepository
+    UserAccountPasswordRepository --> UserAccountPassword
+
+    class ChatMessageService {
+      int getNumberOfNewIncomingMessagesForUser(UserAccount user)
+      Page<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount sender,UserAccount receiver, Pageable request )
+      void saveAll(List<UserAccountChatMessage> user2UserMessageList)
+      UserAccountChatMessage saveAndFlush(UserAccountChatMessage m)
+      List<UserAccountChatMessage> findByReceiverAndReadByReceiver(UserAccount receiver, boolean readByReceiver)
+    }
+    class ChatMessageRepository {
+        Page<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount thisUser,UserAccount otherUser, Pageable request )
+        List<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(UserAccount thisUser,UserAccount otherUser)
+        List<UserAccountChatMessage> findByReceiverAndReadByReceiver(UserAccount receiver, boolean readByReceiver)
+        List<UserAccountChatMessage> findBySenderAndReceiverAndReadByReceiver(UserAccount sender, UserAccount receiver, boolean readByReceiver)
+    }
+    ChatMessageService o--> ChatMessageRepository: chatMessageRepository
+    ChatMessageRepository --> UserAccountChatMessage
+
+    class UserAccountPasswordRecoveryService {}
+    class UserAccountPasswordRecoveryRepository {}
+    UserAccountPasswordRecoveryService o--> UserAccountPasswordRecoveryRepository: userAccountPasswordRecovery
+    UserAccountPasswordRecoveryRepository --> UserAccountPasswordRecovery
+
+    class UserAccountRegistrationService {
+        UserAccountRegistration findByToken(String confirmId)
+        boolean registrationIsRetryAndMaximumNumberOfRetries(String email)
+        void registrationCheckIfResponseIsInTime(String email)
+        void registrationSendEmailTo(String email)
+        void registrationSentEmail(UserAccountRegistration o)
+        void registrationClickedInEmail(UserAccountRegistration o)
+        void registrationUserCreated(UserAccountRegistration o)
+    }
+    class UserAccountRegistrationRepository {
+        UserAccountRegistration findByToken(String token)
+        UserAccountRegistration findByEmail(String email)
+    }
+    UserAccountRegistrationService o--> UserAccountRegistrationRepository: userAccountRegistrationRepository
+    UserAccountRegistrationRepository --> UserAccountRegistration
+
+    class TokenGeneratorService {}
+}
+
+@enduml
diff --git a/src/plantuml/Simpleworklist__Service_Classes_Meso.puml b/src/plantuml/Simpleworklist__Service_Classes_Meso.puml
new file mode 100644
index 00000000..88e1f2c5
--- /dev/null
+++ b/src/plantuml/Simpleworklist__Service_Classes_Meso.puml
@@ -0,0 +1,207 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+left to right direction
+'top to bottom direction
+
+scale 1200 width
+
+package org.woehlke.java.simpleworklist.domain {
+
+    package mvc {
+        class ContextController {}
+        class PagesController {}
+        class ProjectIdController {}
+        class ProjectIdTaskMoveController {}
+        class ProjectRootController {}
+        class ProjectRootTaskController {}
+        class ProjectRootTaskMoveController {}
+        class SearchController {}
+        class TaskLifecycleController {}
+        class TaskMove2TaskController {}
+        class TaskMoveController {}
+        class TaskStateTabController {}
+        class TestDataController {}
+        class UserChatMessageController {}
+        class UserLoginController {}
+        class UserPasswordRecoveryController {}
+        class UserRegistrationController {}
+        class UserSelfserviceController {}
+    }
+
+    package db {
+        package data {
+            class ContextService {}
+            class ProjectService {}
+            class TaskService {}
+            class ProjectRepository {}
+            class TaskRepository {}
+        }
+        package seearch {
+            class SearchService {}
+        }
+        package user {
+            class UserAccountService {}
+            class UserAccountPasswordService {}
+            class ChatMessageService {}
+            class UserAccountPasswordRecoveryService {}
+            class UserAccountRegistrationService {}
+            class TokenGeneratorService {}
+        }
+    }
+    package security {
+        class UserAuthorizationService {}
+        class ApplicationUserDetailsService {}
+        class LoginSuccessService {}
+    }
+    package meso {
+        class ProjectControllerService {
+            void addNewProjectToProjectIdForm(long projectId, UserSessionBean userSession,Context context, Locale locale, Model model)
+            void addNewProjectToProjectRootForm(UserSessionBean userSession, Context context,Locale locale, Model model)
+            String addNewProjectToProjectIdPersist(long projectId,UserSessionBean userSession, Project project,Context context, BindingResult result, Locale locale, Model model)
+            String addNewProjectToProjectRootPersist(UserSessionBean userSession, Project project,Context context, BindingResult result,Locale locale, Model model)
+            Project getProject(long projectId,UserAccount userAccount,UserSessionBean userSession)
+            Project add(Project project)
+            Project update(Project project)
+            Project delete(Project project)
+            void moveTaskToTaskAndChangeTaskOrderInProjectId(Task sourceTask, Task destinationTask)
+            void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask)
+            Project findByProjectId(long projectId)
+            Page<Task> findByProject(Project thisProject, Pageable pageable)
+            List<Task> findByProject(Project thisProject)
+            Project moveProjectToAnotherProject(Project thisProject, Project targetProject)
+            Project moveProjectToAnotherContext(Project thisProject, Context newContext)
+        }
+        class BreadcrumbService {
+            Breadcrumb getBreadcrumbForShowProjectRoot(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForShoProjectId(Project thisProject, Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserChangePassword(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserContexts(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserContextAdd(Locale locale,UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserContextEdit(Locale locale, Context context, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserContextDelete(Locale locale, Context context, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForUserChangeLanguage(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForMessagesBetweenCurrentAndOtherUser(Locale locale, UserSessionBean userSession)
+            Breadcrumb getBreadcrumbForSearchResults(Locale locale, UserSessionBean userSession)
+        }
+        class UserChatMessageControllerService {
+          UserAccountChatMessage sendNewUserMessage(UserAccount thisUser, UserAccount otherUser,ChatMessageForm chatMessageForm)
+          Page<UserAccountChatMessage> readAllMessagesBetweenCurrentAndOtherUser(UserAccount receiver,UserAccount sender,Pageable request)
+        }
+        class TaskLifecycleService {
+          Task addToInbox(Task task)
+          Task addToProject(Task task)
+          Task addToRootProject(Task task)
+          Task updatedViaTaskstate(Task task)
+          Task updatedViaProject(Task task)
+          Task updatedViaProjectRoot(Task task)
+          long getMaxOrderIdTaskState(TaskState completed, Context context)
+          long getMaxOrderIdProject(Project project, Context context)
+          long getMaxOrderIdProjectRoot(Context context)
+          String transformTaskIntoProjectGet(Task task, UserSessionBean userSession, Model model)
+          Project addProjectFromTaskToModel(Task task, Model model)
+          Task addProject(Task task)
+        }
+        class TaskMove2TaskService {
+          void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask)
+          void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask)
+          void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask)
+          void moveTasksUpByProjectId(Task sourceTask, Task destinationTask)
+          void moveTasksDownByProjectId(Task sourceTask, Task destinationTask)
+          void moveTasksUpByTaskState(Task sourceTask, Task destinationTask)
+          void moveTasksDownByTaskState(Task sourceTask, Task destinationTask)
+        }
+        class TaskMoveService {
+          Task moveTaskToAnotherProject(Task task, Project project)
+          Task moveTaskToRootProject(Task task)
+          Task moveTaskToInbox(Task task)
+          Task moveTaskToToday(Task task)
+          Task moveTaskToNext(Task task)
+          Task moveTaskToWaiting(Task task)
+          Task moveTaskToSomeday(Task task)
+          Task moveTaskToFocus(Task task)
+          Task moveTaskToCompleted(Task task)
+          Task moveTaskToTrash(Task task)
+          void moveAllCompletedToTrash(Context context)
+          void emptyTrash(Context context)
+        }
+        class TaskStateTabControllerService {
+          String getTaskStatePageInbox(Context context,Pageable pageRequest, UserSessionBean userSession,Locale locale, Model model)
+          String getTaskStatePageToday(Context context,Pageable pageRequest,UserSessionBean userSession,Locale locale, Model model)
+          String getTaskStatePageNext(Context context,Pageable pageRequest,UserSessionBean userSession,Locale locale,Model model)
+          String getTaskStatePageWaiting(Context context, Pageable pageRequest,UserSessionBean userSession,Locale locale,Model model)
+          String getTaskStatePageScheduled(Context context,Pageable pageRequest,UserSessionBean userSession,Locale locale,Model model)
+          String getTaskStatePageFocus(Context context,Pageable pageRequest,UserSessionBean userSession,Locale locale, Model model)
+          String getTaskStatePageSomeday(Context context, Pageable pageRequest, UserSessionBean userSession, Locale locale,Model model )
+          String getTaskStatePageCompleted(Context context, Pageable pageRequest, UserSessionBean userSession, Locale locale, Model model)
+          String getTaskStatePageTrash(Context context,Pageable pageRequest,UserSessionBean userSession,Locale locale,Model model)
+          String getTaskStatePageDeleted(Context context, Pageable pageRequest, UserSessionBean userSession, Locale locale, Model model)
+          String getTaskStatePageProjects(Context context,Pageable pageRequest, UserSessionBean userSession, Locale locale,Model model)
+          String getTaskStatePageAll(Context context,Pageable pageable,UserSessionBean userSession,Locale locale, Model model)
+        }
+        class TestDataService {
+            void createTestData(UserAccount userAccount)
+        }
+        TestDataService o--> TaskRepository:  taskRepository
+        TestDataService o--> ProjectRepository: projectRepository
+        TaskStateTabControllerService o---> TaskService: taskService
+        TaskStateTabControllerService o--> BreadcrumbService: breadcrumbService
+        TaskMoveService o---> TaskService: taskService
+        TaskMoveService o--> TaskLifecycleService: taskLifecycleService
+        TaskMoveService o--> ProjectService: projectService
+        TaskMove2TaskService o--> TaskService: taskService
+        TaskLifecycleService o--> TaskService: taskService
+        TaskLifecycleService o--> ProjectService: projectService
+        UserChatMessageControllerService o--> ChatMessageService: chatMessageService
+        ProjectControllerService o---> ProjectService: projectService
+        ProjectControllerService o---> TaskService: taskService
+        ProjectControllerService o--> BreadcrumbService: breadcrumbService
+        ProjectControllerService o--> TaskMove2TaskService: taskMove2TaskService
+        BreadcrumbService  o--> TaskService: taskService
+    }
+
+    ContextController ---> ContextService: contextService
+    PagesController --> Class
+    ProjectIdController --> ProjectControllerService: projectControllerService
+    ProjectIdController --> TaskMoveService: taskMoveService
+    ProjectIdController ---> TaskService: taskService
+    ProjectIdController ---> ContextService: contextService
+    ProjectIdController ----> BreadcrumbService: breadcrumbService
+    ProjectIdTaskMoveController --> TaskMoveService: taskMoveService
+    ProjectIdTaskMoveController --> TaskLifecycleService: taskLifecycleService
+    ProjectRootController --> ProjectControllerService: projectControllerService
+    ProjectRootController ---> TaskService: taskService
+    ProjectRootController ----> BreadcrumbService: breadcrumbService
+    ProjectRootTaskController --> ProjectControllerService: projectControllerService
+    ProjectRootTaskController --> TaskLifecycleService: taskLifecycleService
+    ProjectRootTaskController ----> BreadcrumbService: breadcrumbServices
+    ProjectRootTaskMoveController --> TaskLifecycleService: taskLifecycleService
+    ProjectRootTaskMoveController --> TaskMoveService: taskMoveService
+    SearchController --> SearchService: searchService
+    SearchController ----> BreadcrumbService: breadcrumbService
+    TaskLifecycleController --> TaskLifecycleService: taskLifecycleService
+    TaskLifecycleController ----> BreadcrumbService: breadcrumbService
+    TaskLifecycleController ---> ContextService: contextService
+    TaskMove2TaskController -> TaskMove2TaskService: taskMove2TaskService
+    TaskMoveController --> TaskMoveService: taskMoveService
+    TaskStateTabController --> TaskStateTabControllerService: taskStateTabControllerService
+    TestDataController --> TestDataService: testDataService
+    TestDataController --> LoginSuccessService: loginSuccessService
+    UserChatMessageController --> UserChatMessageControllerService: userChatMessageControllerService
+    UserChatMessageController --> BreadcrumbService: breadcrumbService
+    UserLoginController --> LoginSuccessService: loginSuccessService
+    UserLoginController --> UserAuthorizationService: userAuthorizationService
+    UserPasswordRecoveryController -> UserAccountService: userAccountService
+    UserPasswordRecoveryController -> UserAccountPasswordRecoveryService: userAccountPasswordRecoveryService
+    UserRegistrationController -> UserAccountService: userAccountService
+    UserRegistrationController -> UserAccountRegistrationService: userAccountRegistrationService
+    UserSelfserviceController --> UserAuthorizationService: userAuthorizationService
+    UserSelfserviceController ----> BreadcrumbService: breadcrumbService
+    UserSelfserviceController --> UserAccountService: userAccountService
+    UserSelfserviceController ---> ContextService: contextService
+}
+
+@enduml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__001__Start.puml b/src/plantuml/Simpleworklist__Use_Cases__001__Start.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__001__Start.puml
rename to src/plantuml/Simpleworklist__Use_Cases__001__Start.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.puml b/src/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.puml
rename to src/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.puml b/src/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.puml
rename to src/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__004__Project_Root.puml b/src/plantuml/Simpleworklist__Use_Cases__004__Project_Root.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__004__Project_Root.puml
rename to src/plantuml/Simpleworklist__Use_Cases__004__Project_Root.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__005__Project_id.puml b/src/plantuml/Simpleworklist__Use_Cases__005__Project_id.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__005__Project_id.puml
rename to src/plantuml/Simpleworklist__Use_Cases__005__Project_id.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.puml b/src/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.puml
rename to src/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.puml b/src/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.puml
rename to src/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.puml b/src/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.puml
rename to src/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.puml
diff --git a/src/main/plantuml/Simpleworklist__Use_Cases__009__Search.puml b/src/plantuml/Simpleworklist__Use_Cases__009__Search.puml
similarity index 100%
rename from src/main/plantuml/Simpleworklist__Use_Cases__009__Search.puml
rename to src/plantuml/Simpleworklist__Use_Cases__009__Search.puml
diff --git a/src/plantuml/Simpleworklist__Use_Cases__010__User_Profile.puml b/src/plantuml/Simpleworklist__Use_Cases__010__User_Profile.puml
new file mode 100644
index 00000000..a0a903bf
--- /dev/null
+++ b/src/plantuml/Simpleworklist__Use_Cases__010__User_Profile.puml
@@ -0,0 +1,40 @@
+@startuml
+
+title Functional_Requirements - Simpleworklist Use Case Diagram
+
+left to right direction
+'top to bottom direction
+
+'https://plantuml.com/use-case-diagram
+
+scale 1200 width
+
+package Functional_Requirements {
+
+  package 001__Start {
+    SystemUser - (F001_Server_Starts)
+    User - (F002_Home_Page_rendered)
+    (F002_Home_Page_rendered) --> (F003_Registration)
+    (F002_Home_Page_rendered) --> (F004_Password_Recovery)
+    (F002_Home_Page_rendered) --> (F005_Login)
+    (F005_Login) ---> (F006_Page_after_first_successful_Login)
+    (F006_Page_after_first_successful_Login) -> (F007_Navigation)
+    (F007_Navigation) -> (F008_Logout)
+  }
+
+  package 010__User_Profile {
+    (F007_Navigation) - (F201 Nr of Chat Messages got from each Other Users)
+    (F201 Nr of Chat Messages got from each Other Users) --> (F202 Chat Messages shared with one other User)
+    (F201 Nr of Chat Messages got from each Other Users) --> (F203 Send New Chat Message to one other User)
+    (F007_Navigation) - (F202 Nr of Chat Messages got from all Other Users)
+    (F007_Navigation) - (F220 Menu Selfservice)
+    (F220 Menu Selfservice) --> (F221 Menu Selfservice: Change Username)
+    (F220 Menu Selfservice) --> (F222 Menu Selfservice: Change Password)
+    (F220 Menu Selfservice) --> (F223 Menu Selfservice: Change Contexts)
+    (F220 Menu Selfservice) --> (F224 Menu Selfservice: Set Default Language)
+    (F220 Menu Selfservice) --> (F225 Menu Selfservice: Create Test Data)
+  }
+
+  User <|- SystemUser
+}
+@enduml
diff --git a/src/main/plantuml/all/Simpleworklist__Use_Cases.puml b/src/plantuml/all/Simpleworklist__Use_Cases.puml
similarity index 100%
rename from src/main/plantuml/all/Simpleworklist__Use_Cases.puml
rename to src/plantuml/all/Simpleworklist__Use_Cases.puml
diff --git a/src/main/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.puml b/src/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.puml
similarity index 100%
rename from src/main/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.puml
rename to src/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.puml
diff --git a/src/main/plantuml/application/.gitkeep b/src/plantuml/application/.gitkeep
similarity index 100%
rename from src/main/plantuml/application/.gitkeep
rename to src/plantuml/application/.gitkeep
diff --git a/src/main/plantuml/config/.gitkeep b/src/plantuml/config/.gitkeep
similarity index 100%
rename from src/main/plantuml/config/.gitkeep
rename to src/plantuml/config/.gitkeep
diff --git a/src/main/plantuml/domain/breadcrumb/.gitkeep b/src/plantuml/domain/breadcrumb/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/breadcrumb/.gitkeep
rename to src/plantuml/domain/breadcrumb/.gitkeep
diff --git a/src/main/plantuml/domain/chat/.gitkeep b/src/plantuml/domain/chat/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/chat/.gitkeep
rename to src/plantuml/domain/chat/.gitkeep
diff --git a/src/main/plantuml/domain/context/.gitkeep b/src/plantuml/domain/context/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/context/.gitkeep
rename to src/plantuml/domain/context/.gitkeep
diff --git a/src/main/plantuml/domain/language/.gitkeep b/src/plantuml/domain/language/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/language/.gitkeep
rename to src/plantuml/domain/language/.gitkeep
diff --git a/src/main/plantuml/domain/project/.gitkeep b/src/plantuml/domain/project/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/project/.gitkeep
rename to src/plantuml/domain/project/.gitkeep
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.puml
diff --git a/src/main/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.puml b/src/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.puml
similarity index 100%
rename from src/main/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.puml
rename to src/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.puml
diff --git a/src/main/plantuml/domain/search/.gitkeep b/src/plantuml/domain/search/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/search/.gitkeep
rename to src/plantuml/domain/search/.gitkeep
diff --git a/src/main/plantuml/domain/session/.gitkeep b/src/plantuml/domain/session/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/session/.gitkeep
rename to src/plantuml/domain/session/.gitkeep
diff --git a/src/main/plantuml/domain/task/.gitkeep b/src/plantuml/domain/task/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/task/.gitkeep
rename to src/plantuml/domain/task/.gitkeep
diff --git a/src/main/plantuml/domain/taskworkflow/.gitkeep b/src/plantuml/domain/taskworkflow/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/taskworkflow/.gitkeep
rename to src/plantuml/domain/taskworkflow/.gitkeep
diff --git a/src/main/plantuml/domain/testdata/.gitkeep b/src/plantuml/domain/testdata/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/testdata/.gitkeep
rename to src/plantuml/domain/testdata/.gitkeep
diff --git a/src/main/plantuml/domain/user/.gitkeep b/src/plantuml/domain/user/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/.gitkeep
rename to src/plantuml/domain/user/.gitkeep
diff --git a/src/main/plantuml/domain/user/access/.gitkeep b/src/plantuml/domain/user/access/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/access/.gitkeep
rename to src/plantuml/domain/user/access/.gitkeep
diff --git a/src/main/plantuml/domain/user/account/.gitkeep b/src/plantuml/domain/user/account/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/account/.gitkeep
rename to src/plantuml/domain/user/account/.gitkeep
diff --git a/src/main/plantuml/domain/user/accountpassword/.gitkeep b/src/plantuml/domain/user/accountpassword/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/accountpassword/.gitkeep
rename to src/plantuml/domain/user/accountpassword/.gitkeep
diff --git a/src/main/plantuml/domain/user/accountselfservice/.gitkeep b/src/plantuml/domain/user/accountselfservice/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/accountselfservice/.gitkeep
rename to src/plantuml/domain/user/accountselfservice/.gitkeep
diff --git a/src/main/plantuml/domain/user/login/.gitkeep b/src/plantuml/domain/user/login/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/login/.gitkeep
rename to src/plantuml/domain/user/login/.gitkeep
diff --git a/src/main/plantuml/domain/user/passwordrecovery/.gitkeep b/src/plantuml/domain/user/passwordrecovery/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/passwordrecovery/.gitkeep
rename to src/plantuml/domain/user/passwordrecovery/.gitkeep
diff --git a/src/main/plantuml/domain/user/signup/.gitkeep b/src/plantuml/domain/user/signup/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/signup/.gitkeep
rename to src/plantuml/domain/user/signup/.gitkeep
diff --git a/src/main/plantuml/domain/user/token/.gitkeep b/src/plantuml/domain/user/token/.gitkeep
similarity index 100%
rename from src/main/plantuml/domain/user/token/.gitkeep
rename to src/plantuml/domain/user/token/.gitkeep
diff --git a/src/site/markdown/ABOUT.md b/src/site/markdown/ABOUT.md
deleted file mode 100644
index a60fed09..00000000
--- a/src/site/markdown/ABOUT.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# SimpleWorklist
-Your Todo-List for Getting Things Done
-
-## Getting Things Done
-GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. 
-SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
-
-## Software-Stack: 
-* [Spring-Boot](https://spring.io/projects/spring-boot/)
-* [Spring Data JPA](https://spring.io/projects/spring-data-jpa)
-* [Spring Session JDBC](https://spring.io/projects/spring-session-jdbc)
-* [Spring MVC](https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html)
-* [Spring Security](https://spring.io/projects/spring-security)
-* [Thymeleaf](https://github.com/thymeleaf/thymeleaf)
-* [Bootstrap](https://getbootstrap.com/docs/4.4/getting-started/introduction/)
-* [jQuery](http://jquery.com/) 
-* HTML5 for Drag and Drop
-
-## Development
-* [Code Repository on Github](https://github.com/Spring-Framework-Java-Apps/simpleworklist)
-* [Live Deployment on Heroku](https://simpleworklist.herokuapp.com/)
-
-## TODO: Requirements
-* See Files [Requirements.md](./REQUIREMENTS_FUNCTIONAL.md) and [Nonfunctional_Requirements.md](./Nonfunctional_Requirements.md)
-
-## Legacy Documentation: Requirements
-
-### Legacy Documentation: Use Cases
-
-#### User Selfservice
-![Figure Use Cases User](../resources/img/Use_Cases_User.jpg)
- 
-#### Tasks and Projects
-![Figure Use Cases Tasks and Projects](../resources/img/Use_Cases_Data.jpg)
-
-### Use Case: User Self Registration
-#### Figure Registration Request Activity
-![Figure Registration Request Activity](../resources/img/Registration_Request.jpg)
-#### Figure Registration Perform Activity
-![Figure Registration Perform Activity](../resources/img/Registration_Perform.jpg)
-#### Figure Registration Request Sequence
-![Figure Registration Request Details Sequence](../resources/img/Registration_Request_Details.jpg)
-#### Figure Registration Perform Sequence
-![Figure Registration Perform Details Sequence](../resources/img/Registration_Perform_Details.jpg)
-
-### Use Case: User Passwort Recovery
-#### Figure Password Recovery Request
-![Figure Password Recovery Request](../resources/img/Password_Recovery_Request.jpg)
-#### Figure Password Recovery Perform
-![Figure Password Recovery Perform](../resources/img/Password_Recovery_Perform.jpg)
-
-### Domain Model
-#### Entities
-![Figure Domain Model](../resources/img/Domain_Model.jpg)
-#### Domain Model Details
-![Figure Domain Model Details](../resources/img/Domain_Model_Details.jpg)
-#### Database Schema
-![Database Schema](../resources/img/db-schema.png)
-
diff --git a/src/site/markdown/CLOUD_DEPLOYMENT.md b/src/site/markdown/DEPLOYMENTS.md
similarity index 100%
rename from src/site/markdown/CLOUD_DEPLOYMENT.md
rename to src/site/markdown/DEPLOYMENTS.md
diff --git a/src/site/markdown/HOWTO.md b/src/site/markdown/HOWTO.md
index ee477248..b0938e6f 100644
--- a/src/site/markdown/HOWTO.md
+++ b/src/site/markdown/HOWTO.md
@@ -8,22 +8,14 @@
 
 ### Documentation
 * [spring-boot](https://spring.io/projects/spring-boot)
-* [spring-data-jpa](https://spring.io/projects/spring-data-jpa)
-* [spring-framework](https://spring.io/projects/spring-framework)
+* [spring-data-jpa](https://docs.spring.io/spring-data/jpa/docs/2.7.6/reference/html/)
+* [spring-framework](https://docs.spring.io/spring-framework/docs/5.3.23/reference/html/)
 * [spring-framework Data Access](https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/data-access.html)
 * [spring-framework WebMVC](https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html)
-* [spring-boot reference](https://docs.spring.io/spring-boot/docs/2.2.5.RELEASE/reference/html/)
-* [spring-boot appendix-application-properties](https://docs.spring.io/spring-boot/docs/2.2.5.RELEASE/reference/html/appendix-application-properties.html#common-application-properties)
-* [spring-boot api](https://docs.spring.io/spring-boot/docs/2.2.5.RELEASE/api/)
-* [spring-data-jpa](https://docs.spring.io/spring-data/jpa/docs/2.2.5.RELEASE/reference/html/#reference)
-
-### Gradle Plugins
-* [org.springframework.boot](https://plugins.gradle.org/plugin/org.springframework.boot)
-* [org.springframework.cloud.contract](https://plugins.gradle.org/plugin/org.springframework.cloud.contract)
-* [io.spring.dependency-management](https://plugins.gradle.org/plugin/io.spring.dependency-management)
-* [org.asciidoctor.jvm.convert](https://plugins.gradle.org/plugin/org.asciidoctor.jvm.convert)
-* [com.avast.gradle.docker-compose](https://plugins.gradle.org/plugin/com.avast.gradle.docker-compose)
-* [org.liquibase.gradle](https://plugins.gradle.org/plugin/org.liquibase.gradle)
+* [spring-boot reference](https://docs.spring.io/spring-boot/docs/2.7.5/reference/html/)
+* [spring-boot appendix-application-properties](https://docs.spring.io/spring-boot/docs/2.7.5/reference/html/application-properties.html#appendix.application-properties)
+* [spring-boot api](https://docs.spring.io/spring-boot/docs/2.7.5/api/)
+* [spring-data-jpa](https://docs.spring.io/spring-data/jpa/docs/2.7.5/reference/html/)
 
 ### Github Repos
 * [spring-cloud-contract](https://github.com/spring-cloud/spring-cloud-contract)
@@ -42,14 +34,13 @@
 ### UUID and Optimistic Locking
 * UUID: TODO
 
-### Database Schema Evolution with Spring Boot JPA
+### Database Schema Evolution with Spring Boot JPA - liquibase
 * TODO
 * org.flywaydb:flyway
-* org.liquibase:liquibase https://www.liquibase.org/documentation/maven/index.html
+* [org.liquibase:liquibase](https://www.liquibase.org/documentation/maven/index.html)
  
 
 ## Frontend with webjars
-
 ### updating webjar Versions:
-* change Version in build.gradle "ext" (Line 40)
+* change Version in pom.xml section properties (Line 82)
 * change Version in src/main/resources/templates/layout/page.html Section head.tw-head and div.tw-footer (Lines 16, 98) 
diff --git a/src/site/markdown/LICENSE.code.md b/src/site/markdown/LICENSE.code.md
new file mode 100644
index 00000000..715a6179
--- /dev/null
+++ b/src/site/markdown/LICENSE.code.md
@@ -0,0 +1,17 @@
+# Source Code Copyright:
+
+```text
+   Copyright (c) 2017 Thomas Woehlke All Rights Reserved
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
diff --git a/src/site/markdown/LICENSE.md b/src/site/markdown/LICENSE.md
new file mode 100644
index 00000000..8b9450c6
--- /dev/null
+++ b/src/site/markdown/LICENSE.md
@@ -0,0 +1,205 @@
+# License
+
+```text
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
diff --git a/src/site/markdown/LICENSE.writing.md b/src/site/markdown/LICENSE.writing.md
new file mode 100644
index 00000000..62b6f786
--- /dev/null
+++ b/src/site/markdown/LICENSE.writing.md
@@ -0,0 +1,2 @@
+# Content: Creative Commons License
+Except where otherwise noted, this work is licensed under http://creativecommons.org/licenses/by-nd/3.0/
diff --git a/src/site/markdown/MAVEN_PLUGINS.md b/src/site/markdown/MAVEN_PLUGINS.md
index 8cdc8e46..2c8e029c 100644
--- a/src/site/markdown/MAVEN_PLUGINS.md
+++ b/src/site/markdown/MAVEN_PLUGINS.md
@@ -1,34 +1,34 @@
 # Maven Plugins
 
-| Plugin Page | mvnrepository.com | git repo | latest Version | Release Date of latest Version |
-|-------------|-------------------|----------|----------------|--------------------------------|
-| [apache-rat-plugin](http://creadur.apache.org/rat/apache-rat-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-enforcer-plugin](http://maven.apache.org/enforcer/maven-enforcer-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-jxr-plugin](http://maven.apache.org/jxr/maven-jxr-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-clean-plugin](http://maven.apache.org/plugins/maven-clean-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-dependency-plugin](http://maven.apache.org/plugins/maven-dependency-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-deploy-plugin](http://maven.apache.org/plugins/maven-deploy-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-docck-plugin](http://maven.apache.org/plugins/maven-docck-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-install-plugin](http://maven.apache.org/plugins/maven-install-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-jarsigner-plugin](http://maven.apache.org/plugins/maven-jarsigner-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-project-info-reports-plugin](http://maven.apache.org/plugins/maven-project-info-reports-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-remote-resources-plugin](http://maven.apache.org/plugins/maven-remote-resources-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-shade-plugin](http://maven.apache.org/plugins/maven-shade-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-toolchains-plugin](http://maven.apache.org/plugins/maven-toolchains-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-scm-plugin](http://maven.apache.org/scm/maven-scm-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-failsafe-plugin](http://maven.apache.org/surefire/maven-failsafe-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-surefire-plugin](http://maven.apache.org/surefire/maven-surefire-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-surefire-report-plugin](http://maven.apache.org/surefire/maven-surefire-report-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-changes-plugin](https://maven.apache.org/plugins/maven-changes-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-checkstyle-plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-compiler-plugin](https://maven.apache.org/plugins/maven-compiler-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-invoker-plugin](https://maven.apache.org/plugins/maven-invoker-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-javadoc-plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-pmd-plugin](https://maven.apache.org/plugins/maven-pmd-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-resources-plugin](https://maven.apache.org/plugins/maven-resources-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-scm-publish-plugin](https://maven.apache.org/plugins/maven-scm-publish-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-site-plugin](https://maven.apache.org/plugins/maven-site-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-source-plugin](https://maven.apache.org/plugins/maven-source-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
-| [maven-plugin-plugin](https://maven.apache.org/plugin-tools/maven-plugin-plugin/) | &nbsp; |  &nbsp; |  &nbsp; |  &nbsp; | 
+| Plugin Page                                                                                             | mvnrepository.com | git repo | latest Version | Release Date of latest Version |
+|---------------------------------------------------------------------------------------------------------|-------------------|----------|----------------|--------------------------------|
+| [apache-rat-plugin](http://creadur.apache.org/rat/apache-rat-plugin/)                                   | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-enforcer-plugin](http://maven.apache.org/enforcer/maven-enforcer-plugin/)                        | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-jxr-plugin](http://maven.apache.org/jxr/maven-jxr-plugin/)                                       | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/)                     | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-clean-plugin](http://maven.apache.org/plugins/maven-clean-plugin/)                               | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-dependency-plugin](http://maven.apache.org/plugins/maven-dependency-plugin/)                     | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-deploy-plugin](http://maven.apache.org/plugins/maven-deploy-plugin/)                             | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-docck-plugin](http://maven.apache.org/plugins/maven-docck-plugin/)                               | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-install-plugin](http://maven.apache.org/plugins/maven-install-plugin/)                           | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-jarsigner-plugin](http://maven.apache.org/plugins/maven-jarsigner-plugin/)                       | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-project-info-reports-plugin](http://maven.apache.org/plugins/maven-project-info-reports-plugin/) | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-remote-resources-plugin](http://maven.apache.org/plugins/maven-remote-resources-plugin/)         | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-shade-plugin](http://maven.apache.org/plugins/maven-shade-plugin/)                               | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-toolchains-plugin](http://maven.apache.org/plugins/maven-toolchains-plugin/)                     | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-scm-plugin](http://maven.apache.org/scm/maven-scm-plugin/)                                       | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-failsafe-plugin](http://maven.apache.org/surefire/maven-failsafe-plugin/)                        | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-surefire-plugin](http://maven.apache.org/surefire/maven-surefire-plugin/)                        | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-surefire-report-plugin](http://maven.apache.org/surefire/maven-surefire-report-plugin/)          | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-changes-plugin](https://maven.apache.org/plugins/maven-changes-plugin/)                          | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-checkstyle-plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/)                    | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-compiler-plugin](https://maven.apache.org/plugins/maven-compiler-plugin/)                        | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-invoker-plugin](https://maven.apache.org/plugins/maven-invoker-plugin/)                          | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/)                                  | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-javadoc-plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/)                          | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-pmd-plugin](https://maven.apache.org/plugins/maven-pmd-plugin/)                                  | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-resources-plugin](https://maven.apache.org/plugins/maven-resources-plugin/)                      | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-scm-publish-plugin](https://maven.apache.org/plugins/maven-scm-publish-plugin/)                  | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-site-plugin](https://maven.apache.org/plugins/maven-site-plugin/)                                | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-source-plugin](https://maven.apache.org/plugins/maven-source-plugin/)                            | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
+| [maven-plugin-plugin](https://maven.apache.org/plugin-tools/maven-plugin-plugin/)                       | &nbsp;            | &nbsp;   | &nbsp;         | &nbsp;                         | 
diff --git a/src/site/markdown/TODO.md b/src/site/markdown/TODO.md
index 69b076d8..760f0c8e 100644
--- a/src/site/markdown/TODO.md
+++ b/src/site/markdown/TODO.md
@@ -48,4 +48,45 @@
 * Issue #234 Taskstate: Task Edit Form -> change Project via DropDown
 * Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
 * Issue #236 Project/id: Task Edit Form -> change Project via DropDown
+* wontfix #251, wontfix #224, wontfix #245, wontfix #246
 
+
+## 2.4.7
+* fixed #381 Transient_Class_Modell - Update UML Documentation after Refactorings due to Bugfixes
+* fixed #382 Controller_Classes - Update UML Documentation after Refactorings due to Bugfixes
+* fixed #383 F006 Page after first successful Login: change from inbox to today
+
+## 2.4.8
+* fixed #375 reenable integration tests
+
+## 2.4.9
+* fixed #390 refactor integration tests: One Test class for each Controller Class
+* fixed #391 refactor integration tests: One Test class for each Service Class in package meso
+
+## 2.4.10-SNAPSHOT
+*
+
+## 2.4.11-SNAPSHOT
+* fixed #380 add User Use Cases to UML Documentation
+* fixed #393 UML Documentation: Service Classes DB
+* fixed #394 UML Documentation: Service Classes Meso
+
+## 2.4.12-SNAPSHOT
+* fixed #388 make task.taskstate, task.duedate and taskstate workflow independent to each other
+*
+
+## 2.4.13-SNAPSHOT
+* #377 add List of URL (Patterns) to Documentation
+* #392 refactor integration tests: add Unit Tests for Beans and Entities
+*
+
+## 2.4.14-SNAPSHOT
+* #386 make Project Navigation collapsible
+* #389 apply Database Schema Evolution for: 386 make Project Navigation collapsible
+*
+
+## 2.4.15-SNAPSHOT
+* #378 Add Search Index and search functionality
+
+## 2.4.16-SNAPSHOT
+*
diff --git a/src/site/markdown/img/Domain_Model.jpg b/src/site/markdown/img/Domain_Model.jpg
new file mode 100644
index 00000000..de2c2629
Binary files /dev/null and b/src/site/markdown/img/Domain_Model.jpg differ
diff --git a/src/site/markdown/img/Domain_Model_Details.jpg b/src/site/markdown/img/Domain_Model_Details.jpg
new file mode 100644
index 00000000..f44e3ede
Binary files /dev/null and b/src/site/markdown/img/Domain_Model_Details.jpg differ
diff --git a/src/site/markdown/img/Password_Recovery_Perform.jpg b/src/site/markdown/img/Password_Recovery_Perform.jpg
new file mode 100644
index 00000000..270e0fd6
Binary files /dev/null and b/src/site/markdown/img/Password_Recovery_Perform.jpg differ
diff --git a/src/site/markdown/img/Password_Recovery_Request.jpg b/src/site/markdown/img/Password_Recovery_Request.jpg
new file mode 100644
index 00000000..0d7d5651
Binary files /dev/null and b/src/site/markdown/img/Password_Recovery_Request.jpg differ
diff --git a/src/site/markdown/img/Registration_Perform.jpg b/src/site/markdown/img/Registration_Perform.jpg
new file mode 100644
index 00000000..51f02441
Binary files /dev/null and b/src/site/markdown/img/Registration_Perform.jpg differ
diff --git a/src/site/markdown/img/Registration_Perform_Details.jpg b/src/site/markdown/img/Registration_Perform_Details.jpg
new file mode 100644
index 00000000..433a5818
Binary files /dev/null and b/src/site/markdown/img/Registration_Perform_Details.jpg differ
diff --git a/src/site/markdown/img/Registration_Request.jpg b/src/site/markdown/img/Registration_Request.jpg
new file mode 100644
index 00000000..fcbe41b3
Binary files /dev/null and b/src/site/markdown/img/Registration_Request.jpg differ
diff --git a/src/site/markdown/img/Registration_Request_Details.jpg b/src/site/markdown/img/Registration_Request_Details.jpg
new file mode 100644
index 00000000..06d9f554
Binary files /dev/null and b/src/site/markdown/img/Registration_Request_Details.jpg differ
diff --git a/src/site/markdown/img/Service_Model.jpg b/src/site/markdown/img/Service_Model.jpg
new file mode 100644
index 00000000..ae39824c
Binary files /dev/null and b/src/site/markdown/img/Service_Model.jpg differ
diff --git a/src/site/markdown/img/Service_Model_Details_ActionItems.jpg b/src/site/markdown/img/Service_Model_Details_ActionItems.jpg
new file mode 100644
index 00000000..38dc0a07
Binary files /dev/null and b/src/site/markdown/img/Service_Model_Details_ActionItems.jpg differ
diff --git a/src/site/markdown/img/Service_Model_Details_PasswordRecoveryController.jpg b/src/site/markdown/img/Service_Model_Details_PasswordRecoveryController.jpg
new file mode 100644
index 00000000..ae96358b
Binary files /dev/null and b/src/site/markdown/img/Service_Model_Details_PasswordRecoveryController.jpg differ
diff --git a/src/site/markdown/img/Service_Model_Details_RegistrationController.jpg b/src/site/markdown/img/Service_Model_Details_RegistrationController.jpg
new file mode 100644
index 00000000..5c610f61
Binary files /dev/null and b/src/site/markdown/img/Service_Model_Details_RegistrationController.jpg differ
diff --git a/src/site/markdown/img/Service_Model_Details_UserController.jpg b/src/site/markdown/img/Service_Model_Details_UserController.jpg
new file mode 100644
index 00000000..c447529e
Binary files /dev/null and b/src/site/markdown/img/Service_Model_Details_UserController.jpg differ
diff --git a/src/site/markdown/img/Use_Cases_Data.jpg b/src/site/markdown/img/Use_Cases_Data.jpg
new file mode 100644
index 00000000..f926718d
Binary files /dev/null and b/src/site/markdown/img/Use_Cases_Data.jpg differ
diff --git a/src/site/markdown/img/Use_Cases_User.jpg b/src/site/markdown/img/Use_Cases_User.jpg
new file mode 100644
index 00000000..47bb2b64
Binary files /dev/null and b/src/site/markdown/img/Use_Cases_User.jpg differ
diff --git a/src/site/markdown/img/db-schema.png b/src/site/markdown/img/db-schema.png
new file mode 100644
index 00000000..accc0efd
Binary files /dev/null and b/src/site/markdown/img/db-schema.png differ
diff --git a/src/site/markdown/img/maven-feather.png b/src/site/markdown/img/maven-feather.png
new file mode 100644
index 00000000..f509f824
Binary files /dev/null and b/src/site/markdown/img/maven-feather.png differ
diff --git a/src/site/markdown/img/phasenraum_logo.gif b/src/site/markdown/img/phasenraum_logo.gif
new file mode 100644
index 00000000..3615d230
Binary files /dev/null and b/src/site/markdown/img/phasenraum_logo.gif differ
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 00000000..e8306c8d
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,160 @@
+# simpleworklist
+
+[![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
+[![OSSAR](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/OSSAR/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
+[![Travis CI Build Status](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist.svg?branch=master)](https://app.travis-ci.com/github/Spring-Framework-Java-Apps/simpleworklist)
+[![Maven Project Reports](img/maven-feather.png)](https://java.woehlke.org/simpleworklist/)
+
+Your Todo List for Getting Things Done
+
+## Getting Things Done
+GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company.
+SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
+
+## Development
+* [CHANGELOG](CHANGELOG.md)
+* [TODO](TODO.md)
+
+## URLs:
+* Heroku Deployment: [simpleworklist.herokuapp.com/](https://simpleworklist.herokuapp.com/)
+* For Developers: [localhost:8080](http://localhost:8080/)
+
+## Nonfunctional Requirements
+* [Nonfunctional Requirements](src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md)
+
+## Functional Requirements
+
+### Functional Requirements 001 - Start
+![Functional Requirements 001 - Start](plantuml/Simpleworklist__Use_Cases__001__Start.png)
+#### F001 Server Starts
+#### F002 Home Page rendered
+#### F003 Registration
+#### F004 Password Recovery
+#### F005 Login
+#### F006 Page after first successful Login
+#### F007 Logout
+
+### Functional Requirements 002 - Show TaskstateTab
+![Functional Requirements 002 - Show TaskstateTab](plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png)
+#### F010 show /taskstate/inbox
+#### F011 show /taskstate/today
+#### F012 show /taskstate/next
+#### F013 show /taskstate/waiting
+#### F014 show /taskstate/scheduled
+#### F015 show /taskstate/someday
+#### F016 show /taskstate/focus
+#### F017 show /taskstate/completed
+#### F018 show /taskstate/trash
+
+### Functional Requirements 003 - TaskstateTab
+![Functional Requirements 003 - TaskstateTab](plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png)
+#### F040 Taskstate: Add Task to Inbox
+#### F041 Taskstate: Add Task to Inbox again
+#### F042 Taskstate: Task Edit
+#### F043 Taskstate: Task Edit Form -> change Taskstate via DropDown
+#### F044 Taskstate: Task Edit Form -> change Project via DropDown
+#### F045 Taskstate: Task Edit Form -> transform to Project
+#### F046 Taskstate: Task setFocus
+#### F047 Taskstate: Task unSetFocus
+#### F048 Taskstate: Task complete
+#### F049 Taskstate: Task incomplete
+#### F050 Taskstate: Task delete
+#### F051 Taskstate: Task undelete
+
+### Functional Requirements 004 - Project/Root
+![Functional Requirements 004 - Project/Root](plantuml/Simpleworklist__Use_Cases__004__Project_Root.png)
+#### F060 Project/Root: Add Task
+#### F061 Project/Root: Add SubProject
+#### F062 Project/Root: Task Edit
+#### F063 Project/Root: Task Edit Form -> change Taskstate via DropDown
+#### F064 Project/Root: Task Edit Form -> change Project via DropDown
+#### F065 Project/Root: Task Edit Form -> transform to Project
+#### F066 Project/Root: Task setFocus
+#### F067 Project/Root: Task unSetFocus
+#### F068 Project/Root: Task complete
+#### F069 Project/Root: Task incomplete
+#### F070 Project/Root: Task delete
+#### F071 Project/Root: Task undelete
+
+### Functional Requirements 005 - Project/id
+![Functional Requirements 005 - Project/id](plantuml/Simpleworklist__Use_Cases__005__Project_id.png)
+#### F080 Project/id: Add Task
+#### F081 Project/id: Add SubProject
+#### F082 Project/id: Task Edit
+#### F083 Project/id: Task Edit Form -> change Taskstate via DropDown
+#### F084 Project/id: Task Edit Form -> change Project via DropDown
+#### F085 Project/id: Task Edit Form -> transform to Project
+#### F086 Project/id: Task setFocus
+#### F087 Project/id: Task unSetFocus
+#### F088 Project/id: Task complete
+#### F089 Project/id: Task incomplete
+#### F090 Project/id: Task delete
+#### F091 Project/id: Task undelete
+
+### Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab
+![Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab](plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png)
+#### F120 Drag and Drop: Task move to /taskstate/inbox
+#### F121 Drag and Drop: Task move to /taskstate/today
+#### F122 Drag and Drop: Task move to /taskstate/next
+#### F123 Drag and Drop: Task move to /taskstate/waiting
+#### F124 Drag and Drop: Task move to /taskstate/scheduled
+#### F125 Drag and Drop: Task move to /taskstate/someday
+#### F126 Drag and Drop: Task move to /taskstate/focus
+#### F127 Drag and Drop: Task move to /taskstate/completed
+#### F128 Drag and Drop: Task move to /taskstate/trash
+
+### Functional Requirements 007 - Drag and Drop Move to Project
+![Functional Requirements 007 - Drag and Drop Move to Project](plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png)
+#### F129 Drag and Drop: Task move to Project
+#### F130 Drag and Drop: Project move to Project
+
+### Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order
+![Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order](plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png)
+#### F131 Drag and Drop: Move Task to Change Task-Order in TaskstateTab
+#### F132 Drag and Drop: Move Task to Change Task-Order in Project/Root
+#### F133 Drag and Drop: Move Task to Change Task-Order in Project/id
+
+### Functional Requirements 009 - Search
+![Functional Requirements 009 - Search](plantuml/Simpleworklist__Use_Cases__009__Search.png)
+#### F200 Search Request
+
+## Functional Requirements - User
+
+### Functional Requirements 001 - Start
+![Functional Requirements 001 - Start](plantuml/Simpleworklist__Use_Cases__001__Start.png)
+#### F003 Registration
+#### F004 Password Recovery
+#### F005 Login
+#### F007 Logout
+
+### Functional Requirements 010 - User Profile
+![Functional Requirements 010 - User Profile](plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
+#### F200 List of other Users and New Messages received from them
+#### F201 Chat Messages shared with one other User
+#### F202 Send New Chat Message to one other User
+#### F220 Menu Selfservice: Change Username
+#### F221 Menu Selfservice: Change Password
+#### F222 Menu Selfservice: Change Contexts
+#### F223 Menu Selfservice: Set Default Language
+#### F224 Menu Selfservice: Create Test Data
+
+### Functional Requirements 011 - On every Page behind Login
+![Functional Requirements 012 - User Profile](plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
+#### F250 Number of new incoming Messages from other Users
+
+
+### Domain Class Modell
+#### Domain Class Modell - Persistent
+![Domain_Class_Modell_Persistent](plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png)
+#### Domain Class Modell - Transient
+![Domain_Class_Modell_Persistent](plantuml/Simpleworklist__Domain_Class_Modell_Transient.png)
+
+## Software Design
+### Service Classes Controller
+![Service_Classes_Controller](plantuml/Simpleworklist__Service_Classes_Controller.png)
+### Service Classes DB data
+![Service_Classes_DB](plantuml/Simpleworklist__Service_Classes_DB_data.png)
+### Service Classes DB user
+![Service_Classes_DB](plantuml/Simpleworklist__Service_Classes_DB_user.png)
+### Service Classes Meso
+![Service_Classes_Meso](plantuml/Simpleworklist__Service_Classes_Meso.png)
diff --git a/src/site/markdown/plantuml/Simpleworklist__Controller_Classes.png b/src/site/markdown/plantuml/Simpleworklist__Controller_Classes.png
new file mode 100644
index 00000000..9b93cab0
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Controller_Classes.png differ
diff --git a/src/site/markdown/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png b/src/site/markdown/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png
new file mode 100644
index 00000000..b9613d7a
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png differ
diff --git a/src/site/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png b/src/site/markdown/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png
rename to src/site/markdown/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png
diff --git a/src/site/plantuml/Simpleworklist__Service_Classes_Controller.png b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_Controller.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Service_Classes_Controller.png
rename to src/site/markdown/plantuml/Simpleworklist__Service_Classes_Controller.png
diff --git a/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB.png b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB.png
new file mode 100644
index 00000000..37a0fc6a
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB.png differ
diff --git a/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_data.png b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_data.png
new file mode 100644
index 00000000..a4a62441
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_data.png differ
diff --git a/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_user.png b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_user.png
new file mode 100644
index 00000000..e0593711
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_DB_user.png differ
diff --git a/src/site/markdown/plantuml/Simpleworklist__Service_Classes_Meso.png b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_Meso.png
new file mode 100644
index 00000000..d6b5d6ca
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Service_Classes_Meso.png differ
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__001__Start.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__001__Start.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__001__Start.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__001__Start.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__005__Project_id.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__005__Project_id.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__005__Project_id.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__005__Project_id.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__009__Search.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__009__Search.png
similarity index 100%
rename from src/site/plantuml/Simpleworklist__Use_Cases__009__Search.png
rename to src/site/markdown/plantuml/Simpleworklist__Use_Cases__009__Search.png
diff --git a/src/site/markdown/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png
new file mode 100644
index 00000000..613095cc
Binary files /dev/null and b/src/site/markdown/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png differ
diff --git a/src/site/plantuml/all/Simpleworklist__Use_Cases.png b/src/site/markdown/plantuml/all/Simpleworklist__Use_Cases.png
similarity index 100%
rename from src/site/plantuml/all/Simpleworklist__Use_Cases.png
rename to src/site/markdown/plantuml/all/Simpleworklist__Use_Cases.png
diff --git a/src/site/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png b/src/site/markdown/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png
similarity index 100%
rename from src/site/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png
rename to src/site/markdown/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png
new file mode 100644
index 00000000..565da32d
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png
new file mode 100644
index 00000000..3d6299c7
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png
new file mode 100644
index 00000000..af3d928e
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png
new file mode 100644
index 00000000..4a90f3f4
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png
new file mode 100644
index 00000000..fce3f701
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png
new file mode 100644
index 00000000..384aff6e
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png
new file mode 100644
index 00000000..c67f7511
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png
new file mode 100644
index 00000000..2368c123
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png
new file mode 100644
index 00000000..d1678994
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png differ
diff --git a/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png
new file mode 100644
index 00000000..c1bf6ac5
Binary files /dev/null and b/src/site/markdown/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png differ
diff --git a/src/site/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png b/src/site/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png
deleted file mode 100644
index a9f26854..00000000
Binary files a/src/site/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png and /dev/null differ
diff --git a/src/site/plantuml/Simpleworklist__Service_Classes_DB.png b/src/site/plantuml/Simpleworklist__Service_Classes_DB.png
deleted file mode 100644
index 84f74cc7..00000000
Binary files a/src/site/plantuml/Simpleworklist__Service_Classes_DB.png and /dev/null differ
diff --git a/src/site/plantuml/Simpleworklist__Service_Classes_Meso.png b/src/site/plantuml/Simpleworklist__Service_Classes_Meso.png
deleted file mode 100644
index 84f74cc7..00000000
Binary files a/src/site/plantuml/Simpleworklist__Service_Classes_Meso.png and /dev/null differ
diff --git a/src/site/plantuml/Simpleworklist__Use_Cases__010__user.png b/src/site/plantuml/Simpleworklist__Use_Cases__010__user.png
deleted file mode 100644
index 5b19817d..00000000
Binary files a/src/site/plantuml/Simpleworklist__Use_Cases__010__user.png and /dev/null differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Controller_Classes.png b/src/site/resources/plantuml/Simpleworklist__Controller_Classes.png
new file mode 100644
index 00000000..9b93cab0
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Controller_Classes.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png b/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png
new file mode 100644
index 00000000..b9613d7a
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png b/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png
new file mode 100644
index 00000000..9c13615a
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Service_Classes_Controller.png b/src/site/resources/plantuml/Simpleworklist__Service_Classes_Controller.png
new file mode 100644
index 00000000..699598a8
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Service_Classes_Controller.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB.png b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB.png
new file mode 100644
index 00000000..37a0fc6a
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_data.png b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_data.png
new file mode 100644
index 00000000..a4a62441
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_data.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_user.png b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_user.png
new file mode 100644
index 00000000..e0593711
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_user.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Service_Classes_Meso.png b/src/site/resources/plantuml/Simpleworklist__Service_Classes_Meso.png
new file mode 100644
index 00000000..d6b5d6ca
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Service_Classes_Meso.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png
new file mode 100644
index 00000000..fb5b924c
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png
new file mode 100644
index 00000000..c2f049d5
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png
new file mode 100644
index 00000000..43d5cc7a
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png
new file mode 100644
index 00000000..1da40ae9
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__005__Project_id.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__005__Project_id.png
new file mode 100644
index 00000000..62f4ebfd
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__005__Project_id.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png
new file mode 100644
index 00000000..0becd882
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png
new file mode 100644
index 00000000..5eb24765
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png
new file mode 100644
index 00000000..e2cae3f6
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__009__Search.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__009__Search.png
new file mode 100644
index 00000000..a5f0a8a0
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__009__Search.png differ
diff --git a/src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png b/src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png
new file mode 100644
index 00000000..613095cc
Binary files /dev/null and b/src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png differ
diff --git a/src/site/resources/plantuml/all/Simpleworklist__Use_Cases.png b/src/site/resources/plantuml/all/Simpleworklist__Use_Cases.png
new file mode 100644
index 00000000..ad43a3b6
Binary files /dev/null and b/src/site/resources/plantuml/all/Simpleworklist__Use_Cases.png differ
diff --git a/src/site/resources/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png b/src/site/resources/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png
new file mode 100644
index 00000000..f26ed250
Binary files /dev/null and b/src/site/resources/plantuml/all/Simpleworklist__Use_Cases__006__Drag_and_Drop.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png
new file mode 100644
index 00000000..565da32d
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_0_ProjectIdTaskController_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png
new file mode 100644
index 00000000..3d6299c7
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_1_projectTaskAddGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png
new file mode 100644
index 00000000..af3d928e
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_2_projectTaskAddPost_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png
new file mode 100644
index 00000000..4a90f3f4
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_3_editTaskGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png
new file mode 100644
index 00000000..fce3f701
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_4_editTaskPost_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png
new file mode 100644
index 00000000..384aff6e
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_5_transformTaskIntoProjectGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png
new file mode 100644
index 00000000..c67f7511
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_6_setDoneTaskGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png
new file mode 100644
index 00000000..2368c123
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_7_unsetDoneTaskGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png
new file mode 100644
index 00000000..d1678994
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_8_setFocusGet_calls.png differ
diff --git a/src/site/resources/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png
new file mode 100644
index 00000000..c1bf6ac5
Binary files /dev/null and b/src/site/resources/plantuml/domain/project/ProjectIdTaskController_9_unsetFocusGet_calls.png differ
diff --git a/src/site/site.xml b/src/site/site.xml
index e42fee45..57a5e243 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -8,29 +8,30 @@
     <bannerLeft>
         <name>SimpleWorklist</name>
         <src>/img/phasenraum_logo.gif</src>
-        <href>https://woehlke.org/p/simpleworklist</href>
+        <href>https://java.woehlke.org/</href>
     </bannerLeft>
     <body>
         <breadcrumbs>
             <item name="Thomas Wöhlke (Github)" href="https://github.com/thomaswoehlke"/>
             <item name="Spring-Framework-Java-Apps (Github)" href="https://github.com/Spring-Framework-Java-Apps"/>
             <item name="Simpleworklist (Github)" href="https://github.com/Spring-Framework-Java-Apps/simpleworklist"/>
-            <item name="Simpleworklist" href="https://woehlke.org/p/simpleworklist"/>
+            <item name="Simpleworklist" href="index.html"/>
         </breadcrumbs>
         <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
+            <item name="Home" href="index.html"/>
             <item name="JavaDocs" href="apidocs/index.html"/>
             <item name="Source Xref" href="xref/index.html"/>
         </menu>
         <menu name="Requirements">
-            <item name="Requirements" href="Requirements.html" />
-            <item name="Requirements Nonfunctional" href="Requirements_Nonfunctional.html" />
+            <item name="Cloud Deployments" href="CLOUD_DEPLOYMENT.html" />
+            <item name="Nonfunctional Requirements" href="REQUIREMENTS_NONFUNCTIONAL.html" />
+            <item name="Changelog" href="CHANGELOG.html" />
         </menu>
         <menu name="Development">
-            <item name="Development" href="Development.html" />
-            <item name="Maven Plugins" href="Maven_Plugins.html" />
+            <item name="Development" href="DEVELOPMENT.html" />
+            <item name="Maven Plugins" href="MAVEN_PLUGINS.html" />
             <item name="HOWTO" href="HOWTO.html" />
-            <item name="Primesfaces JSF" href="Primesfaces_JSF.html" />
+            <item name="TODO" href="TODO.html" />
         </menu>
         <menu ref="reports"/>
     </body>
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