diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/CreateTarball.java b/src/main/java/io/github/fvarrui/javapackager/maven/CreateTarball.java index 1e59a4e4..8e26308e 100644 --- a/src/main/java/io/github/fvarrui/javapackager/maven/CreateTarball.java +++ b/src/main/java/io/github/fvarrui/javapackager/maven/CreateTarball.java @@ -10,6 +10,8 @@ import static org.twdata.maven.mojoexecutor.MojoExecutor.version; import java.io.File; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; import io.github.fvarrui.javapackager.model.Platform; import io.github.fvarrui.javapackager.packagers.ArtifactGenerator; @@ -35,6 +37,8 @@ public boolean skip(Packager packager) { protected File doApply(Packager packager) { File assetsFolder = packager.getAssetsFolder(); + String name = packager.getName(); + String version = packager.getVersion(); Platform platform = packager.getPlatform(); File outputDirectory = packager.getOutputDirectory(); @@ -69,11 +73,11 @@ protected File doApply(Packager packager) { File finalFile = new File(outputDirectory, finalName + "." + format); // get desired file name - String tarName = packager.getTarballName() != null ? packager.getTarballName() : finalName + "-" + platform; + String tarName = packager.getTarballName() != null ? packager.getTarballName() : name + "-" + version + "-" + platform; File tarFile = new File(outputDirectory, tarName + "." + format); - // rename generated to desired - finalFile.renameTo(tarFile); + // rename generated to desired, replacing an archive left by a previous build + Files.move(finalFile.toPath(), tarFile.toPath(), StandardCopyOption.REPLACE_EXISTING); return tarFile; diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/CreateZipball.java b/src/main/java/io/github/fvarrui/javapackager/maven/CreateZipball.java index ead5c201..d832d68e 100644 --- a/src/main/java/io/github/fvarrui/javapackager/maven/CreateZipball.java +++ b/src/main/java/io/github/fvarrui/javapackager/maven/CreateZipball.java @@ -10,6 +10,8 @@ import static org.twdata.maven.mojoexecutor.MojoExecutor.version; import java.io.File; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; import io.github.fvarrui.javapackager.model.Platform; import io.github.fvarrui.javapackager.packagers.ArtifactGenerator; @@ -35,6 +37,8 @@ public boolean skip(Packager packager) { protected File doApply(Packager packager) { File assetsFolder = packager.getAssetsFolder(); + String name = packager.getName(); + String version = packager.getVersion(); Platform platform = packager.getPlatform(); File outputDirectory = packager.getOutputDirectory(); @@ -69,11 +73,11 @@ protected File doApply(Packager packager) { File finalFile = new File(outputDirectory, finalName + "." + format); // gets desired file name - String zipName = packager.getZipballName() != null ? packager.getZipballName() : finalName + "-" + platform; + String zipName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform; File zipFile = new File(outputDirectory, zipName + "." + format); - // rename generated to desired - finalFile.renameTo(zipFile); + // rename generated to desired, replacing an archive left by a previous build + Files.move(finalFile.toPath(), zipFile.toPath(), StandardCopyOption.REPLACE_EXISTING); return zipFile;