Merge branch 'release/1.2.9'

Author: infeo

.gitignore

@@ -7,6 +7,7 @@
 
 # Maven #
 target/
+pom.xml.versionsBackup
 
 # IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) #
 .idea/**/workspace.xml

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>webdav-nio-adapter-servlet</artifactId>
-	<version>1.2.8</version>
+	<version>1.2.9</version>
 	<name>WebDAV-NIO Adapter Servlet</name>
 	<description>Servlet serving NIO directory contents as WebDAV resources.</description>
 	<url>https://github.com/cryptomator/webdav-nio-adapter-servlet</url>
@@ -24,19 +24,19 @@
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.12.0</junit.jupiter.version>
-		<mockito.version>5.15.2</mockito.version>
+		<junit.jupiter.version>5.12.2</junit.jupiter.version>
+		<mockito.version>5.17.0</mockito.version>
 		<hamcrest.version>3.0</hamcrest.version>
 
 		<!-- mvn plugins -->
 		<mvn-compiler.version>3.14.0</mvn-compiler.version>
-		<mvn-surefire.version>3.5.2</mvn-surefire.version>
+		<mvn-surefire.version>3.5.3</mvn-surefire.version>
 		<mvn-jar.version>3.4.2</mvn-jar.version>
 		<mvn-source.version>3.3.1</mvn-source.version>
 		<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
 		<mvn-gpg.version>3.2.7</mvn-gpg.version>
-		<dependency-check.version>12.1.0</dependency-check.version>
-		<jacoco.version>0.8.12</jacoco.version>
+		<dependency-check.version>12.1.1</dependency-check.version>
+		<jacoco.version>0.8.13</jacoco.version>
 		<central-publishing.version>0.7.0</central-publishing.version>
 	</properties>
 

src/main/java/org/cryptomator/webdav/core/servlet/DavFolder.java

@@ -240,11 +240,9 @@ public DavPropertyName[] getPropertyNames() {
 
 	@Override
 	public DavProperty<?> getProperty(DavPropertyName name) {
-		var osName = System.getProperty("os.name").toLowerCase();
-		var osVersion = System.getProperty("os.version");
 		if (PROPERTY_QUOTA_AVAILABLE.equals(name)) {
-			if (osName.contains("mac") && osVersion.startsWith("15.4")) {
-				// macOS 15.4 has a bug that causes the file system to mount with a 90s delay
+			if (OSUtil.isMacOS15_4orNewer()) {
+				// macOS 15.4+ has a bug that causes the file system to mount with a 90s delay
 				return null;
 			}
 			try {
@@ -254,8 +252,8 @@ public DavProperty<?> getProperty(DavPropertyName name) {
 				return null;
 			}
 		} else if (PROPERTY_QUOTA_USED.equals(name)) {
-			if (osName.contains("mac") && osVersion.startsWith("15.4")) {
-				// macOS 15.4 has a bug that causes the file system to mount with a 90s delay
+			if (OSUtil.isMacOS15_4orNewer()) {
+				// macOS 15.4+ has a bug that causes the file system to mount with a 90s delay
 				return null;
 			}
 			try {

src/main/java/org/cryptomator/webdav/core/servlet/OSUtil.java

@@ -0,0 +1,21 @@
+package org.cryptomator.webdav.core.servlet;
+
+final class OSUtil {
+
+	static boolean isMacOS15_4orNewer() {
+		var osName = System.getProperty("os.name").toLowerCase();
+		if (osName.contains("mac")) {
+			var osVersion = System.getProperty("os.version").split("\\.");
+			if (osVersion.length >= 2) {
+				try {
+					var majorVersion = Integer.parseInt(osVersion[0]);
+					var minorVersion = Integer.parseInt(osVersion[1]);
+					return majorVersion == 15 && minorVersion >= 4 || majorVersion > 16;
+				} catch (NumberFormatException e) {
+					//no-op
+				}
+			}
+		}
+		return false;
+	}
+}