Skip to content

Commit 71c230f

Browse files
authored
Revert module name changes for remaining 'unnamed' Jars (#13515)
* Revert module name changes for remaining 'unnamed' Jars * Fix 'jersey.container.servlet.core' name in requires
1 parent 0848124 commit 71c230f

File tree

5 files changed

+68
-62
lines changed

5 files changed

+68
-62
lines changed

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

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ plugins {
44
id("org.gradlex.java-module-dependencies") // only for mappings at the moment
55
}
66

7-
// TODO remove to translate 'requires' from 'module-info.java' to Gradle dependencies
8-
// and remove 'dependencies {}' block from build.gradle files
9-
javaModuleDependencies { analyseOnly = true }
7+
javaModuleDependencies {
8+
// TODO remove to translate 'requires' from 'module-info.java' to Gradle dependencies
9+
// and remove 'dependencies {}' block from build.gradle files
10+
analyseOnly = true
11+
moduleNameToGA.put("jul.to.slf4j", "org.slf4j:jul-to-slf4j")
12+
}
1013

1114
jvmDependencyConflicts {
1215
consistentResolution {
@@ -107,24 +110,27 @@ extraJavaModuleInfo {
107110
uses("ai.djl.repository.zoo.ZooProvider")
108111
uses("ai.djl.repository.RepositoryFactory")
109112
}
110-
module("at.favre.lib:hkdf", "at.favre.lib.hkdf")
113+
module("at.favre.lib:hkdf", "hkdf")
111114
module("com.github.javakeyring:java-keyring", "java.keyring")
112115

113116
module("com.github.tomtung:latex2unicode_2.13", "com.github.tomtung.latex2unicode") {
114117
exportAllPackages()
115118
requireAllDefinedDependencies()
116119
}
117120
module("com.lihaoyi:fastparse_2.13", "fastparse") {
121+
overrideModuleName() // fastparse_2.13 is not a valid name
118122
exportAllPackages()
119123
requireAllDefinedDependencies()
120124
requires("scala.library")
121125
}
122126
module("com.lihaoyi:sourcecode_2.13", "com.lihaoyi.sourcecode") {
127+
overrideModuleName() // sourcecode_2.13 is not a valid name
123128
exportAllPackages()
124129
requireAllDefinedDependencies()
125130
requires("scala.library")
126131
}
127132
module("com.lihaoyi:geny_2.13", "com.lihaoyi.geny") {
133+
overrideModuleName() // geny_2.13 is not a valid name
128134
exportAllPackages()
129135
requireAllDefinedDependencies()
130136
requires("scala.library")
@@ -133,7 +139,7 @@ extraJavaModuleInfo {
133139
module("com.googlecode.plist:dd-plist", "dd.plist")
134140
module("com.h2database:h2-mvstore", "com.h2database.mvstore")
135141
module("com.ibm.icu:icu4j", "com.ibm.icu")
136-
module("com.knuddels:jtokkit", "com.knuddels.jtokkit")
142+
module("com.knuddels:jtokkit", "jtokkit")
137143
module("com.konghq:unirest-java-core", "unirest.java.core") {
138144
exportAllPackages()
139145
requires("java.net.http")
@@ -146,33 +152,33 @@ extraJavaModuleInfo {
146152
module("com.squareup.retrofit2:converter-jackson", "retrofit2.converter.jackson")
147153
module("com.squareup.retrofit2:retrofit", "retrofit2")
148154
module("com.vladsch.flexmark:flexmark", "flexmark")
149-
module("com.vladsch.flexmark:flexmark-ext-emoji", "com.vladsch.flexmark.ext.emoji")
150-
module("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough", "com.vladsch.flexmark.ext.gfm.strikethrough")
151-
module("com.vladsch.flexmark:flexmark-ext-ins", "com.vladsch.flexmark.ext.ins")
152-
module("com.vladsch.flexmark:flexmark-ext-superscript", "com.vladsch.flexmark.ext.superscript")
153-
module("com.vladsch.flexmark:flexmark-ext-tables", "com.vladsch.flexmark.ext.tables")
154-
module("com.vladsch.flexmark:flexmark-ext-wikilink", "com.vladsch.flexmark.ext.wikilink")
155+
module("com.vladsch.flexmark:flexmark-ext-emoji", "flexmark.ext.emoji")
156+
module("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough", "flexmark.ext.gfm.strikethrough")
157+
module("com.vladsch.flexmark:flexmark-ext-ins", "flexmark.ext.ins")
158+
module("com.vladsch.flexmark:flexmark-ext-superscript", "flexmark.ext.superscript")
159+
module("com.vladsch.flexmark:flexmark-ext-tables", "flexmark.ext.tables")
160+
module("com.vladsch.flexmark:flexmark-ext-wikilink", "flexmark.ext.wikilink")
155161
module("com.vladsch.flexmark:flexmark-html2md-converter", "flexmark.html2md.converter")
156-
module("com.vladsch.flexmark:flexmark-jira-converter", "com.vladsch.flexmark.jira.converter")
157-
module("com.vladsch.flexmark:flexmark-util", "com.vladsch.flexmark.util")
162+
module("com.vladsch.flexmark:flexmark-jira-converter", "flexmark.jira.converter")
163+
module("com.vladsch.flexmark:flexmark-util", "flexmark.util")
158164
module("com.vladsch.flexmark:flexmark-util-ast", "flexmark.util.ast")
159-
module("com.vladsch.flexmark:flexmark-util-builder", "com.vladsch.flexmark.util.builder")
160-
module("com.vladsch.flexmark:flexmark-util-collection", "com.vladsch.flexmark.util.collection")
165+
module("com.vladsch.flexmark:flexmark-util-builder", "flexmark.util.builder")
166+
module("com.vladsch.flexmark:flexmark-util-collection", "flexmark.util.collection")
161167
module("com.vladsch.flexmark:flexmark-util-data", "flexmark.util.data")
162-
module("com.vladsch.flexmark:flexmark-util-dependency", "com.vladsch.flexmark.util.dependency")
163-
module("com.vladsch.flexmark:flexmark-util-format", "com.vladsch.flexmark.util.format")
164-
module("com.vladsch.flexmark:flexmark-util-html", "com.vladsch.flexmark.util.html")
165-
module("com.vladsch.flexmark:flexmark-util-misc", "com.vladsch.flexmark.util.misc")
166-
module("com.vladsch.flexmark:flexmark-util-options", "com.vladsch.flexmark.util.options")
167-
module("com.vladsch.flexmark:flexmark-util-sequence", "com.vladsch.flexmark.util.sequence")
168-
module("com.vladsch.flexmark:flexmark-util-visitor", "com.vladsch.flexmark.util.visitor")
168+
module("com.vladsch.flexmark:flexmark-util-dependency", "flexmark.util.dependency")
169+
module("com.vladsch.flexmark:flexmark-util-format", "flexmark.util.format")
170+
module("com.vladsch.flexmark:flexmark-util-html", "flexmark.util.html")
171+
module("com.vladsch.flexmark:flexmark-util-misc", "flexmark.util.misc")
172+
module("com.vladsch.flexmark:flexmark-util-options", "flexmark.util.options")
173+
module("com.vladsch.flexmark:flexmark-util-sequence", "flexmark.util.sequence")
174+
module("com.vladsch.flexmark:flexmark-util-visitor", "flexmark.util.visitor")
169175
module("commons-beanutils:commons-beanutils", "commons.beanutils")
170176
module("commons-collections:commons-collections", "commons.collections")
171177
module("commons-digester:commons-digester", "commons.digester")
172-
module("de.rototor.jeuclid:jeuclid-core", "de.rototor.jeuclid.core")
178+
module("de.rototor.jeuclid:jeuclid-core", "jeuclid.core")
173179
module("de.rototor.snuggletex:snuggletex-core", "snuggletex.core")
174-
module("de.rototor.snuggletex:snuggletex-jeuclid", "de.rototor.snuggletex.jeuclid")
175-
module("de.swiesend:secret-service", "de.swiesend.secret.service")
180+
module("de.rototor.snuggletex:snuggletex-jeuclid", "snuggletex.jeuclid")
181+
module("de.swiesend:secret-service", "secret.service")
176182
module("de.undercouch:citeproc-java", "citeproc.java") {
177183
exportAllPackages()
178184
requires("java.xml")
@@ -191,25 +197,25 @@ extraJavaModuleInfo {
191197
module("dev.langchain4j:langchain4j-hugging-face", "langchain4j.hugging.face")
192198
module("dev.langchain4j:langchain4j-mistral-ai", "langchain4j.mistral.ai")
193199
module("dev.langchain4j:langchain4j-open-ai", "langchain4j.open.ai")
194-
module("eu.lestard:doc-annotations", "eu.lestard.doc.annotations")
200+
module("eu.lestard:doc-annotations", "doc.annotations")
195201
module("info.debatty:java-string-similarity", "java.string.similarity")
196202
module("io.github.adr:e-adr", "io.github.adr")
197203
module("io.github.java-diff-utils:java-diff-utils", "io.github.javadiffutils")
198-
module("io.zonky.test.postgres:embedded-postgres-binaries-darwin-amd64", "io.zonky.test.postgres.embedded.postgres.binaries.darwin.amd64")
199-
module("io.zonky.test.postgres:embedded-postgres-binaries-darwin-arm64v8", "io.zonky.test.postgres.embedded.postgres.binaries.darwin.arm64v8")
200-
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-amd64", "io.zonky.test.postgres.embedded.postgres.binaries.linux.amd64")
201-
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-amd64-alpine", "io.zonky.test.postgres.embedded.postgres.binaries.linux.amd64.alpine")
202-
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-arm64v8", "io.zonky.test.postgres.embedded.postgres.binaries.linux.arm64v8")
203-
module("io.zonky.test.postgres:embedded-postgres-binaries-windows-amd64", "io.zonky.test.postgres.embedded.postgres.binaries.windows.amd64")
204+
module("io.zonky.test.postgres:embedded-postgres-binaries-darwin-amd64", "embedded.postgres.binaries.darwin.amd64")
205+
module("io.zonky.test.postgres:embedded-postgres-binaries-darwin-arm64v8", "embedded.postgres.binaries.darwin.arm64v8")
206+
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-amd64", "embedded.postgres.binaries.linux.amd64")
207+
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-amd64-alpine", "embedded.postgres.binaries.linux.amd64.alpine")
208+
module("io.zonky.test.postgres:embedded-postgres-binaries-linux-arm64v8", "embedded.postgres.binaries.linux.arm64v8")
209+
module("io.zonky.test.postgres:embedded-postgres-binaries-windows-amd64", "embedded.postgres.binaries.windows.amd64")
204210
module("net.harawata:appdirs", "net.harawata.appdirs")
205211
module("net.java.dev.jna:jna", "com.sun.jna") {
206212
patchRealModule()
207213
exportAllPackages()
208214
requires("java.logging")
209215
}
210216
module("net.java.dev.jna:jna-platform", "com.sun.jna.platform")
211-
module("net.jcip:jcip-annotations", "net.jcip.annotations")
212-
module("net.jodah:typetools", "net.jodah.typetools")
217+
module("net.jcip:jcip-annotations", "jcip.annotations")
218+
module("net.jodah:typetools", "typetools")
213219
module("org.abego.treelayout:org.abego.treelayout.core", "org.abego.treelayout.core")
214220
module("org.antlr:antlr4-runtime", "org.antlr.antlr4.runtime")
215221
module("org.apache.httpcomponents.client5:httpclient5", "org.apache.httpcomponents.client5.httpclient5")
@@ -226,7 +232,7 @@ extraJavaModuleInfo {
226232
module("org.apache.velocity:velocity-engine-core", "velocity.engine.core")
227233
module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit")
228234
module("org.fxmisc.undo:undofx", "org.fxmisc.undo")
229-
module("org.fxmisc.wellbehaved:wellbehavedfx", "org.fxmisc.wellbehaved") {
235+
module("org.fxmisc.wellbehaved:wellbehavedfx", "wellbehavedfx") {
230236
exportAllPackages()
231237
requires("javafx.graphics")
232238
}
@@ -235,7 +241,7 @@ extraJavaModuleInfo {
235241
exportAllPackages()
236242
}
237243
module("org.scala-lang:scala-library", "scala.library")
238-
module("pt.davidafsilva.apple:jkeychain", "pt.davidafsilva.apple.jkeychain")
244+
module("pt.davidafsilva.apple:jkeychain", "jkeychain")
239245

240246
module("org.testfx:testfx-core", "org.testfx") {
241247
patchRealModule()
@@ -296,66 +302,66 @@ extraJavaModuleInfo {
296302
}
297303

298304
module("org.glassfish.hk2.external:aopalliance-repackaged", "org.aopalliance")
299-
module("org.glassfish.jersey.core:jersey-server", "org.glassfish.jersey.server") {
305+
module("org.glassfish.jersey.core:jersey-server", "jersey.server") {
300306
exportAllPackages()
301307
requireAllDefinedDependencies()
302308
requires("java.logging")
303309
requires("jakarta.xml.bind")
304-
requires("org.glassfish.jersey.hk2")
310+
requires("jersey.hk2")
305311
}
306-
// module("org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.servlet")
307-
module("org.glassfish.jersey.inject:jersey-hk2", "org.glassfish.jersey.hk2") {
312+
// module("org.glassfish.jersey.containers:jersey-container-servlet", "jersey.servlet")
313+
module("org.glassfish.jersey.inject:jersey-hk2", "jersey.hk2") {
308314
exportAllPackages()
309315
requireAllDefinedDependencies()
310316
requires("java.logging")
311317
}
312-
module("org.glassfish.jersey.core:jersey-client", "org.glassfish.jersey.client") {
318+
module("org.glassfish.jersey.core:jersey-client", "jersey.client") {
313319
exportAllPackages()
314320
requireAllDefinedDependencies()
315321
requires("java.logging")
316322
}
317-
module("org.glassfish.jersey.core:jersey-common", "org.glassfish.jersey.common") {
323+
module("org.glassfish.jersey.core:jersey-common", "jersey.common") {
318324
exportAllPackages()
319325
requireAllDefinedDependencies()
320326
requires("java.logging")
321327
requires("java.xml")
322328
}
323-
module("org.glassfish.jersey.containers:jersey-container-grizzly2-http", "org.glassfish.jersey.grizzly2.http") {
329+
module("org.glassfish.jersey.containers:jersey-container-grizzly2-http", "jersey.container.grizzly2.http") {
324330
exportAllPackages()
325331
requireAllDefinedDependencies()
326332
requires("java.logging")
327333
requires("org.glassfish.grizzly")
328334
requires("org.glassfish.grizzly.http")
329335
}
330-
module("org.glassfish.jersey.test-framework:jersey-test-framework-core", "org.glassfish.jersey.test.framework.core") {
336+
module("org.glassfish.jersey.test-framework:jersey-test-framework-core", "jersey.test.framework.core") {
331337
exportAllPackages()
332338
requireAllDefinedDependencies()
333339
requires("java.logging")
334340
}
335-
module("org.glassfish.jersey.containers:jersey-container-grizzly2-servlet", "org.glassfish.jersey.container.grizzly2.servlet") {
336-
// requires("org.glassfish.jersey.servlet")
341+
module("org.glassfish.jersey.containers:jersey-container-grizzly2-servlet", "jersey.container.grizzly2.servlet") {
342+
// requires("jersey.servlet")
337343
}
338-
module("org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.container.servlet") {
344+
module("org.glassfish.jersey.containers:jersey-container-servlet", "jersey.container.servlet") {
339345
exportAllPackages()
340346
// requireAllDefinedDependencies()
341-
requires("org.glassfish.jersey.container.servlet.core")
347+
requires("jersey.container.servlet.core")
342348
requires("jakarta.servlet.api")
343349
}
344350
module("jakarta.servlet:jakarta.servlet-api", "jakarta.servlet.api") {
345351
patchRealModule()
346352
exportAllPackages()
347353
}
348-
module("org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.container.servlet.core") {
354+
module("org.glassfish.jersey.containers:jersey-container-servlet-core", "jersey.container.servlet.core") {
349355
exportAllPackages()
350356
requires("jakarta.servlet.api")
351357
}
352-
module("org.glassfish.jersey.media:jersey-media-jaxb", "org.glassfish.jersey.media.jaxb") {
358+
module("org.glassfish.jersey.media:jersey-media-jaxb", "jersey.media.jaxb") {
353359
requireAllDefinedDependencies()
354360
requires("java.logging")
355361
requires("java.xml")
356362
requires("jakarta.xml.bind")
357363
}
358-
module("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2", "org.glassfish.jersey.test.provider.grizzly2") {
364+
module("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2", "jersey.test.provider.grizzly2") {
359365
requireAllDefinedDependencies()
360366
requires("java.logging")
361367
}
@@ -374,7 +380,7 @@ extraJavaModuleInfo {
374380
requireAllDefinedDependencies()
375381
requires("java.logging")
376382
}
377-
module("org.glassfish.hk2:osgi-resource-locator", "org.glassfish.hk2.osgi.resource.locator") {
383+
module("org.glassfish.hk2:osgi-resource-locator", "osgi.resource.locator") {
378384
exportAllPackages()
379385
requireAllDefinedDependencies()
380386
requires("java.logging")
@@ -397,7 +403,7 @@ extraJavaModuleInfo {
397403
requireAllDefinedDependencies()
398404
requiresTransitive("javafx.base")
399405
}
400-
module("org.reactfx:reactfx", "org.reactfx") {
406+
module("org.reactfx:reactfx", "reactfx") {
401407
exportAllPackages()
402408
requireAllDefinedDependencies()
403409
requiresTransitive("javafx.controls")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
provides org.kordamp.ikonli.IkonProvider
4747
with org.jabref.gui.icon.JabrefIconProvider;
4848

49-
requires org.reactfx;
49+
requires reactfx;
5050
// endregion
5151

5252
// region: Logging
@@ -155,7 +155,7 @@
155155
// uses ai.djl.engine.EngineProvider;
156156
// uses ai.djl.repository.RepositoryFactory;
157157
// uses ai.djl.repository.zoo.ZooProvider;
158-
// uses dev.langchain4j.spi.prompt.PromptTemplateFactory;
158+
// uses langchain4j.spi.prompt.PromptTemplateFactory;
159159
// requires velocity.engine.core;
160160
// endregion
161161

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
requires jakarta.validation;
2727
requires jakarta.ws.rs;
2828

29-
requires org.glassfish.jersey.common;
29+
requires jersey.common;
3030

3131
requires info.picocli;
3232

@@ -39,6 +39,6 @@
3939

4040
requires transitive org.jspecify;
4141
requires java.logging;
42-
requires org.glassfish.jersey.grizzly2.http;
43-
requires org.glassfish.jersey.server;
42+
requires jersey.container.grizzly2.http;
43+
requires jersey.server;
4444
}

jabsrv/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666

6767
javaModuleTesting.whitebox(testing.suites["test"]) {
6868
requires.add("jul.to.slf4j")
69-
requires.add("org.glassfish.jersey.test.framework.core")
69+
requires.add("jersey.test.framework.core")
7070
requires.add("org.junit.jupiter.api")
7171
requires.add("org.mockito")
7272
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
requires jakarta.validation;
3939
requires jakarta.ws.rs;
4040

41-
requires org.glassfish.jersey.common;
41+
requires jersey.common;
4242

4343
requires net.harawata.appdirs;
4444
requires com.sun.jna;
@@ -49,6 +49,6 @@
4949

5050
requires transitive org.jspecify;
5151
requires java.logging;
52-
requires org.glassfish.jersey.grizzly2.http;
53-
requires org.glassfish.jersey.server;
52+
requires jersey.container.grizzly2.http;
53+
requires jersey.server;
5454
}

0 commit comments

Comments
 (0)