Skip to content

Commit

Permalink
refactor(assemble): Compress parameter in jlink differs in v21
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Jan 24, 2024
1 parent 7a1bc87 commit e164159
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
Expand Up @@ -156,6 +156,18 @@ protected void doAssemble(TemplateContext props) throws AssemblerProcessingExcep
context.getLogger().debug(RB.$("assembler.copy.jars"), context.relativizeToBasedir(universalJarsDirectory));
copyJars(context, assembler, universalJarsDirectory, "");

Optional<String> compress = assembler.getArgs().stream()
.filter(arg -> arg.contains("--compress") || arg.startsWith("-c=") || arg.startsWith("-c "))
.findFirst();
if (!compress.isPresent()) {
if (jdkVersion.getMajor() >= 21) {
assembler.getArgs().add("--compress");
assembler.getArgs().add("zip-9");
} else {
assembler.getArgs().add("--compress=2");
}
}

for (Artifact targetJdk : assembler.getTargetJdks()) {
if (!targetJdk.isActiveAndSelected()) continue;

Expand Down
Expand Up @@ -158,7 +158,6 @@ private static void validateJlink(JReleaserContext context, Mode mode, JlinkAsse
if (assembler.getArgs().isEmpty()) {
assembler.getArgs().add("--no-header-files");
assembler.getArgs().add("--no-man-pages");
assembler.getArgs().add("--compress=2");
assembler.getArgs().add("--strip-debug");
}

Expand Down

0 comments on commit e164159

Please sign in to comment.