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

* upstream/main: (94 commits) Bump org.openrewrite.rewrite from 6.3.11 to 6.3.16 (#10442) Update all of lucene Bump org.apache.lucene:lucene-core from 9.7.0 to 9.8.0 Bump com.dlsc.gemsfx:gemsfx from 1.77.0 to 1.82.0 Accept LaTeX errors in comment field (#10436) Fix NPEs in UrlCleanup (#10435) Fix triggering workflows (#10433) Show exception in cleanup error (#10430) Exclude check for ampersand (&) at verbatim fields (#10419) fix checkstyle fix escaping of slashes fix checkstyle and l10n Add TeXShop (macOS only) Fix casing First set fetcherWorker properties, then start the worker improve variable names checkstyle Fix fetcher worker execution on background thread Update contributing.md jakarta ...
JabRef · Oct 3, 2023 · 9c2dd3b · 9c2dd3b
2 parents 1a3c47b + cad633e
commit 9c2dd3b
Show file tree

Hide file tree

Showing 230 changed files with 3,617 additions and 1,157 deletions.
diff --git a/.github/heylogs.java b/.github/heylogs.java
@@ -0,0 +1,6 @@
+//DEPS com.github.nbbrd.heylogs:heylogs-cli:0.6.0
+public class heylogs {
+    public static void main(String... args) throws Exception {
+        nbbrd.heylogs.cli.HeylogsCommand.main(args);
+    }
+}
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -1,20 +1,25 @@
-name: Dependabot auto-merge
-on: pull_request
+name: Auto Merge
+on: [pull_request_target, workflow_dispatch]
 
 permissions:
   contents: write
   pull-requests: write
 
 jobs:
-  dependabot:
+  automerge:
     runs-on: ubuntu-latest
-    if: ${{ (github.actor == 'dependabot[bot]') || (github.actor == 'koppor' && startsWith(github.event.pull_request.title, '[Bot]')) }}
+    # Run only if PR is inside JabRef's main repository and created by dependabot or by an update workflow
+    if: >
+      (github.repository == 'JabRef/jabref') &&
+      ((github.actor == 'dependabot[bot]') ||
+       ((startsWith(github.event.pull_request.title, '[Bot] ') || (startsWith(github.event.pull_request.title, 'Bump '))) &&
+       (github.event.pull_request.head.repo.full_name == 'JabRef/jabref')))
     steps:
       - name: Approve PR
         run: gh pr review --approve "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}}
       - name: Merge PR
         run: gh pr merge --auto "$PR_URL"
         env:

diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
@@ -58,13 +58,13 @@ jobs:
       - name: Run GitVersion
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.10.2
-      - name: Set up JDK
+      - name: Setup JDK
         uses: actions/setup-java@v3
         with:
           java-version: 20
           distribution: 'temurin'
           cache: 'gradle'
-      - name: setup jdk JabRef-fix mac
+      - name: Setup JDK jabref-fix macOS
         shell: bash
         run: |
             mkdir ${{runner.temp}}/jdk
@@ -81,7 +81,7 @@ jobs:
       - name: Clean up keychain
         run: |
          security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true
-      - name: Setup OSX key chain on OSX
+      - name: Setup OSX key chain on macOS
         uses: apple-actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
@@ -99,22 +99,24 @@ jobs:
           mkdir ${{runner.temp}}/keychain
           security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain
           security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain
-      - name: Prepare merged jars and modules dir (macos)
+      - name: Prepare merged jars and modules dir (macOS)
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
-      - name: Build dmg (macos)
+      - name: Build dmg (macOS)
         shell: bash
         run: |
           ${{env.JDK21}}/Contents/Home/bin/jpackage \
           --module org.jabref/org.jabref.cli.Launcher \
           --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
           --add-modules org.jabref,org.jabref.merged.module  \
           --dest build/distribution \
+          --app-content buildres/mac/jabrefHost.py \
+          --app-content buildres/mac/native-messaging-host \
           --name JabRef \
           --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
           --verbose \
           --mac-sign \
-          --vendor JabRef \
-          --mac-package-identifier Jabref \
+          --vendor "JabRef e.V." \
+          --mac-package-identifier JabRef \
           --mac-package-name JabRef \
           --type dmg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
           --mac-package-signing-prefix org.jabref \
@@ -123,20 +125,22 @@ jobs:
           --resource-dir buildres/mac \
           --file-associations buildres/mac/bibtexAssociations.properties \
           --jlink-options --bind-services
-      - name: Build pkg (macos)
+      - name: Build pkg (macOS)
         shell: bash
         run: |
           ${{env.JDK21}}/Contents/Home/bin/jpackage \
           --module org.jabref/org.jabref.cli.Launcher \
           --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
           --add-modules org.jabref,org.jabref.merged.module  \
           --dest build/distribution \
+          --app-content buildres/mac/jabrefHost.py \
+          --app-content buildres/mac/native-messaging-host \
           --name JabRef \
           --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
           --verbose \
           --mac-sign \
-          --vendor JabRef \
-          --mac-package-identifier Jabref \
+          --vendor "JabRef e.V." \
+          --mac-package-identifier JabRef \
           --mac-package-name JabRef \
           --type pkg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
           --mac-package-signing-prefix org.jabref \
@@ -168,11 +172,6 @@ jobs:
         if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
         shell: bash
         run: |
-          mkdir ${{runner.temp}}/sshkey
-          if [[ -z "${{ secrets.buildJabRefPrivateKey }}" ]]; then
-            echo "buildJabRefPrivateKey is empty, exiting"
-            exit 1
-          fi
           rsync -Pavz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i ~/.ssh/id_rsa' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
       - name: Upload to GitHub workflow artifacts store
         if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}