Caplital OS name can not activate profile

apache · Jun 2, 2024 · 04043a2 · 04043a2
1 parent dd96794
commit 04043a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/.../main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/.../main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -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("!")) {
@@ -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("!")) {
@@ -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("!")) {

diff --git a/...t/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java b/...t/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
@@ -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")));
+    }
 }