Skip to content
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

Jump to bottom

[MNG-8135] Fix capital OS name can not activate profile #1549

Merged
merged 1 commit into from
Jun 5, 2024
Merged

[MNG-8135] Fix capital OS name can not activate profile #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 @@ -105,14 +105,14 @@ private boolean determineVersionMatch(String expectedVersion, String actualVersi
reverse = true;
test = test.substring(1);
}
result = actualVersion.equals(test);
result = actualVersion.equalsIgnoreCase(test);
}

return reverse != result;
}

private boolean determineArchMatch(String expectedArch, String actualArch) {
String test = expectedArch;
String test = expectedArch.toLowerCase(Locale.ENGLISH);
boolean reverse = false;

if (test.startsWith("!")) {
Expand All @@ -126,7 +126,7 @@ private boolean determineArchMatch(String expectedArch, String actualArch) {
}

private boolean determineNameMatch(String expectedName, String actualName) {
String test = expectedName;
String test = expectedName.toLowerCase(Locale.ENGLISH);
boolean reverse = false;

if (test.startsWith("!")) {
Expand All @@ -140,7 +140,7 @@ private boolean determineNameMatch(String expectedName, String actualName) {
}

private boolean determineFamilyMatch(String family, String actualName) {
String test = family;
String test = family.toLowerCase(Locale.ENGLISH);
boolean reverse = false;

if (test.startsWith("!")) {
Expand Down
14 changes: 14 additions & 0 deletions ...t/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,18 @@ void testAllOsConditions() {
assertActivation(false, profile, newContext(null, newProperties("windows", "99", "amd64")));
assertActivation(true, profile, newContext(null, newProperties("windows", "99", "aarch64")));
}

@Test
public void testCapitalOsName() {
Profile profile = newProfile(ActivationOS.newBuilder()
.family("Mac")
.name("Mac OS X")
.arch("aarch64")
.version("14.5"));

assertActivation(false, profile, newContext(null, newProperties("linux", "6.5.0-1014-aws", "amd64")));
assertActivation(false, profile, newContext(null, newProperties("windows", "1", "aarch64")));
assertActivation(false, profile, newContext(null, newProperties("windows", "99", "amd64")));
assertActivation(true, profile, newContext(null, newProperties("Mac OS X", "14.5", "aarch64")));
}
}