Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:

| Property | Mandatory | Default value | Description |
|----------------------------|--------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `additionalJlinkArgs` | :x: | `[]` | Additional arguments appended to the `jlink` call when generating a customized JRE, e.g. `--include-locales=en,es` or `--compress=0`. |
| `additionalModulePaths` | :x: | `[]` | Additional module paths for `jdeps`. |
| `additionalModules` | :x: | `[]` | Additional modules to the ones identified by `jdeps` or the specified with `modules` property. |
| `additionalResources` | :x: | `[]` | Additional files and folders to include in the bundled app. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public PackagePluginExtension(Project project) {
super();
this.project = project;
this.platform = Platform.auto;
this.additionalJlinkArgs = new ArrayList<>();
this.additionalModules = new ArrayList<>();
this.additionalModulePaths = new ArrayList<>();
this.additionalResources = new ArrayList<>();
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/io/github/javapackager/gradle/PackageTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,18 @@ public void setAdditionalModulePaths(List<File> additionalModulePaths) {
this.additionalModulePaths = additionalModulePaths;
}

@Input
@Optional
private List<String> additionalJlinkArgs;

public List<String> getAdditionalJlinkArgs() {
return additionalJlinkArgs;
}

public void setAdditionalJlinkArgs(List<String> additionalJlinkArgs) {
this.additionalJlinkArgs = additionalJlinkArgs;
}

@Input
@Optional
private List<FileAssociation> fileAssociations;
Expand Down Expand Up @@ -643,6 +655,7 @@ protected Packager createPackager() throws Exception {
return
(Packager) PackagerFactory
.createPackager(defaultIfNull(platform, extension.getPlatform()))
.additionalJlinkArgs(defaultIfNull(additionalJlinkArgs, extension.getAdditionalJlinkArgs()))
.additionalModules(defaultIfNull(additionalModules, extension.getAdditionalModules()))
.additionalModulePaths(defaultIfNull(additionalModulePaths, extension.getAdditionalModulePaths()))
.additionalResources(defaultIfNull(additionalResources, extension.getAdditionalResources()))
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/io/github/javapackager/maven/PackageMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@ public PackageMojo(BuildPluginManager pluginManager) {
@Parameter(property = "additionalModulePaths", required = false)
private List<File> additionalModulePaths;

/**
* Additional arguments passed to jlink when generating a customized JRE
*/
@Parameter(property = "additionalJlinkArgs", required = false)
private List<String> additionalJlinkArgs;

/**
* Packaging JDK
*/
Expand Down Expand Up @@ -353,6 +359,7 @@ public void execute() throws MojoExecutionException {
Packager packager =
(Packager) PackagerFactory
.createPackager(platform)
.additionalJlinkArgs(additionalJlinkArgs)
.additionalModules(additionalModules)
.additionalModulePaths(additionalModulePaths)
.additionalResources(additionalResources)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ protected File doApply(Packager packager) throws Exception {
List<String> requiredModules = packager.getModules();
List<String> additionalModules = packager.getAdditionalModules();
List<File> additionalModulePaths = packager.getAdditionalModulePaths();
List<String> additionalJlinkArgs = packager.getAdditionalJlinkArgs();
File currentJdk = packager.getPackagingJdk();

Logger.infoIndent("Bundling JRE ... with " + currentJdk);
Expand Down Expand Up @@ -167,7 +168,8 @@ protected File doApply(Packager packager) throws Exception {
"--no-man-pages",
"--strip-debug",
"--release-info", releaseInfo,
(jlinkVersion < 21 ? "--compress=2" : null)
(VersionUtils.getJavaMajorVersion() < 21 ? "--compress=2" : null),
additionalJlinkArgs
);

// sets execution permissions on executables in jre
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class PackagerSettings {
protected String jreMinVersion;
protected Manifest manifest;
protected List<File> additionalModulePaths;
protected List<String> additionalJlinkArgs;
protected List<FileAssociation> fileAssociations;
protected File packagingJdk;
protected Scripts scripts;
Expand Down Expand Up @@ -408,6 +409,14 @@ public List<File> getAdditionalModulePaths() {
return additionalModulePaths;
}

/**
* Get additional jlink arguments
* @return Additional jlink arguments
*/
public List<String> getAdditionalJlinkArgs() {
return additionalJlinkArgs;
}

/**
* Get file associations
* @return File associations
Expand Down Expand Up @@ -867,6 +876,16 @@ public PackagerSettings additionalModulePaths(List<File> additionalModulePaths)
return this;
}

/**
* Set additional jlink arguments
* @param additionalJlinkArgs Additional jlink arguments list
* @return Packager settings
*/
public PackagerSettings additionalJlinkArgs(List<String> additionalJlinkArgs) {
this.additionalJlinkArgs = additionalJlinkArgs;
return this;
}

/**
* Set file associations
* @param fileAssociations File associations list
Expand Down Expand Up @@ -943,7 +962,8 @@ public String toString() {
+ ", createZipball=" + createZipball + ", zipballName=" + zipballName + ", extra=" + extra
+ ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir+ ", classpath="
+ classpath + ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest + ", additionalModulePaths="
+ additionalModulePaths + ", fileAssociations=" + fileAssociations + ", packagingJdk=" + packagingJdk
+ additionalModulePaths + ", additionalJlinkArgs="
+ additionalJlinkArgs + ", fileAssociations=" + fileAssociations + ", packagingJdk=" + packagingJdk
+ ", scripts=" + scripts + ", arch=" + arch + ", templates=" + templates + "]";
}

Expand Down
Loading