Skip to content

Commit c0d0a7c

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: (32 commits) Fix path (#13769) Mode aware consistency check (#13584) Refine JBang check (#13765) Add Language Server to the UI and add the integrity/consistency check (#13697) Fix/remove comment code (#13763) New Crowdin updates (#13760) Bump org.openrewrite.rewrite from 7.14.0 to 7.14.1 (#13757) Bump com.autonomousapps:dependency-analysis-gradle-plugin (#13756) Bump dev.langchain4j:langchain4j-bom from 1.2.0 to 1.3.0 in /versions (#13755) Bump jablib/src/main/resources/csl-locales from `fa56de1` to `e29c453` (#13754) Bump com.autonomousapps:dependency-analysis-gradle-plugin (#13753) Bump org.mockito:mockito-core from 5.18.0 to 5.19.0 in /versions (#13752) Bump actions/upload-pages-artifact from 3 to 4 (#13751) Migrate fetchers to Search.g4 ANTLR parser. (#13691) [Junie]: fix: resolve IllegalArgumentException for non-absolute URIs (#13669) Add auto-renaming of linked files on entry data change (#13295) Walkthrough additions (#13745) Switch from zulu to corretto (#13749) New Crowdin updates (#13747) Fix copy to (#13741) ...
2 parents 9bee24f + cefe315 commit c0d0a7c

File tree

205 files changed

+5959
-1555
lines changed

Some content is hidden

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

205 files changed

+5959
-1555
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ Keep ALL the items. Replace the dots inside [.] and mark them as follows:
2525
-->
2626

2727
- [x] I own the copyright of the code submitted and I license it under the [MIT license](https://github.com/JabRef/jabref/blob/main/LICENSE)
28-
- [.] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if change is visible to the user)
29-
- [.] Tests created for changes (if applicable)
30-
- [.] Manually tested changed features in running JabRef (always required)
31-
- [.] Screenshots added in PR description (if change is visible to the user)
32-
- [.] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
33-
- [.] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
28+
- [.] I manually tested my changes in running JabRef (always required)
29+
- [.] I added JUnit tests for changes (if applicable)
30+
- [.] I added screenshots in the PR description (if change is visible to the user)
31+
- [.] I described the change in `CHANGELOG.md` in a way that is understandable for the average user (if change is visible to the user)
32+
- [.] I checked the [user documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request updating file(s) in <https://github.com/JabRef/user-documentation/tree/main/en>.

.github/ghprcomment.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@
130130
Hey, we noticed that you **force-pushed** your changes.
131131
Force pushing is a bad practice when working together on a project (mainly because it is [not supported well by GitHub itself](https://github.com/orgs/community/discussions/3478)).
132132
Commits are lost and comments on commits lose their context, thus making it harder to review changes.
133-
At the end, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway before being merged into the `main` branch.
133+
134+
135+
When the pull request is getting integrated into `main`, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway.
136+
Thus, your individual commit history will not be visible in `main`.
134137
135138
136139
In future, **please avoid that**. For now, you can continue working.

.github/workflows/binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
id: gitversion
194194
uses: gittools/actions/gitversion/[email protected]
195195
- name: Setup JDK
196-
uses: actions/setup-java@v4
196+
uses: actions/setup-java@v5
197197
with:
198198
java-version: '24'
199199
distribution: 'corretto'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ jobs:
3333
3434
Happy coding! 🚀
3535
assignment_suggestion_comment: >
36-
👋 Hey @{{ handle }}, looks like you’re eager to work on this issue—great! 🎉
37-
It also looks like you skipped reading our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md), which explains exactly how to participate. No worries, it happens to the best of us.
38-
Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
36+
👋 Hey @{{ handle }}, looks like you’re eager to work on this issue — great! 🎉
37+
It also looks like you don't know how to assign issues to yourself.
38+
Please read our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) to find out how.
39+
It will also guide you in other aspects of contributing to JabRef.
3940
- name: Move issue corresponding column in "Candidates for University Projects"
4041
uses: m7kvqbe1/github-action-move-issues@main
4142
if: ${{ steps.assign.outputs.assigned == 'yes' || steps.assign.outputs.unassigned == 'yes' }}

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
cd docs
4848
bundle exec jekyll build
4949
- name: Upload artifact
50-
uses: actions/upload-pages-artifact@v3
50+
uses: actions/upload-pages-artifact@v4
5151
with:
5252
path: docs/_site/
5353

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
id: gitversion
5454
uses: gittools/actions/gitversion/[email protected]
5555
- name: Setup JDK
56-
uses: actions/setup-java@v4
56+
uses: actions/setup-java@v5
5757
with:
5858
java-version: '24'
5959
distribution: 'corretto'

.github/workflows/run-openrewrite.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
GH_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}}
3232

3333
- name: Set up JDK
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
36-
java-version: 24.0.1
37-
distribution: 'zulu'
36+
java-version: 24
37+
distribution: 'corretto'
3838
- name: Setup Gradle
3939
uses: gradle/actions/setup-gradle@v4
4040
- name: Generate JBang cache key

.github/workflows/tests-code-fetchers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ jobs:
5353
submodules: 'true'
5454
show-progress: 'false'
5555
- name: Set up JDK
56-
uses: actions/setup-java@v4
56+
uses: actions/setup-java@v5
5757
with:
58-
java-version: 24.0.1
59-
distribution: 'zulu'
58+
java-version: 24
59+
distribution: 'corretto'
6060
- name: Setup Gradle
6161
uses: gradle/actions/setup-gradle@v4
6262
- name: Run fetcher tests

.github/workflows/tests-code.yml

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
submodules: 'true'
4646
show-progress: 'false'
4747
- name: Set up JDK
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
50-
java-version: 24.0.1
51-
distribution: 'zulu'
50+
java-version: 24
51+
distribution: 'corretto'
5252
- name: Run checkstyle reporter
5353
uses: dbelyaev/action-checkstyle@master
5454
with:
@@ -84,10 +84,10 @@ jobs:
8484
submodules: 'true'
8585
show-progress: 'false'
8686
- name: Set up JDK
87-
uses: actions/setup-java@v4
87+
uses: actions/setup-java@v5
8888
with:
89-
java-version: 24.0.1
90-
distribution: 'zulu'
89+
java-version: 24
90+
distribution: 'corretto'
9191
- name: Setup Gradle
9292
uses: gradle/actions/setup-gradle@v4
9393
- name: Generate JBang cache key
@@ -118,10 +118,10 @@ jobs:
118118
submodules: 'true'
119119
show-progress: 'false'
120120
- name: Set up JDK
121-
uses: actions/setup-java@v4
121+
uses: actions/setup-java@v5
122122
with:
123-
java-version: 24.0.1
124-
distribution: 'zulu'
123+
java-version: 24
124+
distribution: 'corretto'
125125
- name: Setup Gradle
126126
uses: gradle/actions/setup-gradle@v4
127127
- name: Generate JBang cache key
@@ -235,10 +235,10 @@ jobs:
235235
- name: Checkout source
236236
uses: actions/checkout@v5
237237
- name: Set up JDK
238-
uses: actions/setup-java@v4
238+
uses: actions/setup-java@v5
239239
with:
240-
java-version: 24.0.1
241-
distribution: 'zulu'
240+
java-version: 24
241+
distribution: 'corretto'
242242
- name: Setup Gradle
243243
uses: gradle/actions/setup-gradle@v4
244244
- name: Generate JBang cache key
@@ -270,10 +270,10 @@ jobs:
270270
submodules: 'true'
271271
show-progress: 'false'
272272
- name: Set up JDK
273-
uses: actions/setup-java@v4
273+
uses: actions/setup-java@v5
274274
with:
275-
java-version: 24.0.1
276-
distribution: 'zulu'
275+
java-version: 24
276+
distribution: 'corretto'
277277
- name: Generate JBang cache key
278278
id: cache-key
279279
shell: bash
@@ -318,10 +318,10 @@ jobs:
318318
submodules: 'true'
319319
show-progress: 'false'
320320
- name: Set up JDK
321-
uses: actions/setup-java@v4
321+
uses: actions/setup-java@v5
322322
with:
323-
java-version: 24.0.1
324-
distribution: 'zulu'
323+
java-version: 24
324+
distribution: 'corretto'
325325
- name: Setup Gradle
326326
uses: gradle/actions/setup-gradle@v4
327327
- name: Generate JBang cache key
@@ -367,10 +367,10 @@ jobs:
367367
submodules: 'true'
368368
show-progress: 'false'
369369
- name: Set up JDK
370-
uses: actions/setup-java@v4
370+
uses: actions/setup-java@v5
371371
with:
372-
java-version: 24.0.1
373-
distribution: 'zulu'
372+
java-version: 24
373+
distribution: 'corretto'
374374
- name: Setup Gradle
375375
uses: gradle/actions/setup-gradle@v4
376376
- name: Generate JBang cache key
@@ -394,9 +394,8 @@ jobs:
394394
DBMS: "postgresql"
395395

396396
jbang:
397-
name: JBang
397+
name: JBang (main)
398398
runs-on: ubuntu-latest
399-
# JBang scripts depend on main-SNAPSHOT; thus, we can only test fully when main is updated
400399
if: github.ref == 'refs/heads/main'
401400
steps:
402401
- name: Checkout source
@@ -405,10 +404,10 @@ jobs:
405404
submodules: 'false'
406405
show-progress: 'false'
407406
- name: Set up JDK
408-
uses: actions/setup-java@v4
407+
uses: actions/setup-java@v5
409408
with:
410-
java-version: 24.0.1
411-
distribution: 'zulu'
409+
java-version: 24
410+
distribution: 'corretto'
412411
- name: Generate JBang cache key
413412
id: cache-key
414413
shell: bash
@@ -426,8 +425,60 @@ jobs:
426425
- run: jbang build .jbang/CheckoutPR.java
427426
- run: jbang build .jbang/CloneJabRef.java
428427
- run: jbang build --fresh .jbang/JabKitLauncher.java
428+
- run: jbang build --fresh .jbang/JabLsLauncher.java
429429
- run: jbang build --fresh .jbang/JabSrvLauncher.java
430430

431+
jbang-pr:
432+
name: JBang (PR)
433+
runs-on: ubuntu-latest
434+
if: github.ref != 'refs/heads/main'
435+
strategy:
436+
fail-fast: false
437+
matrix:
438+
launcher: [JabKitLauncher, JabLsLauncher, JabSrvLauncher]
439+
steps:
440+
- name: Checkout source
441+
uses: actions/checkout@v5
442+
with:
443+
submodules: 'false'
444+
show-progress: 'false'
445+
- name: Set up JDK
446+
uses: actions/setup-java@v5
447+
with:
448+
java-version: 24
449+
distribution: 'corretto'
450+
- name: Generate JBang cache key
451+
id: cache-key
452+
shell: bash
453+
run: |
454+
echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
455+
- name: Use cache
456+
uses: actions/cache@v4
457+
with:
458+
path: ~/.jbang
459+
key: ${{ steps.cache-key.outputs.cache_key }}
460+
restore-keys:
461+
jbang-
462+
- name: Setup JBang
463+
uses: jbangdev/setup-jbang@main
464+
465+
- name: Detect changed jablib classes
466+
id: changed-jablib-files
467+
uses: tj-actions/changed-files@v45
468+
with:
469+
files: |
470+
jablib/src/main/java/**/*.java
471+
472+
- name: Build ${{ matrix.launcher }} launcher including changed classes
473+
shell: bash
474+
# We always run, because changes in jabls, jabsrv also could cause JBang to fail
475+
run: |
476+
# We modify the JBang scripts directly to avoid issues with relative paths
477+
for f in ${{ steps.changed-jablib-files.outputs.all_changed_files }}; do
478+
echo "//SOURCES ../$f" >> ".jbang/${{ matrix.launcher }}.java"
479+
done
480+
jbang build --fresh ".jbang/${{ matrix.launcher }}.java"
481+
431482
codecoverage:
432483
if: false
433484
name: Code coverage
@@ -466,10 +517,10 @@ jobs:
466517
show-progress: 'false'
467518
- name: Set up JDK
468519
if: github.ref == 'refs/heads/main'
469-
uses: actions/setup-java@v4
520+
uses: actions/setup-java@v5
470521
with:
471-
java-version: 24.0.1
472-
distribution: 'zulu'
522+
java-version: 24
523+
distribution: 'corretto'
473524
- name: Setup Gradle
474525
uses: gradle/actions/setup-gradle@v4
475526
- name: Generate JBang cache key
@@ -511,10 +562,10 @@ jobs:
511562
with:
512563
show-progress: 'false'
513564
- name: Set up JDK
514-
uses: actions/setup-java@v4
565+
uses: actions/setup-java@v5
515566
with:
516-
java-version: 24.0.1
517-
distribution: 'zulu'
567+
java-version: 24
568+
distribution: 'corretto'
518569
- name: Setup Gradle
519570
uses: gradle/actions/setup-gradle@v4
520571
- run: ./gradlew traceRequirements

.jbang/JabLsLauncher.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010

1111
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/BibtexTextDocumentService.java
1212
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/BibtexWorkspaceService.java
13-
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/LSPLauncher.java
14-
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/LSPServer.java
13+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/controller/LanguageServerController.java
14+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/ExtensionSettings.java
15+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/LspClientHandler.java
16+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/LspLauncher.java
17+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/LspConsistencyCheck.java
18+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticBuilder.java
19+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticHandler.java
20+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/LspIntegrityCheck.java
1521

1622
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
1723
// 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

0 commit comments

Comments
 (0)