Skip to content

Commit 0848124

Browse files
Munhangyeolkoppor
andauthored
fix: revert Java module names to restore Status Log compatibility in JabRef 5.15 (#13511)
* fix: revert Java module names to restore Status Log compatibility in JabRef 5.15 * fix(cli): align module-info with main project for consistent module names --------- Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
1 parent d71ef77 commit 0848124

File tree

5 files changed

+58
-58
lines changed

5 files changed

+58
-58
lines changed

build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ extraJavaModuleInfo {
108108
uses("ai.djl.repository.RepositoryFactory")
109109
}
110110
module("at.favre.lib:hkdf", "at.favre.lib.hkdf")
111-
module("com.github.javakeyring:java-keyring", "com.github.java.keyring")
111+
module("com.github.javakeyring:java-keyring", "java.keyring")
112112

113113
module("com.github.tomtung:latex2unicode_2.13", "com.github.tomtung.latex2unicode") {
114114
exportAllPackages()
115115
requireAllDefinedDependencies()
116116
}
117-
module("com.lihaoyi:fastparse_2.13", "com.lihaoyi.fastparse") {
117+
module("com.lihaoyi:fastparse_2.13", "fastparse") {
118118
exportAllPackages()
119119
requireAllDefinedDependencies()
120120
requires("scala.library")
@@ -130,35 +130,35 @@ extraJavaModuleInfo {
130130
requires("scala.library")
131131
}
132132

133-
module("com.googlecode.plist:dd-plist", "com.googlecode.dd.plist")
133+
module("com.googlecode.plist:dd-plist", "dd.plist")
134134
module("com.h2database:h2-mvstore", "com.h2database.mvstore")
135135
module("com.ibm.icu:icu4j", "com.ibm.icu")
136136
module("com.knuddels:jtokkit", "com.knuddels.jtokkit")
137-
module("com.konghq:unirest-java-core", "com.konghq.unirest.java.core") {
137+
module("com.konghq:unirest-java-core", "unirest.java.core") {
138138
exportAllPackages()
139139
requires("java.net.http")
140140
uses("kong.unirest.core.json.JsonEngine")
141141
}
142-
module("com.konghq:unirest-modules-gson", "com.konghq.unirest.modules.gson")
142+
module("com.konghq:unirest-modules-gson", "unirest.modules.gson")
143143
module("com.squareup.okhttp3:okhttp", "okhttp3")
144144
module("com.squareup.okhttp3:okhttp-sse", "okhttp3.sse")
145145
module("com.squareup.okio:okio", "okio")
146146
module("com.squareup.retrofit2:converter-jackson", "retrofit2.converter.jackson")
147147
module("com.squareup.retrofit2:retrofit", "retrofit2")
148-
module("com.vladsch.flexmark:flexmark", "com.vladsch.flexmark")
148+
module("com.vladsch.flexmark:flexmark", "flexmark")
149149
module("com.vladsch.flexmark:flexmark-ext-emoji", "com.vladsch.flexmark.ext.emoji")
150150
module("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough", "com.vladsch.flexmark.ext.gfm.strikethrough")
151151
module("com.vladsch.flexmark:flexmark-ext-ins", "com.vladsch.flexmark.ext.ins")
152152
module("com.vladsch.flexmark:flexmark-ext-superscript", "com.vladsch.flexmark.ext.superscript")
153153
module("com.vladsch.flexmark:flexmark-ext-tables", "com.vladsch.flexmark.ext.tables")
154154
module("com.vladsch.flexmark:flexmark-ext-wikilink", "com.vladsch.flexmark.ext.wikilink")
155-
module("com.vladsch.flexmark:flexmark-html2md-converter", "com.vladsch.flexmark.html2md.converter")
155+
module("com.vladsch.flexmark:flexmark-html2md-converter", "flexmark.html2md.converter")
156156
module("com.vladsch.flexmark:flexmark-jira-converter", "com.vladsch.flexmark.jira.converter")
157157
module("com.vladsch.flexmark:flexmark-util", "com.vladsch.flexmark.util")
158-
module("com.vladsch.flexmark:flexmark-util-ast", "com.vladsch.flexmark.util.ast")
158+
module("com.vladsch.flexmark:flexmark-util-ast", "flexmark.util.ast")
159159
module("com.vladsch.flexmark:flexmark-util-builder", "com.vladsch.flexmark.util.builder")
160160
module("com.vladsch.flexmark:flexmark-util-collection", "com.vladsch.flexmark.util.collection")
161-
module("com.vladsch.flexmark:flexmark-util-data", "com.vladsch.flexmark.util.data")
161+
module("com.vladsch.flexmark:flexmark-util-data", "flexmark.util.data")
162162
module("com.vladsch.flexmark:flexmark-util-dependency", "com.vladsch.flexmark.util.dependency")
163163
module("com.vladsch.flexmark:flexmark-util-format", "com.vladsch.flexmark.util.format")
164164
module("com.vladsch.flexmark:flexmark-util-html", "com.vladsch.flexmark.util.html")
@@ -170,29 +170,29 @@ extraJavaModuleInfo {
170170
module("commons-collections:commons-collections", "commons.collections")
171171
module("commons-digester:commons-digester", "commons.digester")
172172
module("de.rototor.jeuclid:jeuclid-core", "de.rototor.jeuclid.core")
173-
module("de.rototor.snuggletex:snuggletex-core", "de.rototor.snuggletex.core")
173+
module("de.rototor.snuggletex:snuggletex-core", "snuggletex.core")
174174
module("de.rototor.snuggletex:snuggletex-jeuclid", "de.rototor.snuggletex.jeuclid")
175175
module("de.swiesend:secret-service", "de.swiesend.secret.service")
176-
module("de.undercouch:citeproc-java", "de.undercouch.citeproc.java") {
176+
module("de.undercouch:citeproc-java", "citeproc.java") {
177177
exportAllPackages()
178178
requires("java.xml")
179179
requires("org.antlr.antlr4.runtime")
180180
requires("org.apache.commons.lang3")
181181
requires("org.apache.commons.text")
182-
requires("org.jbibtex")
182+
requires("jbibtex")
183183
// Compile time only
184184
// requires("jackson.annotations")
185185
}
186-
module("dev.langchain4j:langchain4j", "dev.langchain4j")
187-
module("dev.langchain4j:langchain4j-core", "dev.langchain4j.core")
188-
module("dev.langchain4j:langchain4j-google-ai-gemini", "dev.langchain4j.google.ai.gemini")
189-
module("dev.langchain4j:langchain4j-http-client", "dev.langchain4j.http.client")
190-
module("dev.langchain4j:langchain4j-http-client-jdk", "dev.langchain4j.http.client.jdk")
191-
module("dev.langchain4j:langchain4j-hugging-face", "dev.langchain4j.hugging.face")
192-
module("dev.langchain4j:langchain4j-mistral-ai", "dev.langchain4j.mistral.ai")
193-
module("dev.langchain4j:langchain4j-open-ai", "dev.langchain4j.open.ai")
186+
module("dev.langchain4j:langchain4j", "langchain4j")
187+
module("dev.langchain4j:langchain4j-core", "langchain4j.core")
188+
module("dev.langchain4j:langchain4j-google-ai-gemini", "langchain4j.google.ai.gemini")
189+
module("dev.langchain4j:langchain4j-http-client", "langchain4j.http.client")
190+
module("dev.langchain4j:langchain4j-http-client-jdk", "langchain4j.http.client.jdk")
191+
module("dev.langchain4j:langchain4j-hugging-face", "langchain4j.hugging.face")
192+
module("dev.langchain4j:langchain4j-mistral-ai", "langchain4j.mistral.ai")
193+
module("dev.langchain4j:langchain4j-open-ai", "langchain4j.open.ai")
194194
module("eu.lestard:doc-annotations", "eu.lestard.doc.annotations")
195-
module("info.debatty:java-string-similarity", "info.debatty.java.string.similarity")
195+
module("info.debatty:java-string-similarity", "java.string.similarity")
196196
module("io.github.adr:e-adr", "io.github.adr")
197197
module("io.github.java-diff-utils:java-diff-utils", "io.github.javadiffutils")
198198
module("io.zonky.test.postgres:embedded-postgres-binaries-darwin-amd64", "io.zonky.test.postgres.embedded.postgres.binaries.darwin.amd64")
@@ -223,15 +223,15 @@ extraJavaModuleInfo {
223223
requires("org.apache.commons.logging")
224224
}
225225
module("org.apache.pdfbox:pdfbox-io", "org.apache.pdfbox.io")
226-
module("org.apache.velocity:velocity-engine-core", "org.apache.velocity.engine.core")
226+
module("org.apache.velocity:velocity-engine-core", "velocity.engine.core")
227227
module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit")
228228
module("org.fxmisc.undo:undofx", "org.fxmisc.undo")
229229
module("org.fxmisc.wellbehaved:wellbehavedfx", "org.fxmisc.wellbehaved") {
230230
exportAllPackages()
231231
requires("javafx.graphics")
232232
}
233233
module("org.javassist:javassist", "org.javassist")
234-
module("org.jbibtex:jbibtex", "org.jbibtex") {
234+
module("org.jbibtex:jbibtex", "jbibtex") {
235235
exportAllPackages()
236236
}
237237
module("org.scala-lang:scala-library", "scala.library")
@@ -412,12 +412,12 @@ extraJavaModuleInfo {
412412
requireAllDefinedDependencies()
413413
requiresTransitive("javafx.graphics")
414414
}
415-
module("io.github.stefanbratanov:jvm-openai", "io.github.stefanbratanov.jvm.openai") {
415+
module("io.github.stefanbratanov:jvm-openai", "jvm.openai") {
416416
exportAllPackages()
417417
requireAllDefinedDependencies()
418418
requires("java.net.http")
419419
}
420-
module("io.zonky.test:embedded-postgres", "io.zonky.test.embedded.postgres") {
420+
module("io.zonky.test:embedded-postgres", "embedded.postgres") {
421421
exportAllPackages()
422422
requireAllDefinedDependencies()
423423
requires("java.sql")

jabgui/src/main/java/module-info.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
// region HTTP clients
9292
requires org.apache.httpcomponents.core5.httpcore5;
9393
requires org.jsoup;
94-
requires com.konghq.unirest.java.core;
94+
requires unirest.java.core;
9595
// requires unirest.modules.gson;
9696
// endregion
9797

@@ -129,14 +129,14 @@
129129
// requires org.apache.xmpbox;
130130
// requires com.ibm.icu;
131131

132-
requires com.vladsch.flexmark;
133-
requires com.vladsch.flexmark.html2md.converter;
134-
requires com.vladsch.flexmark.util.ast;
135-
requires com.vladsch.flexmark.util.data;
132+
requires flexmark;
133+
requires flexmark.html2md.converter;
134+
requires flexmark.util.ast;
135+
requires flexmark.util.data;
136136

137137
// requires com.h2database.mvstore;
138138

139-
requires com.github.java.keyring;
139+
requires java.keyring;
140140
// requires org.freedesktop.dbus;
141141

142142
requires org.jooq.jool;
@@ -147,7 +147,7 @@
147147
// requires ai.djl.tokenizers;
148148
// requires jvm.openai;
149149
// requires langchain4j;
150-
requires dev.langchain4j.core;
150+
requires langchain4j.core;
151151
// requires langchain4j.google.ai.gemini;
152152
// requires langchain4j.hugging.face;
153153
// requires langchain4j.mistral.ai;

jablib/src/main/java/module-info.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,20 @@
152152
requires jakarta.ws.rs;
153153
requires org.apache.httpcomponents.core5.httpcore5;
154154
requires org.jsoup;
155-
requires com.konghq.unirest.java.core;
156-
requires com.konghq.unirest.modules.gson;
155+
requires unirest.java.core;
156+
requires unirest.modules.gson;
157157
// endregion
158158

159159
// region: SQL databases
160-
requires io.zonky.test.embedded.postgres;
160+
requires embedded.postgres;
161161
requires org.tukaani.xz;
162162
requires org.postgresql.jdbc;
163163
// endregion
164164

165165
// region: Apache Commons and other (similar) helper libraries
166166
requires com.google.common;
167167
requires io.github.javadiffutils;
168-
requires info.debatty.java.string.similarity;
168+
requires java.string.similarity;
169169
requires org.apache.commons.compress;
170170
requires org.apache.commons.csv;
171171
requires org.apache.commons.io;
@@ -176,27 +176,27 @@
176176

177177
// region: latex2unicode
178178
requires com.github.tomtung.latex2unicode;
179-
requires com.lihaoyi.fastparse;
179+
requires fastparse;
180180
requires scala.library;
181181
// endregion
182182

183-
requires org.jbibtex;
184-
requires de.undercouch.citeproc.java;
183+
requires jbibtex;
184+
requires citeproc.java;
185185

186-
requires de.rototor.snuggletex.core;
186+
requires snuggletex.core;
187187

188188
requires org.apache.pdfbox;
189189
requires org.apache.xmpbox;
190190
requires com.ibm.icu;
191191

192-
requires com.vladsch.flexmark;
193-
requires com.vladsch.flexmark.html2md.converter;
194-
requires com.vladsch.flexmark.util.ast;
195-
requires com.vladsch.flexmark.util.data;
192+
requires flexmark;
193+
requires flexmark.html2md.converter;
194+
requires flexmark.util.ast;
195+
requires flexmark.util.data;
196196

197197
requires com.h2database.mvstore;
198198

199-
requires com.github.java.keyring;
199+
requires java.keyring;
200200
requires org.freedesktop.dbus;
201201

202202
requires org.jooq.jool;
@@ -205,18 +205,18 @@
205205
requires ai.djl.api;
206206
requires ai.djl.pytorch_model_zoo;
207207
requires ai.djl.tokenizers;
208-
requires io.github.stefanbratanov.jvm.openai;
209-
requires dev.langchain4j;
210-
requires dev.langchain4j.core;
211-
requires dev.langchain4j.google.ai.gemini;
212-
requires dev.langchain4j.hugging.face;
213-
requires dev.langchain4j.mistral.ai;
214-
requires dev.langchain4j.open.ai;
208+
requires jvm.openai;
209+
requires langchain4j;
210+
requires langchain4j.core;
211+
requires langchain4j.google.ai.gemini;
212+
requires langchain4j.hugging.face;
213+
requires langchain4j.mistral.ai;
214+
requires langchain4j.open.ai;
215215
uses ai.djl.engine.EngineProvider;
216216
uses ai.djl.repository.RepositoryFactory;
217217
uses ai.djl.repository.zoo.ZooProvider;
218218
uses dev.langchain4j.spi.prompt.PromptTemplateFactory;
219-
requires org.apache.velocity.engine.core;
219+
requires velocity.engine.core;
220220
// endregion
221221

222222
// region: Lucene
@@ -242,7 +242,7 @@
242242

243243
// region: other libraries (alphabetically)
244244
requires cuid;
245-
requires com.googlecode.dd.plist;
245+
requires dd.plist;
246246
requires io.github.adr;
247247
// required by okhttp and some AI library
248248
requires kotlin.stdlib;

jabsrv-cli/src/main/java/module-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
requires com.sun.jna;
3535
requires com.sun.jna.platform;
3636

37-
requires org.jbibtex;
38-
requires de.undercouch.citeproc.java;
37+
requires jbibtex;
38+
requires citeproc.java;
3939

4040
requires transitive org.jspecify;
4141
requires java.logging;

jabsrv/src/main/java/module-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
requires com.sun.jna;
4545
requires com.sun.jna.platform;
4646

47-
requires org.jbibtex;
48-
requires de.undercouch.citeproc.java;
47+
requires jbibtex;
48+
requires citeproc.java;
4949

5050
requires transitive org.jspecify;
5151
requires java.logging;

0 commit comments

Comments
 (0)