Merge master into develop

.github/workflows/deployment.yml

@@ -11,17 +11,17 @@ jobs:
         include:
          - os: ubuntu-latest
            displayName: linux
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_linux-x64_bin.tar.gz
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_linux-x64_bin.tar.gz
            jdk14Path: /jdk-14
            archivePortable: tar -czf build/distribution/JabRef-portable_linux.tar.gz -C build/distribution JabRef && rm -R build/distribution/JabRef
          - os: windows-latest
            displayName: windows
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_windows-x64_bin.zip
            jdk14Path: /jdk-14
            archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
          - os: macOS-latest
            displayName: macOS
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_osx-x64_bin.tar.gz
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_osx-x64_bin.tar.gz
            jdk14Path: /jdk-14.jdk/Contents/Home
            archivePortable: tar -czf build/distribution/JabRef-portable_macos.tar.gz -C build/distribution JabRef.app && rm -R build/distribution/JabRef.app
 
@@ -45,7 +45,15 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11.0.4
+        java-version: 13
+    - uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: |
+          ${{ runner.OS }}-gradle-${{ env.cache-name }}-
+          ${{ runner.OS }}-gradle-
+          ${{ runner.OS }}-
     - name: Download jpackage
       # We need to download jpackage from https://jdk.java.net/jpackage/
       run: |
@@ -88,8 +96,8 @@ jobs:
       env:
         SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
       run: |
-          docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/"
-          # cd build/distribution/ && mdkir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg && snapcraft push --release=beta *.snap
+          mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
+          docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/ && snapcraft push build/distribution/jabref*.snap --release edge || true"
       shell: bash
     - name: Upload to builds.jabref.org
       uses: garygrossgarten/github-action-scp@release

.gitignore

@@ -21,6 +21,10 @@ prime/
 jabref_source.tar.bz2
 snap/.snapcraft/
 
+# flatpak
+flatpak/.buildconfig
+flatpak/JabRef-portable_linux.tar.gz
+
 # Gradle
 # generated when `gradlew --gui` is called
 ui/
@@ -443,4 +447,4 @@ gradle-app.setting
 -!/buildSrc/src/main/groovy/org/jabref/build
 -
 -# do not ignore JabRef icons (they are ignored by the macos setting above)
--!src/main/java/org/jabref/gui/icon
+-!src/main/java/org/jabref/gui/icon

.mailmap

@@ -91,8 +91,8 @@ Ulrik Stervbo <ulriks@users.sourceforge.net>
 Stefano Gariazzo <steog88@gmail.com>
 Lee Patton <lpatton@users.sourceforge.net>
 Jörg Lenhard <joerg.lenhard@kau.se>
-<joerg.lenhard@kau.se> <joerg@lenhard.info>
-<joerg.lenhard@kau.se> <lenhard@users.noreply.github.com>
+Jörg Lenhard <joerg.lenhard@kau.se> <joerg@lenhard.info>
+Jörg Lenhard <joerg.lenhard@kau.se> <lenhard@users.noreply.github.com>
 Jörg Lenhard <joerg.lenhard@kau.se> <joerg.lenhard@uni-bamberg.de>
 Matthias Geiger <matthias.geiger@uni-bamberg.de>
 Christoph Braun <braunch.dev@gmail.com>
@@ -110,6 +110,8 @@ Jens Döcke <jens.doecke@gmail.com>
 Jürgen Lange <juergen.lange@unitybox.de>
 Sascha Zeller <zeller.dev@gmail.com>
 Ali Ayan <ali.ayan@hotmail.de>
+Ali Zhagparov <ali_zhagparov@epam.com>
+Ali Zhagparov <ali_zhagparov@epam.com> <alijakparov.kz@gmail.com>
 Arno Blouin <blouin.arno@gmail.com>
 Jeff Miller <miller@psy.otago.ac.nz>
 Alain Vaucher <avaucher@users.noreply.github.com>
@@ -144,3 +146,42 @@ Cerrianne Santos <cerrianne.santos@gmail.com>
 Stefan Scheffel <st155160@stud.uni-stuttgart.de>
 Stefan Gerzmann <steppery@gmx.de>
 Deepak Kumar <deepakkumar24196@gmail.com>
+Aman Jain <aman.jain01@sap.com> <aman-coolinc1@users.noreply.github.com>
+Ayachi Nene <1710082010@qq.com>
+Jan Schäfer <j@nschaefer.net>
+Stefan Scheffel <Brainsucker92@users.noreply.github.com>
+Stefan Scheffel <stscit21@hs-esslingen.de>
+Yash Kothari <yashkothari199767@gmail.com>
+Quentin Fritz <49909555+core-master@users.noreply.github.com>
+Daniel Rodrigues <daniel.rodrigues.45@hotmail.com>
+Malte Deiseroth <deisi@users.noreply.github.com>
+Malik Atalla <6626492+HerrAachen@users.noreply.github.com>
+Kaique Komata <kaique.komata@gmail.com>
+S. Krause <st156455@stud.uni-stuttgart.de>
+Leonhard Wolz <leonhard.wo@gmx.de>
+Manuel Wtfjoke <WtfJoke@users.noreply.github.com>
+Valentin Pons <valx76@gmail.com>
+Arthur Fröhlich <37243770+znuznu@users.noreply.github.com>
+Songyu Wang <36670132+Songyu-Wang@users.noreply.github.com>
+Alex Tarrix <tarix@fu-berlin.de>
+Samiya Caur <samiya17094@iiitd.ac.in>
+Stanley Foerster <stanley.foerster@gmail.com>
+Michael McCann <tokkot@gmail.com>
+Robin Lichtenthaeler <robin.lichtenthaeler@web.de>
+Rodrigo Paula da Silva <rodrigopds73@gmail.com>
+Robert Jäschke <robert@Roberts-MacBook-Pro.local>
+Nick S. Weatherley <nick.s.weatherley@protonmail.com>
+Nivedha Sunderraj <nivedha.sunderraj@gmail.com>
+Lavabit <payload@lavabit.com>
+Rachel Wu <46014322+rachelwu21@users.noreply.github.com>
+Abraham Polk <abepolk@gmail.com>
+dima <dpolishc@cisco.com>
+Fred Stevens <breakfastfish@users.sf.net>
+Rui Kang <1539678784@qq.com>
+Yurick Honda <yurickyussuke@hotmail.com>
+Yurick Honda <yurickyussuke@hotmail.com> <32721326+yurickyh@users.noreply.github.com>
+Mihu <joszhistoria@gmail.com> <41503450+mmihuu@users.noreply.github.com>
+Michael Schwarmi <schwarmi@users.sf.net>
+Michal Rican <michal.rican@gmail.com>
+Param Mittal <parammittal16@gmail.com>
+Victor Michelan <venanciuslm@gmail.com>

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - openjdk11
+  - openjdk13
 
 # we test at Ubuntu Trusty (Ubuntu 14.04 LTS)
 # see https://docs.travis-ci.com/user/trusty-ci-environment/
@@ -31,8 +31,8 @@ matrix:
     fast_finish: true
     allow_failures:
       - env: TEST_SUITE=fetcherTest
+      - env: TEST_SUITE=databaseTest
       - env: TEST_SUITE=guiTest
-      - env: TEST_SUITE=codecov
       - env: DEPENDENCY_UPDATES=check
 
 # JavaFX localization tests need a running X environment
@@ -48,12 +48,10 @@ before_script:
   - mysql -u root -e 'create database jabref'
 
 script:
-  # --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
-  # For more information see https://gradle.com/scans/get-started
-  - if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
+  - if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest; fi
   - if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
   - if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
-  - if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport; bash <(curl -s https://codecov.io/bash); fi
+  - if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash); fi
   - if [ "$DEPENDENCY_UPDATES" == "check" ]; then ./gradlew -q checkOutdatedDependencies; fi
 
 after_failure: