Merge branch 'release/0.3.1'

Author: overheadhunter

README.md

@@ -15,12 +15,13 @@ Download the jar file via [GitHub Releases](https://github.com/cryptomator/cli/r
 Cryptomator CLI depends on a Java 8 JRE. In addition the JCE unlimited strength policy files (needed for 256-bit keys) must be installed.
 
 ```sh
-java -jar cryptomator-cli-x.y.z.jar --bind 0.0.0.0 --port 8080 --vault demoVault=/path/to/vault --password demoVault=topSecret
+java -jar cryptomator-cli-x.y.z.jar \
+    --vault demoVault=/path/to/vault --password demoVault=topSecret \
+    --vault otherVault=/path/to/differentVault --passwordfile otherVault=/path/to/fileWithPassword \
+    --bind 0.0.0.0 --port 8080
 # you can now mount http://localhost:8080/demoVault/
 ```
 
-In the current test version passwords can only be provided as a program argument. This will change in the future.
-
 ## License
 
 This project is dual-licensed under the AGPLv3 for FOSS projects as well as a commercial license derived from the LGPL for independent software vendors and resellers. If you want to use this library in applications, that are *not* licensed under the AGPL, feel free to contact our [support team](https://cryptomator.org/help/).

pom.xml

@@ -2,16 +2,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cli</artifactId>
-	<version>0.3.0</version>
+	<version>0.3.1</version>
 	<name>Cryptomator CLI</name>
 	<description>Command line program to access encrypted files via WebDAV.</description>
 	<url>https://github.com/cryptomator/cli</url>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<cryptofs.version>1.4.0</cryptofs.version>
+		<webdav-nio.version>0.6.2</webdav-nio.version>
 		<commons.cli.version>1.3.1</commons.cli.version>
-		<cryptofs.version>1.3.1</cryptofs.version>
-		<webdav-nio.version>0.4.0</webdav-nio.version>
+		<logback.version>1.2.2</logback.version>
+
+		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -44,7 +46,7 @@
 			<artifactId>webdav-nio-adapter</artifactId>
 			<version>${webdav-nio.version}</version>
 		</dependency>
-		
+
 		<!-- Commons -->
 		<dependency>
 			<groupId>commons-cli</groupId>
@@ -54,14 +56,14 @@
 
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.8</version>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.8</version>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -76,7 +78,7 @@
 					<showWarnings>true</showWarnings>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>3.0.0</version>

src/main/resources/log4j2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xml>
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<withJansi>true</withJansi>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>