fix build to output a single archive as artifact

Author: Armin Schrenk

assembly-linux.xml

@@ -4,44 +4,29 @@
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
-		<format>zip</format>
+		<format>tar.gz</format>
 	</formats>
 	<fileSets>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-linux.sh</include>
+				<include>helloJavaFX</include>
 			</includes>
 			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
 		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>runtime</include>
+				<include>LICENSE.txt</include>
 			</includes>
-			<outputDirectory></outputDirectory>
+			<outputDirectory>helloJavaFX</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>target/runtimeImage</directory>
+			<directory>target/helloJavaFX</directory>
 			<includes>
 				<include>**/**</include>
 			</includes>
-			<outputDirectory>runtime</outputDirectory>
+			<outputDirectory>helloJavaFX</outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>

assembly-mac.xml

@@ -10,38 +10,23 @@
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-mac.sh</include>
+				<include>helloJavaFX.app</include>
 			</includes>
 			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
 		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>runtimeImage</include>
+				<include>LICENSE.txt</include>
 			</includes>
-			<outputDirectory></outputDirectory>
+			<outputDirectory>helloJavaFX.app</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>target/runtimeImage</directory>
+			<directory>target/helloJavaFX.app</directory>
 			<includes>
 				<include>**/**</include>
 			</includes>
-			<outputDirectory>runtime</outputDirectory>
+			<outputDirectory>helloJavaFX.app</outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>

assembly-win.xml

@@ -10,38 +10,23 @@
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-			<outputDirectory></outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>launcher-win.bat</include>
+				<include>helloJavaFX</include>
 			</includes>
 			<outputDirectory></outputDirectory>
-			<fileMode>0755</fileMode>
 		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
-				<include>runtime</include>
+				<include>LICENSE.txt</include>
 			</includes>
-			<outputDirectory></outputDirectory>
+			<outputDirectory>helloJavaFX</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>target/runtimeImage</directory>
+			<directory>target/helloJavaFX</directory>
 			<includes>
 				<include>**/**</include>
 			</includes>
-			<outputDirectory>runtime</outputDirectory>
+			<outputDirectory>helloJavaFX</outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>

pom.xml

@@ -147,6 +147,7 @@
                         <configuration>
                             <executable>${env.JAVA_HOME}/bin/jpackage</executable>
                             <workingDirectory>${project.build.directory}</workingDirectory>
+                            <!-- the maven assembly plugin depend on directory name, so be careful when changing it -->
                             <commandlineArgs>--name helloJavaFX --type app-image -m ${java.jpms.modulename}/${java.jpms.modulename}.App
                                 --runtime-image runtimeImage --app-version ${project.version} --vendor "Skymatic GmbH"
                                 --description "${project.description}" --icon ../skymatic.ico
@@ -196,10 +197,11 @@
                         </goals>
                         <configuration>
                             <descriptors>
+                                <!-- part of the descriptors depend on the jlink output -->
                                 <descriptor>assembly-${assembly.artifact.name}.xml</descriptor>
                             </descriptors>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>javafx-testkit-${assembly.artifact.name}</finalName>
+                            <finalName>helloJavaFX-${project.version}-${assembly.artifact.name}</finalName>
                         </configuration>
                     </execution>
                 </executions>