Merge branch 'release/1.2.5'

Author: overheadhunter

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>webdav-nio-adapter</artifactId>
-	<version>1.2.4</version>
+	<version>1.2.5</version>
 	<name>WebDAV-NIO Adapter</name>
 	<description>Embedded Jetty serving a WebDAV servlet to access resources at a given NIO path.</description>
 	<url>https://github.com/cryptomator/webdav-nio-adapter</url>
@@ -20,12 +20,12 @@
 		<!-- dependencies -->
 		<webdavservlet.version>1.2.0</webdavservlet.version>
 		<dagger.version>2.37</dagger.version>
-		<jetty.version>10.0.3</jetty.version>
-		<guava.version>30.1-jre</guava.version>
-		<slf4j.version>1.7.30</slf4j.version>
+		<jetty.version>10.0.6</jetty.version>
+		<guava.version>30.1.1-jre</guava.version>
+		<slf4j.version>1.7.31</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.7.1</junit.jupiter.version>
+		<junit.jupiter.version>5.7.2</junit.jupiter.version>
 	</properties>
 
 	<licenses>
@@ -143,7 +143,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -164,7 +164,7 @@
 					<plugin>
 						<groupId>org.owasp</groupId>
 						<artifactId>dependency-check-maven</artifactId>
-						<version>6.1.6</version>
+						<version>6.2.2</version>
 						<configuration>
 							<cveValidForHours>24</cveValidForHours>
 							<failBuildOnCVSS>0</failBuildOnCVSS>
@@ -193,7 +193,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.6</version>
+						<version>0.8.7</version>
 						<executions>
 							<execution>
 								<id>prepare-agent</id>
@@ -219,7 +219,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>3.0.1</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

src/main/java/org/cryptomator/frontend/webdav/VersionCompare.java

@@ -0,0 +1,27 @@
+package org.cryptomator.frontend.webdav;
+
+/**
+ * from: https://www.baeldung.com/java-comparing-versions#customSolution
+ */
+public class VersionCompare {
+
+	public static int compareVersions(String version1, String version2) {
+		int comparisonResult = 0;
+
+		String[] version1Splits = version1.split("\\.");
+		String[] version2Splits = version2.split("\\.");
+		int maxLengthOfVersionSplits = Math.max(version1Splits.length, version2Splits.length);
+
+		for (int i = 0; i < maxLengthOfVersionSplits; i++) {
+			Integer v1 = i < version1Splits.length ? Integer.parseInt(version1Splits[i]) : 0;
+			Integer v2 = i < version2Splits.length ? Integer.parseInt(version2Splits[i]) : 0;
+			int compare = v1.compareTo(v2);
+			if (compare != 0) {
+				comparisonResult = compare;
+				break;
+			}
+		}
+		return comparisonResult;
+	}
+
+}

src/main/java/org/cryptomator/frontend/webdav/mount/MacAppleScriptMounter.java

@@ -1,7 +1,6 @@
 package org.cryptomator.frontend.webdav.mount;
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
+import org.cryptomator.frontend.webdav.VersionCompare;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,14 +18,14 @@
 class MacAppleScriptMounter implements MounterStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(MacAppleScriptMounter.class);
-	private static final boolean IS_OS_MACOSX = System.getProperty("os.name").contains("Mac OS X");
-	private static final String[] OS_VERSION = Iterables.toArray(Splitter.on('.').splitToList(System.getProperty("os.version")), String.class);
+	private static final boolean IS_OS_MAC = System.getProperty("os.name").contains("Mac OS X");
+	private static final String OS_VERSION = System.getProperty("os.version");
 	private static final Pattern MOUNT_PATTERN = Pattern.compile(".* on (\\S+) \\(.*\\)"); // catches mount point in "http://host:port/foo/ on /Volumes/foo (webdav, nodev, noexec, nosuid)"
 
 	@Override
 	public boolean isApplicable() {
 		try {
-			return IS_OS_MACOSX && OS_VERSION.length >= 2 && Integer.parseInt(OS_VERSION[1]) >= 10; // since macOS 10.10+
+			return IS_OS_MAC && VersionCompare.compareVersions(OS_VERSION, "10.10") >= 0; // since macOS 10.10+
 		} catch (NumberFormatException e) {
 			return false;
 		}

src/main/java/org/cryptomator/frontend/webdav/mount/MacShellScriptMounter.java

@@ -1,5 +1,11 @@
 package org.cryptomator.frontend.webdav.mount;
 
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import org.cryptomator.frontend.webdav.VersionCompare;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -12,24 +18,18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.zip.CRC32;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
 class MacShellScriptMounter implements MounterStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(MacShellScriptMounter.class);
 	private static final Path VOLUMES_PATH = Paths.get("/Volumes");
-	private static final boolean IS_OS_MACOSX = System.getProperty("os.name").contains("Mac OS X");
-	private static final String[] OS_VERSION = Iterables.toArray(Splitter.on('.').splitToList(System.getProperty("os.version")), String.class);
+	private static final boolean IS_OS_MAC = System.getProperty("os.name").contains("Mac OS X");
+	private static final String OS_VERSION = System.getProperty("os.version");
 
 	@Override
 	public boolean isApplicable() {
 		try {
 			// Fail fast for systems >= 10.9
-			if (!IS_OS_MACOSX || OS_VERSION.length < 2 || Integer.parseInt(OS_VERSION[1]) >= 10) { // since macOS 10.10+
+			if (!IS_OS_MAC || VersionCompare.compareVersions(OS_VERSION, "10.10") < 0) {
 				return false;
 			}
 		} catch (NumberFormatException e) {