Skip to content

Commit fc0af37

Browse files
committed
Merge branch 'main' of github.com:JabRef/jabref
* 'main' of github.com:JabRef/jabref: (26 commits) Change Open AI to Open AI (or API Compatible) (#13608) Remove all assignment tracking labels Updated architecture and components link in CONTRIBUTING.md (#13606) #13301 Fix/unicode reference marks (#13590) Show fetch exception at citation relation (#13549) More jbang caching Sequential run for moving issues Update CSL Styles (#13601) Fix gradle issues (#13603) Add System.exit (#13510) New Crowdin updates (#13600) Automatic lookup DOI at citation information. (#13596) Update heylogs from 0.10.0 to 0.11.1 (#13594) add fallback and reenable defaultcomeslast (#13593) Fix debian vagrant image (#13589) Fix: Replace string "Tests" with "Source Code Tests" in PR Comment (#13587) Fix version for SNAPSHOT (#13581) Update JDK and JavaFX (#13580) Add icon (#13579) Fixes link I broke in PR 13568 (#13577) ...
2 parents bec3e93 + 7f75384 commit fc0af37

File tree

89 files changed

+1352
-595
lines changed

Some content is hidden

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

89 files changed

+1352
-595
lines changed

.github/ghprcomment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
[Markdown lint's rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#rules) help to keep our Markdown files consistent within this repository and consistent with the Markdown files outside here.
103103
104104
105-
You can check the detailed error output by navigating to your pull request, selecting the tab "Checks", section "Tests" (on the left), subsection "CHANGELOG.md".
105+
You can check the detailed error output by navigating to your pull request, selecting the tab "Checks", section "Source Code Tests" (on the left), subsection "CHANGELOG.md".
106106
- jobName: Markdown
107107
workflowName: 'Source Code Tests'
108108
message: >
@@ -111,7 +111,7 @@
111111
[Markdown lint's rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#rules) help to keep our Markdown files consistent within this repository and consistent with the Markdown files outside here.
112112
113113
114-
You can check the detailed error output by navigating to your pull request, selecting the tab "Checks", section "Tests" (on the left), subsection "Markdown".
114+
You can check the detailed error output by navigating to your pull request, selecting the tab "Checks", section "Source Code Tests" (on the left), subsection "Markdown".
115115
116116
117117
# Submodules and branches

.github/workflows/binaries.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ jobs:
208208
- name: Use cache
209209
uses: actions/cache@v4
210210
with:
211-
lookup-only: true
212211
path: ~/.jbang
213212
key: ${{ steps.cache-key.outputs.cache_key }}
214213
restore-keys:

.github/workflows/on-issue-unlabeled.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,13 @@ jobs:
4242
done
4343
env:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
- name: Remove labels assigned, reminder-sent, pinned, and "FirstTimeCodeContribution"
46+
run: |
47+
set -e
48+
49+
gh issue edit ${{ github.event.issue.number }} --remove-label "📍 Assigned"
50+
gh issue edit ${{ github.event.issue.number }} --remove-label "🔔 reminder-sent"
51+
gh issue edit ${{ github.event.issue.number }} --remove-label "📌 Pinned"
52+
gh issue edit ${{ github.event.issue.number }} --remove-label "FirstTimeCodeContribution"
53+
env:
54+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ on:
1313
# run on each Monday
1414
- cron: '2 3 * * 1'
1515
workflow_dispatch:
16+
inputs:
17+
tagbuild:
18+
description: 'Trigger a full maven central release'
19+
required: false
20+
default: false
21+
type: boolean
1622

1723
permissions:
1824
actions: write
@@ -62,7 +68,6 @@ jobs:
6268
- name: Use cache
6369
uses: actions/cache@v4
6470
with:
65-
lookup-only: true
6671
path: ~/.jbang
6772
key: ${{ steps.cache-key.outputs.cache_key }}
6873
restore-keys:
@@ -97,5 +102,13 @@ jobs:
97102
file ${{ steps.secring.outputs.filePath }}
98103
md5sum ${{ steps.secring.outputs.filePath }}
99104
- name: publishAllPublicationsToMavenCentralRepository
100-
run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" -Ptagbuild="${{ steps.istagbuild.outputs.tagbuild }}" :jablib:publishAllPublicationsToMavenCentralRepository
105+
# Different version at maven centrl: 6.0-SNAPSHOT - and not 6.0.23234-SNAPSHOT
106+
# We need to manually trigger a full maven central release - to avoid 6.0-alpha3 being published as 6.0 on maven central.
107+
run: |
108+
if [[ "${{ github.event.inputs.tagbuild }}" == "true" ]]; then
109+
tagbuild="true"
110+
else
111+
tagbuild="false"
112+
fi
113+
./gradlew -PprojVersion="${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" -Ptagbuild="$tagbuild" :jablib:publishAllPublicationsToMavenCentralRepository
101114
# endregion

.github/workflows/run-openrewrite.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
- name: Use cache
4646
uses: actions/cache@v4
4747
with:
48-
lookup-only: true
4948
path: ~/.jbang
5049
key: ${{ steps.cache-key.outputs.cache_key }}
5150
restore-keys:

.github/workflows/tests-code.yml

Lines changed: 87 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@ jobs:
5757
checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
5858
- name: Setup Gradle
5959
uses: gradle/actions/setup-gradle@v4
60+
- name: Generate JBang cache key
61+
id: cache-key
62+
shell: bash
63+
run: |
64+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
65+
- name: Use cache
66+
uses: actions/cache@v4
67+
with:
68+
path: ~/.jbang
69+
key: ${{ steps.cache-key.outputs.cache_key }}
70+
restore-keys:
71+
jbang-
72+
- name: Setup JBang
73+
uses: jbangdev/setup-jbang@main
6074
- name: Run checkstyle using gradle
6175
run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
6276

@@ -84,7 +98,6 @@ jobs:
8498
- name: Use cache
8599
uses: actions/cache@v4
86100
with:
87-
lookup-only: true
88101
path: ~/.jbang
89102
key: ${{ steps.cache-key.outputs.cache_key }}
90103
restore-keys:
@@ -111,6 +124,20 @@ jobs:
111124
distribution: 'zulu'
112125
- name: Setup Gradle
113126
uses: gradle/actions/setup-gradle@v4
127+
- name: Generate JBang cache key
128+
id: cache-key
129+
shell: bash
130+
run: |
131+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
132+
- name: Use cache
133+
uses: actions/cache@v4
134+
with:
135+
path: ~/.jbang
136+
key: ${{ steps.cache-key.outputs.cache_key }}
137+
restore-keys:
138+
jbang-
139+
- name: Setup JBang
140+
uses: jbangdev/setup-jbang@main
114141
- name: Run modernizer
115142
run: |
116143
# enable failing of this task if modernizer complains
@@ -146,21 +173,20 @@ jobs:
146173
id: cache-key
147174
shell: bash
148175
run: |
149-
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
176+
echo "cache_key=jbang-heylogs-$(date +%F)" >> $GITHUB_OUTPUT
150177
- name: Use cache
151178
uses: actions/cache@v4
152179
with:
153-
lookup-only: true
154180
path: ~/.jbang
155181
key: ${{ steps.cache-key.outputs.cache_key }}
156182
restore-keys:
157-
jbang-
183+
jbang-heylogs-
158184
- name: Setup JBang
159185
uses: jbangdev/setup-jbang@main
160186
- name: Lint CHANGELOG.md
161187
run: |
162188
# run heylogs verification
163-
jbang com.github.nbbrd.heylogs:heylogs-cli:0.10.0:bin check CHANGELOG.md > heylogs.txt || true
189+
jbang com.github.nbbrd.heylogs:heylogs-cli:0.11.1:bin check CHANGELOG.md > heylogs.txt || true
164190
165191
# improve output
166192
sed -i 's/all-h2-contain-a-version/all-h2-contain-a-version (ignored)/' heylogs.txt
@@ -215,6 +241,20 @@ jobs:
215241
distribution: 'zulu'
216242
- name: Setup Gradle
217243
uses: gradle/actions/setup-gradle@v4
244+
- name: Generate JBang cache key
245+
id: cache-key
246+
shell: bash
247+
run: |
248+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
249+
- name: Use cache
250+
uses: actions/cache@v4
251+
with:
252+
path: ~/.jbang
253+
key: ${{ steps.cache-key.outputs.cache_key }}
254+
restore-keys:
255+
jbang-
256+
- name: Setup JBang
257+
uses: jbangdev/setup-jbang@main
218258
- run: ./gradlew javadoc
219259

220260
tests:
@@ -242,7 +282,6 @@ jobs:
242282
- name: Use cache
243283
uses: actions/cache@v4
244284
with:
245-
lookup-only: true
246285
path: ~/.jbang
247286
key: ${{ steps.cache-key.outputs.cache_key }}
248287
restore-keys:
@@ -285,6 +324,20 @@ jobs:
285324
distribution: 'zulu'
286325
- name: Setup Gradle
287326
uses: gradle/actions/setup-gradle@v4
327+
- name: Generate JBang cache key
328+
id: cache-key
329+
shell: bash
330+
run: |
331+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
332+
- name: Use cache
333+
uses: actions/cache@v4
334+
with:
335+
path: ~/.jbang
336+
key: ${{ steps.cache-key.outputs.cache_key }}
337+
restore-keys:
338+
jbang-
339+
- name: Setup JBang
340+
uses: jbangdev/setup-jbang@main
288341
- name: Run ${{ matrix.module }} tests
289342
run: ./gradlew :${{ matrix.module }}:check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer
290343
env:
@@ -320,6 +373,20 @@ jobs:
320373
distribution: 'zulu'
321374
- name: Setup Gradle
322375
uses: gradle/actions/setup-gradle@v4
376+
- name: Generate JBang cache key
377+
id: cache-key
378+
shell: bash
379+
run: |
380+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
381+
- name: Use cache
382+
uses: actions/cache@v4
383+
with:
384+
path: ~/.jbang
385+
key: ${{ steps.cache-key.outputs.cache_key }}
386+
restore-keys:
387+
jbang-
388+
- name: Setup JBang
389+
uses: jbangdev/setup-jbang@main
323390
- name: Run tests on PostgreSQL
324391
run: ./gradlew :jablib:databaseTest --rerun-tasks
325392
env:
@@ -350,7 +417,6 @@ jobs:
350417
- name: Use cache
351418
uses: actions/cache@v4
352419
with:
353-
lookup-only: true
354420
path: ~/.jbang
355421
key: ${{ steps.cache-key.outputs.cache_key }}
356422
restore-keys:
@@ -406,6 +472,20 @@ jobs:
406472
distribution: 'zulu'
407473
- name: Setup Gradle
408474
uses: gradle/actions/setup-gradle@v4
475+
- name: Generate JBang cache key
476+
id: cache-key
477+
shell: bash
478+
run: |
479+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
480+
- name: Use cache
481+
uses: actions/cache@v4
482+
with:
483+
path: ~/.jbang
484+
key: ${{ steps.cache-key.outputs.cache_key }}
485+
restore-keys:
486+
jbang-
487+
- name: Setup JBang
488+
uses: jbangdev/setup-jbang@main
409489
- name: Update test coverage metrics
410490
if: (github.ref == 'refs/heads/main') && (steps.checksecrets.outputs.secretspresent == 'YES')
411491
run: xvfb-run --auto-servernum ./gradlew jacocoTestReport

.github/workflows/unassign-issues.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464
if: ${{ needs.unassign_issues.outputs.unassigned_issues != '[]' }}
6565
runs-on: ubuntu-latest
6666
strategy:
67+
fail-fast: false
68+
max-parallel: 1
6769
matrix:
6870
issue_number: ${{ fromJson(needs.unassign_issues.outputs.unassigned_issues) }}
6971
steps:

.jbang/JabKitLauncher.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
//FILES tinylog.properties=../jabkit/src/main/resources/tinylog.properties
2222

2323
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
24-
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots
25-
// REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
24+
// REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots
25+
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
2626
// REPOS mavencentral,jitpack=https://jitpack.io
2727

2828
// TODO: ASCII things won't work, but we accept for now to keep things going
2929
//DEPS com.ibm.icu:icu4j:77.1
3030

3131
// Choose one - both should work
3232
// https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/jabref/jablib/
33-
// DEPS org.jabref:jablib:6.+
33+
//DEPS org.jabref:jablib:6.0-SNAPSHOT
3434
// https://jitpack.io/#jabref/jabref/main-SNAPSHOT
35-
//DEPS com.github.jabref:jabref:main-SNAPSHOT
35+
// DEPS com.github.jabref:jabref:main-SNAPSHOT
3636

3737
//DEPS info.picocli:picocli:4.7.7
3838

.jbang/JabSrvLauncher.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,44 @@
1414
//SOURCES ../jabsrv/src/main/java/org/jabref/http/dto/GsonFactory.java
1515
//SOURCES ../jabsrv/src/main/java/org/jabref/http/dto/LinkedPdfFileDTO.java
1616
//SOURCES ../jabsrv/src/main/java/org/jabref/http/JabrefMediaType.java
17-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/CAYWResource.java
17+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/JabRefSrvStateManager.java
18+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/SrvStateManager.java
1819
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/CAYWQueryParams.java
20+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/CAYWResource.java
21+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/BibLatexFormatter.java
22+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/CAYWFormatter.java
23+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/FormatterService.java
24+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/SimpleJsonFormatter.java
1925
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/gui/CAYWEntry.java
2026
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/gui/SearchDialog.java
2127
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/gui/SearchField.java
2228
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/gui/SearchResultContainer.java
2329
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/gui/SelectedItemsContainer.java
24-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/BibLatexFormatter.java
25-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/CAYWFormatter.java
26-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/FormatterService.java
27-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/SimpleJsonFormatter.java
30+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/Command.java
31+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/CommandResource.java
32+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/SelectEntriesCommand.java
2833
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/CORSFilter.java
2934
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java
3035
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java
3136
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/PreferencesFactory.java
3237
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/RootResource.java
3338
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/Server.java
34-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/ContextsToServe.java
3539
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
3640
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/ServerUtils.java
3741

3842
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
39-
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots
40-
// REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
43+
// REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots
44+
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
4145
// REPOS mavencentral,jitpack=https://jitpack.io
4246

4347
// TODO: ASCII things won't work, but we accept for now to keep things going
4448
//DEPS com.ibm.icu:icu4j:77.1
4549

4650
// Choose one - both should work
4751
// https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/jabref/jablib/
48-
// DEPS org.jabref:jablib:6.+
52+
//DEPS org.jabref:jablib:6.0-SNAPSHOT
4953
// https://jitpack.io/#jabref/jabref/main-SNAPSHOT
50-
//DEPS com.github.jabref:jabref:main-SNAPSHOT
54+
// DEPS com.github.jabref:jabref:main-SNAPSHOT
5155

5256
//DEPS info.picocli:picocli:4.7.7
5357
//DEPS org.jspecify:jspecify:1.0.0

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
java=24.0.1-amzn
1+
java=24.0.2-amzn
22
#visualvm=2.1.10

0 commit comments

Comments
 (0)