Skip to content

Commit 5aee419

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jackson3
* upstream/main: (30 commits) Chore(deps): Bump io.github.classgraph:classgraph from 4.8.181 to 4.8.184 in /versions (#14304) Chore(deps): Bump com.fasterxml:aalto-xml in /versions (#14311) Chore(deps): Bump commons-io:commons-io in /versions (#14310) Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin (#14298) Disable fetcher-gui-test (#14308) Chore(deps): Bump com.dlsc.gemsfx:gemsfx in /versions (#14307) No labels for dependeabot updates Fix fallback window height from 786 to 768 (#14295) Chore(deps): Bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml (#14306) Chore(deps): Bump org.apache.maven.plugins:maven-compiler-plugin (#14302) Chore(deps): Bump org.apache.maven.plugins:maven-deploy-plugin (#14300) Chore(deps): Bump org.apache.maven.plugins:maven-clean-plugin (#14299) Chore(deps): Bump jablib/src/main/resources/csl-styles (#14296) Chore(deps): Bump com.vanniktech.maven.publish in /jablib (#14303) Chore(deps): Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#14297) Update all dependencies (#14301) Prepare maven3 example project (#14294) Refactor StringUtilTest to use parameterized tests (#14126) Try to fix download of pr_number Fix workflow names ...
2 parents f404793 + 163cae2 commit 5aee419

File tree

88 files changed

+2005
-752
lines changed

Some content is hidden

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

88 files changed

+2005
-752
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ updates:
99
schedule:
1010
interval: weekly
1111
day: sunday
12-
labels:
13-
- "dependencies"
12+
labels: [ ]
1413
ignore:
1514
- dependency-name: com.microsoft.azure:applicationinsights-core
1615
versions:
@@ -23,10 +22,17 @@ updates:
2322
schedule:
2423
interval: weekly
2524
day: sunday
26-
labels:
27-
- "dependencies"
25+
labels: [ ]
2826
- package-ecosystem: "gitsubmodule"
2927
directory: "/"
3028
schedule:
3129
interval: weekly
3230
day: sunday
31+
labels: [ ]
32+
- package-ecosystem: "maven"
33+
directories:
34+
- "jablib-examples/maven3/doi-to-bibtex"
35+
schedule:
36+
interval: weekly
37+
day: sunday
38+
labels: [ ]

.github/ghprcomment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,19 +179,19 @@
179179
Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
180180
181181
- jobName: 'PR title must not contain "issue <number>"'
182-
workflowName: 'PR Format'
182+
workflowName: 'Check PR Format'
183183
always: true
184184
message: >
185185
The title of the pull request must not start with "Fix for issue xyz".
186186
Please use a concise one-line summary that explains what the fix or change actually does.
187187
Example of a good title: "Prevent crash when importing malformed BibTeX entries".
188188
- jobName: 'Mandatory Checks present'
189-
workflowName: 'PR Format'
189+
workflowName: 'Check PR Format'
190190
always: true
191191
message: >
192192
You have removed the "Mandatory Checks" section from your pull request description. Please adhere to our [pull request template](https://github.com/JabRef/jabref/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L10).
193193
- jobName: 'PR checklist OK'
194-
workflowName: 'PR Format'
194+
workflowName: 'Check PR Format'
195195
always: true
196196
message: >
197197
Note that your PR will not be reviewed/accepted until you have gone through the mandatory checks in the description and marked each of them them exactly in the format of `[x]` (done), `[ ]` (not done yet) or `[/]` (not applicable).

.github/workflows/on-pr-changes-requested-move-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1111
runs-on: ubuntu-latest
1212
permissions:
13-
issues: write
1413
actions: read
1514
contents: read
15+
pull-requests: write
1616
steps:
1717
- name: Download artifact from triggering run
1818
uses: actions/download-artifact@v6

.github/workflows/on-pr-opened-updated.yml renamed to .github/workflows/on-pr-opened-updated-check.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: On PR opened/updated
1+
name: On PR opened/updated (Check)
22

33
on:
44
# _target is required
@@ -10,6 +10,9 @@ jobs:
1010
if: github.repository == 'JabRef/jabref'
1111
name: Conflicts with target branch
1212
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
actions: write
1316
steps:
1417
- uses: actions/checkout@v5
1518
with:

.github/workflows/on-pr-opened-updated-move-labels.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@ name: On PR opened/updated (Labels)
22

33
on:
44
workflow_run:
5-
workflows: ["On PR opened/updated"]
5+
workflows: ["On PR opened/updated (Check)"]
66
types: [completed]
77

88
jobs:
99
apply-labels:
1010
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1111
runs-on: ubuntu-latest
1212
permissions:
13-
issues: write
1413
actions: read
1514
contents: read
15+
pull-requests: write
1616
steps:
1717
- name: Download artifact from triggering run
1818
uses: actions/download-artifact@v6
1919
with:
20-
run-id: ${{ github.event.workflow_run.id }}
21-
name: pr_number
20+
name: pr_number
21+
github-token: ${{ secrets.GITHUB_TOKEN }}
22+
run-id: ${{ github.event.workflow_run.id }}
2223
continue-on-error: true
2324
- name: Check for pr_number.txt
2425
id: check

.github/workflows/tests-code.yml

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ jobs:
434434
KOPPOR_MAVENCENTRALUSERNAME: ${{ secrets.KOPPOR_MAVENCENTRALUSERNAME }}
435435
KOPPOR_MAVENCENTRALPASSWORD: ${{ secrets.KOPPOR_MAVENCENTRALPASSWORD }}
436436

437-
jbang:
437+
jbang-main:
438438
name: JBang (main)
439439
runs-on: ubuntu-latest
440440
needs: publish
@@ -452,7 +452,7 @@ jobs:
452452
files: |
453453
.jbang/*.java
454454
jablib/src/main/java/**/*.java
455-
jablib-examples/**/*.java
455+
jablib-examples/jbang/**/*.java
456456
files_ignore: |
457457
jablib/src/main/java/**/*-*.java
458458
- name: Set up JDK
@@ -488,7 +488,7 @@ jobs:
488488
done
489489
if: steps.changed-jablib-files.outputs.any_changed != 'true'
490490
- run: |
491-
for f in jablib-examples/*.java; do
491+
for f in jablib-examples/jbang/*.java; do
492492
echo "Building $f..."
493493
jbang build --fresh "$f"
494494
done
@@ -510,7 +510,7 @@ jobs:
510510
strategy:
511511
fail-fast: false
512512
matrix:
513-
script: [.jbang/JabKitLauncher.java, .jbang/JabLsLauncher.java, .jbang/JabSrvLauncher.java, jablib-examples/ieee_pdf_references_to_bibtex.java]
513+
script: [.jbang/JabKitLauncher.java, .jbang/JabLsLauncher.java, .jbang/JabSrvLauncher.java, jablib-examples/jbang/doi_to_bibtex.java, jablib-examples/jbang/ieee_pdf_references_to_bibtex.java]
514514
steps:
515515
- name: Checkout source
516516
uses: actions/checkout@v5
@@ -525,7 +525,7 @@ jobs:
525525
.jbang/*.java
526526
jabkit/src/main/java/**/*.java
527527
jablib/src/main/java/**/*.java
528-
jablib-examples/**/*.java
528+
jablib-examples/jbang/**/*.java
529529
files_ignore: |
530530
jablib/src/main/java/**/*-*.java
531531
- name: Set up JDK
@@ -579,6 +579,60 @@ jobs:
579579
if: ${{ contains(matrix.script, 'Launcher.java') }}
580580
shell: bash
581581

582+
maven-examples:
583+
name: Maven examples (main)
584+
runs-on: ubuntu-latest
585+
needs: publish
586+
if: github.ref == 'refs/heads/main'
587+
strategy:
588+
fail-fast: false
589+
matrix:
590+
project: [jablib-examples/maven3/doi-to-bibtex]
591+
steps:
592+
- name: Checkout source
593+
uses: actions/checkout@v5
594+
with:
595+
submodules: 'false'
596+
show-progress: 'false'
597+
- name: Set up JDK
598+
uses: actions/setup-java@v5
599+
with:
600+
java-version: 24
601+
distribution: 'corretto'
602+
cache: maven
603+
check-latest: true
604+
- run: |
605+
cd ${{ matrix.project }}
606+
mvn --batch-mode --update-snapshots verify
607+
shell: bash
608+
609+
maven-pr:
610+
name: Maven examples (PR)
611+
runs-on: ubuntu-latest
612+
# does not need publish, because there is no publishing on non-main
613+
if: github.ref != 'refs/heads/main'
614+
strategy:
615+
fail-fast: false
616+
matrix:
617+
project: [jablib-examples/maven3/doi-to-bibtex]
618+
steps:
619+
- name: Checkout source
620+
uses: actions/checkout@v5
621+
with:
622+
submodules: 'false'
623+
show-progress: 'false'
624+
- name: Set up JDK
625+
uses: actions/setup-java@v5
626+
with:
627+
java-version: 24
628+
distribution: 'corretto'
629+
cache: maven
630+
check-latest: true
631+
- run: |
632+
cd ${{ matrix.project }}
633+
mvn --batch-mode --update-snapshots verify
634+
shell: bash
635+
582636
codecoverage:
583637
if: false
584638
name: Code coverage

.jbang/JabKitLauncher.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,11 @@
2222
//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/JabKit.java
2323
//FILES tinylog.properties=../jabkit/src/main/resources/tinylog.properties
2424

25-
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
26-
// 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
27-
//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/
28-
// REPOS mavencentral,jitpack=https://jitpack.io
25+
// raw is for https://github.com/unicode-org/icu/pull/2127
26+
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
2927

30-
// TODO: ASCII things won't work, but we accept for now to keep things going
31-
//DEPS com.ibm.icu:icu4j:78.1
32-
33-
// Choose one - both should work
34-
// https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/jabref/jablib/
3528
//DEPS org.jabref:jablib:6.0-SNAPSHOT
36-
// https://jitpack.io/#jabref/jabref/main-SNAPSHOT
37-
// DEPS com.github.jabref:jabref:main-SNAPSHOT
29+
3830
//DEPS io.github.darvil82:terminal-text-formatter:2.2.0
3931
//DEPS info.picocli:picocli:4.7.7
4032
//DEPS com.github.ben-manes.caffeine:caffeine:3.2.3

.jbang/JabLsLauncher.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,10 @@
2626
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/LatexDefinitionProvider.java
2727
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/MarkdownDefinitionProvider.java
2828

29-
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
30-
// 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
31-
//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/
32-
// REPOS mavencentral,jitpack=https://jitpack.io
29+
// raw is for https://github.com/unicode-org/icu/pull/2127
30+
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
3331

34-
// Choose one - both should work
35-
// https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/jabref/jablib/
3632
//DEPS org.jabref:jablib:6.0-SNAPSHOT
37-
// https://jitpack.io/#jabref/jabref/main-SNAPSHOT
38-
// DEPS com.github.jabref:jabref:main-SNAPSHOT
3933

4034
//DEPS io.github.darvil82:terminal-text-formatter:2.2.0
4135
//DEPS info.picocli:picocli:4.7.7
@@ -49,12 +43,14 @@
4943
//DEPS com.github.eclipse:lsp4j:0.24.0
5044
//DEPS info.picocli:picocli:4.7.7
5145
//DEPS org.apache.logging.log4j:log4j-to-slf4j:2.25.2
46+
//DEPS org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0
5247
//DEPS org.jabref:afterburner.fx:2.0.0
5348
//DEPS org.slf4j:jul-to-slf4j:2.0.17
5449
//DEPS org.slf4j:slf4j-api:2.0.17
5550
//DEPS org.tinylog:slf4j-tinylog:2.7.0
5651
//DEPS org.tinylog:tinylog-impl:2.7.0
5752
//DEPS com.github.ben-manes.caffeine:caffeine:3.2.3
53+
//DEPS org.apache.commons:commons-lang3:3.19.0
5854

5955
/// This class is required for [jbang](https://www.jbang.dev/)
6056
public class JabLsLauncher {

.jbang/JabSrvLauncher.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,10 @@
4444
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/PreferencesFactory.java
4545
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/Server.java
4646

47-
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
48-
// 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
49-
//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/
50-
// REPOS mavencentral,jitpack=https://jitpack.io
47+
// raw is for https://github.com/unicode-org/icu/pull/2127
48+
//REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,raw=https://raw.githubusercontent.com/JabRef/jabref/refs/heads/main/jablib/lib/
5149

52-
// TODO: ASCII things won't work, but we accept for now to keep things going
53-
//DEPS com.ibm.icu:icu4j:78.1
54-
55-
// Choose one - both should work
56-
// https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/jabref/jablib/
5750
//DEPS org.jabref:jablib:6.0-SNAPSHOT
58-
// https://jitpack.io/#jabref/jabref/main-SNAPSHOT
59-
// DEPS com.github.jabref:jabref:main-SNAPSHOT
6051

6152
//DEPS io.github.darvil82:terminal-text-formatter:2.2.0
6253
//DEPS info.picocli:picocli:4.7.7
@@ -92,6 +83,7 @@
9283
//DEPS tools.jackson.core:jackson-core:3.0.2
9384
//DEPS tools.jackson.core:jackson-databind:3.0.2
9485
//DEPS tools.jackson.dataformat:jackson-dataformat-yaml:3.0.2
86+
//DEPS org.apache.commons:commons-lang3:3.19.0
9587

9688
/// This class is required for [jbang](https://www.jbang.dev/)
9789
public class JabSrvLauncher {

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
1717

1818
### Changed
1919

20+
- We replaced the standard ComboBox with a SearchableComboBox and added a free text field in custom Entry Types [#14082](https://github.com/JabRef/jabref/issues/14082)
21+
- We separated the "Clean up entries" dialog into three tabs for clarity [#13819](https://github.com/JabRef/jabref/issues/13819)
2022
- `JabKit`: `--porcelain` does not output any logs to the console anymore. [#14244](https://github.com/JabRef/jabref/pull/14244)
2123
- <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>L</kbd> now opens the terminal in the active library directory. [#14130](https://github.com/JabRef/jabref/issues/14130)
2224

2325
### Fixed
2426

2527
- We fixed an issue where pressing <kbd>ESC</kbd> in the preferences dialog would not always close the dialog. [#8888](https://github.com/JabRef/jabref/issues/8888)
2628
- We fixed the checkbox in merge dialog "Treat duplicates the same way" to make it functional. [#14224](https://github.com/JabRef/jabref/pull/14224)
29+
- Correct fallback window height (786 → 768) in JabRefGUI. [#14295](https://github.com/JabRef/jabref/pull/14295)
2730

2831
### Removed
2932

0 commit comments

Comments
 (0)