Merge branch 'release/2.0.9'

Author: infeo

.github/workflows/publish-central.yml

@@ -32,4 +32,4 @@ jobs:
           MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
           MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
-          MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235"
+          MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

.github/workflows/publish-github.yml

@@ -21,4 +21,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
           MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
-          MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235"
+          MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+The changelog starts with version 2.0.9.
+Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/webdav-nio-adapter/releases).
+
+## [Unreleased]
+
+### Added
+* File /CHANGELOG.md to keep track of changes
+
+## Changed
+* Increase timeout for MacAppleScript mounter to 120s (see #107)
+* Updates org.eclipse.jetty:jetty-server from 10.0.24 to 10.0.25
+* Updates org.eclipse.jetty:jetty-servlet from 10.0.24 to 10.0.25

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>webdav-nio-adapter</artifactId>
-	<version>2.0.8</version>
+	<version>2.0.9</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>
@@ -21,15 +21,15 @@
 		<!-- dependencies -->
 		<integrations-api.version>1.5.1</integrations-api.version>
 		<webdavservlet.version>1.2.7</webdavservlet.version>
-		<jetty.version>10.0.24</jetty.version>
+		<jetty.version>10.0.25</jetty.version>
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.12.0</junit.jupiter.version>
+		<junit.jupiter.version>5.12.1</junit.jupiter.version>
 
 		<!-- mvn plugin dependencies -->
 		<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>

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

@@ -88,7 +88,7 @@ protected Mount mount(WebDavServerHandle serverHandle, WebDavServletController s
 				String mountAppleScript = String.format("mount volume \"%s\"", uri.toASCIIString());
 				ProcessBuilder mount = new ProcessBuilder("/usr/bin/osascript", "-e", mountAppleScript);
 				Process mountProcess = mount.start();
-				ProcessUtil.waitFor(mountProcess, 60, TimeUnit.SECONDS); // huge timeout since the user might need to confirm connecting via http
+				ProcessUtil.waitFor(mountProcess, 120, TimeUnit.SECONDS); // huge timeout since issue #107 + the user might need to confirm connecting via http
 				ProcessUtil.assertExitValue(mountProcess, 0);
 
 				// verify mounted: