[MNG-8135] Profile activation based on OS properties is no longer cas…

…e insensitive (#1561) Backport of 0456c7c --- https://issues.apache.org/jira/browse/MNG-8135
apache · Jun 5, 2024 · 9ee3963 · 9ee3963
1 parent 2a43483
commit 9ee3963
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
@@ -109,14 +109,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("!")) {
@@ -130,7 +130,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("!")) {
@@ -144,7 +144,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
@@ -141,4 +141,18 @@ public void testAllOsConditions() {
         assertActivation(false, profile, newContext(null, newProperties("windows", "99", "amd64")));
         assertActivation(true, profile, newContext(null, newProperties("windows", "99", "aarch64")));
     }
+
+    public void testCapitalOsName() {
+        ActivationOS os = new ActivationOS();
+        os.setFamily("Mac");
+        os.setName("Mac OS X");
+        os.setArch("aarch64");
+        os.setVersion("14.5");
+        Profile profile = newProfile(os);
+
+        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")));
+    }
 }