Merge remote-tracking branch 'upstream/main' into min-http-api

* upstream/main: (737 commits) Use OpenRewrite UseStringReplace (#10299) Add ReplaceStringBuilderWithString (#10302) Apply ShortenFullyQualifiedTypeReferences (#10301) Apply StaticMethodNotFinal (#10300) Apply exit early pattern (#10297) Avoid GH_TOKEN_UPDATE_GRADLE_WRAPPER at refresh-csl-subtrees Update snapcraft.yaml Fix exception when opening preferences (#10294) gnome-42-2204 use gnome 4.2 Use gnome Update base 22 Add method for detecting journal abbrev delimiter (#10281) Update bug_report.yml Fix selection of table sort order (#10250) Fix mixup with YAML tags (#10287) More guards for upload (#10282) Reduced calls to Globals.prefs and Globals.entryTypesManager (#10177) Update jmh plugin (#10279) Add computer science to protected terms (#10222) ... # Conflicts: # build.gradle # src/main/java/module-info.java # src/main/java/org/jabref/cli/Launcher.java # src/main/java/org/jabref/preferences/JabRefPreferences.java # src/main/resources/tinylog.properties
JabRef · Sep 3, 2023 · 9299917 · 9299917
2 parents 817d77d + 07f54ed
commit 9299917
Show file tree

Hide file tree

Showing 1,027 changed files with 34,525 additions and 18,656 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,18 +1,8 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/java
 {
  "name": "Java",
  "image": "mcr.microsoft.com/vscode/devcontainers/base:bullseye",
-
- // Configure tool-specific properties.
  "customizations": {
- // Configure properties specific to VS Code.
  "vscode": {
- // Set *default* container specific settings.json values on container create.
- "settings": { 
- },
-
- // Add the IDs of extensions you want installed when the container is created.
  "extensions": [
  "vscjava.vscode-java-pack",
  "vscjava.vscode-gradle",
@@ -22,23 +12,28 @@
  }
  },
 
- "onCreateCommand": "gradle assemble",
+ // Source code generation needs to be done before hand-over to VS Code.
+ // Otherwise, the Java extension will go mad.
+ "onCreateCommand": "./gradlew testClasses --no-daemon",
 
- // Forward the noVNC port (desktop-lite: https://github.com/devcontainers/features/tree/main/src/desktop-lite) 
- "forwardPorts": [6080],
+ // Forward the vncPort and noVNC port.
+ // They are provided by desktop-lite:
+ // https://github.com/devcontainers/features/tree/main/src/desktop-lite#options
+ "forwardPorts": [5901, 6080],
 
  // Need to connect as root otherwise we run into issues with gradle.
  // default option is "vscode". More info: https://aka.ms/vscode-remote/containers/non-root.
  "remoteUser": "root",
  "features": {
  // Adds a lightweight desktop that can be accessed using a VNC viewer or the web
- "desktop-lite": "latest",
+ "ghcr.io/devcontainers/features/desktop-lite:1": {},
 
- // Install java
- "java": {
- "version": "20",
+ // Install java.
+ // See https://github.com/devcontainers/features/tree/main/src/java#options for details.
+ "ghcr.io/devcontainers/features/java:1": {
+ "version": "19.0.2-tem",
  "installGradle": false,
- "jdkDistro": "sem"
+ "jdkDistro": "tem"
  }
  }
 }
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,8 +12,7 @@ body:
  attributes:
  label: JabRef version
  options:
- - "5.9 (latest release)"
- - "3.8.2"
+ - "5.10 (latest release)"
  - Latest development branch build (please note build date below)
  - Other (please describe below)
  description: The version as shown in the about dialog.
@@ -42,7 +41,7 @@ body:
 
  - type: checkboxes
  attributes:
- label: Checked with the latest development build
+ label: Checked with the latest development build (copy version output from About dialog)
  description: |
  Please always test if the bug is still reproducible in the latest development version. We are constantly improving JabRef and some bugs may already be fixed. If you already use a development version, ensure that you use the latest one.
  You can download the latest development build at: https://builds.jabref.org/main/ . **Please make a backup of your library before you try out this version.**

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,12 +11,10 @@ The title of the PR must not reference an issue, because GitHub does not support
 - [x] done; [ ] not done / not applicable
 -->
 
-```[tasklist]
-### Compulsory checks
+### Mandatory checks
 - [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable)
 - [ ] Tests created for changes (if applicable)
 - [ ] Manually tested changed features in running JabRef (always required)
 - [ ] Screenshots added in PR description (for UI changes)
 - [ ] [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.
-```
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
  schedule:
  interval: weekly
  labels:
- - "type: dependencies"
+ - "dependencies"
  ignore:
  - dependency-name: com.microsoft.azure:applicationinsights-core
  versions:
@@ -18,10 +18,10 @@ updates:
  schedule:
  interval: weekly
  labels:
- - "type: dependencies"
+ - "dependencies"
  - package-ecosystem: "github-actions"
  directory: "/"
  schedule:
  interval: weekly
  labels:
- - "type: dependencies"
+ - "dependencies"
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -1,34 +1,22 @@
-name: Automerge Pull Requests
-on:
- pull_request:
- types:
- - opened
- - synchronize
- - reopened
- - labeled
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+ contents: write
+ pull-requests: write
+
 jobs:
- automerge:
- name: Automerge Dependency Updates
+ dependabot:
  runs-on: ubuntu-latest
- if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || contains(github.event.pull_request.labels.*.name, 'dependencies')
+ if: ${{ github.actor == 'dependabot[bot]' }}
  steps:
- - name: 'Wait for status checks'
- id: waitforstatuschecks
- uses: "WyriHaximus/github-action-wait-for-status@v1.7.1"
- with:
- ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check
- checkInterval: 13
+ - name: Approve PR
+ run: gh pr review --approve "$PR_URL"
  env:
- GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- - name: Auto approve
- uses: hmarr/auto-approve-action@v3.2.1
- if: steps.waitforstatuschecks.outputs.status == 'success'
- with:
- github-token: "${{ secrets.GITHUB_TOKEN }}"
- - name: Merge pull requests
- uses: pascalgn/automerge-action@v0.15.6
- if: steps.waitforstatuschecks.outputs.status == 'success'
+ PR_URL: ${{github.event.pull_request.html_url}}
+ GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+ - name: Merge PR
+ run: gh pr merge --auto "$PR_URL"
  env:
- MERGE_METHOD: "merge"
- MERGE_LABELS: ""
- GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+ PR_URL: ${{github.event.pull_request.html_url}}
+ GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/cleanup_pr.yml b/.github/workflows/cleanup_pr.yml
@@ -7,8 +7,12 @@ on:
 jobs:
  cleanup:
  runs-on: ubuntu-latest
-
  steps:
+ - name: Cancel deployment run
+ uses: styfle/cancel-workflow-action@0.11.0
+ with:
+ ignore_sha: true
+ workflow_id: 9813 # workflow "Deployment"
  - name: Check secrets presence
  id: checksecrets
  shell: bash
@@ -20,17 +24,19 @@ jobs:
  fi
  env:
  BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
- - name: Extract branch name
- id: extract_branch
- if: ${{ steps.checksecrets.outputs.secretspresent }}
- run: |
- echo "branch=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT
  - name: Delete folder on builds.jabref.org
  if: steps.checksecrets.outputs.secretspresent == 'YES'
- uses: appleboy/ssh-action@v0.1.10
+ uses: appleboy/ssh-action@v1.0.0
  with:
- script: rm -rf /var/www/builds.jabref.org/www/${{ steps.extract_branch.outputs.branch }} || true
+ script: rm -rf /var/www/builds.jabref.org/www/pull/${{ github.event.pull_request.number }} || true
  host: build-upload.jabref.org
  port: 9922
  username: jrrsync
  key: ${{ secrets.buildJabRefPrivateKey }}
+ - name: Update PR comment
+ if: steps.checksecrets.outputs.secretspresent == 'YES'
+ uses: thollander/actions-comment-pull-request@v2
+ with:
+ comment_tag: download-link
+ message: The build for this PR is no longer available. Please visit <https://builds.jabref.org/main/> for the latest build.
+ mode: upsert