Skip to content

Commit 89e076b

Browse files
committed
Update 'unique_modules' (special handling of problematic entries)
1 parent 783b131 commit 89e076b

File tree

3 files changed

+112
-8
lines changed

3 files changed

+112
-8
lines changed

gradle/plugins/src/main/kotlin/gradlexbuild/UniqueModulesPropertiesUpdate.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ abstract class UniqueModulesPropertiesUpdate : DefaultTask() {
3939
val split = entry.value.toString().split("/")
4040
val group = split.subList(4, split.size - 3).joinToString(".")
4141
val name = split[split.size - 3]
42+
// Special handling of "wrong" entries
43+
.replace("-debug-jdk18on", "-jdk18on")
4244
val version = split[split.size - 2]
4345
Module(entry.key.toString(), "$group:$name", version)
4446
}.groupBy { it.ga }.values.map { moduleList ->

src/main/resources/org/gradlex/javamodule/dependencies/modules.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ org.apache.httpcomponents.httpmime=org.apache.httpcomponents:httpmime
5353
org.apache.logging.log4j.slf4j=org.apache.logging.log4j:log4j-slf4j2-impl
5454
org.apache.pdfbox.tools=org.apache.pdfbox:pdfbox-tools
5555
org.apache.pdfbox=org.apache.pdfbox:pdfbox
56-
org.checkerframework.checker.qual=org.checkerframework:checker-qual
5756
org.codehaus.stax2=org.codehaus.woodstox:stax2-api
5857
org.eclipse.jetty.websocket.javax.websocket.server=org.eclipse.jetty.websocket:javax-websocket-server-impl
5958
org.hamcrest=org.hamcrest:hamcrest

0 commit comments

Comments
 (0)