Skip to content

Commit fcb8147

Browse files
committed
[MNG-8178] Fall back to system properties for missing profile activation context properties (#1609)
Missed port to the build implementation from f2a0865
1 parent 885a4b3 commit fcb8147

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,15 @@ public boolean isActive(Profile profile, ProfileActivationContext context, Model
5656

5757
boolean active = ensureAtLeastOneNonNull(os);
5858

59-
String actualOsName = context.getSystemProperties().get("os.name").toLowerCase(Locale.ENGLISH);
60-
String actualOsArch = context.getSystemProperties().get("os.arch").toLowerCase(Locale.ENGLISH);
61-
String actualOsVersion = context.getSystemProperties().get("os.version").toLowerCase(Locale.ENGLISH);
59+
String actualOsName = context.getSystemProperties()
60+
.getOrDefault("os.name", Os.OS_NAME)
61+
.toLowerCase(Locale.ENGLISH);
62+
String actualOsArch = context.getSystemProperties()
63+
.getOrDefault("os.arch", Os.OS_ARCH)
64+
.toLowerCase(Locale.ENGLISH);
65+
String actualOsVersion = context.getSystemProperties()
66+
.getOrDefault("os.version", Os.OS_VERSION)
67+
.toLowerCase(Locale.ENGLISH);
6268

6369
if (active && os.getFamily() != null) {
6470
active = determineFamilyMatch(os.getFamily(), actualOsName);

0 commit comments

Comments
 (0)