Merge pull request #339 from Spring-Framework-Java-Apps/master

update branch to master

Author: thomaswoehlke

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [ thomaswoehlke ] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: thomaswoehlke
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/workflows/codeql-analysis.yml

@@ -36,10 +36,10 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    - name: Set up JDK 15
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 15
+        java-version: 11
 
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.

.github/workflows/maven.yml

@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 15
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 15
+        java-version: 11
     - 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 --file pom.xml

.gitignore

@@ -33,9 +33,11 @@ setenv.cmd
 /src/main/java/org/woehlke/simpleworklist/project/x.txt
 /src/main/java/org/woehlke/simpleworklist/task/x.txt
 /src/main/java/org/woehlke/simpleworklist/context/x.txt
-/src/main/java/org/woehlke/simpleworklist/common/error/x.txt
+/src/main/java/org/woehlke/simpleworklist/application/error/x.txt
 /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt
 
 /simpleworklist.diff
 target
 .idea
+/x.txt
+/transaction-logs/