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

* upstream/master:
  Squashed 'src/main/resources/csl-styles/' changes from a8dafef..fad76fe
  Update journalList.mv
  Update journalList.mv
  Fix github-push-action
  Revert "Try to refresh on master push"
  Try to refresh on master push
  Refresh journal lists periodically (#5749)
  Cancel Previous Workflow Runs (#6826)

.github/workflows/deployment.yml

@@ -40,6 +40,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
       - name: Fetch all history for all tags and branches
         uses: actions/checkout@v2
         with:

.github/workflows/refresh-journal-lists.yml

@@ -0,0 +1,59 @@
+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
+
+jobs:
+  publish:
+    name: Refresh Journal List Files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch all history for all tags and branches
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          persist-credentials: false
+          fetch-depth: 0
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - uses: actions/cache@v1
+        name: Restore gradle wrapper
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Update journal lists
+        run: |
+          set +o pipefail
+
+          # prepare journal lists
+          cd /tmp
+          git clone --depth=1 https://github.com/JabRef/abbrv.jabref.org.git
+          cd abbrv.jabref.org/journals
+
+          # remove all lists without dot in them
+          # we use abbrevatiation lists containing dots in them only (to be consistent)
+          rm journal_abbreviations_entrez.csv
+          rm journal_abbreviations_medicus.csv
+          rm journal_abbreviations_webofscience-dots.csv
+
+          # prepare building
+          mkdir -p $GITHUB_WORKSPACE/build/journals
+          cp * $GITHUB_WORKSPACE/build/journals/
+
+          # create .mv file
+          cd $GITHUB_WORKSPACE
+          ./gradlew generateJournalAbbreviationList
+
+          # git commit
+          git config user.email "[email protected]"
+          git config user.name "JabRef refresh journal lists [bot]"
+          git add . && git commit -m"Update journalList.mv"
+      - uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/snap.yml

@@ -12,7 +12,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Create snapcraft image
-
     steps:
       - name: Check secrets presence
         id: checksecrets

.github/workflows/tests.yml

@@ -17,6 +17,10 @@ jobs:
     name: Checkstyle
     runs-on: ubuntu-latest
     steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
       - name: Checkout source
         uses: actions/checkout@v2
       - name: Set up JDK

.gitignore

@@ -2,9 +2,6 @@
 src/main/gen/
 src/main/generated/
 
-# the journal list cache
-*.mv
-
 # private data
 /buildres/jabref-cert-2016.p12
 

CHANGELOG.md

@@ -16,6 +16,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Changed
 
+- JabRef now offers journal lists from <https://abbrv.jabref.org>. JabRef the lists which use a dot inside the abbreviations. [#5749](https://github.com/JabRef/jabref/pull/5749)
+
 ### Fixed
 
 ### Removed

build.gradle

@@ -298,8 +298,7 @@ task generateSource(dependsOn: ["generateBstGrammarSource",
                                 "generateMedlineSource",
                                 "generateBibtexmlSource",
                                 "generateEndnoteSource",
-                                "generateModsSource",
-                                "generateJournalAbbreviationList"]) {
+                                "generateModsSource"]) {
     group = 'JabRef'
     description 'Generates all necessary (Java) source files.'
 }
@@ -365,7 +364,7 @@ task generateJournalAbbreviationList(type: JournalAbbreviationConverter) {
     group = 'JabRef'
     description = "Converts the comma-separated journal abbreviation file to a H2 MVStore."
 
-    inputDir = file("src/main/resources/journals")
+    inputDir = file("build/journals")
     outputDir = file("src/main/resources/journals")
 }
 

src/main/resources/csl-styles/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: c2cc508c57157ee7d00948e24c46e10e3f319d57
+  revision: 7822dbda11e229cbd933f84a3a1cfdbe8e75dfaf
   specs:
     sheldon (1.0.2)
       citeproc-ruby
@@ -14,42 +14,42 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    citeproc (1.0.9)
+    citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.10)
+    citeproc-ruby (1.1.12)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.5)
-    csl (1.5.0)
+    csl (1.5.1)
       namae (~> 1.0)
-    csl-styles (1.0.1.9)
+    csl-styles (1.0.1.10)
       csl (~> 1.0)
-    diff-lcs (1.3)
-    diffy (3.3.0)
-    dotenv (2.7.5)
+    diff-lcs (1.4.4)
+    diffy (3.4.0)
+    dotenv (2.7.6)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     mini_portile2 (2.4.0)
     namae (1.0.1)
-    nokogiri (1.10.8)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    ostruct (0.1.0)
+    ostruct (0.2.0)
     rake (13.0.1)
-    reverse_markdown (1.3.0)
+    reverse_markdown (2.0.0)
       nokogiri
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.3)
     ruby-progressbar (1.10.1)
 
 PLATFORMS