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/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 diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index 815c0ca06..63525ea6b 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.9 + 1.4.10 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 48baed05d..e5fb5dadb 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.9 + 1.4.10 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index db188cb5b..19eb72355 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.9 + 1.4.10 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 3fec49bf2..057d7f0d2 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.9 + 1.4.10 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 167aef89c..2ee844d9b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.4.9 + 1.4.10 pom Cryptomator @@ -25,11 +25,11 @@ 1.2.1 - 1.8.2 + 1.8.3 2.0.0 1.1.2 - 1.1.7 - 1.0.9 + 1.1.8 + 1.0.10 12 diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 024f6382f..6943fa10c 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.9 + 1.4.10 ui Cryptomator GUI