@@ -4,9 +4,12 @@ plugins {
4
4
id(" org.gradlex.java-module-dependencies" ) // only for mappings at the moment
5
5
}
6
6
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
+ }
10
13
11
14
jvmDependencyConflicts {
12
15
consistentResolution {
@@ -107,24 +110,27 @@ extraJavaModuleInfo {
107
110
uses(" ai.djl.repository.zoo.ZooProvider" )
108
111
uses(" ai.djl.repository.RepositoryFactory" )
109
112
}
110
- module(" at.favre.lib:hkdf" , " at.favre.lib. hkdf" )
113
+ module(" at.favre.lib:hkdf" , " hkdf" )
111
114
module(" com.github.javakeyring:java-keyring" , " java.keyring" )
112
115
113
116
module(" com.github.tomtung:latex2unicode_2.13" , " com.github.tomtung.latex2unicode" ) {
114
117
exportAllPackages()
115
118
requireAllDefinedDependencies()
116
119
}
117
120
module(" com.lihaoyi:fastparse_2.13" , " fastparse" ) {
121
+ overrideModuleName() // fastparse_2.13 is not a valid name
118
122
exportAllPackages()
119
123
requireAllDefinedDependencies()
120
124
requires(" scala.library" )
121
125
}
122
126
module(" com.lihaoyi:sourcecode_2.13" , " com.lihaoyi.sourcecode" ) {
127
+ overrideModuleName() // sourcecode_2.13 is not a valid name
123
128
exportAllPackages()
124
129
requireAllDefinedDependencies()
125
130
requires(" scala.library" )
126
131
}
127
132
module(" com.lihaoyi:geny_2.13" , " com.lihaoyi.geny" ) {
133
+ overrideModuleName() // geny_2.13 is not a valid name
128
134
exportAllPackages()
129
135
requireAllDefinedDependencies()
130
136
requires(" scala.library" )
@@ -133,7 +139,7 @@ extraJavaModuleInfo {
133
139
module(" com.googlecode.plist:dd-plist" , " dd.plist" )
134
140
module(" com.h2database:h2-mvstore" , " com.h2database.mvstore" )
135
141
module(" com.ibm.icu:icu4j" , " com.ibm.icu" )
136
- module(" com.knuddels:jtokkit" , " com.knuddels. jtokkit" )
142
+ module(" com.knuddels:jtokkit" , " jtokkit" )
137
143
module(" com.konghq:unirest-java-core" , " unirest.java.core" ) {
138
144
exportAllPackages()
139
145
requires(" java.net.http" )
@@ -146,33 +152,33 @@ extraJavaModuleInfo {
146
152
module(" com.squareup.retrofit2:converter-jackson" , " retrofit2.converter.jackson" )
147
153
module(" com.squareup.retrofit2:retrofit" , " retrofit2" )
148
154
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" )
155
161
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" )
158
164
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" )
161
167
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" )
169
175
module(" commons-beanutils:commons-beanutils" , " commons.beanutils" )
170
176
module(" commons-collections:commons-collections" , " commons.collections" )
171
177
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" )
173
179
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" )
176
182
module(" de.undercouch:citeproc-java" , " citeproc.java" ) {
177
183
exportAllPackages()
178
184
requires(" java.xml" )
@@ -191,25 +197,25 @@ extraJavaModuleInfo {
191
197
module(" dev.langchain4j:langchain4j-hugging-face" , " langchain4j.hugging.face" )
192
198
module(" dev.langchain4j:langchain4j-mistral-ai" , " langchain4j.mistral.ai" )
193
199
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" )
195
201
module(" info.debatty:java-string-similarity" , " java.string.similarity" )
196
202
module(" io.github.adr:e-adr" , " io.github.adr" )
197
203
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" )
204
210
module(" net.harawata:appdirs" , " net.harawata.appdirs" )
205
211
module(" net.java.dev.jna:jna" , " com.sun.jna" ) {
206
212
patchRealModule()
207
213
exportAllPackages()
208
214
requires(" java.logging" )
209
215
}
210
216
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" )
213
219
module(" org.abego.treelayout:org.abego.treelayout.core" , " org.abego.treelayout.core" )
214
220
module(" org.antlr:antlr4-runtime" , " org.antlr.antlr4.runtime" )
215
221
module(" org.apache.httpcomponents.client5:httpclient5" , " org.apache.httpcomponents.client5.httpclient5" )
@@ -226,7 +232,7 @@ extraJavaModuleInfo {
226
232
module(" org.apache.velocity:velocity-engine-core" , " velocity.engine.core" )
227
233
module(" org.eclipse.jgit:org.eclipse.jgit" , " org.eclipse.jgit" )
228
234
module(" org.fxmisc.undo:undofx" , " org.fxmisc.undo" )
229
- module(" org.fxmisc.wellbehaved:wellbehavedfx" , " org.fxmisc.wellbehaved " ) {
235
+ module(" org.fxmisc.wellbehaved:wellbehavedfx" , " wellbehavedfx " ) {
230
236
exportAllPackages()
231
237
requires(" javafx.graphics" )
232
238
}
@@ -235,7 +241,7 @@ extraJavaModuleInfo {
235
241
exportAllPackages()
236
242
}
237
243
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" )
239
245
240
246
module(" org.testfx:testfx-core" , " org.testfx" ) {
241
247
patchRealModule()
@@ -296,66 +302,66 @@ extraJavaModuleInfo {
296
302
}
297
303
298
304
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" ) {
300
306
exportAllPackages()
301
307
requireAllDefinedDependencies()
302
308
requires(" java.logging" )
303
309
requires(" jakarta.xml.bind" )
304
- requires(" org.glassfish. jersey.hk2" )
310
+ requires(" jersey.hk2" )
305
311
}
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" ) {
308
314
exportAllPackages()
309
315
requireAllDefinedDependencies()
310
316
requires(" java.logging" )
311
317
}
312
- module(" org.glassfish.jersey.core:jersey-client" , " org.glassfish. jersey.client" ) {
318
+ module(" org.glassfish.jersey.core:jersey-client" , " jersey.client" ) {
313
319
exportAllPackages()
314
320
requireAllDefinedDependencies()
315
321
requires(" java.logging" )
316
322
}
317
- module(" org.glassfish.jersey.core:jersey-common" , " org.glassfish. jersey.common" ) {
323
+ module(" org.glassfish.jersey.core:jersey-common" , " jersey.common" ) {
318
324
exportAllPackages()
319
325
requireAllDefinedDependencies()
320
326
requires(" java.logging" )
321
327
requires(" java.xml" )
322
328
}
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" ) {
324
330
exportAllPackages()
325
331
requireAllDefinedDependencies()
326
332
requires(" java.logging" )
327
333
requires(" org.glassfish.grizzly" )
328
334
requires(" org.glassfish.grizzly.http" )
329
335
}
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" ) {
331
337
exportAllPackages()
332
338
requireAllDefinedDependencies()
333
339
requires(" java.logging" )
334
340
}
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")
337
343
}
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" ) {
339
345
exportAllPackages()
340
346
// requireAllDefinedDependencies()
341
- requires(" org.glassfish. jersey.container.servlet.core" )
347
+ requires(" jersey.container.servlet.core" )
342
348
requires(" jakarta.servlet.api" )
343
349
}
344
350
module(" jakarta.servlet:jakarta.servlet-api" , " jakarta.servlet.api" ) {
345
351
patchRealModule()
346
352
exportAllPackages()
347
353
}
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" ) {
349
355
exportAllPackages()
350
356
requires(" jakarta.servlet.api" )
351
357
}
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" ) {
353
359
requireAllDefinedDependencies()
354
360
requires(" java.logging" )
355
361
requires(" java.xml" )
356
362
requires(" jakarta.xml.bind" )
357
363
}
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" ) {
359
365
requireAllDefinedDependencies()
360
366
requires(" java.logging" )
361
367
}
@@ -374,7 +380,7 @@ extraJavaModuleInfo {
374
380
requireAllDefinedDependencies()
375
381
requires(" java.logging" )
376
382
}
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" ) {
378
384
exportAllPackages()
379
385
requireAllDefinedDependencies()
380
386
requires(" java.logging" )
@@ -397,7 +403,7 @@ extraJavaModuleInfo {
397
403
requireAllDefinedDependencies()
398
404
requiresTransitive(" javafx.base" )
399
405
}
400
- module(" org.reactfx:reactfx" , " org. reactfx" ) {
406
+ module(" org.reactfx:reactfx" , " reactfx" ) {
401
407
exportAllPackages()
402
408
requireAllDefinedDependencies()
403
409
requiresTransitive(" javafx.controls" )
0 commit comments