From 8badec2d44fa426d0ff1087227ca7a42b69a0682 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 13 Jun 2017 12:24:05 +0200 Subject: [PATCH 1/4] Updated usage --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 35c4b4d..d111a44 100644 --- a/README.md +++ b/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/). From 9ba9b64cd2c5e744d5cb734e41929f730322403d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 20 Jun 2017 12:05:49 +0200 Subject: [PATCH 2/4] updated dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e33a266..2b5c6ad 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 1.8 1.3.1 - 1.3.1 + 1.4.0 0.4.0 UTF-8 From 1516034ab3642c7d6da55078adfe62461b59b721 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 2 Jul 2017 18:49:24 +0200 Subject: [PATCH 3/4] Updated dependencies, moved from log4j to logback --- pom.xml | 24 +++++++++++++----------- src/main/resources/log4j2.xml | 23 ----------------------- src/main/resources/logback.xml | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 34 deletions(-) delete mode 100644 src/main/resources/log4j2.xml create mode 100644 src/main/resources/logback.xml diff --git a/pom.xml b/pom.xml index 2b5c6ad..0bba46a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,10 +8,12 @@ https://github.com/cryptomator/cli - 1.8 - 1.3.1 1.4.0 - 0.4.0 + 0.6.2 + 1.3.1 + 1.2.2 + + 1.8 UTF-8 @@ -44,7 +46,7 @@ webdav-nio-adapter ${webdav-nio.version} - + commons-cli @@ -54,14 +56,14 @@ - org.apache.logging.log4j - log4j-slf4j-impl - 2.8 + ch.qos.logback + logback-core + ${logback.version} - org.apache.logging.log4j - log4j-core - 2.8 + ch.qos.logback + logback-classic + ${logback.version} @@ -76,7 +78,7 @@ true - + maven-assembly-plugin 3.0.0 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 2ae85c4..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..a92d372 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + + true + + %d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %logger{36} - %msg%n + + + + + + + From d4ad011f396bea955a96a519eb6f23d9cb6c1eee Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 2 Jul 2017 18:49:35 +0200 Subject: [PATCH 4/4] preparing release 0.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bba46a..7de11e6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.cryptomator cli - 0.4.0-SNAPSHOT + 0.3.1 Cryptomator CLI Command line program to access encrypted files via WebDAV. https://github.com/cryptomator/cli