Merge branch 'development' into dependabot/maven/development/com.fast…

…erxml.jackson.core-jackson-annotations-2.12.1
qbicsoftware · Nov 14, 2023 · 1f90d34 · 1f90d34
2 parents 0ab39c9 + 1ecd7ff
commit 1f90d34
Show file tree

Hide file tree

Showing 112 changed files with 6,191 additions and 948 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
diff --git a/.generate-reports.py b/.generate-reports.py
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/general_question.md b/.github/ISSUE_TEMPLATE/general_question.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
@@ -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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, 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 ]
+    branches: [ main, master ]
   schedule:
     - cron: '21 1 * * 4'