diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 6f1b2757..3906b5eb 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
+patreon: thomaswoehlke
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
index c9e3e9c8..145992ac 100644
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -8,11 +8,11 @@
 
 name: Codacy Security Scan
 
-on: 
+on:
   push:
-    branches: [ "master", "main" ]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
 
 jobs:
   codacy-security-scan:
@@ -22,7 +22,7 @@ jobs:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
         uses: actions/checkout@v2
-      
+
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
         uses: codacy/codacy-analysis-cli-action@1.0.0
@@ -36,7 +36,7 @@ jobs:
           # Force 0 exit code to allow SARIF file generation
           # This will handover control about PR rejection to the GitHub side
           max-allowed-issues: 2147483647
-      
+
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
         uses: github/codeql-action/upload-sarif@v1
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4f01cf2b..d5c52c5c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   schedule:
     - cron: '0 19 * * 2'
 
@@ -47,7 +47,7 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
diff --git a/.github/workflows/fortify-analysis.yml b/.github/workflows/fortify-analysis.yml
index 41738e05..323d0bd0 100644
--- a/.github/workflows/fortify-analysis.yml
+++ b/.github/workflows/fortify-analysis.yml
@@ -1,4 +1,4 @@
-################################################################################################################################################ 
+################################################################################################################################################
 # Fortify lets you build secure software fast with an appsec platform that automates testing throughout the DevSecOps pipeline. Fortify static,#
 # dynamic, interactive, and runtime security testing is available on premises or as a service. To learn more about Fortify, start a free trial #
 # or contact our sales team, visit microfocus.com/appsecurity.                                                                                 #
@@ -14,17 +14,17 @@
 name: Fortify on Demand Scan
 
 # TODO: Customize trigger events based on your DevSecOps processes and typical FoD SAST scan time
-on: 
+on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
-  
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+
 jobs:
   FoD-SAST-Scan:
-    # Use the appropriate runner for building your source code. 
+    # Use the appropriate runner for building your source code.
     # TODO: Use a Windows runner for .NET projects that use msbuild. Additional changes to RUN commands will be required to switch to Windows syntax.
     runs-on: ubuntu-latest
 
@@ -37,27 +37,27 @@ jobs:
           fetch-depth: 2
       # If this run was triggered by a pull request event, then checkout the head of the pull request instead of the merge commit.
       - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}      
+        if: ${{ github.event_name == 'pull_request' }}
       # Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool)
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 13
-      
+          java-version: 15
+
       # Prepare source+dependencies for upload. The default example is for a Maven project that uses pom.xml.
       # TODO: Update PACKAGE_OPTS based on the ScanCentral Client documentation for your project's included tech stack(s). Helpful hints:
       #   ScanCentral Client will download dependencies for maven (-bt mvn) and gradle (-bt gradle).
       #   ScanCentral Client can download dependencies for msbuild projects (-bt msbuild); however, you must convert the workflow to use a Windows runner.
       #   ScanCentral has additional options that should be set for PHP and Python projects
       #   For other build tools, add your build commands to download necessary dependencies and prepare according to Fortify on Demand Packaging documentation.
-      #   ScanCentral Client documentation is located at https://www.microfocus.com/documentation/fortify-software-security-center/ 
+      #   ScanCentral Client documentation is located at https://www.microfocus.com/documentation/fortify-software-security-center/
       - name: Download Fortify ScanCentral Client
         uses: fortify/gha-setup-scancentral-client@v1
       - name: Package Code + Dependencies
         run: scancentral package $PACKAGE_OPTS -o package.zip
         env:
           PACKAGE_OPTS: "-bt mvn"
-      
+
       # Start Fortify on Demand SAST scan and wait until results complete. For more information on FoDUploader commands, see https://github.com/fod-dev/fod-uploader-java
       # TODO: Update ENV variables for your application and create the necessary GitHub Secrets.  Helpful hints:
       #   Credentials and release ID should be obtained from your FoD tenant (either Personal Access Token or API Key can be used).
@@ -66,8 +66,8 @@ jobs:
         uses: fortify/gha-setup-fod-uploader@v1
       - name: Perform SAST Scan
         run: java -jar $FOD_UPLOAD_JAR -z package.zip -aurl $FOD_API_URL -purl $FOD_URL -rid "$FOD_RELEASE_ID" -tc "$FOD_TENANT" -uc "$FOD_USER" "$FOD_PAT" $FOD_UPLOADER_OPTS -n "$FOD_UPLOADER_NOTES"
-        env: 
-          FOD_TENANT: ${{ secrets.FOD_TENANT }}  
+        env:
+          FOD_TENANT: ${{ secrets.FOD_TENANT }}
           FOD_USER: ${{ secrets.FOD_USER }}
           FOD_PAT: ${{ secrets.FOD_PAT }}
           FOD_RELEASE_ID: ${{ secrets.FOD_RELEASE_ID }}
@@ -75,7 +75,7 @@ jobs:
           FOD_API_URL: "https://api.ams.fortify.com/"
           FOD_UPLOADER_OPTS: "-ep 2 -pp 0 -I 1 -apf"
           FOD_UPLOADER_NOTES: 'Triggered by GitHub Actions (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})'
-      
+
       # Once scan completes, pull SAST issues from Fortify on Demand and generate SARIF output.
       # TODO: Review Action inputs. For most users, these will be the same as used in the Perform SAST Scan step.
       - name: Download Results
@@ -87,7 +87,7 @@ jobs:
           password: ${{ secrets.FOD_PAT }}
           release-id: ${{ secrets.FOD_RELEASE_ID }}
           output: ./sarif/output.sarif
-      
+
       # Import Fortify on Demand results to GitHub Security Code Scanning
       - name: Import Results
         uses: github/codeql-action/upload-sarif@v1
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9e7d0305..55a97902 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
-    branches: [ master ]
+    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
 
 jobs:
   build:
@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 13
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
-        java-version: 13
+        java-version: 15
     - name: Build with Maven
       run: ./mvnw -B -DskipTests clean dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree package spring-boot:repackage site --file pom.xml
diff --git a/.github/workflows/ossar-analysis.yml b/.github/workflows/ossar-analysis.yml
index 84e84392..dc0408ad 100644
--- a/.github/workflows/ossar-analysis.yml
+++ b/.github/workflows/ossar-analysis.yml
@@ -5,9 +5,9 @@ name: OSSAR
 
 on:
   push:
-    branches: [ master ]
+    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
-    branches: [ master ]
+    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
 
 jobs:
   OSSAR-Scan:
diff --git a/.github/workflows/veracode-analysis.yml b/.github/workflows/veracode-analysis.yml
index a270e0e1..f3f9f12e 100644
--- a/.github/workflows/veracode-analysis.yml
+++ b/.github/workflows/veracode-analysis.yml
@@ -6,9 +6,9 @@ name: Veracode Static Analysis Pipeline Scan
 # events but only for the master branch
 on:
   push:
-    branches: [ master ]
+    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
   pull_request:
-    branches: [ master ]
+    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -17,7 +17,7 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     steps:
-    
+
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it and copies all sources into ZIP file for submitting for analysis. Replace this section with your applications build steps
     - uses: actions/checkout@v2
       with:
@@ -28,28 +28,28 @@ jobs:
         files: /
         recursive: true
         dest: veracode-pipeline-scan-results-to-sarif.zip
-          
+
     - uses: actions/upload-artifact@v1
       with:
         name: my-artifact
         path: veracode-pipeline-scan-results-to-sarif.zip
-    
+
     # download the Veracode Static Analysis Pipeline scan jar
     - uses: wei/curl@master
       with:
         args: -O https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
     - run: unzip -o pipeline-scan-LATEST.zip
-    
+
     - uses: actions/setup-java@v1
       with:
-        java-version: 13
+        java-version: 15
     - run: java -jar pipeline-scan.jar --veracode_api_id "${{secrets.VERACODE_API_ID}}" --veracode_api_key "${{secrets.VERACODE_API_KEY}}" --fail_on_severity="Very High, High" --file veracode-pipeline-scan-results-to-sarif.zip
       continue-on-error: true
     - uses: actions/upload-artifact@v1
       with:
         name: ScanResults
         path: results.json
-    - name: Convert pipeline scan output to SARIF format 
+    - name: Convert pipeline scan output to SARIF format
       id: convert
       uses: veracode/veracode-pipeline-scan-results-to-sarif@master
       with:
diff --git a/.github/workflows/xanitizer-analysis.yml b/.github/workflows/xanitizer-analysis.yml
new file mode 100644
index 00000000..a6d0d53a
--- /dev/null
+++ b/.github/workflows/xanitizer-analysis.yml
@@ -0,0 +1,86 @@
+# This workflow downloads and installs the latest version of Xanitizer, builds your project, runs a Xanitizer security analysis on it,
+# and then archives the findings list reports and uploads the findings into the GitHub code scanning alert section of your repository.
+#
+# Documentation for the `RIGS-IT/xanitizer-action` is located here: https://github.com/RIGS-IT/xanitizer-action
+#
+# To use this basic workflow, you will need to complete the following setup steps:
+#
+# 1. The underlying Xanitizer, used in this workflow, needs a separate license file.
+#    Licenses are free of charge for open source projects and for educational usage.
+#    To get more information about the Xanitizer licenses and how to obtain a license file,
+#    please consult https://www.xanitizer.com/xanitizer-pricing/.
+#
+# 2. The content of the license file has to be stored as a GitHub secret (e.g. XANITIZER_LICENSE) on this repository.
+#    Please consult https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets for details.
+#
+# 3. Reference the GitHub secret in the step using the `RIGS-IT/xanitizer-action` GitHub action.
+#    Example:
+#    - name: Xanitizer Security Analysis
+#      uses: RIGS-IT/xanitizer-action@v1
+#      with:
+#        license: ${{ secrets.XANITIZER_LICENSE }}
+#
+# 4. As a static application security testing (SAST) tool,
+#    Xanitizer requires that all dependencies of the artifacts being analyzed can be resolved successfully.
+#    So you have to install all used libraries and build your project before running the security analysis,
+#    e.g. via `mvn compile` for Java or `npm install` for JavaScript
+
+name: "Xanitizer Security Analysis"
+
+on:
+  # Run the workflow on each push
+  push:
+  # Run the workflow each day at 5 am
+  # schedule:
+  # - cron: '0 5 * * *'
+  # Run the workflow manually
+  workflow_dispatch:
+
+jobs:
+  xanitizer-security-analysis:
+    # Xanitizer runs on ubuntu-latest and windows-latest.
+    runs-on: ubuntu-latest
+
+    steps:
+      # Check out the repository
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Set up the correct Java version for your project
+      # Please comment out, if your project does not contain Java source code.
+      - name: Set up JDK 15
+        uses: actions/setup-java@v1
+        with:
+          java-version: 15
+
+      # Compile the code for Java projects and get all libraries, e.g. via Maven
+      # Please adapt, if your project uses another build system to compile Java source code.
+      # Please comment out, if your project does not contain Java source code.
+      - name: Compile Java code
+        run: ./mvnw -B -DskipTests clean dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree package spring-boot:repackage site --file pom.xml
+
+      # Install all dependent libraries for JavaScript/TypeScript projects, e.g. via npm
+      # Please adapt to run `npm install` in the correct directories.
+      # Please adapt, if your project uses another package manager for getting JavaScript libraries.
+      # Please comment out, if your project does not use a package manager for getting JavaScript libraries.
+      #- name: Install JavaScript libraries
+      #  run: npm install
+
+      # Run the security analysis with default settings
+      - name: Xanitizer Security Analysis
+        uses: RIGS-IT/xanitizer-action@v1
+        with:
+          license: ${{ secrets.XANITIZER_LICENSE }}
+
+      # Archiving the findings list reports
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Xanitizer-Reports
+          path: |
+            *-Findings-List.pdf
+            *-Findings-List.sarif
+
+      # Uploads the findings into the GitHub code scanning alert section using the upload-sarif action
+      - uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: Xanitizer-Findings-List.sarif
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3ba69115..88d5208f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,13 +3,19 @@
   <component name="CompilerConfiguration">
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
+      <profile name="Annotation profile for simpleworklist" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar" />
+        </processorPath>
         <module name="simpleworklist" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simpleworklist" target="15" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572c..3745b114 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/.travis.yml b/.travis.yml
index 89c94ea4..1bc8aac5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 dist: bionic
 language: java
-jdk: openjdk13
+jdk: openjdk15
 services:
   - docker
 env:
diff --git a/README.md b/README.md
index bf3ca8da..3dd47ba0 100644
--- a/README.md
+++ b/README.md
@@ -13,26 +13,11 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 * [Functional Requirements](etc/requirements/Requirements.md)
 * [Nonfunctional Requirements](etc/requirements/Nonfunctional_Requirements.md)
 
-### Github Shortcuts
-* [Projects](https://github.com/Spring-Framework-Java-Apps/simpleworklist/projects)
-* [Milestones](https://github.com/Spring-Framework-Java-Apps/simpleworklist/milestones)
-* [Issues](https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues)
-* [Releases](https://github.com/Spring-Framework-Java-Apps/simpleworklist/releases)
-* [Branches](https://github.com/Spring-Framework-Java-Apps/simpleworklist/branches)
-* [CI](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
-* [spring-framework-java-apps.github.io/simpleworklist](http://spring-framework-java-apps.github.io/simpleworklist/)
-
 ## Development
-* [Requirements](src/site/markdown/Requirements.md)
+* [Requirements](src/site/markdown/REQUIREMENTS_FUNCTIONAL.md)
 * [Nonfunctional_Requirements](src/site/markdown/Nonfunctional_Requirements.md)
-* [HOWTO](etc/development/HOWTO.md)
-* [Maven_Plugins](etc/development/Maven_Plugins.md)
-* [Primesfaces_JSF](etc/development/Primesfaces_JSF.md)
+* [HOWTO](src/site/markdown/TODO.md)
 
 ## URLs:
 * Heroku Deployment: [simpleworklist.herokuapp.com/](https://simpleworklist.herokuapp.com/)
 * For Developers: [localhost:8080](http://localhost:8080/)
-
-## Up and Running - Deployment
-* A Java Web App, which can easily be deployed to Heroku.
-* [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
diff --git a/pom.xml b/pom.xml
index d9bbe04a..0f820aa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.27-SNAPSHOT</version>
+    <version>2.3.28-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <parent>
@@ -17,7 +17,7 @@
         <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>master</tag>
+        <tag>branch-2.3-MVC</tag>
     </scm>
 
     <name>simpleworklist</name>
@@ -67,46 +67,26 @@
     </distributionManagement>
 
     <properties>
-        <java.version>13</java.version>
-        <version.maven>3.6.3</version.maven>
+        <java.version>15</java.version>
+        <version.maven>3.6.2</version.maven>
+        <pmdVersion>6.28.0</pmdVersion>
 
         <!-- SCM and Releasing with Maven -->
         <maven.scm.version>1.11.2</maven.scm.version>
-        <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
-        <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
 
-        <!-- Maven plugins -->
-        <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
-        <maven-help-plugin.version>3.2.0</maven-help-plugin.version>
-        <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
-        <maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-        <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-war-plugin.version>3.3.1</maven-war-plugin.version>
-        <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
-        <xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
-        <git-commit-id-plugin.version>4.0.1</git-commit-id-plugin.version>
+        <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
+        <liquibase-maven-plugin.version>3.8.9</liquibase-maven-plugin.version>
 
-        <!-- Maven Reports and Site -->
-        <maven-project-info-reports-plugin.version>3.1.0</maven-project-info-reports-plugin.version>
+        <!-- Maven Reports for Site -->
+        <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
+        <maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
         <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
         <maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
         <maven-pmd-plugin.version>3.13.0</maven-pmd-plugin.version>
-        <spotbugs-maven-plugin.version>4.0.4</spotbugs-maven-plugin.version>
-        <doxia-module-markdown.version>1.9.1</doxia-module-markdown.version>
-        <maven-pmd-plugin.version>3.13.0</maven-pmd-plugin.version>
+        <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
         <maven-surefire-report-plugin.version>3.0.0-M5</maven-surefire-report-plugin.version>
-        <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
+        <asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
+        <doxia-module-markdown.version>1.9.1</doxia-module-markdown.version>
         <doxia-module.version>1.9.1</doxia-module.version>
 
         <!-- Docker -->
@@ -136,21 +116,15 @@
 
         <!-- Spring Boot and Spring Frameworks -->
         <spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
-
         <spring-data-releasetrain.version>Neumann-SR4</spring-data-releasetrain.version>
         <spring-session-bom.version>Dragonfruit-SR1</spring-session-bom.version>
-        <spring-framework.version>5.2.9.RELEASE</spring-framework.version>
-        <spring-security.version>5.3.4.RELEASE</spring-security.version>
 
         <!-- Unit and Integration Testing -->
-        <junit-jupiter.version>5.6.2</junit-jupiter.version>
         <xmlunit2.version>2.6.4</xmlunit2.version>
         <xmlunit.version>2.6.4</xmlunit.version>
         <htmlunit.version>2.43.0</htmlunit.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <lombok.version>1.18.12</lombok.version>
         <jsoup.version>1.13.1</jsoup.version>
-
         <skipTests>true</skipTests>
     </properties>
 
@@ -485,13 +459,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <!--
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-properties-migrator</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -775,6 +742,28 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
                     <version>${maven-pmd-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-core</artifactId>
+                            <version>${pmdVersion}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-java</artifactId>
+                            <version>${pmdVersion}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-javascript</artifactId>
+                            <version>${pmdVersion}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-jsp</artifactId>
+                            <version>${pmdVersion}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -868,11 +857,6 @@
                                 <requireJavaVersion>
                                     <version>${java.version}</version>
                                 </requireJavaVersion>
-                                <!--
-                                <requireOS>
-                                    <family>unix</family>
-                                </requireOS>
-                                -->
                                 <requireFilesExist>
                                     <files>
                                         <file>${project.basedir}/README.md</file>
@@ -881,9 +865,15 @@
                                         <file>${project.basedir}/app.json</file>
                                         <file>${project.basedir}/_config.yml</file>
                                         <file>${project.basedir}/Procfile</file>
-                                        <file>${project.basedir}/src/site/markdown/Requirements.md</file>
-                                        <file>${project.basedir}/src/site/markdown/Requirements_Nonfunctional.md</file>
-                                        <file>${project.basedir}/src/site/markdown/About.md</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_FUNCTIONAL.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}/run.sh</file>
@@ -1111,123 +1101,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-dependencies-classpath</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>analyze-only</goal>
-                            <goal>analyze-dep-mgt</goal>
-                            <goal>analyze-report</goal>
-                            <goal>sources</goal>
-                            <goal>resolve</goal>
-                            <goal>resolve-plugins</goal>
-                            <goal>collect</goal>
-                            <goal>copy-dependencies</goal>
-                            <goal>unpack-dependencies</goal>
-                            <goal>build-classpath</goal>
-                        </goals>
-                        <configuration>
-                            <overWriteReleases>true</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <outputFile>${project.build.outputDirectory}/classpath.txt</outputFile>
-                            <failOnWarning>false</failOnWarning>
-                            <type>java-source,jar</type>
-                            <ignoredDependencies>
-                                <ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
-                            </ignoredDependencies>
-                            <ignoredUsedUndeclaredDependencies>
-                                <ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUsedUndeclaredDependency>
-                            </ignoredUsedUndeclaredDependencies>
-                            <ignoredUnusedDeclaredDependencies>
-                                <ignoredUnusedDeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUnusedDeclaredDependency>
-                            </ignoredUnusedDeclaredDependencies>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>check-dependencies-1</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>list</goal>
-                            <goal>list-repositories</goal>
-                            <goal>properties</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>check-dependencies-2</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>analyze</goal>
-                            <goal>analyze-dep-mgt</goal>
-                            <goal>analyze-duplicate</goal>
-                            <goal>analyze-report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>check-dependencies-3</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>tree</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>site</phase>
-                        <configuration>
-                            <excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin</excludeArtifactIds>
-                            <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
-                            <reportSets>
-                                <reportSet>
-                                    <reports>
-                                        <report>analyze-report</report>
-                                    </reports>
-                                </reportSet>
-                            </reportSets>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>get-dependency-classes</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>resolve</goal>
-                            <goal>resolve-plugins</goal>
-                            <goal>collect</goal>
-                            <goal>copy-dependencies</goal>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <type>jar</type>
-                            <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
-                            <outputDirectory>${project.build.directory}/dependency-classes/</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>get-dependency-sources</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>sources</goal>
-                            <goal>resolve</goal>
-                            <goal>resolve-plugins</goal>
-                            <goal>collect</goal>
-                            <goal>copy-dependencies</goal>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <type>java-source</type>
-                            <excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.velocity</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools</excludeArtifactIds>
-                            <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
-                            <outputDirectory>${project.build.directory}/dependency-sources/</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -1240,7 +1113,24 @@
                     </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>
@@ -1355,16 +1245,7 @@
             <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>
-                </configuration>
+                <inherited>true</inherited>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -1436,24 +1317,6 @@
                     <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
                 </configuration>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changes-plugin</artifactId>
-                <configuration>
-                    <githubAPIScheme>https</githubAPIScheme>
-                    <githubAPIPort>443</githubAPIPort>
-                </configuration>
-                <reportSets>
-                    <reportSet>
-                        <id>id-github-report</id>
-                        <reports>
-                            <report>github-report</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/src/site/markdown/About.md b/src/site/markdown/ABOUT.md
similarity index 94%
rename from src/site/markdown/About.md
rename to src/site/markdown/ABOUT.md
index c486f8f4..a60fed09 100644
--- a/src/site/markdown/About.md
+++ b/src/site/markdown/ABOUT.md
@@ -21,7 +21,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
 * [Live Deployment on Heroku](https://simpleworklist.herokuapp.com/)
 
 ## TODO: Requirements
-* See Files [Requirements.md](./Requirements.md) and [Nonfunctional_Requirements.md](./Nonfunctional_Requirements.md)
+* See Files [Requirements.md](./REQUIREMENTS_FUNCTIONAL.md) and [Nonfunctional_Requirements.md](./Nonfunctional_Requirements.md)
 
 ## Legacy Documentation: Requirements
 
diff --git a/src/site/markdown/CHANGELOG.md b/src/site/markdown/CHANGELOG.md
index 4dc68c6f..35825543 100644
--- a/src/site/markdown/CHANGELOG.md
+++ b/src/site/markdown/CHANGELOG.md
@@ -1,2 +1,140 @@
 # Changelog
 
+## 2.3.7
+* Fixed #32, Fixed #36,  Fixed #89, Fixed #83, Fixed #84, Fixed #85, Fixed #88, Fixed #90, Fixed #91, Fixed #99
+
+## 2.3.8
+* Fixed #79, Fixed #80, Fixed #81, Fixed #100, Fixed #101
+
+## BUGS:
+*  Issue #101 ERROR: relation "spring_session" does not exist
+````
+ Unexpected error occurred in scheduled task
+
+org.springframework.jdbc.BadSqlGrammarException: PreparedStatementCallback; bad SQL grammar [DELETE FROM SPRING_SESSION WHERE EXPIRY_TIME < ?]; nested exception is org.postgresql.util.PSQLException: ERROR: relation "spring_session" does not exist
+  Position: 13
+
+Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" does not exist
+  Position: 13
+````
+
+## Read about Spring-Session:
+* [Spring Session with JDBC](https://www.baeldung.com/spring-session-jdbc)
+* [Spring Session with JDBC on Github](https://github.com/eugenp/tutorials/tree/master/spring-session/spring-session-jdbc)
+* [Spring Session with JDBC](https://www.javadevjournal.com/spring/spring-session-with-jdbc/)
+
+## 2.3.9 
+* Fixed #79, Fixed #80, Fixed #81, Fixed #100, Fixed #101
+
+## 2.3.10 
+* Bugfixing
+* F007 Add first new Task: broken
+* An error happened during template parsing (template: "class path resource [templates/task/add.html]")
+
+## F008 Add first new Project: broken
+* -> Form OK
+* -> Save Data: Error
+* http://localhost:8080/project/root
+* -> Button "add new project"
+* http://localhost:8080/project/add/new/project
+* -> Save -> ERROR
+* Errorpage - Refer to logfile:
+````
+2020-04-03 14:30:37.148 DEBUG 2864 --- [nio-8080-exec-1] o.s.web.servlet.DispatcherServlet        : Completed 200 OK
+2020-04-03 14:30:58.514 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : POST "/project/addchild/", parameters={masked}
+2020-04-03 14:30:58.586  WARN 2864 --- [nio-8080-exec-8] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2020-04-03 14:30:58.586 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : Completed 405 METHOD_NOT_ALLOWED
+2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : "ERROR" dispatch for POST "/fehler", parameters={masked}
+2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped to org.woehlke.simpleworklist.application.error.MyErrorController#handleError(HttpServletRequest, Model)
+2020-04-03 14:30:58.591  WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController            : errorMessage :Request method 'POST' not supported
+2020-04-03 14:30:58.591  WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController            : 405Method Not Allowed
+2020-04-03 14:30:58.593 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : Exiting from "ERROR" dispatch, status 405
+````
+* Fixed #103, Fixed #102
+
+## 2.3.11 
+* Fixed #107, Fixed #108
+
+## 2.3.12
+* Fixed #106, Fixed #109, Fixed #110
+* Deployment to heroku
+ 
+# Maven Config:
+## maven-changes-plugin
+* https://maven.apache.org/plugins/maven-changes-plugin/examples/configuring-github-report.html
+
+## maven-enforcer-plugin
+* http://maven.apache.org/enforcer/maven-enforcer-plugin/plugin-info.html
+* http://maven.apache.org/enforcer/enforcer-rules/
+* https://maven.apache.org/enforcer/enforcer-rules/requireFilesExist.html
+* https://maven.apache.org/enforcer/enforcer-rules/requireEnvironmentVariable.html
+* https://maven.apache.org/enforcer/enforcer-rules/requireActiveProfile.html
+* https://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html
+* shttps://www.baeldung.com/maven-enforcer-plugin
+
+## 2.3.14
+* Fixed #122, Fixed #123, Fixed #127, Fixed #130, Fixed #152, Fixed #153, Fixed #154, Fixed #155, Fixed #156, Fixed #157, Fixed #158, Fixed #159, Fixed #160, Fixed #161, Fixed #162, Fixed #163, Fixed #164, Fixed #165, Fixed #166, Fixed #167
+* https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5
+
+## 2.3.15
+* Fixed #129, Fixed #126, Fixed #168 
+* https://github.com/thymeleaf/thymeleaf-testing
+
+## 2.3.16 
+* Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 
+
+## 2.3.17
+* Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233 
+* Fixed #201, Fixed #202, Fixed #203, Fixed #204, Fixed #205, Fixed #206, Fixed #207, Fixed #208, Fixed #209, Fixed #210, Fixed #211, Fixed #212, Fixed #213, Fixed #214, Fixed #215, Fixed #216, Fixed #217, Fixed #218, Fixed #219 
+* Fixed #220, Fixed #221, Fixed #222 
+
+## 2.3.18
+* Fixed #128, Fixed #192, Fixed #193, Fixed #194, Fixed #195, Fixed #196, Fixed #197, Fixed #198, Fixed #199, Fixed #200, Fixed #239, Fixed #240
+
+## 2.3.19
+* Fixed #241, Fixed #242, Fixed #243, Fixed #252
+
+## 2.3.20
+* fixed #255 Update Spring-Boot to 2.3.0
+
+## 2.3.23
+* fixed #274 add Annotations to suppress Deprecation Warnings
+* fixed #273 resort Issues, Milestones and Releases
+* fixed #271 Milestone Burndown: Update Spring-Boot to current Version 2.3.3
+* fixed #270 Update to Spring Framework for Spring-Boot 2.3.3
+* fixed #269 mvnw docker-compose:up
+* fixed #268 update webjars
+* fixed #267 Update to Spring Security xyz for Spring-Boot 2.3.3
+* fixed #266 Update to Spring Data Bom Neumann-SR3 for Spring-Boot 2.3.3
+* fixed #264 setup travis-ci
+* fixed #263 setup github-ci
+* fixed #262 setup on my current Linux Machines
+* fixed #260 Compare pom.xml and others to bloodmoney spring-webapp
+* fixed #259 Update Spring-Boot to current Version 2.3.3 
+* fixed #275 setup dev Databases enhancement
+* fixed #272 prepare Release 2.3.23
+* fixed #265 make release with maven plugin
+
+## 2.3.24
+* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
+* fixed #279 Formular Layout Errors
+* fixed #283 prepare Release 2.3.24 
+* fixed #284 make release with maven plugin
+
+## 2.3.25
+* fixed #285 Update spring-boot 2.3.3 to 2.3.4
+* fixed #286 Update spring-data-releasetrain to Neumann-SR4
+* fixed #287 Update spring-session-bom to Dragonfruit-SR1
+
+## 2.3.26
+* fixed #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement
+* 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
+
+## 2.3.27
+* Issue  #298 try out java15
+
+
+
+
diff --git a/src/site/markdown/CLOUD_DEPLOYMENT.md b/src/site/markdown/CLOUD_DEPLOYMENT.md
new file mode 100644
index 00000000..79b268fb
--- /dev/null
+++ b/src/site/markdown/CLOUD_DEPLOYMENT.md
@@ -0,0 +1,15 @@
+# Cloud Deployments
+
+## Github Shortcuts
+* [Projects](https://github.com/Spring-Framework-Java-Apps/simpleworklist/projects)
+* [Milestones](https://github.com/Spring-Framework-Java-Apps/simpleworklist/milestones)
+* [Issues](https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues)
+* [Releases](https://github.com/Spring-Framework-Java-Apps/simpleworklist/releases)
+* [Branches](https://github.com/Spring-Framework-Java-Apps/simpleworklist/branches)
+* [CI](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
+* [spring-framework-java-apps.github.io/simpleworklist](http://spring-framework-java-apps.github.io/simpleworklist/)
+
+## Up and Running - Deployment
+* A Java Web App, which can easily be deployed to Heroku.
+* [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
+
diff --git a/src/site/markdown/Development.md b/src/site/markdown/DEVELOPMENT.md
similarity index 100%
rename from src/site/markdown/Development.md
rename to src/site/markdown/DEVELOPMENT.md
diff --git a/src/site/markdown/Maven_Plugins.md b/src/site/markdown/MAVEN_PLUGINS.md
similarity index 100%
rename from src/site/markdown/Maven_Plugins.md
rename to src/site/markdown/MAVEN_PLUGINS.md
diff --git a/src/site/markdown/Primesfaces_JSF.md b/src/site/markdown/Primesfaces_JSF.md
deleted file mode 100644
index dfd81d62..00000000
--- a/src/site/markdown/Primesfaces_JSF.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Primesfaces JSF
-
diff --git a/src/site/markdown/Requirements.md b/src/site/markdown/REQUIREMENTS_FUNCTIONAL.md
similarity index 100%
rename from src/site/markdown/Requirements.md
rename to src/site/markdown/REQUIREMENTS_FUNCTIONAL.md
diff --git a/src/site/markdown/Requirements_Nonfunctional.md b/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md
similarity index 100%
rename from src/site/markdown/Requirements_Nonfunctional.md
rename to src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md
diff --git a/src/site/markdown/TODO.md b/src/site/markdown/TODO.md
new file mode 100644
index 00000000..80b71eb0
--- /dev/null
+++ b/src/site/markdown/TODO.md
@@ -0,0 +1,17 @@
+#TODO 
+## 2.3.25
+* fixed #285 Update spring-boot 2.3.3 to 2.3.4
+* fixed #286 Update spring-data-releasetrain to Neumann-SR4
+* fixed #287 Update spring-session-bom to Dragonfruit-SR1
+
+## 2.3.26
+* fixed #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement
+
+## 2.3.27
+* fixed #298 try out java15
+
+## 2.3.28
+* 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
+
diff --git a/src/site/markdown/set_java_windows10.md b/src/site/markdown/set_java_windows10.md
deleted file mode 100644
index 0c0404ff..00000000
--- a/src/site/markdown/set_java_windows10.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Set java on Windows10
-
-
diff --git a/system.properties b/system.properties
index 280686e2..9143abd7 100644
--- a/system.properties
+++ b/system.properties
@@ -1 +1,2 @@
-java.runtime.version=13
+java.runtime.version=15
+maven.version=3.6.2