From 5e621eb0fb6e67050e32404cabcf55e531e44ca6 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 28 Jun 2017 11:12:00 +0200 Subject: [PATCH 1/2] Preparing 1.3.0-rc8 --- main/ant-kit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 4ff1d9267..11a057166 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 ant-kit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 7187f7d6c..173548b98 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 commons Cryptomator Commons diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 5969a246b..7ae735b82 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index e8e2cc871..e94546478 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 21cfb26ac..5c9506e0c 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 73ed929b6..1b60a152d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 8a839614a..24e81cd77 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 uber-jar Single über jar with all dependencies diff --git a/main/ui/pom.xml b/main/ui/pom.xml index d9151ee7b..ad58168d1 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc8 ui Cryptomator GUI From 096e0637543859c00c6bcec2ad6817acdb25e98a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 28 Jun 2017 11:25:42 +0200 Subject: [PATCH 2/2] Dependency cleanup --- .../cryptomator/common/settings/Settings.java | 2 - main/keychain/pom.xml | 4 -- .../WindowsProtectedKeychainAccess.java | 9 ++-- main/pom.xml | 49 ++++++------------- main/ui/pom.xml | 4 -- .../org/cryptomator/ui/l10n/Localization.java | 5 +- 6 files changed, 23 insertions(+), 50 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java index 5ef5df1c4..a2721f4d3 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java @@ -10,8 +10,6 @@ package org.cryptomator.common.settings; import java.util.function.Consumer; -import org.apache.commons.lang3.SystemUtils; - import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index e94546478..c50d8f4cb 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -17,10 +17,6 @@ com.google.code.gson gson - - commons-codec - commons-codec - org.cryptomator jni diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java index 5527b0b27..f31536aff 100644 --- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java +++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java @@ -18,7 +18,6 @@ import java.io.Writer; import java.lang.reflect.Type; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.nio.charset.StandardCharsets; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.NoSuchFileException; @@ -32,13 +31,13 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.jni.WinDataProtection; import org.cryptomator.jni.WinFunctions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.io.BaseEncoding; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializationContext; @@ -179,16 +178,16 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy { private static class ByteArrayJsonAdapter implements JsonSerializer, JsonDeserializer { - private static final Base64 BASE64 = new Base64(); + private static final BaseEncoding BASE64 = BaseEncoding.base64(); @Override public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return BASE64.decode(json.getAsString().getBytes(StandardCharsets.UTF_8)); + return BASE64.decode(json.getAsString()); } @Override public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) { - return new JsonPrimitive(new String(BASE64.encode(src), StandardCharsets.UTF_8)); + return new JsonPrimitive(BASE64.encode(src)); } } diff --git a/main/pom.xml b/main/pom.xml index 1b60a152d..ba8567c28 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -28,21 +28,24 @@ 1.4.0 0.6.1 1.0.2 + + 2.5 + 3.6 + 4.5.3 + + 1.0.3 + + 22.0 + 2.11 + 2.8.1 + 1.7.25 1.2.2 + 4.12 4.12.1 - 1.3 - 2.4 - 4.0 - 3.5 - 1.10 - 4.5.3 2.7.21 - 2.11 - 1.0.3 - 22.0 - 2.8.0 + 1.3 @@ -126,27 +129,17 @@ ${logback.version} - + commons-io commons-io ${commons-io.version} - - org.apache.commons - commons-collections4 - ${commons-collections.version} - org.apache.commons commons-lang3 ${commons-lang3.version} - - commons-codec - commons-codec - ${commons-codec.version} - org.apache.httpcomponents httpclient @@ -160,27 +153,17 @@ ${easybind.version} - + com.google.guava guava ${guava.version} - - com.google.dagger dagger ${dagger.version} - - com.google.dagger - dagger-compiler - ${dagger.version} - provided - - - com.google.code.gson gson @@ -281,7 +264,7 @@ maven-dependency-plugin - 3.0.0 + 3.0.1 copy-libs diff --git a/main/ui/pom.xml b/main/ui/pom.xml index ad58168d1..d13d89391 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -62,10 +62,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-collections4 - org.apache.httpcomponents httpclient diff --git a/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java b/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java index b4e0d6a78..299392098 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java +++ b/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java @@ -22,11 +22,12 @@ import java.util.ResourceBundle; import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.Sets; + @Singleton public class Localization extends ResourceBundle { @@ -88,7 +89,7 @@ public class Localization extends ResourceBundle { @Override public Enumeration getKeys() { - Collection keys = CollectionUtils.union(localized.keySet(), fallback.keySet()); + Collection keys = Sets.union(localized.keySet(), fallback.keySet()); return Collections.enumeration(keys); }