Skip to content

Commit ef1fd5c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-changed
* 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
2 parents 3394dbd + 7bc6766 commit ef1fd5c

File tree

60 files changed

+6030
-1095
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6030
-1095
lines changed

.github/workflows/check-links.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
markdown-link-check:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- uses: gaurav-nelson/github-action-markdown-link-check@v1
1818
with:
1919
use-quiet-mode: 'yes'

.github/workflows/deployment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
name: Create installer and portable version for ${{ matrix.displayName }}
5252
steps:
5353
- name: Fetch all history for all tags and branches
54-
uses: actions/checkout@v2
54+
uses: actions/checkout@v3
5555
with:
5656
fetch-depth: 0
5757
- name: Install GitVersion
@@ -152,7 +152,7 @@ jobs:
152152
env:
153153
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
154154
- name: Checkout source
155-
uses: actions/checkout@v2
155+
uses: actions/checkout@v3
156156
- name: Fetch all history for all tags and branches
157157
run: git fetch --prune --unshallow
158158
- name: Install GitVersion

.github/workflows/gource.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: 'Checkout'
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
fetch-depth: 0
1919
- name: Determine dates

.github/workflows/refresh-csl-subtrees.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: github.repository == 'JabRef/jabref'
1414
steps:
1515
- name: Checkout source
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
ref: main
1919
fetch-depth: 0

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Fetch all history for all tags and branches
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
with:
1515
ref: main
1616
persist-credentials: false

.github/workflows/snap.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
3232
- name: Checkout source
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
3434
# The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
3535
# See snap/snapcraft.yml for details
3636
- name: Run snapcraft build

.github/workflows/tests-fetchers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout source
40-
uses: actions/checkout@v2
40+
uses: actions/checkout@v3
4141
- name: Set up JDK
4242
uses: actions/setup-java@v2
4343
with:

.github/workflows/tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout source
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030
- name: Set up JDK
3131
uses: actions/setup-java@v2
3232
with:
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- name: Checkout source
53-
uses: actions/checkout@v2
53+
uses: actions/checkout@v3
5454
- name: Set up JDK
5555
uses: actions/setup-java@v2
5656
with:
@@ -82,7 +82,7 @@ jobs:
8282
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
8383
steps:
8484
- name: Checkout source
85-
uses: actions/checkout@v2
85+
uses: actions/checkout@v3
8686
- name: Set up JDK
8787
uses: actions/setup-java@v2
8888
with:
@@ -116,7 +116,7 @@ jobs:
116116
runs-on: ubuntu-latest
117117
steps:
118118
- name: Checkout source
119-
uses: actions/checkout@v2
119+
uses: actions/checkout@v3
120120
- name: Set up JDK
121121
uses: actions/setup-java@v2
122122
with:
@@ -154,7 +154,7 @@ jobs:
154154
env:
155155
SNAPCRAFT_LOGIN_FILE: ${{ secrets.CODECOV_TOKEN }}
156156
- name: Checkout source
157-
uses: actions/checkout@v2
157+
uses: actions/checkout@v3
158158
- name: Set up JDK
159159
uses: actions/setup-java@v2
160160
with:
@@ -174,5 +174,5 @@ jobs:
174174
name: "Validate Gradle Wrapper"
175175
runs-on: ubuntu-latest
176176
steps:
177-
- uses: actions/checkout@v2
177+
- uses: actions/checkout@v3
178178
- uses: gradle/wrapper-validation-action@v1

.github/workflows/update-gradle-wrapper.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414

1515
- name: Update Gradle Wrapper
1616
uses: gradle-update/update-gradle-wrapper-action@v1

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2323

2424
### Fixed
2525

26+
- 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)
2627
- We fixed an issue where an exception could occur when saving the preferences [#7614](https://github.com/JabRef/jabref/issues/7614)
2728
- 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)
2829
- 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)
2930
- 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)
3031
- 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)
32+
- 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)
3133

3234
### Removed
3335

@@ -56,6 +58,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
5658
- We moved the search box in preview preferences closer to the available citation styles list. [#8370](https://github.com/JabRef/jabref/pull/8370)
5759
- 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)
5860
- We enabled switching themes in JabRef without the need to restart JabRef. [#7335](https://github.com/JabRef/jabref/pull/7335)
61+
- 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)
5962

6063
### Fixed
6164

build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414

1515
id 'org.openjfx.javafxplugin' version '0.0.12'
1616

17-
id 'org.beryx.jlink' version '2.24.4'
17+
id 'org.beryx.jlink' version '2.25.0'
1818

1919
// nicer test outputs during running and completion
2020
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
@@ -144,14 +144,14 @@ dependencies {
144144

145145
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.5'
146146

147-
implementation 'org.postgresql:postgresql:42.3.2'
147+
implementation 'org.postgresql:postgresql:42.3.3'
148148

149149
implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
150150
// causing module issues
151151
exclude module: 'oraclepki'
152152
}
153153

154-
implementation ('com.google.guava:guava:31.0.1-jre') {
154+
implementation ('com.google.guava:guava:31.1-jre') {
155155
// TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
156156
exclude module: "jsr305"
157157
}
@@ -165,7 +165,7 @@ dependencies {
165165
implementation 'de.saxsys:mvvmfx:1.8.0'
166166
implementation 'com.tobiasdiez:easybind:2.2'
167167
implementation 'org.fxmisc.flowless:flowless:0.6.8'
168-
implementation 'org.fxmisc.richtext:richtextfx:0.10.7'
168+
implementation 'org.fxmisc.richtext:richtextfx:0.10.9'
169169
implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
170170
implementation 'com.jfoenix:jfoenix:9.0.10'
171171
implementation 'org.controlsfx:controlsfx:11.1.1'
@@ -199,7 +199,7 @@ dependencies {
199199

200200
implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
201201

202-
testImplementation 'io.github.classgraph:classgraph:4.8.139'
202+
testImplementation 'io.github.classgraph:classgraph:4.8.141'
203203
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
204204
testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
205205

@@ -208,13 +208,13 @@ dependencies {
208208
testImplementation 'org.mockito:mockito-core:4.3.1'
209209
testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
210210
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
211-
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.22.0'
212-
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.22.0'
211+
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1'
212+
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.23.1'
213213
testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
214214
testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
215215
testImplementation "org.hamcrest:hamcrest-library:2.2"
216216

217-
checkstyle 'com.puppycrawl.tools:checkstyle:9.3'
217+
checkstyle 'com.puppycrawl.tools:checkstyle:10.0'
218218
// xjc needs the runtime as well for the ant task, otherwise it fails
219219
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
220220
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'

buildres/csl/csl-styles/american-journal-of-archaeology.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<issn>0002-9114</issn>
1616
<eissn>1939-828X</eissn>
1717
<summary>The American Journal of Archaeology style</summary>
18-
<updated>2021-11-12T14:22:00+00:00</updated>
18+
<updated>2022-02-27T11:00:00+00:00</updated>
1919
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2020
</info>
2121
<locale>
@@ -262,7 +262,7 @@
262262
<text macro="container-prefix" suffix=" "/>
263263
</if>
264264
</choose>
265-
<text variable="container-title" font-style="italic"/>
265+
<text variable="container-title" text-case="title" font-style="italic"/>
266266
</macro>
267267
<macro name="publisher">
268268
<group>

buildres/csl/csl-styles/antiquites-africaines.csl

+44-19
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,26 @@
99
<link href="https://journals.openedition.org/antafr/340" rel="documentation"/>
1010
<author>
1111
<name>Antonio Mendes da Silva</name>
12-
<email>mendes@mmsh.univ-aix.fr</email>
12+
<email>antonio.mendes@cnrs.fr</email>
1313
</author>
1414
<category citation-format="author-date"/>
1515
<category field="humanities"/>
1616
<category field="history"/>
1717
<issn>0066-4871</issn>
1818
<eissn>2117-539X</eissn>
19-
<summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de
20-
l’Afrique du Nord, de la protohistoire à la conquête arabe &#8211; History and
21-
archaeology of North Africa, from protohistory to the Arab conquests. Centre Camille
22-
Jullian, CNRS</summary>
23-
<updated>2020-05-04T12:23:43+00:00</updated>
19+
<summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de l’Afrique
20+
du Nord, de la protohistoire à la conquête arabe &#8211; History and archaeology of North
21+
Africa, from protohistory to the Arab conquests. Centre Camille Jullian, CNRS</summary>
22+
<updated>2020-05-10T04:06:15+00:00</updated>
2423
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2524
</info>
2625
<locale xml:lang="fr">
2726
<terms>
28-
<term name="no date" form="short">[s.d.]</term>
27+
<term name="no date" form="short">s.d.</term>
2928
<term name="et-al">et alii</term>
3029
<term name="editor" form="short">
31-
<single>dir.</single>
32-
<multiple>dirs.</multiple>
30+
<single>éd.</single>
31+
<multiple>éd.</multiple>
3332
</term>
3433
</terms>
3534
</locale>
@@ -105,7 +104,7 @@
105104
</names>
106105
</else-if>
107106
<else-if type="book">
108-
<text variable="title-short"/>
107+
<text variable="title-short" font-style="italic"/>
109108
</else-if>
110109
<else-if type="map">
111110
<text variable="title-short"/>
@@ -133,6 +132,14 @@
133132
<label form="short" prefix=" (" suffix=".)"/>
134133
</names>
135134
</else-if>
135+
<else-if variable="editorial-director">
136+
<names variable="editorial-director" suffix=" ">
137+
<name name-as-sort-order="all" and="text" initialize-with=". " delimiter-precedes-last="never" sort-separator=" ">
138+
<name-part name="family" font-variant="small-caps"/>
139+
</name>
140+
<label form="short" prefix=" (" suffix=".)"/>
141+
</names>
142+
</else-if>
136143
</choose>
137144
</macro>
138145
<macro name="editor">
@@ -274,7 +281,7 @@
274281
<choose>
275282
<if variable="issued">
276283
<text macro="volume" prefix=", "/>
277-
<text variable="issue" prefix="&amp;#160;"/>
284+
<text variable="issue" prefix="&#160;"/>
278285
</if>
279286
<else>
280287
<text macro="volume" prefix=", "/>
@@ -343,10 +350,9 @@
343350
<macro name="collection">
344351
<choose>
345352
<if type="motion_picture map entry-dictionary entry-encyclopedia book speech paper-conference chapter" match="any">
346-
<group prefix=" (" suffix=")" delimiter=", ">
353+
<group prefix=" (" suffix=")">
347354
<text variable="collection-title"/>
348-
<text macro="volume"/>
349-
<text variable="collection-number"/>
355+
<text variable="collection-number" prefix=" "/>
350356
</group>
351357
</if>
352358
<else-if type="article-journal">
@@ -361,6 +367,7 @@
361367
<group suffix=", " prefix=" ">
362368
<choose>
363369
<if variable="issued">
370+
<text macro="originally-published" suffix=" "/>
364371
<date variable="issued">
365372
<date-part name="year" form="long"/>
366373
</date>
@@ -383,6 +390,15 @@
383390
</else>
384391
</choose>
385392
</macro>
393+
<macro name="originally-published">
394+
<group delimiter=", " prefix=" [" suffix="]">
395+
<date variable="original-date">
396+
<date-part name="day" suffix=" "/>
397+
<date-part name="month" suffix=" "/>
398+
<date-part name="year"/>
399+
</date>
400+
</group>
401+
</macro>
386402
<macro name="page-bib">
387403
<choose>
388404
<if type="book" match="any"/>
@@ -444,7 +460,6 @@
444460
<group suffix=", ">
445461
<choose>
446462
<if is-numeric="volume">
447-
<text term="volume" form="short" suffix=". "/>
448463
<text variable="volume"/>
449464
<text variable="number-of-volumes" prefix="/"/>
450465
</if>
@@ -465,19 +480,28 @@
465480
</names>
466481
</group>
467482
</macro>
468-
<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=" ">
483+
<macro name="archive">
484+
<group suffix="." prefix=". ">
485+
<group delimiter=", ">
486+
<text variable="archive"/>
487+
<text variable="archive_location"/>
488+
<text variable="call-number"/>
489+
</group>
490+
</group>
491+
</macro>
492+
<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=" ">
469493
<sort>
470494
<key variable="issued" sort="descending"/>
471495
<key macro="author-citation"/>
472496
<key macro="title"/>
473497
</sort>
474-
<layout delimiter="&amp;#160;; ">
475-
<group delimiter=",&amp;#160;">
498+
<layout delimiter="&#160;; ">
499+
<group delimiter=",&#160;">
476500
<group delimiter=" ">
477501
<text macro="author-citation"/>
478502
<text macro="year-date-short"/>
479503
</group>
480-
<group delimiter="&amp;#160;">
504+
<group delimiter="&#160;">
481505
<label variable="locator" form="short"/>
482506
<text variable="locator"/>
483507
</group>
@@ -501,6 +525,7 @@
501525
<text macro="place"/>
502526
<text macro="collection"/>
503527
<text macro="page-bib"/>
528+
<text macro="archive"/>
504529
</group>
505530
<text variable="URL"/>
506531
</layout>

0 commit comments

Comments
 (0)