Browse Source

Merge branch 'release/1.4.10'

Tobias Hagemann 6 năm trước cách đây
mục cha
commit
272115d2f7
8 tập tin đã thay đổi với 12 bổ sung11 xóa
  1. 1 0
      .gitignore
  2. 2 2
      README.md
  3. 1 1
      main/buildkit/pom.xml
  4. 1 1
      main/commons/pom.xml
  5. 1 1
      main/keychain/pom.xml
  6. 1 1
      main/launcher/pom.xml
  7. 4 4
      main/pom.xml
  8. 1 1
      main/ui/pom.xml

+ 1 - 0
.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

+ 2 - 2
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
 

+ 1 - 1
main/buildkit/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.9</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>

+ 1 - 1
main/commons/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.9</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>

+ 1 - 1
main/keychain/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.9</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>

+ 1 - 1
main/launcher/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.9</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>

+ 4 - 4
main/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.4.9</version>
+	<version>1.4.10</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
@@ -25,11 +25,11 @@
 
 		<!-- dependency versions -->
 		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.8.2</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.8.3</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.1.2</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.1.7</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.9</cryptomator.webdav.version>
+		<cryptomator.dokany.version>1.1.8</cryptomator.dokany.version>
+		<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>
 
 		<javafx.version>12</javafx.version>
 

+ 1 - 1
main/ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.9</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>