From b6451f1f7e5f383979a85c36260090fc60605fb1 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Thu, 14 Aug 2025 19:22:54 +0200 Subject: [PATCH 1/4] fix git modules requires and uses --- .../org.jabref.gradle.base.dependency-rules.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index c92897f75b9..966b71817db 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -236,7 +236,11 @@ extraJavaModuleInfo { } module("org.apache.pdfbox:pdfbox-io", "org.apache.pdfbox.io") module("org.apache.velocity:velocity-engine-core", "velocity.engine.core") - module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit") + module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit") { + exportAllPackages() + requires("org.slf4j") + uses("org.eclipse.jgit.lib.SignerFactory") + } module("org.fxmisc.undo:undofx", "org.fxmisc.undo") module("org.fxmisc.wellbehaved:wellbehavedfx", "wellbehavedfx") { exportAllPackages() From 6c62f3327675d4ec5bf1bc988f6e550c594a3140 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 8 Sep 2025 19:14:58 +0200 Subject: [PATCH 2/4] Fix module name of lsp4j and use maven download instead of jitpack Fixes https://github.com/JabRef/jabref/issues/13702 --- ...ef.gradle.base.dependency-rules.gradle.kts | 30 +++++++------------ jabls/build.gradle.kts | 3 +- jabls/src/main/java/module-info.java | 8 ++--- jabsrv/build.gradle.kts | 2 +- versions/build.gradle.kts | 3 +- 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index 966b71817db..77ea40634df 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -293,43 +293,34 @@ extraJavaModuleInfo { module("com.github.javaparser:javaparser-symbol-solver-core", "com.github.javaparser.symbolsolver.core") module("net.sf.jopt-simple:jopt-simple", "jopt.simple") - // "com.github.eclipse:org.eclipse.lsp4j", "lsp4j" - // - The name 'org.eclipse.lsp4j' is different than the name derived from the Jar file name 'lsp4j'; turn off 'failOnModifiedDerivedModuleNames' or explicitly allow override via 'overrideModuleName()' - // - Not a module and no mapping defined: lsp4j-0.24.0.jar - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j", "lsp4j") { - overrideModuleName() + + module("org.eclipse.lsp4j:org.eclipse.lsp4j", "org.eclipse.lsp4j") { exportAllPackages() requireAllDefinedDependencies() // Note the missing "lsp4j" at the group - mergeJar("com.github.eclipse:lsp4j") + //mergeJar("org.eclipse:lsp4j") requires("com.google.gson") } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.debug", "lsp4j.debug") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.debug", "org.eclipse.lsp4j.debug") { exportAllPackages() } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.generator", "lsp4j.generator") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.generator", "org.eclipse.lsp4j.generator") { exportAllPackages() } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc", "lsp4j.jsonrpc") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc", "org.eclipse.lsp4j.jsonrpc") { exportAllPackages() requires("com.google.gson") requires("java.logging") } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug", "lsp4j.jsonrpc.debug") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug", "org.eclipse.lsp4j.jsonrpc.debug") { exportAllPackages() } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.websocket", "lsp4j.websocket") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket", "org.eclipse.lsp4j.websocket") { exportAllPackages() requireAllDefinedDependencies() } - module("com.github.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta", "lsp4j.websocket.jakarta") { - overrideModuleName() + module("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta", "org.eclipse.lsp4j.websocket.jakarta") { exportAllPackages() requireAllDefinedDependencies() } @@ -337,8 +328,7 @@ extraJavaModuleInfo { overrideModuleName() exportAllPackages() } - module("javax.websocket:javax.websocket-api", "javax.websocket") { - overrideModuleName() + module("javax.websocket:javax.websocket-api", "javax.websocket.api") { exportAllPackages() } module("org.eclipse.xtend:org.eclipse.xtend", "xtend") { diff --git a/jabls/build.gradle.kts b/jabls/build.gradle.kts index cad7958fc3e..59d60e0fd1c 100644 --- a/jabls/build.gradle.kts +++ b/jabls/build.gradle.kts @@ -11,7 +11,8 @@ dependencies { implementation("org.slf4j:slf4j-api") // LSP4J for LSP Server - implementation("com.github.eclipse:lsp4j") + implementation("org.eclipse.lsp4j:org.eclipse.lsp4j") + implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket") // route all requests to java.util.logging to SLF4J (which in turn routes to tinylog) testImplementation("org.slf4j:jul-to-slf4j") diff --git a/jabls/src/main/java/module-info.java b/jabls/src/main/java/module-info.java index aa072e5194e..4d396d6837b 100644 --- a/jabls/src/main/java/module-info.java +++ b/jabls/src/main/java/module-info.java @@ -1,6 +1,6 @@ module org.jabref.jabls { exports org.jabref.languageserver; - opens org.jabref.languageserver to lsp4j, lsp4j.jsonrpc, com.google.gson; + opens org.jabref.languageserver to org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc, com.google.gson; exports org.jabref.languageserver.controller; exports org.jabref.languageserver.util; @@ -8,8 +8,8 @@ requires org.slf4j; - requires lsp4j; - requires lsp4j.jsonrpc; - requires lsp4j.websocket; + requires org.eclipse.lsp4j; + requires org.eclipse.lsp4j.jsonrpc; + requires org.eclipse.lsp4j.websocket; requires com.google.gson; } diff --git a/jabsrv/build.gradle.kts b/jabsrv/build.gradle.kts index 64347ff704f..0817c5b6b88 100644 --- a/jabsrv/build.gradle.kts +++ b/jabsrv/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { implementation("org.hibernate.validator:hibernate-validator") // LSP4J for LSP Server - implementation("com.github.eclipse:lsp4j") + implementation("org.eclipse.lsp4j:org.eclipse.lsp4j") implementation("com.konghq:unirest-modules-gson") diff --git a/versions/build.gradle.kts b/versions/build.gradle.kts index 9d4923dbaae..320562e4819 100644 --- a/versions/build.gradle.kts +++ b/versions/build.gradle.kts @@ -38,7 +38,8 @@ dependencies.constraints { api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2") api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0") api("com.fasterxml:aalto-xml:1.3.3") - api("com.github.eclipse:lsp4j:0.24.0") + api("org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0") + api("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket:0.24.0") api("com.github.javakeyring:java-keyring:1.0.4") api("com.github.javaparser:javaparser-symbol-solver-core:3.27.0") api("com.github.jknack:handlebars-helpers:4.3.1") // Required by Wiremock - and our patching of Wiremock From 88b729be47c73af704761b7ea128eba4e20cc828 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 8 Sep 2025 20:22:39 +0200 Subject: [PATCH 3/4] Fix linting issues --- .../kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index 77ea40634df..839cf4878a5 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -297,10 +297,7 @@ extraJavaModuleInfo { module("org.eclipse.lsp4j:org.eclipse.lsp4j", "org.eclipse.lsp4j") { exportAllPackages() requireAllDefinedDependencies() - // Note the missing "lsp4j" at the group - //mergeJar("org.eclipse:lsp4j") requires("com.google.gson") - } module("org.eclipse.lsp4j:org.eclipse.lsp4j.debug", "org.eclipse.lsp4j.debug") { exportAllPackages() From 1145a64d0854ea719a7a0eda77342bd15a1ebe89 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 8 Sep 2025 20:23:27 +0200 Subject: [PATCH 4/4] Remove empty line --- .../kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index 839cf4878a5..90aba2d28c1 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -293,7 +293,6 @@ extraJavaModuleInfo { module("com.github.javaparser:javaparser-symbol-solver-core", "com.github.javaparser.symbolsolver.core") module("net.sf.jopt-simple:jopt-simple", "jopt.simple") - module("org.eclipse.lsp4j:org.eclipse.lsp4j", "org.eclipse.lsp4j") { exportAllPackages() requireAllDefinedDependencies()