Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into macsign
Browse files Browse the repository at this point in the history
* upstream/master:
  Bump WyriHaximus/github-action-wait-for-status from v1.1 to v1.1.2 (#6786)
  Bump postgresql from 42.2.15 to 42.2.16 (#6785)
  Bump unirest-java from 3.9.00 to 3.10.00 (#6784)
  Bump org.beryx.jlink from 2.21.2 to 2.21.3 (#6783)
  Bump mockito-core from 3.5.0 to 3.5.5 (#6782)
  Fixed forgotten biblatex test with biblatex-software type definitions (#6780)
  Enable SpringerFetcherTest running on CI using a dedicated key (#6729)
  Add missing authors
  New Crowdin updates (#6778)
  Add signing for mac osx. (#6748)
  Linkfix
  Squashed 'src/main/resources/csl-styles/' changes from 0895562..469deb6
  • Loading branch information
Siedlerchr committed Aug 24, 2020
2 parents 73a136b + 1ed1704 commit 5d16209
Show file tree
Hide file tree
Showing 82 changed files with 3,884 additions and 437 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- name: 'Wait for status checks'
id: waitforstatuschecks
uses: "WyriHaximus/github-action-wait-for-status@v1.1"
uses: "WyriHaximus/github-action-wait-for-status@v1.1.2"
with:
ignoreActions: automerge
checkInterval: 13
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ on:
- cron: '2 3 * * 3'

env:
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }}
IEEEAPIKey: ${{ secrets.IEEEAPIKey }}
SpringerNatureAPIKey: ${{ secrets.SPRINGERNATUREAPIKEY_FOR_TESTS }}
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}

jobs:
fetchertests:
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ Guillaume Gardey
Hakan Duran
Hannes Restel
Harinda Samarasekara
hemantgs
HifeFish
Hollyqqqqq
hrandrianasolo
Expand Down Expand Up @@ -309,6 +310,7 @@ Richard Schneeman
Robert Jäschke
Robin Lichtenthaeler
Rodrigo Paula da Silva
Rolf Green
Rolf Starre
Ronak Lakhotia
Roy Storey
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

## Older versions

The changelog of JabRef 4.x is available at the [v4.x branch](https://github.com/JabRef/jabref/blob/v4.x/CHANGELOG.md).
The changelog of JabRef 4.x is available at the [v4.3.1 tag](https://github.com/JabRef/jabref/blob/v4.3.1/CHANGELOG.md).
The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.29.0'
id 'org.javamodularity.moduleplugin' version '1.7.0'
id 'org.openjfx.javafxplugin' version '0.0.9'
id 'org.beryx.jlink' version '2.21.2'
id 'org.beryx.jlink' version '2.21.3'

// nicer test outputs during running and completion
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
Expand Down Expand Up @@ -139,7 +139,7 @@ dependencies {

implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.6.2'

implementation 'org.postgresql:postgresql:42.2.15'
implementation 'org.postgresql:postgresql:42.2.16'

implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
// causing module issues
Expand All @@ -166,7 +166,7 @@ dependencies {
implementation 'org.controlsfx:controlsfx:11.0.2'

implementation 'org.jsoup:jsoup:1.13.1'
implementation 'com.konghq:unirest-java:3.9.00'
implementation 'com.konghq:unirest-java:3.10.00'

implementation 'org.slf4j:slf4j-api:2.0.0-alpha1'
implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
Expand Down Expand Up @@ -203,7 +203,7 @@ dependencies {
testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.14'
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
testImplementation 'org.mockito:mockito-core:3.5.0'
testImplementation 'org.mockito:mockito-core:3.5.5'
testImplementation 'org.xmlunit:xmlunit-core:2.7.0'
testImplementation 'org.xmlunit:xmlunit-matchers:2.7.0'
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.14.1'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
<info>
<title>American Physical Society (without titles)</title>
<title-short>APS (without titles)</title-short>
<id>http://www.zotero.org/styles/american-physics-society-without-titles</id>
<link href="http://www.zotero.org/styles/american-physics-society-without-titles" rel="self"/>
<link href="http://www.zotero.org/styles/american-physics-society" rel="template"/>
<link href="https://journals.aps.org/prl/authors#techformat" rel="documentation"/>
<author>
<name>Richard Karnesky</name>
<email>karnesky+zotero@gmail.com</email>
<uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
</author>
<author>
<name>Brenton M. Wiernik</name>
</author>
<category citation-format="numeric"/>
<category field="physics"/>
<summary>Common style use by APS publications, without article titles.</summary>
<updated>2012-09-27T22:06:38+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>
<macro name="author">
<names variable="author">
<name delimiter=", " initialize-with=". " and="text"/>
<label form="long" prefix=", " suffix=" "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</names>
</macro>
<macro name="editor">
<names variable="editor">
<label form="verb" suffix=" "/>
<name delimiter=", " initialize-with=". " and="text"/>
</names>
</macro>
<macro name="year-date">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</macro>
<macro name="day-date">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="day" suffix=" "/>
<date-part name="month" form="long" suffix=" "/>
<date-part name="year"/>
</date>
</if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</macro>
<macro name="publisher">
<group prefix="(" suffix=")" delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place" text-case="title"/>
<text macro="year-date"/>
</group>
</macro>
<macro name="edition-volume">
<group delimiter=", ">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<text term="edition" form="short"/>
</group>
</if>
<else>
<text variable="edition"/>
</else>
</choose>
<group delimiter=" ">
<label variable="volume" form="short" text-case="capitalize-first"/>
<text variable="volume"/>
</group>
</group>
</macro>
<citation collapse="citation-number">
<sort>
<key variable="citation-number"/>
</sort>
<layout delimiter="," prefix="&#160;[" suffix="]">
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush">
<!-- Reference for arxiv: https://doi.org/10.1103/PhysRevLett.116.135503 -->
<layout suffix=".">
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" suffix=", "/>
<choose>
<if type="bill book figure graphic legal_case legislation map motion_picture song treaty" match="any">
<group delimiter=" ">
<group delimiter=", ">
<text variable="title" text-case="title" font-style="italic"/>
<text macro="edition-volume"/>
</group>
<text macro="publisher"/>
</group>
</if>
<else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
<group delimiter=" ">
<choose>
<if variable="container-title">
<group delimiter=" ">
<text term="in"/>
<group delimiter=", ">
<text variable="container-title" text-case="title" font-style="italic"/>
<text macro="editor"/>
<text macro="edition-volume"/>
</group>
</group>
</if>
<else>
<group delimiter=", ">
<text variable="title" text-case="title" font-style="italic"/>
<text macro="edition-volume"/>
</group>
</else>
</choose>
<group delimiter=", ">
<text macro="publisher"/>
<group delimiter=" ">
<label variable="page" form="short"/>
<text variable="page"/>
</group>
</group>
</group>
</else-if>
<else-if type="patent">
<group delimiter=" ">
<text variable="number"/>
<text macro="day-date" prefix="(" suffix=")"/>
</group>
</else-if>
<else-if type="thesis report" match="any">
<group delimiter=", ">
<text variable="title" text-case="title"/>
<group delimiter=" ">
<text variable="genre"/>
<group delimiter=" ">
<text term="issue" form="short" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</group>
<text variable="publisher"/>
<text macro="year-date"/>
</group>
</else-if>
<else-if type="article" match="any">
<choose>
<if variable="container-title">
<text variable="container-title"/>
</if>
<else>
<text variable="number"/>
</else>
</choose>
</else-if>
<else-if type="dataset interview manuscript pamphlet personal_communication post post-weblog speech webpage">
<!-- unpublished materials; guidelines call for 'enough information to be retrievable' -->
<!-- Based on arXiv format -->
<group delimiter=", ">
<choose>
<if variable="DOI">
<text variable="DOI" prefix="https://doi.org/"/>
</if>
<else-if variable="URL">
<text variable="URL"/>
</else-if>
<else>
<text value="(unpublished)"/>
</else>
</choose>
</group>
</else-if>
<else>
<!--article-journal article-magazine article-newspaper review review-book-->
<group delimiter=" ">
<text variable="container-title" form="short" text-case="title"/>
<group delimiter=", ">
<text variable="volume" font-weight="bold"/>
<group delimiter=" ">
<text variable="page-first" form="short"/>
<text macro="year-date" prefix="(" suffix=")"/>
</group>
</group>
</group>
</else>
</choose>
</layout>
</bibliography>
</style>
Loading

0 comments on commit 5d16209

Please sign in to comment.