Skip to content

Commit

Permalink
Merge branch 'main' into gradlew-update-7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
calixtus authored Nov 22, 2021
2 parents 882f3cb + ab13b2a commit 264a786
Show file tree
Hide file tree
Showing 102 changed files with 4,705 additions and 1,163 deletions.
1 change: 1 addition & 0 deletions .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
schedule:
# Run on the first of each month at 9:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
- cron: "0 9 1 * *"
workflow_dispatch:

jobs:
markdown-link-check:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ env:
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
JAVA_OPTS: -Xmx4g

concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand All @@ -45,21 +49,17 @@ jobs:
runs-on: ${{ matrix.os }}
name: Create installer and portable version for ${{ matrix.displayName }}
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Fetch all history for all tags and branches
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.10
uses: gittools/actions/gitversion/setup@v0.9.11
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.10
uses: gittools/actions/gitversion/execute@v0.9.11
- name: Set up JDK
uses: actions/setup-java@v2
with:
Expand Down Expand Up @@ -155,12 +155,12 @@ jobs:
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.10
uses: gittools/actions/gitversion/setup@v0.9.11
with:
versionSpec: '5.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.10
uses: gittools/actions/gitversion/execute@v0.9.11
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- gource
schedule:
- cron: '15 3 1 1,4,7,10 *'
workflow_dispatch:

jobs:
action:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
# run on each day
- cron: "33 4 * * *"

concurrency:
group: snap-${{ github.head_ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ env:
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}

concurrency:
group: fetcher-tests-${{ github.head_ref }}
cancel-in-progress: true

jobs:
fetchertests:
name: Fetcher tests
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ name: Tests
on:
push:
branches:
- master
- main
- main-release
pull_request:
# always run on pull requests
workflow_dispatch:

env:
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
Expand All @@ -14,15 +16,15 @@ env:
GRADLE_OPTS: -Xmx4g
JAVA_OPTS: -Xmx4g

concurrency:
group: tests-${{ github.head_ref }}
cancel-in-progress: true

jobs:
checkstyle:
name: Checkstyle
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout source
uses: actions/checkout@v2
- name: Set up JDK
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- The default directory of the "LaTeX Citations" tab is now the directory of the currently opened database (and not the directory chosen at the last open file dialog or the last database save) [koppor#538](https://github.com/koppor/jabref/issues/538)
- We fixed an issue where right-clicking on a tab and selecting close will close the focused tab even if it is not the tab we right-clicked [#8193](https://github.com/JabRef/jabref/pull/8193)
- We fixed an issue where selecting a citation style in the preferences would sometimes produce an exception [#7860](https://github.com/JabRef/jabref/issues/7860)
- We fixed an issue where an exception would occur when clicking on a DOI link in the preview pane [#7706](https://github.com/JabRef/jabref/issues/7706)

### Removed

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ dependencies {
// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
implementation 'org.bouncycastle:bcprov-jdk15on:1.69'

implementation 'commons-cli:commons-cli:1.4'
implementation 'commons-cli:commons-cli:1.5.0'

implementation 'org.libreoffice:libreoffice:7.2.2'
implementation 'org.libreoffice:unoloader:7.2.2'
Expand Down Expand Up @@ -207,14 +207,14 @@ dependencies {

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

testImplementation 'io.github.classgraph:classgraph:4.8.132'
testImplementation 'io.github.classgraph:classgraph:4.8.135'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
testImplementation 'org.junit.platform:junit-platform-launcher:1.8.1'

testImplementation 'net.bytebuddy:byte-buddy-parent:1.12.1'
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
testImplementation 'org.mockito:mockito-core:4.0.0'
testImplementation 'org.mockito:mockito-core:4.1.0'
testImplementation 'org.xmlunit:xmlunit-core:2.8.3'
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.3'
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.22.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</contributor>
<category citation-format="author-date"/>
<summary>Style as per the May 2019 guidelines.</summary>
<updated>2021-04-22T13:05:29+00:00</updated>
<updated>2021-11-10T10:39:01+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="en">
Expand Down Expand Up @@ -279,20 +279,12 @@
<group delimiter=". " suffix=".">
<text macro="title" prefix=", "/>
<text variable="number"/>
<date variable="issued">
<date-part name="year"/>
<date-part name="month" form="numeric-leading-zeros" prefix="-"/>
<date-part name="day" form="numeric-leading-zeros" prefix="-"/>
</date>
<text macro="issued"/>
</group>
</else-if>
<else-if type="webpage post-weblog post" match="any">
<group delimiter=". " prefix=" ">
<date variable="issued" prefix="(" suffix=")">
<date-part name="year"/>
<date-part name="month" form="numeric-leading-zeros" prefix="-"/>
<date-part name="day" form="numeric-leading-zeros" prefix="-"/>
</date>
<text macro="issued"/>
<text macro="title"/>
<text variable="container-title" font-style="italic"/>
<text variable="genre" prefix="[" suffix="]"/>
Expand Down
Loading

0 comments on commit 264a786

Please sign in to comment.