From 19222475ec8e284c9e518a9279deab57fc42c339 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 7 May 2019 11:33:06 +0200 Subject: [PATCH 1/5] Updated README.md (due to confusions, see #682) [ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dc3912b94..151436412 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ For more information on the security details visit [cryptomator.org](https://cry ### Dependencies -* Java 10 (min. 10.0.1, we recommend to use the current version) +* JDK 11 (we recommend to use the latest version) * Maven 3 * Optional: OS-dependent build tools for native packaging (see [Windows](https://github.com/cryptomator/cryptomator-win), [OS X](https://github.com/cryptomator/cryptomator-osx), [Linux](https://github.com/cryptomator/builder-containers)) @@ -57,7 +57,7 @@ cd main mvn clean install -Prelease ``` -An executable jar file will be created inside `main/uber-jar/target`. +This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages. ## License From e83aab996854acf36f6d13602c21cd7495a8655b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 7 May 2019 12:37:43 +0200 Subject: [PATCH 2/5] fixes #883 --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index d14bf3944..cb9c63d2e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -29,7 +29,7 @@ 2.0.0 1.1.2 1.1.7 - 1.0.9 + 1.0.10 12 From 8205e4dd5a7af90ce9f1598ed26433fef78ad3ae Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 7 May 2019 13:15:52 +0200 Subject: [PATCH 3/5] fixes #880 fixes #862 --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index cb9c63d2e..778f26ba3 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ 1.2.1 - 1.8.2 + 1.8.3 2.0.0 1.1.2 1.1.7 From c2e1f8d7f7883695d062b59509dda2aee9c226da Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 7 May 2019 13:21:54 +0200 Subject: [PATCH 4/5] preparing 1.4.10 --- .gitignore | 1 + main/buildkit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/ui/pom.xml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 52f9a6ccd..3f055e749 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,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 diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index 32fa59d67..63525ea6b 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index ebb78e73f..e5fb5dadb 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 29471ed1d..19eb72355 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..057d7f0d2 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 778f26ba3..f4090960d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 1465683f0..6943fa10c 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.10 ui Cryptomator GUI From 95ae0ac9fd988ade1e22a12bbad6aa5e4da31b1e Mon Sep 17 00:00:00 2001 From: infeo Date: Wed, 8 May 2019 15:11:14 +0200 Subject: [PATCH 5/5] fixes #867 --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index f4090960d..2ee844d9b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -28,7 +28,7 @@ 1.8.3 2.0.0 1.1.2 - 1.1.7 + 1.1.8 1.0.10 12