Skip to content

Commit

Permalink
issue #176: adjust ModuleManager call in SuggestedMergedModuleInfoBui…
Browse files Browse the repository at this point in the history
…lder
  • Loading branch information
siordache committed Mar 22, 2021
1 parent 50d190c commit 77404e4
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,12 @@ class SuggestedMergedModuleInfoBuilder {
LOGGER.debug("External packages used by the merged service:\n\t${scanner.externalPackages.join('\n\t')}")

def depMgr = new DependencyManager(project, forceMergedJarPrefixes, extraDependenciesPrefixes, configuration)
def moduleManager = new ModuleManager(*depMgr.modularJars.toArray(), new File("$javaHome/jmods"))
def exportsMap = new ModuleManager(javaHome)
.getExportsMap(*depMgr.modularJars.toArray(), new File("$javaHome/jmods"))
def builders = new HashSet<RequiresBuilder>()

scanner.externalPackages.each { pkg ->
def moduleName = moduleManager.exportMap[pkg]
def moduleName = exportsMap[pkg]
if(!moduleName) {
LOGGER.info("Cannot find module exporting $pkg (used by the merged module)")
} else if(moduleName != 'java.base'){
Expand Down

0 comments on commit 77404e4

Please sign in to comment.