Skip to content

Commit 4e5b8c2

Browse files
author
Yubo-Cao
committed
Revert "Merge branch 'main' of https://github.com/JabRef/jabref into markdown-ai"
This reverts commit b6b43d2, reversing changes made to 99a6c3d.
1 parent 7d6414b commit 4e5b8c2

File tree

246 files changed

+1817
-9155
lines changed

Some content is hidden

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

246 files changed

+1817
-9155
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
Closes #_____
1+
<!-- YOU HAVE TO MODIFY THE TEXT BELOW TO FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT. -->
22

3-
In about one to three sentences, describe the changes you have made: what, where, why, ...
3+
<!-- LINK THE ISSUE WITH THE "Closes" KEYWORD -->
4+
<!-- Example: Closes (link) OR Closes #12345 -->
45

5-
<!-- NOTE: If your work is not yet complete, please open a draft pull request. In that case, outline your intended next steps. Do you need feedback? Will you continue in parallel? ... -->
6-
7-
### Steps to test
8-
9-
Describe how reviewers can test this fix/feature. Ideally, think of how you would guide a beginner user of Jabef to try out your change.
10-
You can add screenshots or videos (using [Loom](https://www.loom.com/) or by just adding .mp4 files).
11-
12-
<!-- YOU HAVE TO MODIFY THE ABOVE TEXT FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT. -->
13-
<!-- LINK THE ISSUE WITH THE "Closes" KEYWORD. Example: Closes (link) OR Closes #12345 -->
6+
Closes _____
7+
Describe the changes you have made here: what, where, why, ...
8+
If your work is not yet complete, please open a draft pull request. In that case, outline your intended next steps. Do you need feedback? Will you continue in parallel? ...
149

1510
### Mandatory checks
1611

‎.github/dependabot.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: gradle
4-
directories:
5-
- "/build-logic" # Build-related logic for gradle
6-
- "/jabgui" # JabRef's GUI
7-
- "/jabkit" # JabRef's CLI ("JabKit")
8-
- "/jablib" # Core library
9-
- "/jabsrv" # Server-related module
10-
- "/jabsrv-cli" # CLI for the server
11-
- "/test-support" # Module for test utilities
4+
directory: "/"
125
schedule:
136
interval: weekly
147
labels:

‎.github/workflows/binaries-ea.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
outputs:
4747
upload-to-builds-jabref-org: ${{ steps.binary.outputs.upload-to-builds-jabref-org }}
4848
secretspresent: ${{ steps.binary.outputs.secretspresent }}
49-
# requried to avoid obsolete builds in case of labels != "dev: binaries"
49+
# requried to avoid obsolete builds in case of labels != "dev: binary"
5050
should-build: ${{ steps.binary.outputs.should-build }}
5151
should-notarize: ${{ steps.binary.outputs.should-notarize }}
5252
steps:
@@ -66,7 +66,7 @@ jobs:
6666
exit 0
6767
fi
6868
69-
if [[ "$EVENT_NAME" != "labeled" || "$LABEL_NAME" == "automerge" || "$LABEL_NAME" == "dev: binaries" ]]; then
69+
if [[ "$EVENT_NAME" != "labeled" || "$LABEL_NAME" == "automerge" || "$LABEL_NAME" == "dev: binary" ]]; then
7070
echo "📦 build enabled"
7171
echo "should-build=true" >> "$GITHUB_OUTPUT"
7272
else
@@ -109,12 +109,12 @@ jobs:
109109
110110
LABELS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels --jq '.[].name')
111111
112-
if echo "$LABELS" | grep -q "^dev: binaries$"; then
112+
if echo "$LABELS" | grep -q "^dev: binary$"; then
113113
echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
114-
echo "☁️ Label 'dev: binaries' found – will upload"
114+
echo "☁️ Label 'dev: binary' found – will upload"
115115
else
116116
echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
117-
echo "🚫 Label 'dev: binaries' not found – skipping upload"
117+
echo "🚫 Label 'dev: binary' not found – skipping upload"
118118
fi
119119
120120
build:

‎.github/workflows/binaries.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
upload-to-builds-jabref-org: ${{ steps.binary.outputs.upload-to-builds-jabref-org }}
5151
secretspresent: ${{ steps.binary.outputs.secretspresent }}
5252
tagbuild: ${{ steps.binary.outputs.tagbuild }}
53-
# requried to avoid obsolete builds in case of labels != "dev: binaries"
53+
# requried to avoid obsolete builds in case of labels != "dev: binary"
5454
should-build: ${{ steps.binary.outputs.should-build }}
5555
should-notarize: ${{ steps.binary.outputs.should-notarize }}
5656

@@ -71,7 +71,7 @@ jobs:
7171
exit 0
7272
fi
7373
74-
if [[ "$EVENT_NAME" != "labeled" || "$LABEL_NAME" == "automerge" || "$LABEL_NAME" == "dev: binaries" ]]; then
74+
if [[ "$EVENT_NAME" != "labeled" || "$LABEL_NAME" == "automerge" || "$LABEL_NAME" == "dev: binary" ]]; then
7575
echo "📦 build enabled"
7676
echo "should-build=true" >> "$GITHUB_OUTPUT"
7777
else
@@ -120,12 +120,12 @@ jobs:
120120
121121
LABELS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels --jq '.[].name')
122122
123-
if echo "$LABELS" | grep -q "^dev: binaries$"; then
123+
if echo "$LABELS" | grep -q "^dev: binary$"; then
124124
echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
125-
echo "☁️ Label 'dev: binaries' found – will upload"
125+
echo "☁️ Label 'dev: binary' found – will upload"
126126
else
127127
echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
128-
echo "🚫 Label 'dev: binaries' not found – skipping upload"
128+
echo "🚫 Label 'dev: binary' not found – skipping upload"
129129
fi
130130
131131
build:

‎.github/workflows/cleanup-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
with:
2323
ignore_sha: true
2424
workflow_id: 160969125
25-
- uses: actions/checkout@v4
2625
- name: "Check for 'dev: binaries' label"
2726
id: check_label
2827
run: |

‎.github/workflows/gource.yml

Lines changed: 60 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,90 +2,95 @@ name: Gource
22

33
on:
44
push:
5-
paths:
6-
- .github/workflows/gource.yml
5+
branches:
6+
- gource
7+
- fix-gource
78
schedule:
8-
- cron: '15 3 5 * *'
9+
- cron: '15 3 5 * *'
910
workflow_dispatch:
1011

1112
concurrency:
1213
group: gource
1314
cancel-in-progress: true
1415

1516
jobs:
16-
gource:
17+
action:
1718
if: github.repository == 'JabRef/jabref'
1819
runs-on: ubuntu-latest
19-
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
include:
24-
- title: 'JabRef v6.0 (in development) | more information at contribute.jabref.org'
25-
# Last alpha release 2025-04-27, but want to have some seconds before
26-
start: '2025-04-15'
27-
end: ''
28-
file: 'jabref-v6.0-dev.mp4'
29-
# - title: 'JabRef v6.0-alpha2 | more information at contribute.jabref.org'
30-
# start: '2024-12-23'
31-
# end: '2025-04-27'
32-
# file: 'jabref-v6.0-alpha2.mp4'
33-
# - title: 'JabRef v6.0-alpha | more information at contribute.jabref.org'
34-
# start: '2024-07-10'
35-
# end: '2024-12-23'
36-
# file: 'jabref-v6.0-alpha.mp4'
37-
- title: 'JabRef v6.x | more information at contribute.jabref.org'
38-
start: '2024-07-10'
39-
end: ''
40-
file: 'jabref-v6.x.mp4'
41-
# - title: 'JabRef v5.x | more information at contribute.jabref.org'
42-
# start: '2018-06-05'
43-
# end: '2024-07-10'
44-
# file: 'jabref-v5.x.mp4'
45-
# seconds_per_day: '0.5'
46-
- title: 'JabRef | more information at contribute.jabref.org'
47-
start: ''
48-
end: ''
49-
file: 'jabref-complete.mp4'
50-
seconds_per_day: '0.1'
51-
5220
steps:
53-
- name: Checkout
21+
- name: 'Checkout'
5422
uses: actions/checkout@v4
5523
with:
5624
fetch-depth: 0
5725
show-progress: 'false'
58-
59-
- name: Generate Gource video
60-
uses: nbprojekt/gource-action@v1
26+
- name: 'Development history of current build'
27+
uses: BoundfoxStudios/action-gource@v2
6128
with:
62-
gource_title: ${{ matrix.title }}
29+
gource_title: 'JabRef v6.0 (in development) | more information at contribute.jabref.org'
6330
logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
6431
avatars_auto_fetch: true
65-
gource_start_date: ${{ matrix.start }}
66-
gource_stop_date: ${{ matrix.end }}
67-
gource_seconds_per_day: ${{ matrix.seconds_per_day || '1' }}
32+
# 5s * 365 / 4 = 7.5min
33+
gource_seconds_per_day: 1
34+
gource_start_date: '2024-07-11'
6835
gource_file_filter: 'buildres/csl|\.csl'
69-
70-
- name: Store video
36+
- name: 'Store video'
7137
run: |
72-
mkdir -p gource-videos
73-
mv ./gource/gource.mp4 ${{ matrix.file }}
74-
75-
- name: Upload gource video
38+
mkdir gource-videos
39+
mv ./gource/gource.mp4 ./gource-videos/jabref-v6.0-dev.mp4
40+
- name: 'Development history of last release'
41+
uses: BoundfoxStudios/action-gource@v2
42+
with:
43+
gource_title: 'JabRef v5.15 | more information at contribute.jabref.org'
44+
logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
45+
avatars_auto_fetch: true
46+
# 5s * 365 / 4 = 7.5min
47+
gource_seconds_per_day: 2
48+
gource_start_date: '2024-07-09'
49+
gource_stop_date: '2024-07-10'
50+
gource_file_filter: 'buildres/csl|\.csl'
51+
- name: 'Store video'
52+
run: |
53+
mv ./gource/gource.mp4 ./gource-videos/jabref-v5.15.mp4
54+
- name: 'Complete development history'
55+
uses: BoundfoxStudios/action-gource@v2
56+
with:
57+
gource_title: 'JabRef | more information at contribute.jabref.org'
58+
logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
59+
avatars_auto_fetch: true
60+
# 0.01 leads to a 45 second video for the complete history until end of 2020
61+
# 0.1 leads to a 8 minute video
62+
gource_seconds_per_day: 0.1
63+
gource_file_filter: 'buildres/csl|\.csl'
64+
- name: 'Store video'
65+
run: |
66+
mv gource/gource.mp4 gource-videos/jabref-complete.mp4
67+
- name: 'Upload gource video'
7668
uses: actions/upload-artifact@v4
7769
with:
78-
name: Gource-${{ matrix.file }}
79-
path: ${{ matrix.file }}
70+
name: Gource
71+
path: gource-videos/
8072
retention-days: 80
81-
73+
- name: Check secrets presence
74+
id: checksecrets
75+
shell: bash
76+
run: |
77+
if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
78+
echo "secretspresent=NO" >> $GITHUB_OUTPUT
79+
echo "❌ Secret BUILDJABREFPRIVATEKEY not present"
80+
else
81+
echo "secretspresent=YES" >> $GITHUB_OUTPUT
82+
echo "✔️ Secret BUILDJABREFPRIVATEKEY present"
83+
fi
84+
env:
85+
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
8286
- name: Upload to files.jabref.org
87+
if: steps.checksecrets.outputs.secretspresent == 'YES'
8388
uses: Pendect/action-rsyncer@v2.0.0
8489
env:
8590
DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
8691
with:
8792
flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial
8893
options: ''
8994
ssh_options: '-p 9922'
90-
src: '${{ matrix.file }}'
95+
src: 'gource-videos/'
9196
dest: jrrsync@build-upload.jabref.org:/var/www/files.jabref.org/www/gource/

‎.github/workflows/on-issue-comment.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
2525
We're excited to have you on board. Start by exploring our [Contributing](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) guidelines, and don't forget to check out our [workspace setup guidelines](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace) to get started smoothly.
2626
27-
For questions on JabRef functionality and the code base, you can consult the [JabRef Guru](https://gurubase.io/g/jabref) or ask on our Gitter chat.
28-
2927
In case you encounter failing tests during development, please check our [developer FAQs](https://devdocs.jabref.org/code-howtos/faq.html)!
3028
3129
Having any questions or issues? Feel free to ask here on GitHub. Need help setting up your local workspace? Join the conversation on [JabRef's Gitter chat](https://gitter.im/JabRef/jabref). And don't hesitate to open a (draft) pull request early on to show the direction it is heading towards. This way, you will receive valuable feedback.

‎.github/workflows/on-issue-unassigned.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
issues: write
1414
contents: read
1515
steps:
16-
- uses: actions/checkout@v4
1716
- name: Check assignees
1817
id: check_assignee
1918
run: |
@@ -48,6 +47,8 @@ jobs:
4847
ignored-columns: ""
4948
default-column: "Free to take"
5049
skip-if-not-in-project: true
50+
- uses: actions/checkout@v4
51+
if: steps.check_assignee.outputs.assigned == 'no'
5152
- name: Remove labels assigned, reminder-sent, pinned, and "FirstTimeCodeContribution"
5253
if: steps.check_assignee.outputs.assigned == 'no'
5354
run: |

‎.github/workflows/on-pr-opened-updated.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
titleRegex: '^#(?<ticketNumber>\d+)'
4343
branchRegex: '^(?<ticketNumber>\d+)'
4444
# Matches GitHub's closes/fixes/resolves #{number}, but does not match our example `Closes #12345` in PULL_REQUEST_TEMPLATE
45-
# Also matches URLs that are wrapped in `<>`.
46-
bodyRegex: '(?<action>fixes|closes|resolves|refs)\s+<?(?:https?:\/\/github\.com\/JabRef\/jabref\/issues\/)?#?(?<ticketNumber>(?!12345\b)\d+)>?'
45+
bodyRegex: '(?<action>fixes|closes|resolves|refs)\s+(?:https?:\/\/github\.com\/JabRef\/jabref\/issues\/)?#?(?<ticketNumber>(?!12345\b)\d+)'
4746
bodyRegexFlags: 'i'
4847
outputOnly: true
4948
- run: echo "${{ steps.get_issue_number.outputs.ticketNumber }}"

‎.github/workflows/tests.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
- run: ./gradlew javadoc
183183

184184
tests:
185-
name: "Unit tests – ${{ matrix.module }}"
185+
name: Unit tests – ${{ matrix.module }}
186186
runs-on: ubuntu-latest
187187
strategy:
188188
matrix:
@@ -215,8 +215,7 @@ jobs:
215215
run: scripts/after-failure.sh
216216

217217
tests-windows:
218-
name: "Unit tests (Windows) – ${{ matrix.module }}"
219-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
218+
name: Unit tests (Windows) – ${{ matrix.module }}
220219
runs-on: windows-latest
221220
strategy:
222221
matrix:
@@ -274,22 +273,6 @@ jobs:
274273
CI: "true"
275274
DBMS: "postgresql"
276275

277-
jbang:
278-
name: JBang
279-
runs-on: ubuntu-latest
280-
steps:
281-
- name: Checkout source
282-
uses: actions/checkout@v4
283-
with:
284-
submodules: 'false'
285-
show-progress: 'false'
286-
- name: Install JBang
287-
uses: jbangdev/setup-jbang@main
288-
- run: jbang build .jbang/CheckoutPR.java
289-
- run: jbang build .jbang/CloneJabRef.java
290-
- run: jbang build .jbang/JabKitLauncher.java
291-
- run: jbang build .jbang/JabSrvLauncher.java
292-
293276
codecoverage:
294277
if: false
295278
name: Code coverage

‎.github/workflows/unassign-issues.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
> [!WARNING]
2828
> This issue will be **automatically unassigned** in **{{ days_remaining }} days** if there's no activity.
2929
30-
Remember that you can ask the [JabRef Guru](https://gurubase.io/g/jabref) about anything regarding JabRef. Additionally, our contributing guide has [hints on creating a pull request](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md#pull-request-process) and a link to our Gitter chat.
31-
3230
<details open>
3331
<summary>How to keep your assignment</summary>
3432

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jdk-14/
4646

4747
# Python
4848
__pycache__/
49-
venv
5049

5150
# Snap
5251
parts/
@@ -189,7 +188,6 @@ replay_pid*
189188
.idea/**/usage.statistics.xml
190189
.idea/**/dictionaries
191190
.idea/**/shelf
192-
.vscode/settings.json
193191

194192
# AWS User-specific
195193
.idea/**/aws.xml

0 commit comments

Comments
 (0)