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

deploy Release 2.3.34

Author: thomaswoehlke

.github/workflows/codacy-analysis.yml

@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
   schedule:
     - cron: '0 19 * * 2'
 
@@ -36,10 +36,15 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - name: Set up JDK 15
+      uses: actions/setup-java@v1
+      with:
+        java-version: 15
+
     # 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' }}
+    #- run: git checkout HEAD^2
+    #  if: ${{ github.event_name == 'pull_request' }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -53,8 +58,8 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,7 +69,7 @@ jobs:
     #    uses a compiled language
 
     - 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
+        ./mvnw -B -DskipTests clean dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree package spring-boot:repackage --file pom.xml
     #   make release
 
     - name: Perform CodeQL Analysis

.github/workflows/codeql-analysis.yml

@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
   pull_request:
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
 
 jobs:
   build:
@@ -21,4 +21,4 @@ jobs:
       with:
         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
+      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

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: OSSAR
 
 on:
   push:
-    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
   pull_request:
-    branches: [  'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [  'master' ]
 
 jobs:
   OSSAR-Scan:
@@ -24,6 +24,11 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - name: Set up JDK 15
+      uses: actions/setup-java@v1
+      with:
+        java-version: 15
+
     # 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

.github/workflows/ossar-analysis.yml

@@ -33,7 +33,7 @@ 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/application/error/x.txt
+/src/main/java/org/woehlke/simpleworklist/common/error/x.txt
 /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt
 
 /simpleworklist.diff