This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 47fc18faf9 [MNG-7992] Fix windows identified as dos (#1360)
47fc18faf9 is described below
commit 47fc18faf941d230a42c34335173a32bb9964875
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jan 8 09:52:00 2024 +0100
[MNG-7992] Fix windows identified as dos (#1360)
---
.../src/main/java/org/apache/maven/utils/Os.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java
b/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java
index 7f647374e6..f4ae42d7a7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java
@@ -106,6 +106,11 @@ public class Os {
*/
private static final String FAMILY_ZOS = "z/os";
+ /**
+ * OS family that can be tested for. {@value}
+ */
+ private static final String FAMILY_OS390 = "os/390";
+
/**
* OS family that can be tested for. {@value}
*/
@@ -169,7 +174,7 @@ public class Os {
case FAMILY_NETWARE:
return OS_NAME.contains(FAMILY_NETWARE);
case FAMILY_DOS:
- return PATH_SEP.equals(";") && !isFamily(FAMILY_NETWARE);
+ return PATH_SEP.equals(";") && !isFamily(FAMILY_NETWARE) &&
!isWindows;
case FAMILY_MAC:
return OS_NAME.contains(FAMILY_MAC) ||
OS_NAME.contains(DARWIN);
case FAMILY_TANDEM:
@@ -177,9 +182,9 @@ public class Os {
case FAMILY_UNIX:
return PATH_SEP.equals(":")
&& !isFamily(FAMILY_OPENVMS)
- && (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x") ||
OS_NAME.contains(DARWIN));
+ && (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x"));
case FAMILY_ZOS:
- return OS_NAME.contains(FAMILY_ZOS) ||
OS_NAME.contains("os/390");
+ return OS_NAME.contains(FAMILY_ZOS) ||
OS_NAME.contains(FAMILY_OS390);
case FAMILY_OS400:
return OS_NAME.contains(FAMILY_OS400);
case FAMILY_OPENVMS:
