From 0615ae176d691beeeb312026d02aaa0dafc4639c Mon Sep 17 00:00:00 2001
From: Serban Iordache <iordache@hotmail.com>
Date: Fri, 14 Dec 2018 01:14:20 +0100
Subject: [PATCH] fix issue with force merged multi-release jars

---
 .../org/beryx/jlink/impl/CreateMergedModuleTaskImpl.groovy      | 2 +-
 src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy       | 1 -
 .../org/beryx/jlink/impl/PrepareMergedJarsDirTaskImpl.groovy    | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/groovy/org/beryx/jlink/impl/CreateMergedModuleTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/CreateMergedModuleTaskImpl.groovy
index ebe309cf..a0d71443 100644
--- a/src/main/groovy/org/beryx/jlink/impl/CreateMergedModuleTaskImpl.groovy
+++ b/src/main/groovy/org/beryx/jlink/impl/CreateMergedModuleTaskImpl.groovy
@@ -78,7 +78,7 @@ class CreateMergedModuleTaskImpl extends BaseTaskImpl<CreateMergedModuleTaskData
             def pkgName = Util.getPackage(entry.name)
             if(pkgName) packages << pkgName
         }
-        def moduleName = Util.getModuleName(jarFile, project)
+        def moduleName = Util.getFallbackModuleName(jarFile)
         def modinfoDir = new File(targetDir, moduleName)
         modinfoDir.mkdirs()
         def modInfoJava = new File(modinfoDir, 'module-info.java')
diff --git a/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy
index a29dd103..219d8173 100644
--- a/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy
+++ b/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy
@@ -53,7 +53,6 @@ class JlinkTaskImpl extends BaseTaskImpl<JlinkTaskData> {
                            "$jdkHome/jmods/$SEP${project.files(td.jlinkJarsDir).asPath}$SEP${project.jar.archivePath}",
                            '--add-modules', td.moduleName,
                            '--output', imageDir]
-//        '--launcher', "$td.launcherData.name=$td.moduleName/$td.mainClass"]
         }
         if(result.exitValue != 0) {
             project.logger.error(project.ext.jlinkOutput())
diff --git a/src/main/groovy/org/beryx/jlink/impl/PrepareMergedJarsDirTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/PrepareMergedJarsDirTaskImpl.groovy
index 7e658ace..0305a67f 100644
--- a/src/main/groovy/org/beryx/jlink/impl/PrepareMergedJarsDirTaskImpl.groovy
+++ b/src/main/groovy/org/beryx/jlink/impl/PrepareMergedJarsDirTaskImpl.groovy
@@ -71,6 +71,7 @@ class PrepareMergedJarsDirTaskImpl extends BaseTaskImpl<PrepareMergedJarsDirTask
                 project.copy {
                     from versionedDir
                     into td.tmpJarsDirPath
+                    exclude 'module-info.class'
                 }
             }