fix runnable jar generation

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java

@@ -22,6 +22,7 @@
 import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
+import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.MojoExecutorUtils;
 
@@ -44,8 +45,8 @@ protected File doApply(Packager packager) {
 		File outputDirectory = packager.getOutputDirectory();
 		ExecutionEnvironment env = Context.getMavenContext().getEnv();
 		Manifest manifest = packager.getManifest();
-
-		File jarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
+		String artifactId = env.getMavenProject().getArtifactId();
+		File jarFile = new File(outputDirectory, artifactId + "-" + classifier + ".jar");
 
 		List<Element> archive = new ArrayList<>();
 		archive.add(
@@ -86,18 +87,21 @@ protected File doApply(Packager packager) {
 					configuration(
 							element("classifier", classifier),
 							element("archive", archive.toArray(new Element[archive.size()])),
-							element("outputDirectory", jarFile.getParentFile().getAbsolutePath())
+							element("outputDirectory", outputDirectory.getAbsolutePath())
 					),
-					env);
-
+					env
+			);
+			
 		} catch (MojoExecutionException e) {
 
 			Logger.error("Runnable jar creation failed! " + e.getMessage());
 			throw new RuntimeException(e);
 
 		}
 
-		return jarFile;
+		File finalJarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
+		FileUtils.rename(jarFile, finalJarFile.getName());		
+		return finalJarFile;
 	}
 
 }