Skip to content

Fix lsp4j modules#13835

Merged
koppor merged 8 commits intomainfrom
fixlsp4jmodules
Sep 8, 2025
Merged

Fix lsp4j modules#13835
koppor merged 8 commits intomainfrom
fixlsp4jmodules

Conversation

@Siedlerchr
Copy link
Copy Markdown
Member

Closes #13702

Steps to test

Compile JabRef and start lsp server

Mandatory checks

  • I own the copyright of the code submitted and I license it under the MIT license
  • I manually tested my changes in running JabRef (always required)
  • [/] I added JUnit tests for changes (if applicable)
  • [/] I added screenshots in the PR description (if change is visible to the user)
  • [/] I described the change in CHANGELOG.md in a way that is understandable for the average user (if change is visible to the user)
  • [/] I checked the user documentation: 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.

* upstream/main:
  New translations jabref_en.properties (Italian) (#13725)
  Minor code style updates (#13722)
  Fix: Make FileUtil.relativize symlink-aware (#13553)
  New Crowdin updates (#13720)
  Bump org.glassfish.jersey.core:jersey-server in /versions (#13714)
  Enable UseObjectNotifyAll (#13718)
  Bump com.dlsc.gemsfx:gemsfx from 3.3.5 to 3.4.2 in /versions (#13717)
  Update on-issue-comment.yml
  Bump org.openrewrite.recipe:rewrite-recipe-bom from 3.12.1 to 3.13.0 (#13716)
  Bump org.openrewrite.rewrite from 7.12.1 to 7.14.0 (#13715)
  Bump org.glassfish.jersey.inject:jersey-hk2 in /versions (#13713)
  feat(git): add “Share to GitHub” flow (#13677)
  Bump jablib/src/main/resources/csl-styles from `292aec3` to `1194364` (#13712)
  Bump jablib/src/main/abbrv.jabref.org from `cfe719f` to `a97f9c6` (#13711)
  Bump jablib/src/main/resources/csl-locales from `e2de1e3` to `fa56de1` (#13710)
  Add noop Git Config System Reader to prevent usage of real world stuff into jgit (#13703)
  Added static (stream & preferences) constructors to BibDatabaseContext (#13694)
  New Crowdin updates (#13698)
  fix git modules requires and uses (#13696)
  Focus "Specify Bib(La)TeX" when Bib(La)TeX is in clipboard (#13633)
* 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)
  ...
* upstream/main:
  Add missing variables
  Reformat BibTex in Show BibTex Source (#13761)
  Auto publish before JBang tests (#13779)
  Hotfix: calling of publish.yml
  Support BibLaTeX datamodel validations (#13693)
  Auto add and remove of "status: changes-required" label (#13778)
  New Crowdin updates (#13777)
  Restore local-only Git behavior for SLR to fix repository initialization error (#13775)
  Use vanilla hashset (#13771)
  Fix Springer Fetcher names (#13770)
  Fix condition
  Publish SNAPSHOT on jablib change (#13774)
  Adapt as per new set of checks (#13772)
  Bump jablib/src/main/resources/csl-styles from `1194364` to `17cfa60` (#13750)
* upstream/main: (54 commits)
  Split relativizeSymlinks parameterized tests in separate tests (#13782)
  Update the search syntax highlight for web search (#13801)
  Chore(deps): Bump ai.djl:bom from 0.33.0 to 0.34.0 in /versions (#13833)
  Fix typos in CHANGELOG.md (#13826)
  Chore(deps): Bump com.konghq:unirest-modules-gson in /versions (#13831)
  Chore(deps): Bump org.gradlex:extra-java-module-info in /build-logic (#13830)
  Chore(deps): Bump org.apache.logging.log4j:log4j-to-slf4j in /versions (#13832)
  Chore(deps): Bump io.zonky.test.postgres:embedded-postgres-binaries-bom (#13834)
  Chore(deps): Bump jablib/src/main/resources/csl-locales (#13829)
  Chore(deps): Bump jablib/src/main/resources/csl-styles (#13827)
  Chore(deps): Bump jablib/src/main/abbrv.jabref.org (#13828)
  add: CAYW endpoint formats (#13785)
  New Crowdin updates (#13823)
  chore(deps): update dependency org.kohsuke:github-api to v2.0-rc.5 (#13822)
  Add support for automatic ICORE conference ranking lookup [#13476] (#13699)
  New Crowdin updates (#13820)
  Initialize search bar auto-completion with real database context (no tab switch needed) (#13816)
  Fixes #13274: Allow cygwin-paths on Windows (#13297)
  Refine "REDACTED" replacement of API key value in web fetcher search URL (#13814)
  changed ISSNCleanup into NormalizeIssn, refactored respective tests #13748 (#13767)
  ...
@Siedlerchr Siedlerchr changed the title Fix lsp 4j modules Fix lsp4j modules Sep 8, 2025
@Siedlerchr Siedlerchr added the dev: binaries Binary builds should be uploaded to builds.jabref.org label Sep 8, 2025
koppor
koppor previously approved these changes Sep 8, 2025
@koppor koppor enabled auto-merge September 8, 2025 18:23
@trag-bot
Copy link
Copy Markdown

trag-bot bot commented Sep 8, 2025

@trag-bot didn't find any issues in the code! ✅✨

1 similar comment
@trag-bot
Copy link
Copy Markdown

trag-bot bot commented Sep 8, 2025

@trag-bot didn't find any issues in the code! ✅✨

@koppor koppor added this pull request to the merge queue Sep 8, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 8, 2025

The build of this PR is available at https://builds.jabref.org/pull/13835/merge.

Merged via the queue into main with commit aa1d8f9 Sep 8, 2025
38 checks passed
@koppor koppor deleted the fixlsp4jmodules branch September 8, 2025 18:54
}
module("javax.websocket:javax.websocket-api", "javax.websocket") {
overrideModuleName()
module("javax.websocket:javax.websocket-api", "javax.websocket.api") {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this adjustment be applied to module("jakarta.websocket:jakarta.websocket-api", "jakarta.websocket") as well?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will test this out later

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry my mistake. It's alright. Jakarta does explicitly declare the module name

module jakarta.websocket {
    exports jakarta.websocket.server;
    
    requires transitive jakarta.websocket.client;
    
    uses jakarta.websocket.server.ServerEndpointConfig.Configurator;
}

For javax.websocket, it's a different story since its automatic module name is indeed javax.websocket.api. Sorry for the wrong alert!

module("javax.websocket:javax.websocket-api", "javax.websocket.api") {
exportAllPackages()
}
module("org.eclipse.xtend:org.eclipse.xtend", "xtend") {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like some module names still don't match. Shouldn't this be module("org.eclipse.xtend:org.eclipse.xtend", "org.eclipse.xtend")?
For some reason, xtend hasn't been an issue for the APIdia doc built so far. Will see how this week's build later this week will turn out and report back issues if any...

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will check this one out as well

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a relocation note (to group org.eclipse.xtext) for this artifact since version 2.40.0: https://repo1.maven.org/maven2/org/eclipse/xtend/org.eclipse.xtend.relocated.parent/2.40.0/org.eclipse.xtend.relocated.parent-2.40.0.pom
Then, neither in group org.eclipse.xtext nor in org.eclipse.xtend there exists an artifact plainly named org.eclipse.xtend. There are org.eclipse.xtend.lib and org.eclipse.xtend.core. My educated guess is that you want lib. So, I suppose this entry should be changed to either of (or both if necessary)

module("org.eclipse.xtext:org.eclipse.xtend.lib", "org.eclipse.xtend.lib")
module("org.eclipse.xtext:org.eclipse.xtend.core", "org.eclipse.xtend.core")

The first version under the new location has been released recently, so I suppose it's most future-proof to follow this move from the start...

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record, this did not cause any problem for the recent doc build. However, my system does not consider xtend a dependency of any JabRef module at all. Consequently, it's not listed on https://apidia.net/java/JabRef/6.0-snapshot-2025-09-12/
That means, it is not a compile-time dependency: Calling javac with JabRef sources does not require this dependency. Sure, it might be a runtime-only dependency. If you are not sure why it is needed, you should perhaps revisit it.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, indeed, maybe it was required in the past as transitive dependency for some tooling

Siedlerchr added a commit that referenced this pull request Sep 9, 2025
* upstream/main:
  Fix typo in PR template
  Fix: No exception if file is not within a git repository (#13839)
  Fix lsp4j modules (#13835)
  New Crowdin updates (#13837)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dev: binaries Binary builds should be uploaded to builds.jabref.org

Projects

None yet

Development

Successfully merging this pull request may close these issues.

lsp4j dependencies are obfuscated/not called by their official names

3 participants