Compare commits

...

8 Commits
1.3.3 ... 1.3.4

Author SHA1 Message Date
Sebastian Stenzel
558f4be945 Merge branch 'hotfix/1.3.4' 2018-03-29 13:25:44 +02:00
Sebastian Stenzel
d63735df1a bumped version to 1.3.4 2018-03-29 13:24:12 +02:00
Sebastian Stenzel
191d7561f0 Merge branch 'hotfix/1.3.4' 2018-03-29 12:58:03 +02:00
Sebastian Stenzel
49a6fe9571 updated api key for github releases 2018-03-29 12:57:18 +02:00
Sebastian Stenzel
f2212169be updated api key for github releases 2018-03-29 12:39:32 +02:00
Sebastian Stenzel
42b5b2663e Merge branch 'hotfix/1.3.4' 2018-03-29 12:16:57 +02:00
Sebastian Stenzel
a0a867474b updated dependencies 2018-03-29 12:16:37 +02:00
Sebastian Stenzel
c98f7f8574 fixes #645 2018-03-29 12:06:49 +02:00
9 changed files with 12 additions and 12 deletions

View File

@@ -30,7 +30,7 @@ deploy:
- provider: releases
prerelease: false
api_key:
secure: "ZjE1j93v3qbPIe2YbmhS319aCbMdLQw0HuymmluTurxXsZtn9D4t2+eTr99vBVxGRuB5lzzGezPR5zjk5W7iHF7xhwrawXrFzr2rPJWzWFt0aM+Ry2njU1ROTGGXGTbv4anWeBlgMxLEInTAy/9ytOGNJlec83yc0THpOY2wxnk="
secure: "d06x5z/a0GGPJWASlPn1m2qNUeIIMhdCeSW/fnzo8YtX1qNj+d5mZQe2HSRMItKYYqgt6hnwst0YngYKrGQ/Sg3vy9BxVzoJm04MDmBkDNfHNTMhcx0euFAgRsfkyFs/CVRBNW1MPOg8BTDtyKoknIuCl2FPIKouP2QHO+CBYYY="
file:
- "main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar"
- "main/ant-kit/target/antkit.tar.gz"

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
</parent>
<artifactId>ant-kit</artifactId>
<packaging>pom</packaging>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
</parent>
<artifactId>jacoco-report</artifactId>
<name>Cryptomator Code Coverage Report</name>

View File

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

View File

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

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
<packaging>pom</packaging>
<name>Cryptomator</name>
@@ -24,9 +24,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.1.7</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.4.5</cryptomator.cryptofs.version>
<cryptomator.webdav.version>1.0.3</cryptomator.webdav.version>
<cryptomator.cryptolib.version>1.2.0</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.5.0</cryptomator.cryptofs.version>
<cryptomator.webdav.version>1.0.4</cryptomator.webdav.version>
<cryptomator.jni.version>1.0.2</cryptomator.jni.version>
<commons-io.version>2.5</commons-io.version>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
</parent>
<artifactId>uber-jar</artifactId>
<name>Single über jar with all dependencies</name>

View File

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