Merge remote-tracking branch 'upstream/master' into sharelatex

* upstream/master: (164 commits) Bump lucene-queryparser from 8.6.3 to 8.7.0 (JabRef#7089) Fix endnote importer when keyword style is null (JabRef#7084) Rename Firefox extension file in Windows (JabRef#7092) Add support for Microsoft Edge browser in Windows and Linux builds (JabRef#7056) Bump unirest-java from 3.11.03 to 3.11.05 (JabRef#7087) Bump com.github.ben-manes.versions from 0.33.0 to 0.36.0 (JabRef#7088) Bump gittools/actions from v0.9.4 to v0.9.5 (JabRef#7091) Feature/add abstract field to complex search (JabRef#7079) Add missing authors Implement Emacs key bindings (JabRef#6037) Special field code maintenance (JabRef#7078) Follow up fix for 7077 Reset preview layouts on clear Fix preview settings not saved due to l10n (JabRef#7077) Add link to existing documentation of filed types Remove unused supportsPaging Squashed 'src/main/resources/csl-styles/' changes from 5c376b8..f4399aa Fix more 404 links Fix custom theme styles not applied to the entry preview (JabRef#7071) Fix Shared Database Tests (JabRef#7040) Bump byte-buddy-parent from 1.10.17 to 1.10.18 (JabRef#7059) ... # Conflicts: # src/main/java/org/jabref/gui/DefaultInjector.java
JabRef · Nov 11, 2020 · ba10c02 · ba10c02
2 parents d08943d + f5c52a2
commit ba10c02
Show file tree

Hide file tree

Showing 569 changed files with 28,658 additions and 7,799 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,13 +10,16 @@ updates:
   ignore:
   - dependency-name: com.microsoft.azure:applicationinsights-core
     versions:
-    - ">= 2.5.a, <= 2.6.1" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
+    - ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
   - dependency-name: com.microsoft.azure:applicationinsights-logging-log4j2
     versions:
-    - ">= 2.5.a, <= 2.6.1" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
+    - ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
   - dependency-name: de.jensd:fontawesomefx-materialdesignfont
     versions:
     - "> 1.7.22-4" # Strange versioning format
+  - dependency-name: org.fxmisc.richtext:richtextfx
+    versions:
+    - "< 0.10.6" # Blocked by https://github.com/FXMisc/RichTextFX/issues/967, wait for new release
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -11,12 +11,12 @@ jobs:
         id: waitforstatuschecks
         uses: "WyriHaximus/github-action-wait-for-status@v1.2"
         with:
-          ignoreActions: automerge
+          ignoreActions: Automerge Dependabot
           checkInterval: 13
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Merge pull requests
-        uses: pascalgn/automerge-action@v0.9.0
+        uses: pascalgn/automerge-action@v0.12.0
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
           MERGE_METHOD: "squash"

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -41,32 +41,30 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
       - name: Fetch all history for all tags and branches
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.4
+        uses: gittools/actions/gitversion/setup@v0.9.5
         with:
           versionSpec: "5.3.7"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.4
-      - name: Set up Adotptopen JDK mac
-        uses: joschi/setup-jdk@v2
+        uses: gittools/actions/gitversion/execute@v0.9.5
+      - name: Set up JDK 15 for linux and mac
+        uses: actions/setup-java@v1
         with:
-          # reason: https://bugs.openjdk.java.net/browse/JDK-8238184
           java-version: 15
-          release_type: ea
-        if: matrix.os == 'macos-latest'
-      - name: Set up JDK for linux and windows
+        if: matrix.os != 'windows-latest'
+      - name: Set up JDK 14 for windows
         uses: actions/setup-java@v1
         with:
           java-version: 14
-        if: matrix.os != 'macos-latest'
+        if: matrix.os == 'windows-latest'
       - name: Restore gradle cache
         uses: actions/cache@master
         with:
@@ -109,17 +107,17 @@ jobs:
         if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/master'
         shell: bash
         run: |
-          REQUEST_UUID=$(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}')
-          while xcrun altool --notarization-info "$REQUEST_UUID" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
+          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}')
+          while xcrun altool --notarization-info "$REQUEST_UUID_DMG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
             echo "Verification in progress..."
             sleep 30
           done
           xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
           spctl -vvv --assess --type exec build/distribution/JabRef.app
           codesign -vvv --deep --strict "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
           codesign -dvv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          REQUEST_UUID=$(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 }}-signed.pkg" | grep RequestUUID | awk '{print $3}')
-          while xcrun altool --notarization-info "$REQUEST_UUID" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
+          REQUEST_UUID_PKG=$(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 }}-signed.pkg" | grep RequestUUID | awk '{print $3}')
+          while xcrun altool --notarization-info "$REQUEST_UUID_PKG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
             echo "Verification in progress..."
             sleep 30
           done
@@ -163,12 +161,12 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.4
+        uses: gittools/actions/gitversion/setup@v0.9.5
         with:
           versionSpec: '5.2.x'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.4
+        uses: gittools/actions/gitversion/execute@v0.9.5
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:

diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
@@ -1,9 +1,6 @@
 name: Refresh Journal Lists
 
 on:
-  schedule:
-    # run on 1st and 15th of each month
-    - cron: '2 20 1,15 * *'
   workflow_dispatch:
     # Allow to run manually
 

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -31,6 +31,8 @@ jobs:
       - name: Build snap (1) Run build
         uses: snapcore/action-build@v1
         id: snapcraft
+        with:
+          snapcraft-args: "--debug"
       - name: Build snap (2) Upload snap
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         uses: snapcore/action-publish@v1

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout source
@@ -41,7 +41,12 @@ jobs:
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Run checkstyle
+      - name: Run check style reporter
+        uses: nikitasavinov/checkstyle-action@master
+        with:
+          reporter: github-pr-check
+          checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
+      - name: Run checkstyle gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
       - name: Run markdown-lint
         uses: avto-dev/markdown-lint@v1
@@ -86,7 +91,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:13-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -235,7 +240,7 @@ jobs:
         with:
           # full checkout needed for authors generation
           fetch-depth: 0
-      - name: "Check AUTHORS"
+      - name: "All authors of this PR listed in AUTHORS"
         id: authors_check
         shell: bash
         run: |
@@ -245,19 +250,17 @@ jobs:
           set +o pipefail
           added=$(git diff HEAD --no-ext-diff --unified=0 -a --no-prefix | egrep "^\+[^+]" | sed "s/^\+//")
           if [ -z "$added" ]; then
-            echo "::set-output name=newauthor::false"
             echo "No authors added"
             exit 0
           fi
-          message="The JabRef maintainers will add the following name to the [AUTHORS file](https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits). In case you want to use a different one, please comment here and [adjust your name in your git configuration](https://docs.github.com/en/github/using-git/setting-your-username-in-git) for future commits.%0A%0A\`\`\`%0A${added//$'\n'/'%0A'}%0A\`\`\`%0A"
-          echo "::set-output name=message::$message"
-          echo "::set-output name=newauthor::true"
-          echo "New authors found"
-      - name: Comment PR
-        uses: unsplash/comment-on-pr@master
-        if: steps.authors_check.outputs.newauthor == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_COMMENT_ON_PR }}
-        with:
-          msg: "${{ steps.authors_check.outputs.message }}"
-          check_for_duplicate_msg: true
+          echo "Authors found in this PR not listed in the AUTHORS file."
+          echo
+          echo "The JabRef maintainers will add the following name to the AUTHORS file"
+          echo
+          echo -e "$added"
+          echo
+          echo "In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits"
+          echo
+          echo "Just adding yourself into the AUHTORS file does not help as it is overwritten by our script ./scripts/generate-authors."
+          echo "Read more on the AUTHORS file at found at https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits"
+          exit 1
diff --git a/.mailmap b/.mailmap
@@ -47,6 +47,7 @@ Frédéric Darboux <Frederic.Darboux@orleans.inra.fr>
 Frédéric Darboux <Frederic.Darboux@orleans.inra.fr> <fdar@users.sourceforge.net>
 Frédéric Darboux <Frederic.Darboux@orleans.inra.fr> <mlep@users.noreply.github.com>
 Frédéric Darboux <Frederic.Darboux@orleans.inra.fr> <mlep@github.com>
+Frédéric Darboux <frederic.darboux@inrae.fr>
 Florian Straßer <strassfn@studi.informatik.uni-stuttgart.de>
 Gregor Herrmann <gregoa@debian.org>
 Hakan Duran <ehakanduran@gmail.com> hakova <ehakanduran@gmail.com>
@@ -211,3 +212,5 @@ Tianjian Lei <185049857@qq.com> <leitianjian@outlook.com>
 Muhammad Arsalan Badar <arsalan_badar@intuit.com>
 ZhouSky <11711923@mail.sustech.edu.cn>
 Vincent Gagnon <vincentgagnon53@gmail.com>
+Tom Warnke <Toromtomtom@users.noreply.github.com>
+Eric Lau <919023+skeric@users.noreply.github.com>
diff --git a/.markdownlint.yml b/.markdownlint.yml
@@ -13,6 +13,9 @@ MD013: false
 MD026:
   punctuation: ".,;:!"
 
+# not supported by gitbook
+MD031: false
+
 MD033:
   # we have <a> tags with ids and superscript
   allowed_elements: ['a', 'sup']
diff --git a/AUTHORS b/AUTHORS
@@ -29,6 +29,7 @@ Andreas Amann
 Andreas Buhr
 Andreas Rudert
 Andrew Collins
+Andrew Kuncevich
 Andrew Levit
 André Schlichting
 Andrés Sánchez
@@ -46,6 +47,7 @@ Baruch Oltman
 Behrouz Javanmardi
 Benedikt Tutzer
 Benjamin Köhler
+Benjamin Schroth
 Berk Gureken
 Bernd Kalbfuss
 Bernhard Tempel
@@ -112,6 +114,7 @@ Eiswindyeti
 Ellen Reitmayr
 Erdem Derebasoglu
 Erdem Derebaşoğlu
+Eric Lau
 Erik Putrycz
 Ervin Kolenovic
 Escoul
@@ -125,6 +128,7 @@ Fancy Zhang
 Fedor Bezrukov
 Felix Berger
 Felix Langner
+Felix Luthman
 Felix Wilke
 Fernando Santagata
 ffffatgoose
@@ -161,12 +165,14 @@ Igor Chernyavsky
 Igor Steinmacher
 Illes Solt
 Ingvar Jackal
+Isaac Roles
 Jackson Ryan
 Jan Frederik Maas
 Jan Kubovy
 Jan Schäfer
 Janosch Kutscherauer
 Jason Pickering
+Jasper Vandemalle
 Javier Muñoz Ferrara
 jcampbell11245
 Jeff Kerr
@@ -177,11 +183,13 @@ Jens Döcke
 joeyzgraggen
 Johannes Hupe
 Johannes Manner
+Johannes Theiner
 John David
 John Relph
 John Zedlewski
 Jonas Lähnemann
 Jonas Moosmann
+Jonatan Asketorp
 Jonathan Powell
 Jong-Ho Shinn
 Jorge Tornero
@@ -206,6 +214,7 @@ Kelly Click
 Koji Yokota
 KOLANICH
 Kolja Brix
+Kristoffer Gunnarsson
 Krunoslav Zubrinic
 Krzysztof A. Kościuszkiewicz
 Kyle Johnson
@@ -224,19 +233,20 @@ Lucas Beretti
 Luciana de Melo e Abud
 Lugduni Desrosiers
 Luis Romero
-m-mauersberger
 Mairieli Wessel
 Malik Atalla
 Malte Deiseroth
 Manuel Siebeneicher
 Manuel Wtfjoke
 Marcel Luethi
+Marco Aurélio Graciotto Silva
 Marco Konersmann
 Mariana Prudencio
 Marius Kleiner
 Mark Schenk
 Martin Kähmer
 Martin Stolle
+Martin W. Kirst
 Martina Catizone
 Mathias Walter
 Matthias Geiger
@@ -251,6 +261,7 @@ MhhhxX
 Michael Beckmann
 Michael Falkenthal
 Michael Lass
+Michael Mauersberger
 Michael McCann
 Michael Schwarmi
 Michael Spiegel
@@ -266,6 +277,7 @@ Morgan Lovato
 Moritz Ringler
 Morten Alver
 ms111ds
+muachilin
 Muhammad Arsalan Badar
 Mélanie Tremblay
 Nadeem Mahmood
@@ -275,10 +287,12 @@ Nick Mancuso
 Nick S. Weatherley
 Nico Schlömer
 Nicolas Pavillon
+Niffler
 Nikita Borovikov
 Niklas Schmitt
 nikmilpv
 NikodemKch
+Nikolaus Koopmann
 Nils Streijffert
 Niv Ierushalmi
 Nivedha Sunderraj
@@ -371,10 +385,13 @@ Tianjian Lei
 Tim Kilian
 Tim van Rossum
 Tim Würtele
+Timucin Merdin
 Tobias Boceck
 Tobias Bouschen
 Tobias Denkinger
 Tobias Diez
+Tom Warnke
+Tommy Samuelsson
 Tomás Morales de Luna
 Tony K
 Toralf Senger