diff options
Diffstat (limited to 'pdf-over-gui/pom.xml')
-rw-r--r-- | pdf-over-gui/pom.xml | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml index a9ad40ce..14001aa2 100644 --- a/pdf-over-gui/pom.xml +++ b/pdf-over-gui/pom.xml @@ -244,23 +244,16 @@ <goal>copy</goal> </goals> <configuration> - <fileset> - <directory>${pdfover-build.staging-dir}</directory> - <outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory> - </fileset> - </configuration> - </execution> - <execution> - <id>bundle-jre</id> - <phase>install</phase> <!-- linux profile: none --> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <fileset> - <directory>${project.basedir}/../jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory> - <outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory> - </fileset> + <filesets> + <fileset> + <directory>${pdfover-build.staging-dir}</directory> + <outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory> + </fileset> + <fileset> + <directory>${pdfover-build.root-dir}/jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory> + <outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory> + </fileset> + </filesets> </configuration> </execution> </executions> @@ -542,10 +535,6 @@ <version>1.2</version> <executions> <execution> - <id>bundle-jre</id> - <phase>none</phase> - </execution> - <execution> <id>build-archive</id> <phase>none</phase> </execution> |