jlengrand/jreleaser
1
0
Fork 0
mirror of https://github.com/jlengrand/jreleaser.git synced 2026-03-10 08:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[model] consistent naming convention for skip properties. Fixes #239

Browse Source
This commit is contained in:
Andres Almiray
2021-06-28 11:28:59 +02:00
parent b260f90267
commit fab208eeed
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jreleaser-tools/src/main/java/org/jreleaser/tools/BrewToolProcessor.java
View File

@@ -72,7 +72,8 @@ public class BrewToolProcessor extends AbstractRepositoryToolProcessor<Brew> {
if ((distribution.getType() == Distribution.DistributionType.JAVA_BINARY ||
distribution.getType() == Distribution.DistributionType.SINGLE_JAR) &&
!tool.getExtraProperties().containsKey("javaSkip")) {
!tool.getExtraProperties().containsKey("javaSkip") &&
!tool.getExtraProperties().containsKey("skipJava")) {
tool.addDependency("openjdk@" + props.get(Constants.KEY_DISTRIBUTION_JAVA_VERSION));
} else if (distribution.getType() == Distribution.DistributionType.NATIVE_PACKAGE) {
props.put(Constants.KEY_BREW_CASK_NAME, tool.getCask().getResolvedCaskName(props));

3
sdks/sdkman-java-sdk/src/main/java/org/jreleaser/sdk/sdkman/SdkmanAnnouncer.java
View File

@@ -124,7 +124,8 @@ public class SdkmanAnnouncer implements Announcer {
return (distribution.getType() == Distribution.DistributionType.JAVA_BINARY ||
distribution.getType() == Distribution.DistributionType.JLINK ||
distribution.getType() == Distribution.DistributionType.NATIVE_IMAGE) &&
!distribution.getExtraProperties().containsKey("sdkmanSkip");
!distribution.getExtraProperties().containsKey("sdkmanSkip") &&
!distribution.getExtraProperties().containsKey("skipSdkman");
}
private String mapPlatform(String platform) {