Merge branch 'master' into fix-for-issue-5833

.gitattributes

@@ -5,9 +5,6 @@ gradlew text eol=lf
 # windows line endings at windows files
 *.bat text eol=crlf
 
-# required for proper releasing
-AUTHORS text eol=lf
-
 # ensure that line endings of *.java, and *.properties are normalized
 *.java text
 *.properties text

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help
+    url: https://discourse.jabref.org/c/help/
+    about: Questions and requests for help are handled at https://discourse.jabref.org
+  - name: Feature requests
+    url: https://discourse.jabref.org/c/features/
+    about: If you are missing an important feature? Let us know!

.github/workflows/automerge.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
-        uses: "WyriHaximus/github-action-wait-for-status@v1.2"
+        uses: "WyriHaximus/github-action-wait-for-status@v1.3"
         with:
           ignoreActions: Automerge Dependabot
           checkInterval: 13

.github/workflows/deployment.yml

@@ -42,20 +42,20 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.6.0
+        uses: styfle/cancel-workflow-action@0.7.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/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].8
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].8
       - name: Set up JDK 15 for linux and mac
         uses: actions/setup-java@v1
         with:
@@ -97,11 +97,11 @@ jobs:
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          codesign --entitlements buildres/mac/myapp.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
-          codesign --entitlements buildres/mac/myapp.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/MacOS/JabRef
-          codesign --entitlements buildres/mac/myapp.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/MacOS/JabRef
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app
           jpackage --type pkg --dest build/distribution --name JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type dmg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
-          codesign -s "Developer ID Application: Tobias Diez (W2PU6LW5U5)" --options runtime --entitlements buildres/mac/myapp.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
+          codesign -s "Developer ID Application: Tobias Diez (W2PU6LW5U5)" --options runtime --entitlements buildres/mac/jabref.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
           jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
           productsign --sign "Developer ID Installer: Tobias Diez (W2PU6LW5U5)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
       - name: Notarize dmg and pkg installer
@@ -162,12 +162,12 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].8
         with:
           versionSpec: '5.x'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].8
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:

.github/workflows/refresh-csl-subtrees.yml

@@ -16,20 +16,27 @@ jobs:
         with:
           ref: master
           fetch-depth: 0
-      - name: Add csl-styles remote
-        run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
-      - name: Update csl-styles
+      - name: Initialize git
         run: |
           git checkout master
           git config --local core.editor /usr/bin/cat
           git config user.name "github actions"
           git config user.email "[email protected]"
-          git subtree pull --prefix src/main/resources/csl-styles csl-styles master --squash
+      - name: Add csl-styles remote
+        run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
+      - name: Update csl-styles
+        run: |
+          git subtree pull --prefix buildres/csl/csl-styles csl-styles master --squash
+          cp buildres/csl/csl-styles/acm-siggraph.csl src/main/resources/csl-styles/
+          cp buildres/csl/csl-styles/ieee.csl src/main/resources/csl-styles/
+          cp buildres/csl/csl-styles/turabian-author-date.csl src/main/resources/csl-styles/
       - name: Add csl-locales remote
         run: git remote add -f csl-locales https://github.com/citation-style-language/locales.git
       - name: Update csl-locales
         run: |
-          git subtree pull --prefix src/main/resources/csl-locales csl-locales master --squash
+          git subtree pull --prefix buildres/csl/csl-locales csl-locales master --squash
+          cp buildres/csl/csl-locales/locales.json src/main/resources/csl-locales/
+          cp buildres/csl/csl-locales/locales-en-US src/main/resources/csl-locales/
       - uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/snap.yml

@@ -1,6 +1,7 @@
 name: Snap
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - snapcraft
@@ -28,12 +29,12 @@ jobs:
         uses: actions/checkout@v2
       # The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
       # See snap/snapcraft.yml for details
-      - name: Build snap (1) Run build
+      - name: Run snapcraft build
         uses: snapcore/action-build@v1
         id: snapcraft
         with:
           snapcraft-args: "--debug"
-      - name: Build snap (2) Upload snap
+      - name: Upload snap
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         uses: snapcore/action-publish@v1
         with:

.github/workflows/tests-fetchers.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           java-version: 14
       - uses: actions/cache@v1
-        name: Restore gradle chache
+        name: Restore gradle cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.6.0
+        uses: styfle/cancel-workflow-action@0.7.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout source
@@ -64,7 +64,7 @@ jobs:
         with:
           java-version: 14
       - uses: actions/cache@v1
-        name: Restore gradle chache
+        name: Restore gradle cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -108,7 +108,7 @@ jobs:
         with:
           java-version: 14
       - uses: actions/cache@v1
-        name: Restore gradle chache
+        name: Restore gradle cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -154,7 +154,7 @@ jobs:
         with:
           java-version: 14
       - uses: actions/cache@v1
-        name: Restore gradle chache
+        name: Restore gradle cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -204,7 +204,7 @@ jobs:
         with:
           java-version: 14
       - uses: actions/cache@v1
-        name: Restore gradle chache
+        name: Restore gradle cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -232,35 +232,3 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
-  checkauthors:
-    name: "Validate AUTHORS"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          # full checkout needed for authors generation
-          fetch-depth: 0
-      - name: "All authors of this PR listed in AUTHORS"
-        id: authors_check
-        shell: bash
-        run: |
-          git config user.name "JabRef Author Checker [bot]"
-          git config user.email "[email protected]"
-          ./scripts/generate-authors.sh
-          set +o pipefail
-          added=$(git diff HEAD --no-ext-diff --unified=0 -a --no-prefix | egrep "^\+[^+]" | sed "s/^\+//")
-          if [ -z "$added" ]; then
-            echo "No authors added"
-            exit 0
-          fi
-          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 AUTHORS 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