Merge remote-tracking branch 'upstream/main' into writebackupToTemp

* upstream/main: (25 commits)
  Fix NumberFormatException in BracketedPattern (#7600)
  Update MAINTAINERS (#7601)
  Fix CSL update (#7592)
  Add unit tests for org.jabref.gui classes (#7579)
  Squashed 'buildres/csl/csl-styles/' changes from 30fb68e..e1acabe
  Bump tika-core from 1.25 to 1.26 (#7589)
  Revert "Skip Mac OS build if secret not present (#7591)" (#7594)
  Optimize saving (#7568)
  Skip Mac OS build if secret not present (#7591)
  Rename master to main in dev help
  Update tests-fetchers.yml
  Update refresh-journal-lists.yml
  Update deployment.yml
  Rename master to main in coding readme
  Rename master to main in citation style update
  Rename master to main in gitversion config
  Fix column sort order gets overwritten (#7573)
  Add some hints on test tooling (#7585)
  Add "Update Gradle Wrapper Action" (#7584)
  Bump classgraph from 4.8.102 to 4.8.104 (#7587)
  ...

Author: Siedlerchr

.github/workflows/automerge.yml

@@ -3,9 +3,9 @@ on: [pull_request]
 
 jobs:
   automerge:
-    name: Automerge Dependabot
+    name: Automerge Dependency Updates
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || contains(github.event.pull_request.labels.*.name, 'dependencies')
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
@@ -24,6 +24,6 @@ jobs:
         uses: pascalgn/automerge-action@v0.13.1
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
-          MERGE_METHOD: "squash"
+          MERGE_METHOD: "merge"
           MERGE_LABELS: ""
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/deployment.yml

@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
-      - master-release
+      - main
+      - main-release
     paths-ignore:
       - 'docs/**'
       - 'src/test/**'
@@ -107,7 +107,7 @@ jobs:
           mv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
       # DISABLED UNTIL WE HAVE A NEW APPLE DEVELOPER ACCOUNT
       # - name: Notarize dmg and pkg installer
-      #   if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/master'
+      #   if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/main'
       #   shell: bash
       #   run: |
       #     REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "W2PU6LW5U5" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}')