Merge remote-tracking branch 'upstream/main' into updateCiteprocAlpha4

* upstream/main: Bump guava from 31.0.1-jre to 31.1-jre (#8543) Bump org.beryx.jlink from 2.24.4 to 2.25.0 (#8548) Bump postgresql from 42.3.2 to 42.3.3 (#8546) Bump richtextfx from 0.10.7 to 0.10.9 (#8547) Bump archunit-junit5-engine from 0.22.0 to 0.23.1 (#8545) Bump actions/checkout from 2 to 3 (#8542) Squashed 'buildres/csl/csl-styles/' changes from eb97405..8f69d4e Bump classgraph from 4.8.139 to 4.8.141 (#8535) Bump archunit-junit5-api from 0.22.0 to 0.23.1 (#8536)
JabRef · Mar 7, 2022 · f853ce8 · f853ce8
2 parents fd287e0 + 3c381bb
commit f853ce8
Show file tree

Hide file tree

Showing 33 changed files with 5,670 additions and 1,016 deletions.
diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
@@ -13,7 +13,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-quiet-mode: 'yes'

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -51,7 +51,7 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install GitVersion
@@ -152,7 +152,7 @@ jobs:
         env:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion

diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Determine dates

diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'JabRef/jabref'
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
           fetch-depth: 0

diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
           persist-credentials: false

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -30,7 +30,7 @@ jobs:
         env:
           SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
       # See snap/snapcraft.yml for details
       - name: Run snapcraft build

diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
@@ -82,7 +82,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
@@ -154,7 +154,7 @@ jobs:
         env:
           SNAPCRAFT_LOGIN_FILE: ${{ secrets.CODECOV_TOKEN }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
@@ -174,5 +174,5 @@ jobs:
     name: "Validate Gradle Wrapper"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1

diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
 
     id 'org.openjfx.javafxplugin' version '0.0.12'
 
-    id 'org.beryx.jlink' version '2.24.4'
+    id 'org.beryx.jlink' version '2.25.0'
 
     // nicer test outputs during running and completion
     // Homepage: https://github.com/radarsh/gradle-test-logger-plugin
@@ -148,14 +148,14 @@ dependencies {
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.5'
 
-    implementation 'org.postgresql:postgresql:42.3.2'
+    implementation 'org.postgresql:postgresql:42.3.3'
 
     implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
         // causing module issues
         exclude module: 'oraclepki'
     }
 
-    implementation ('com.google.guava:guava:31.0.1-jre') {
+    implementation ('com.google.guava:guava:31.1-jre') {
         // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
         exclude module: "jsr305"
     }
@@ -169,7 +169,7 @@ dependencies {
     implementation 'de.saxsys:mvvmfx:1.8.0'
     implementation 'com.tobiasdiez:easybind:2.2'
     implementation 'org.fxmisc.flowless:flowless:0.6.8'
-    implementation 'org.fxmisc.richtext:richtextfx:0.10.7'
+    implementation 'org.fxmisc.richtext:richtextfx:0.10.9'
     implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'org.controlsfx:controlsfx:11.1.1'
@@ -203,7 +203,7 @@ dependencies {
 
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.139'
+    testImplementation 'io.github.classgraph:classgraph:4.8.141'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
 
@@ -212,8 +212,8 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:4.3.1'
     testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
     testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
-    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.22.0'
-    testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.22.0'
+    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1'
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.23.1'
     testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
     testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
     testImplementation "org.hamcrest:hamcrest-library:2.2"

diff --git a/buildres/csl/csl-styles/american-journal-of-archaeology.csl b/buildres/csl/csl-styles/american-journal-of-archaeology.csl
@@ -15,7 +15,7 @@
     <issn>0002-9114</issn>
     <eissn>1939-828X</eissn>
     <summary>The American Journal of Archaeology style</summary>
-    <updated>2021-11-12T14:22:00+00:00</updated>
+    <updated>2022-02-27T11:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -262,7 +262,7 @@
         <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
-    <text variable="container-title" font-style="italic"/>
+    <text variable="container-title" text-case="title" font-style="italic"/>
   </macro>
   <macro name="publisher">
     <group>

diff --git a/buildres/csl/csl-styles/antiquites-africaines.csl b/buildres/csl/csl-styles/antiquites-africaines.csl
@@ -9,27 +9,26 @@
     <link href="https://journals.openedition.org/antafr/340" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <category field="history"/>
     <issn>0066-4871</issn>
     <eissn>2117-539X</eissn>
-    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de
-            l’Afrique du Nord, de la protohistoire à la conquête arabe &#8211; History and
-            archaeology of North Africa, from protohistory to the Arab conquests. Centre Camille
-            Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de l’Afrique
+      du Nord, de la protohistoire à la conquête arabe &#8211; History and archaeology of North
+      Africa, from protohistory to the Arab conquests. Centre Camille Jullian, CNRS</summary>
+    <updated>2020-05-10T04:06:15+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
     <terms>
-      <term name="no date" form="short">[s.d.]</term>
+      <term name="no date" form="short">s.d.</term>
       <term name="et-al">et alii</term>
       <term name="editor" form="short">
-        <single>dir.</single>
-        <multiple>dirs.</multiple>
+        <single>éd.</single>
+        <multiple>éd.</multiple>
       </term>
     </terms>
   </locale>
@@ -105,7 +104,7 @@
         </names>
       </else-if>
       <else-if type="book">
-        <text variable="title-short"/>
+        <text variable="title-short" font-style="italic"/>
       </else-if>
       <else-if type="map">
         <text variable="title-short"/>
@@ -133,6 +132,14 @@
           <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </else-if>
+      <else-if variable="editorial-director">
+        <names variable="editorial-director" suffix=" ">
+          <name name-as-sort-order="all" and="text" initialize-with=". " delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+          <label form="short" prefix=" (" suffix=".)"/>
+        </names>
+      </else-if>
     </choose>
   </macro>
   <macro name="editor">
@@ -274,7 +281,7 @@
           <choose>
             <if variable="issued">
               <text macro="volume" prefix=", "/>
-              <text variable="issue" prefix="&amp;#160;"/>
+              <text variable="issue" prefix="&#160;"/>
             </if>
             <else>
               <text macro="volume" prefix=", "/>
@@ -343,10 +350,9 @@
   <macro name="collection">
     <choose>
       <if type="motion_picture map entry-dictionary entry-encyclopedia book speech paper-conference chapter" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" (" suffix=")">
           <text variable="collection-title"/>
-          <text macro="volume"/>
-          <text variable="collection-number"/>
+          <text variable="collection-number" prefix=" "/>
         </group>
       </if>
       <else-if type="article-journal">
@@ -361,6 +367,7 @@
     <group suffix=", " prefix=" ">
       <choose>
         <if variable="issued">
+          <text macro="originally-published" suffix=" "/>
           <date variable="issued">
             <date-part name="year" form="long"/>
           </date>
@@ -383,6 +390,15 @@
       </else>
     </choose>
   </macro>
+  <macro name="originally-published">
+    <group delimiter=", " prefix=" [" suffix="]">
+      <date variable="original-date">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
   <macro name="page-bib">
     <choose>
       <if type="book" match="any"/>
@@ -444,7 +460,6 @@
     <group suffix=", ">
       <choose>
         <if is-numeric="volume">
-          <text term="volume" form="short" suffix=". "/>
           <text variable="volume"/>
           <text variable="number-of-volumes" prefix="/"/>
         </if>
@@ -465,19 +480,28 @@
       </names>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; ">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -501,6 +525,7 @@
         <text macro="place"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text variable="URL"/>
     </layout>