Merge master into development

Author: KochTobi

.generate-reports.py

@@ -1,6 +1,12 @@
 name: Build Maven Package
 
-on: [push]
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main, master ]
 
 jobs:
   package:
@@ -19,6 +25,5 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-
       - name: Run mvn package
         run: mvn -B package --file pom.xml

.github/ISSUE_TEMPLATE/bug_report.md

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, main, development, patch/*, release/*, hotfix/* ]
+    branches: [ main, master, development, release/*, hotfix/* ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, main]
+    branches: [ main, master ]
   schedule:
     - cron: '21 1 * * 4'