Skip to content

Commit 17dc39e

Browse files
committed
default values on some maven project properties to avoid warnings with launch4j-maven-plugin
1 parent e0a5206 commit 17dc39e

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
package io.github.fvarrui.javapackager.maven;
22

33
import java.io.File;
4+
import java.time.Year;
45

5-
import io.github.fvarrui.javapackager.packagers.*;
6+
import org.apache.commons.lang3.StringUtils;
7+
import org.apache.maven.model.Organization;
68
import org.apache.maven.plugin.logging.Log;
9+
import org.apache.maven.project.MavenProject;
710
import org.twdata.maven.mojoexecutor.MojoExecutor.ExecutionEnvironment;
811

12+
import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
13+
import io.github.fvarrui.javapackager.packagers.Context;
14+
import io.github.fvarrui.javapackager.packagers.CreateWindowsExeWhy;
15+
import io.github.fvarrui.javapackager.packagers.CreateWindowsExeWinRun4j;
16+
import io.github.fvarrui.javapackager.packagers.Packager;
17+
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
18+
919
/**
1020
* Maven context
1121
*/
@@ -18,6 +28,24 @@ public MavenContext(ExecutionEnvironment env, Log logger) {
1828
super();
1929
this.env = env;
2030
this.logger = logger;
31+
32+
// initialize some default params on project (avoid launch4j-maven-plugin warnings)
33+
MavenProject project = env.getMavenProject();
34+
if (project.getOrganization() == null) {
35+
project.setOrganization(new Organization());
36+
}
37+
// set default organization name
38+
if (StringUtils.isBlank(project.getOrganization().getName())) {
39+
project.getOrganization().setName(Packager.DEFAULT_ORGANIZATION_NAME);
40+
}
41+
// set default inception year
42+
if (StringUtils.isBlank(project.getInceptionYear())) {
43+
project.setInceptionYear(Year.now().toString());
44+
}
45+
// set default description
46+
if (StringUtils.isBlank(project.getDescription())) {
47+
project.setDescription(project.getArtifactId());
48+
}
2149
}
2250

2351
public ExecutionEnvironment getEnv() {
@@ -77,7 +105,5 @@ public File createWindowsExe(WindowsPackager packager) throws Exception {
77105
}
78106
return null;
79107
}
80-
81-
82108

83109
}

src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.fvarrui.javapackager.packagers;
22

3-
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
4-
import static org.apache.commons.io.FilenameUtils.getExtension;
53
import static org.apache.commons.collections4.CollectionUtils.addIgnoreNull;
4+
import static org.apache.commons.io.FilenameUtils.getExtension;
5+
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
66

77
import java.io.File;
88
import java.nio.file.InvalidPathException;
@@ -21,7 +21,7 @@
2121
*/
2222
public abstract class Packager extends PackagerSettings {
2323

24-
private static final String DEFAULT_ORGANIZATION_NAME = "ACME";
24+
public static final String DEFAULT_ORGANIZATION_NAME = "ACME";
2525

2626
// artifact generators
2727
protected List<ArtifactGenerator<?>> installerGenerators = new ArrayList<>();
@@ -163,6 +163,7 @@ private void init() throws Exception {
163163
macConfig = null;
164164
break;
165165
default:
166+
// do nothing
166167
}
167168

168169
Logger.info("" + this); // prints packager settings

0 commit comments

Comments
 (0)