Compare commits

..
Author SHA1 Message Date
Sebastian Stenzel 5e7cea216d Merge branch 'release/1.4.0-beta1' 2018-04-06 16:54:12 +02:00
Sebastian Stenzel 6d91992102 preparing 1.4.0-beta1 2018-04-06 16:31:08 +02:00
Sebastian Stenzel 5a23ee0be6 updated dependencies 2018-04-06 16:29:40 +02:00
Sebastian Stenzel 31e186dd15 bumped fuse version 2018-04-05 23:24:47 +02:00
8 changed files with 13 additions and 13 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>ant-kit</artifactId>
<packaging>pom</packaging>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>commons</artifactId>
<name>Cryptomator Commons</name>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>jacoco-report</artifactId>
<name>Cryptomator Code Coverage Report</name>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>keychain</artifactId>
<name>System Keychain Access</name>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>launcher</artifactId>
<name>Cryptomator Launcher</name>
+6 -6
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
<packaging>pom</packaging>
<name>Cryptomator</name>
@@ -25,17 +25,17 @@
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.2.0</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.5.1</cryptomator.cryptofs.version>
<cryptomator.cryptofs.version>1.5.2</cryptomator.cryptofs.version>
<cryptomator.webdav.version>1.0.4</cryptomator.webdav.version>
<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
<cryptomator.fuse.version>0.1.3</cryptomator.fuse.version>
<cryptomator.fuse.version>0.1.4</cryptomator.fuse.version>
<commons-io.version>2.5</commons-io.version>
<commons-lang3.version>3.6</commons-lang3.version>
<easybind.version>1.0.3</easybind.version>
<guava.version>23.6-jre</guava.version>
<guava.version>24.1-jre</guava.version>
<dagger.version>2.14.1</dagger.version>
<gson.version>2.8.2</gson.version>
@@ -264,7 +264,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.0</version>
<executions>
<execution>
<id>copy-libs</id>
@@ -281,7 +281,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<version>0.8.1</version>
<executions>
<execution>
<id>prepare-agent</id>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>uber-jar</artifactId>
<name>Single über jar with all dependencies</name>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0-beta1</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>