issue #51: Duplicate data in packages produced by jpackage

beryx · Jul 26, 2020 · f73bd84 · f73bd84
1 parent 40ac38d
commit f73bd84
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/JPackageImageTask.groovy b/src/main/groovy/org/beryx/jlink/JPackageImageTask.groovy
@@ -72,7 +72,6 @@ class JPackageImageTask extends BaseTask {
         taskData.moduleName = moduleName
         taskData.jpackageData = jpackageData
         taskData.mainClass = mainClass ?: defaultMainClass
-        taskData.jlinkJarsDir = jlinkJarsDir.asFile
 
         def jlinkTask = (JlinkTask) project.tasks.getByName(JlinkPlugin.TASK_NAME_JLINK)
         taskData.configureRuntimeImageDir(jlinkTask)

diff --git a/src/main/groovy/org/beryx/jlink/JPackageTask.groovy b/src/main/groovy/org/beryx/jlink/JPackageTask.groovy
@@ -72,7 +72,6 @@ class JPackageTask extends BaseTask {
         taskData.moduleName = moduleName
         taskData.jpackageData = jpackageData
         taskData.mainClass = mainClass ?: defaultMainClass
-        taskData.jlinkJarsDir = jlinkJarsDir.asFile
 
         def jlinkTask = (JlinkTask) project.tasks.getByName(JlinkPlugin.TASK_NAME_JLINK)
         taskData.configureRuntimeImageDir(jlinkTask)

diff --git a/src/main/groovy/org/beryx/jlink/data/JPackageTaskData.groovy b/src/main/groovy/org/beryx/jlink/data/JPackageTaskData.groovy
@@ -29,7 +29,6 @@ class JPackageTaskData extends BaseTaskData {
 
     String moduleName
     String mainClass
-    File jlinkJarsDir
     File imageDir
     File runtimeImageDir
     JPackageData jpackageData

diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy
@@ -85,7 +85,6 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                            '--type', 'app-image',
                            '--dest', outputDir,
                            '--name', jpd.imageName,
-                           '--module-path', td.jlinkJarsDir,
                            '--module', "$td.moduleName/$td.mainClass",
                            *versionOpts,
                            '--runtime-image', td.runtimeImageDir,