From 8439216233404c37307fe3e106d7619d66d7013b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 10 Nov 2016 15:13:28 +0100 Subject: [PATCH 1/6] Updated version to 1.2.1 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index ddbc98205..a8071f010 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 9f0055118..be5582cd7 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index b3c5595ca..4b3ee1003 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index a815393c7..cdd06797c 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 817000f84..5e07d6763 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 0c732d6e0..d5194f98c 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 0450bae54..20919972b 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index 18fe0427e..04427d655 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 0a01cd0f2..7ddd03d0e 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index dc60fee28..4336ebb53 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 80c9dea6e..c1da3d816 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index b4abb4084..5a86d503e 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index abf1de672..0caca5bbc 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index f92a99b8d..12fa71d63 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 2f43205e7..29b003937 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 54160080d..246ac4d9c 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 keychain System Keychain Access diff --git a/main/pom.xml b/main/pom.xml index 000fc4a0c..01a9a958e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 016486d8b..f078456b9 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 09efe9e1c..f72545892 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.1 ui Cryptomator GUI From bac1d6fd834876148a7798bc352a678821a93a38 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 12 Nov 2016 16:41:26 +0100 Subject: [PATCH 2/6] Updated siv-mode to 1.2.0 to be consistent with CryptoLib --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 4 ++-- .../cryptomator/crypto/engine/impl/FilenameCryptorImpl.java | 4 ++-- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index a8071f010..607902dba 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index be5582cd7..d53fdd079 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 4b3ee1003..cda650dbe 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index cdd06797c..19b43b448 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 5e07d6763..c37512ce1 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index d5194f98c..2763445b8 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 20919972b..7c60a38b8 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,14 +12,14 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-crypto Cryptomator filesystem: Encryption layer 1.51 - 1.0.8 + 1.2.0 diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java index e19cb0e25..2066fe5f4 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java @@ -14,7 +14,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.regex.Pattern; -import javax.crypto.AEADBadTagException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.SecretKey; @@ -23,6 +22,7 @@ import org.apache.commons.codec.binary.BaseNCodec; import org.cryptomator.crypto.engine.AuthenticationFailedException; import org.cryptomator.crypto.engine.FilenameCryptor; import org.cryptomator.siv.SivMode; +import org.cryptomator.siv.UnauthenticCiphertextException; class FilenameCryptorImpl implements FilenameCryptor { @@ -71,7 +71,7 @@ class FilenameCryptorImpl implements FilenameCryptor { try { final byte[] cleartextBytes = AES_SIV.get().decrypt(encryptionKey, macKey, encryptedBytes, associatedData); return new String(cleartextBytes, UTF_8); - } catch (AEADBadTagException | IllegalBlockSizeException e) { + } catch (UnauthenticCiphertextException | IllegalBlockSizeException e) { throw new AuthenticationFailedException("Invalid ciphertext.", e); } } diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index 04427d655..a640963ca 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 7ddd03d0e..442b4dcd0 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index 4336ebb53..c2da992b3 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index c1da3d816..834da5a2a 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 5a86d503e..8d6055807 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 0caca5bbc..a95764b6e 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 12fa71d63..0182184f3 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 29b003937..419454760 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 246ac4d9c..fdeb8384d 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 keychain System Keychain Access diff --git a/main/pom.xml b/main/pom.xml index 01a9a958e..009875667 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.2.1 + 1.2.2 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index f078456b9..f6222e5cd 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index f72545892..368a698d8 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.1 + 1.2.2 ui Cryptomator GUI From 9956f43fd913fd102f887db87e4b60bec208e8c4 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Tue, 29 Nov 2016 22:24:26 +0100 Subject: [PATCH 3/6] updated to version 1.2.3 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index ddbc98205..7292a21ef 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 9f0055118..a9bb921f9 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index b3c5595ca..8e3f3101f 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index a815393c7..84d3ba083 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 817000f84..127ab648a 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 0c732d6e0..c9fbd1d92 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 209f404c0..9cd80702a 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index 18fe0427e..c52333cc9 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 0a01cd0f2..765eb2595 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index dc60fee28..95f58e244 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 80c9dea6e..7b31518c4 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index b4abb4084..dd93fccdb 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index abf1de672..da7ec0d45 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index f92a99b8d..c788b15e9 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 2f43205e7..6f4f898ae 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 54160080d..756e81eeb 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 keychain System Keychain Access diff --git a/main/pom.xml b/main/pom.xml index 000fc4a0c..f0f365e73 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 016486d8b..4d715f850 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 09efe9e1c..06a479090 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.3 ui Cryptomator GUI From ab39bd166730ccfe2292b31bd93b2fae57a607bf Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Fri, 27 Jan 2017 11:12:45 +0100 Subject: [PATCH 4/6] updated to version 1.2.4 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index ddbc98205..791664bee 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 9f0055118..1850d442e 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index b3c5595ca..afe1d2acc 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index a815393c7..c8ed44aac 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 817000f84..455114bad 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 0c732d6e0..e93d8b941 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 209f404c0..c6ba9f594 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index 18fe0427e..c7da5eaae 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 0a01cd0f2..d1e4bafe7 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index dc60fee28..e10828e96 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 80c9dea6e..7611668be 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index b4abb4084..3ca32df9f 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index abf1de672..3b0ca81c7 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index f92a99b8d..588eea667 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 2f43205e7..b981c33a1 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 54160080d..53f8b371b 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 keychain System Keychain Access diff --git a/main/pom.xml b/main/pom.xml index 000fc4a0c..da95f678a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 016486d8b..02b00d3ba 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 09efe9e1c..2bbefaf66 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.2.4 ui Cryptomator GUI From 332890d92bf466569e7466de7fc8c203778eadbd Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 23 Jun 2017 13:37:45 +0200 Subject: [PATCH 5/6] fixes #523 --- main/ant-kit/src/main/resources/build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml index 6dce44b1e..b227f5f0f 100644 --- a/main/ant-kit/src/main/resources/build.xml +++ b/main/ant-kit/src/main/resources/build.xml @@ -32,6 +32,7 @@ + @@ -55,6 +56,7 @@ + From 6932fe4ab437915f153922fc3d6a79c76b5b14f4 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 23 Jun 2017 13:38:09 +0200 Subject: [PATCH 6/6] preparing hotfix 1.2.5 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 791664bee..ef6995e6b 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 1850d442e..15438b0e4 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index afe1d2acc..4c5218c63 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index c8ed44aac..99bc7c512 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 455114bad..7d1561d3a 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index e93d8b941..b3c0af6ce 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index c6ba9f594..5cb5cdd44 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index c7da5eaae..dc4b91d72 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index d1e4bafe7..a0cf9a790 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index e10828e96..bd3297fad 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 7611668be..dd5f18c39 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 3ca32df9f..a1b442ed5 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 3b0ca81c7..11492f51e 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 588eea667..e74018605 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index b981c33a1..95943086c 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 53f8b371b..dbd93a503 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 keychain System Keychain Access diff --git a/main/pom.xml b/main/pom.xml index da95f678a..4c1133e1e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.2.4 + 1.2.5 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 02b00d3ba..435a02ffc 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2bbefaf66..e15db90ab 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.4 + 1.2.5 ui Cryptomator GUI