Merge branch 'main' into fix-threewaymerge-exception

Author: koppor

.devcontainer/devcontainer.json

@@ -31,8 +31,9 @@
         // Install java.
         // See https://github.com/devcontainers/features/tree/main/src/java#options for details.
         "ghcr.io/devcontainers/features/java:1": {
-            "version": "24.0.1-amzn",
-            "installGradle": false,
+            "version": "24.0.2-amzn",
+            "installGradle": true,
+            "gradleVersion": "8.14.3",
             "jdkDistro": "Corretto"
         }
     }

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,9 +25,8 @@ Keep ALL the items. Replace the dots inside [.] and mark them as follows:
 -->
 
 - [x] I own the copyright of the code submitted and I license it under the [MIT license](https://github.com/JabRef/jabref/blob/main/LICENSE)
-- [.] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if change is visible to the user)
-- [.] Tests created for changes (if applicable)
-- [.] Manually tested changed features in running JabRef (always required)
-- [.] Screenshots added in PR description (if change is visible to the user)
-- [.] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
-- [.] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
+- [.] I manually tested my changes in running JabRef (always required)
+- [.] I added JUnit tests for changes (if applicable)
+- [.] I added screenshots in the PR description (if change is visible to the user)
+- [.] I described the change in `CHANGELOG.md` in a way that is understandable for the average user (if change is visible to the user)
+- [.] I checked the [user documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request updating file(s) in <https://github.com/JabRef/user-documentation/tree/main/en>.

.github/ghprcomment.yml

@@ -14,7 +14,7 @@
   message: >
     JUnit tests of `jablib` are failing.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
 
 
     You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -24,7 +24,7 @@
   message: >
     JUnit tests of `jabkit` are failing.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
 
 
     You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -34,7 +34,7 @@
   message: >
     JUnit tests of `jabsrv` are failing.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
 
 
     You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -45,7 +45,7 @@
     Your code currently does not meet [JabRef's code guidelines](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html).
     We use [Checkstyle](https://checkstyle.sourceforge.io/) to identify issues.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / Checkstyle (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / Checkstyle (pull_request)" and click on it.
 
 
     In case of issues with the import order, double check that you [activated Auto Import](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html#enable-proper-import-cleanup).
@@ -60,7 +60,7 @@
     Your code currently does not meet JabRef's code guidelines.
     We use [OpenRewrite](https://docs.openrewrite.org/) to ensure "modern" Java coding practices.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / OpenRewrite (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / OpenRewrite (pull_request)" and click on it.
 
 
     The issues found can be **automatically fixed**.
@@ -71,7 +71,7 @@
     Your code currently does not meet JabRef's code guidelines.
     We use [Gradle Modernizer Plugin](https://github.com/andygoossens/gradle-modernizer-plugin#gradle-modernizer-plugin) to ensure "modern" Java coding practices.
     You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
-    To see the test output, locate "Tests / Modernizer (pull_request)" and click on it.
+    To see the test output, locate "Source Code Tests / Modernizer (pull_request)" and click on it.
 
 
     Please fix the detected errors, commit, and push.
@@ -130,7 +130,10 @@
     Hey, we noticed that you **force-pushed** your changes.
     Force pushing is a bad practice when working together on a project (mainly because it is [not supported well by GitHub itself](https://github.com/orgs/community/discussions/3478)).
     Commits are lost and comments on commits lose their context, thus making it harder to review changes.
-    At the end, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway before being merged into the `main` branch.
+
+
+    When the pull request is getting integrated into `main`, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway.
+    Thus, your individual commit history will not be visible in `main`.
 
 
     In future, **please avoid that**. For now, you can continue working.

.github/workflows/binaries.yml

@@ -174,7 +174,7 @@ jobs:
     name: ${{ matrix.displayName }} installer and portable version
     steps:
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'true'
@@ -193,7 +193,7 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v3.2.1
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '24'
           distribution: 'corretto'
@@ -362,7 +362,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Download from GitHub workflow artifacts store (macOS)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: JabRef-${{ matrix.os }}-tbn
       - name: Notarize dmg

.github/workflows/check-links.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'JabRef/jabref'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           show-progress: 'false'
       - name: Run linkspector

.github/workflows/cleanup-pr.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           ignore_sha: true
           workflow_id: 160969125
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Check for 'dev: binaries' label"
         id: check_label
         run: |

.github/workflows/dockerimages.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'true'

.github/workflows/gource.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           show-progress: 'false'

.github/workflows/latex.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install TeX Live
         uses: zauguin/install-texlive@v4
         with:
@@ -80,7 +80,7 @@ jobs:
             bibengine: biber
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install TeX Live
         uses: zauguin/install-texlive@v4

.github/workflows/on-issue-comment.yml

@@ -17,7 +17,8 @@ jobs:
         uses: takanome-dev/assign-issue-action@edge
         with:
           github_token: '${{ secrets.GITHUB_TOKEN }}'
-          days_until_unassign: 14
+          # If this is updated, also update the number at unassign-issues.yml
+          days_until_unassign: 21
           maintainers: 'koppor,Siedlerchr,ThiloteE,calixtus,HoussemNasri,subhramit,InAnYan,LinusDietz'
           assigned_comment: |
             👋 Hey @{{ handle }}, thank you for your interest in this issue! 🎉
@@ -32,9 +33,10 @@ jobs:
 
             Happy coding! 🚀
           assignment_suggestion_comment: >
-            👋 Hey @{{ handle }}, looks like you’re eager to work on this issue—great! 🎉
-            It also looks like you skipped reading our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md), which explains exactly how to participate. No worries, it happens to the best of us.
-            Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
+            👋 Hey @{{ handle }}, looks like you’re eager to work on this issue — great! 🎉
+            It also looks like you don't know how to assign issues to yourself.
+            Please read our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) to find out how.
+            It will also guide you in other aspects of contributing to JabRef.
       - name: Move issue corresponding column in "Candidates for University Projects"
         uses: m7kvqbe1/github-action-move-issues@main
         if: ${{ steps.assign.outputs.assigned == 'yes' || steps.assign.outputs.unassigned == 'yes' }}