mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.4.17' into support/1.4.x

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-10-31 01:01:24 +01:00
parent 7636d6874b 95db29158c
commit 274c3886f5
6 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/buildkit/pom.xml
View File

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

2
main/commons/pom.xml
View File

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

2
main/keychain/pom.xml
View File

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

2
main/launcher/pom.xml
View File

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

28
main/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.16</version>
<version>1.4.17</version>
<packaging>pom</packaging>
<name>Cryptomator</name>
@@ -25,29 +25,28 @@
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.8.8</cryptomator.cryptofs.version>
<cryptomator.cryptofs.version>1.8.9</cryptomator.cryptofs.version>
<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
<cryptomator.fuse.version>1.2.0</cryptomator.fuse.version>
<cryptomator.fuse.version>1.2.1</cryptomator.fuse.version>
<cryptomator.dokany.version>1.1.11</cryptomator.dokany.version>
<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>
<javafx.version>12</javafx.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<commons-lang3.version>3.9</commons-lang3.version>
<easybind.version>1.0.3</easybind.version>
<guava.version>27.1-jre</guava.version>
<dagger.version>2.22.1</dagger.version>
<gson.version>2.8.5</gson.version>
<guava.version>28.1-jre</guava.version>
<dagger.version>2.24</dagger.version>
<gson.version>2.8.6</gson.version>
<slf4j.version>1.7.26</slf4j.version>
<slf4j.version>1.7.28</slf4j.version>
<logback.version>1.2.3</logback.version>
<junit.jupiter.version>5.4.2</junit.jupiter.version>
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>2.1</hamcrest.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<mockito.version>3.1.0</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
</properties>
<repositories>
@@ -163,11 +162,6 @@
</dependency>
<!-- Apache Commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>

6
main/ui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.16</version>
<version>1.4.17</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>
@@ -73,10 +73,6 @@
</dependency>
<!-- apache commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>