Skip to content

[MNG-8178] Fall back to system properties for missing profile activation context properties #1603

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 2 commits into from
Jul 10, 2024
Merged

[MNG-8178] Fall back to system properties for missing profile activation context properties #1603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3a0523
[MNG-8178] Fall back to System.getProperty for missing context props
kohlschuetter Jul 9, 2024
a770d61
Use Os class to grab values instead
gnodet Jul 10, 2024
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
12 changes: 9 additions & 3 deletions .../main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,15 @@ public boolean isActive(Profile profile, ProfileActivationContext context, Model

boolean active = ensureAtLeastOneNonNull(os);

String actualOsName = context.getSystemProperties().get("os.name").toLowerCase(Locale.ENGLISH);
String actualOsArch = context.getSystemProperties().get("os.arch").toLowerCase(Locale.ENGLISH);
String actualOsVersion = context.getSystemProperties().get("os.version").toLowerCase(Locale.ENGLISH);
String actualOsName = context.getSystemProperties()
.getOrDefault("os.name", Os.OS_NAME)
.toLowerCase(Locale.ENGLISH);
String actualOsArch = context.getSystemProperties()
.getOrDefault("os.arch", Os.OS_ARCH)
.toLowerCase(Locale.ENGLISH);
String actualOsVersion = context.getSystemProperties()
.getOrDefault("os.version", Os.OS_VERSION)
.toLowerCase(Locale.ENGLISH);

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