Skip to content

Fixes #7 and solves #8 and #9 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2019
Merged

Fixes #7 and solves #8 and #9 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,24 @@ And the following `plugin` tag to your `pom.xml`.

Where:

| Property | Mandatory | Default value | Description |
| ----------------------- | --------- | ------------------------------ | ------------------------------------------------------------ |
| `mainClass` | Yes | `null` | Full path to your app main class. |
| `bundleJre` | No | `false` | Embed a customized JRE with the app. |
| `forceJreOptimization` | No | `false` | Although JDK version < 13, it will try to reduce the bundled JRE. |
| `jrePath` | No | `""` | Path to JRE folder. If specified, it will bundle this JRE with the app, and won't generate a customized JRE. For Java 8 version or least. |
| `administratorRequired` | No | `false` | If true, app will run with administrator privileges. |
| `additionalResources` | No | [] | Additional files and folders to include in the bundled app. |
| `generateInstaller` | No | `true` | Generate an installer for the app. |
| `displayName` | No | `${project.name}` | App name to show. |
| `iconFile` | No | `null` | Path to the app icon file (PNG, ICO or ICNS). |
| `licenseFile` | No | `${project.licenses[0].url}` | Path to project license file. |
| `url` | No | `null` | App website URL. |
| `organizationName` | No | `${project.organization.name}` | Organization name. |
| `organizationUrl` | No | `${project.organization.url}` | Organization website URL. |
| `organizationEmail` | No | `null` | Organization email. |
| Property | Mandatory | Default value | Description |
| --------------------------------- | --------- | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `mainClass` | Yes | `null` | Full path to your app main class. |
| `bundleJre` | No | `false` | Embed a customized JRE with the app. |
| `forceJreOptimization` | No | `false` | Although JDK version < 13, it will try to reduce the bundled JRE. |
| `jrePath` | No | `""` | Path to JRE folder. If specified, it will bundle this JRE with the app, and won't generate a customized JRE. For Java 8 version or least. |
| `moduleDependenceAnalysisOption` | No | `"--list-deps"` | When generating a customized JRE, this option allows to specify a different Module dependence analysis option other than the default (--list-deps) for jdeps |
| `additionalModules` | No | `""` | When generating a customized JRE, allows adding aditional modules other than the ones identified by jdeps before calling jlink. |
| `administratorRequired` | No | `false` | If true, app will run with administrator privileges. |
| `additionalResources` | No | [] | Additional files and folders to include in the bundled app. |
| `generateInstaller` | No | `true` | Generate an installer for the app. |
| `displayName` | No | `${project.name}` | App name to show. |
| `iconFile` | No | `null` | Path to the app icon file (PNG, ICO or ICNS). |
| `licenseFile` | No | `${project.licenses[0].url}` | Path to project license file. |
| `url` | No | `null` | App website URL. |
| `organizationName` | No | `${project.organization.name}` | Organization name. |
| `organizationUrl` | No | `${project.organization.url}` | Organization website URL. |
| `organizationEmail` | No | `null` | Organization email. |

Some assets, such as application icons, could be located in `assets` folder organized by platform, and so it would not be necessary to specify the `iconFile` property:

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>fvarrui.maven</groupId>
<artifactId>javapackager</artifactId>
<version>0.8.4</version>
<version>0.8.5-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>JavaPackager Maven Plugin</name>
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/fvarrui/maven/plugin/javapackager/PackageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ public class PackageMojo extends AbstractMojo {
@Parameter(property = "additionalResources", required = false)
private List<File> additionalResources;

@Parameter(defaultValue = "--list-deps", property = "moduleDependenceAnalysisOption", required = false)
private String moduleDependenceAnalysisOption;

@Parameter(defaultValue = "", property = "additionalModules", required = false)
private String additionalModules;

public PackageMojo() {
super();
Logger.init(getLog());
Expand Down Expand Up @@ -674,9 +680,9 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
jdeps.getAbsolutePath(),
"-q",
additionalArguments,
"--list-deps",
moduleDependenceAnalysisOption,
"--multi-release", JavaUtils.getJavaMajorVersion(),
new File(libsFolder, "*"),
new File(libsFolder, "*.jar"),
jarFile
);

Expand All @@ -686,6 +692,9 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
.map(module -> module.trim())
.filter(module -> !module.startsWith("JDK removed internal"))
.collect(Collectors.toList());
if (!StringUtils.isEmpty(additionalModules)) {
modulesList.addAll(Arrays.asList(additionalModules.split(",")).stream().map(module->module.trim()).collect(Collectors.toList()));
}

return StringUtils.join(modulesList, ",");
}
Expand Down