Merge branch 'master' into replace_deprecated

Author: koppor

.github/workflows/deployment.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - master-release
     paths-ignore:
       - 'docs/**'
       - 'src/test/**'
@@ -42,24 +43,16 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 0
-      - name: Fetch tags and master for GitVersion
-        run: |
-          git fetch --tags origin
-          git rev-parse --verify master
-          if (-not $?) {
-            git branch --force --create-reflog master origin/master
-          }
-        shell: pwsh
+        uses: actions/checkout@v2
+      - name: Fetch all history for all tags and branches
+        run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/setup-gitversion@v0.3
+        uses: gittools/actions/gitversion/setup@v0.9.1
         with:
-            versionSpec: '5.1.2'
+            versionSpec: '5.1.3'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/execute-gitversion@v0.3
+        uses: gittools/actions/gitversion/execute@v0.9.1
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
@@ -113,24 +106,9 @@ jobs:
       - name: Package application image
         run: ${{ matrix.archivePortable }}
         shell: bash
-      - name: Build snap (1) Setup snapcraft
-        uses: jhenstridge/snapcraft-build-action@v1
-        id: snapcraft
-        if: matrix.displayName == 'linux'
-      - name: Build snap (2) Run build
-        run: |
-          mv ${{ steps.snapcraft.outputs.snap }} build/distribution/
-        if: matrix.displayName == 'linux'
-      - name: Build snap (3) Upload snap
-        if: matrix.displayName == 'linux' && github.ref == 'refs/heads/master'
-        env:
-          SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
-        run: |
-            mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
-            snapcraft push build/distribution/jabref*.snap --release edge || true
-        shell: bash
       - name: Rename files
         run: |
+          get-childitem -Path build/distribution/*
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
         shell: pwsh
@@ -145,24 +123,16 @@ jobs:
     needs: [build]
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 0
-      - name: Fetch tags and master for GitVersion
-        run: |
-          git fetch --tags origin
-          git rev-parse --verify master
-          if (-not $?) {
-            git branch --force --create-reflog master origin/master
-          }
-        shell: pwsh
+        uses: actions/checkout@v2
+      - name: Fetch all history for all tags and branches
+        run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/setup-gitversion@v0.3
+        uses: gittools/actions/gitversion/setup@v0.9.1
         with:
-            versionSpec: '5.1.2'
+            versionSpec: '5.1.3'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/execute-gitversion@v0.3
+        uses: gittools/actions/gitversion/execute@v0.9.1
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:

.github/workflows/snap.yml

@@ -0,0 +1,26 @@
+name: Snap
+
+on:
+  schedule:
+    # run on each day
+    - cron: '33 4 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Create snapcraft image
+
+    steps:
+      - name: Checkout source
+        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
+        uses: jhenstridge/snapcraft-build-action@v1
+        id: snapcraft
+      - name: Build snap (2) Upload snap
+        uses: jhenstridge/snapcraft-publish-action@v1
+        with:
+          store_login: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
+          snap: ${{ steps.snapcraft.outputs.snap }}
+          release: edge

.gitignore

@@ -11,6 +11,9 @@ status.md
 # Install4J
 install4j6/
 
+# JDK14 (see .github/deployment.yml for details)
+jdk-14/
+
 # Python
 __pycache__/
 

.mailmap

@@ -186,3 +186,5 @@ Michal Rican <michal.rican@gmail.com>
 Param Mittal <parammittal16@gmail.com>
 Victor Michelan <venanciuslm@gmail.com>
 P4trice <34972281+P4trice@users.noreply.github.com>
+Julien Bénard <50318255+Julien29121998@users.noreply.github.com>
+Alexsandro Lauber <alexlauber@outlook.com>

AUTHORS

@@ -77,6 +77,7 @@ Daniel Svärd
 David Gleich
 David Méndez
 David Weitzman
+Dawid Motyka
 Dawid Owoc
 Deepak Kumar
 Dennis Tschechlov
@@ -112,6 +113,7 @@ ffffatgoose
 Florian Beetz
 Florian Straßer
 Foivos Christoulakis
+fpguy
 Francois Charette
 Frank Steimle
 frasca80
@@ -121,6 +123,7 @@ Galileo Sartor
 Geoffrey Taerim Kim
 Gert Renckens
 Gregor Herrmann
+guenesaydin
 Guillaume Gardey
 Hakan Duran
 Hannes Restel
@@ -141,6 +144,7 @@ Jeff Miller
 Jeffrey Kuhn
 Jeffrey Sander
 Jens Döcke
+joeyzgraggen
 Johannes Hupe
 Johannes Manner
 John David
@@ -153,6 +157,7 @@ josephshin93
 Joshua Ramon Enslin
 José Jesús Sinohui Fernández
 Julian Pfeifer
+Julien Bénard
 Jure Slak
 József Pallagi
 Jörg Lenhard
@@ -182,7 +187,9 @@ Li Zhilin
 Ling Wang
 Linus Dietz
 Lorenzo Genta
+Lucas Beretti
 Luciana de Melo e Abud
+Lugduni Desrosiers
 Luis Romero
 Mairieli Wessel
 Malik Atalla
@@ -203,6 +210,7 @@ Mattia Bunel
 Mattias Ulbrich
 mcmoody
 Meltem Demirköprü
+MhhhxX
 Michael Beckmann
 Michael Falkenthal
 Michael Lass
@@ -230,10 +238,12 @@ Nico Schlömer
 Nicolas Pavillon
 Nikita Borovikov
 nikmilpv
+NikodemKch
 Niv Ierushalmi
 Nivedha Sunderraj
 Nizar N. Batada
 noravanq
+obsluk00
 Olaf Lenz
 Oliver Beckmann
 Oliver Kopp
@@ -304,6 +314,7 @@ Sven Jäger
 systemoperator
 Thiago Toledo
 Thomas Arildsen
+Thomas F. Duellmann
 Thomas Ilsche
 Thorsten Dahlheimer
 Tim Kilian
@@ -313,6 +324,7 @@ Tobias Boceck
 Tobias Bouschen
 Tobias Denkinger
 Tobias Diez
+Tomás Morales de Luna
 Tony K
 Toralf Senger
 uid112001
@@ -321,6 +333,7 @@ Ulrik Stervbo
 UltimaBGD
 Uwe Kuehn
 Valentin Pons
+Venceslas Roullier
 Victor Figueira
 Victor Michelan
 Vincent W. Yang