Skip to content

Commit

Permalink
Omit removed Java modules from detected jlinkModules (#1374)
Browse files Browse the repository at this point in the history
* Omit removed Java modules from jlinkModules

* Add java.annotation to known Jakarta modules
  • Loading branch information
nigredo-tori committed Oct 14, 2020
1 parent 7a12611 commit 202cb48
Showing 1 changed file with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,28 @@ object JlinkPlugin extends AutoPlugin {
// This requires special handling on our part when deciding if the module
// is a part of the platform or not.
// At least the new modules shouldn't be doing this...
val knownJakartaJavaModules = Set("java.xml.bind", "java.xml.soap", "java.ws.rs")
val knownJakartaJavaModules = Set("java.annotation", "java.xml.bind", "java.xml.soap", "java.ws.rs")

// Java platform modules that were officially removed.
// https://www.oracle.com/java/technologies/javase/jdk-11-relnote.html#JDK-8190378
val removedJavaModules = Set(
"java.xml.ws",
"java.xml.bind",
"java.activation",
"java.xml.ws.annotation",
"java.corba",
"java.transaction",
"java.se.ee",
"jdk.xml.ws",
"jdk.xml.bind"
)

val filteredModuleDeps = detectedModuleDeps
.filter { m =>
m.startsWith("jdk.") || m.startsWith("java.")
}
.filterNot(knownJakartaJavaModules.contains)
.filterNot(removedJavaModules.contains)

// We always want `java.base`, and `jlink` requires at least one module.
(filteredModuleDeps + "java.base").toSeq
Expand Down

0 comments on commit 202cb48

Please sign in to comment.