Skip to content

Commit c8f54bf

Browse files
committed
fix warning due to finalName is a read-only property
1 parent 4cdd034 commit c8f54bf

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public boolean skip(Packager packager) {
3535
protected File doApply(Packager packager) {
3636

3737
File assetsFolder = packager.getAssetsFolder();
38-
String name = packager.getName();
39-
String version = packager.getVersion();
4038
Platform platform = packager.getPlatform();
4139
File outputDirectory = packager.getOutputDirectory();
4240

@@ -46,8 +44,7 @@ protected File doApply(Packager packager) {
4644
File assemblyFile = new File(assetsFolder, "assembly-tarball-" + platform + ".xml");
4745
VelocityUtils.render(platform + "/assembly.xml.vtl", assemblyFile, packager);
4846

49-
// tgz file name
50-
String finalName = packager.getTarballName() != null ? packager.getTarballName() : name + "-" + version + "-" + platform;
47+
// output file format
5148
String format = "tar.gz";
5249

5350
// invokes plugin to assemble tarball
@@ -62,13 +59,23 @@ protected File doApply(Packager packager) {
6259
element("outputDirectory", outputDirectory.getAbsolutePath()),
6360
element("formats", element("format", format)),
6461
element("descriptors", element("descriptor", assemblyFile.getAbsolutePath())),
65-
element("finalName", finalName),
6662
element("appendAssemblyId", "false")
6763
),
6864
Context.getMavenContext().getEnv()
6965
);
7066

71-
return new File(outputDirectory, finalName + "." + format);
67+
// get generated filename
68+
String finalName = Context.getMavenContext().getEnv().getMavenProject().getBuild().getFinalName();
69+
File finalFile = new File(outputDirectory, finalName + "." + format);
70+
71+
// get desired file name
72+
String tarName = packager.getTarballName() != null ? packager.getTarballName() : finalName + "-" + platform;
73+
File tarFile = new File(outputDirectory, tarName + "." + format);
74+
75+
// rename generated to desired
76+
finalFile.renameTo(tarFile);
77+
78+
return tarFile;
7279

7380
} catch (Exception e) {
7481

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public boolean skip(Packager packager) {
3535
protected File doApply(Packager packager) {
3636

3737
File assetsFolder = packager.getAssetsFolder();
38-
String name = packager.getName();
39-
String version = packager.getVersion();
4038
Platform platform = packager.getPlatform();
4139
File outputDirectory = packager.getOutputDirectory();
4240

@@ -47,7 +45,6 @@ protected File doApply(Packager packager) {
4745
VelocityUtils.render(platform + "/assembly.xml.vtl", assemblyFile, packager);
4846

4947
// zip file name and format
50-
String finalName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform;
5148
String format = "zip";
5249

5350
// invokes plugin to assemble zipball and/or tarball
@@ -62,13 +59,23 @@ protected File doApply(Packager packager) {
6259
element("outputDirectory", outputDirectory.getAbsolutePath()),
6360
element("formats", element("format", format)),
6461
element("descriptors", element("descriptor", assemblyFile.getAbsolutePath())),
65-
element("finalName", finalName),
6662
element("appendAssemblyId", "false")
6763
),
6864
Context.getMavenContext().getEnv()
6965
);
7066

71-
return new File(outputDirectory, finalName + "." + format);
67+
// gets generated filename
68+
String finalName = Context.getMavenContext().getEnv().getMavenProject().getBuild().getFinalName();
69+
File finalFile = new File(outputDirectory, finalName + "." + format);
70+
71+
// gets desired file name
72+
String zipName = packager.getZipballName() != null ? packager.getZipballName() : finalName + "-" + platform;
73+
File zipFile = new File(outputDirectory, zipName + "." + format);
74+
75+
// rename generated to desired
76+
finalFile.renameTo(zipFile);
77+
78+
return zipFile;
7279

7380
} catch (Exception e) {
7481

0 commit comments

Comments
 (0)