Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix-changed
Browse files Browse the repository at this point in the history
* upstream/main:
  Add Missing Fillers/Extractors for Supported Fields and Support Day Conversion (#8531)
  Bump checkstyle from 9.3 to 10.0 (#8544)
  Fix online link detection in entry editor (#8514)
  Add some JavaDoc to Fetchers
  Support two argument form of \abx@aux@cite macro in DefaultAuxParser (#8549)
  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)

# Conflicts:
#	src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
  • Loading branch information
Siedlerchr committed Mar 9, 2022
2 parents 3394dbd + 7bc6766 commit ef1fd5c
Show file tree
Hide file tree
Showing 60 changed files with 6,030 additions and 1,095 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/refresh-csl-subtrees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/refresh-journal-lists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Fixed

- We fixed an issue where online links in the file field were not detected correctly and could produce an exception [#8150](https://github.com/JabRef/jabref/issues/8510)
- We fixed an issue where an exception could occur when saving the preferences [#7614](https://github.com/JabRef/jabref/issues/7614)
- We fixed an issue where "Copy DOI url" in the right-click menu of the Entry List would just copy the DOI and not the DOI url. [#8389](https://github.com/JabRef/jabref/issues/8389)
- We fixed an issue where opening the console from the drop-down menu would cause an exception. [#8466](https://github.com/JabRef/jabref/issues/8466)
- We fixed an issue when reading non-UTF-8 encoded. When no encoding header is present, the encoding is now detected from the file content (and the preference option is disregarded) [#8417](https://github.com/JabRef/jabref/issues/8417)
- We fixed an issue where pasting a URL was replacing + signs by spaces making the URL unreachable. [#8448](https://github.com/JabRef/jabref/issues/8448)
- We fixed an issue where creating subsidiary files from aux files created with some versions of biblatex would produce incorrect results. [#8513](https://github.com/JabRef/jabref/issues/8513)

### Removed

Expand Down Expand Up @@ -56,6 +58,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We moved the search box in preview preferences closer to the available citation styles list. [#8370](https://github.com/JabRef/jabref/pull/8370)
- Changing the preference to show the preview panel as a separate tab now has effect without restarting JabRef. [#8370](https://github.com/JabRef/jabref/pull/8370)
- We enabled switching themes in JabRef without the need to restart JabRef. [#7335](https://github.com/JabRef/jabref/pull/7335)
- We added support for the field `day`, `rights`, `coverage` and `language` when reading XMP data in Dublin Core format. [#8491](https://github.com/JabRef/jabref/issues/8491)

### Fixed

Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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
Expand Down Expand Up @@ -144,14 +144,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"
}
Expand All @@ -165,7 +165,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'
Expand Down Expand Up @@ -199,7 +199,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'

Expand All @@ -208,13 +208,13 @@ 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"

checkstyle 'com.puppycrawl.tools:checkstyle:9.3'
checkstyle 'com.puppycrawl.tools:checkstyle:10.0'
// xjc needs the runtime as well for the ant task, otherwise it fails
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
Expand Down
4 changes: 2 additions & 2 deletions buildres/csl/csl-styles/american-journal-of-archaeology.csl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
63 changes: 44 additions & 19 deletions buildres/csl/csl-styles/antiquites-africaines.csl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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=", "/>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -501,6 +525,7 @@
<text macro="place"/>
<text macro="collection"/>
<text macro="page-bib"/>
<text macro="archive"/>
</group>
<text variable="URL"/>
</layout>
Expand Down
Loading

0 comments on commit ef1fd5c

Please sign in to comment.