diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 9a217cecc..571ef1968 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml deleted file mode 100644 index 1850d442e..000000000 --- a/main/commons-test/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - commons-test - Cryptomator common test dependencies - Shared utilities for tests - - - - org.cryptomator - commons - - - - junit - junit - - - org.mockito - mockito-core - - - de.bechte.junit - junit-hierarchicalcontextrunner - - - org.hamcrest - hamcrest-all - - - - diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 9bafa8635..58cadb135 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 commons Cryptomator Commons 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 67fe4cb53..a43c8cf83 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,6 +10,8 @@ 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; @@ -27,7 +29,7 @@ public class Settings { public static final int MAX_PORT = 65535; public static final boolean DEFAULT_CHECK_FOR_UDPATES = true; public static final int DEFAULT_PORT = 42427; - public static final boolean DEFAULT_USE_IPV6 = false; + public static final boolean DEFAULT_USE_IPV6 = SystemUtils.IS_OS_WINDOWS; public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3; public static final String DEFAULT_GVFS_SCHEME = "dav"; public static final boolean DEFAULT_DEBUG_MODE = false; diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java index ae3e301eb..1bb4ddbc8 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java @@ -69,7 +69,10 @@ public class SettingsJsonAdapter extends TypeAdapter { settings.port().set(in.nextInt()); break; case "useIpv6": - settings.useIpv6().set(in.nextBoolean()); + // Temporarily we will disable loading this setting, as we want the default value on each app start. + // This setting might be removed completely in the future + // settings.useIpv6().set(in.nextBoolean()); + in.skipValue(); break; case "numTrayNotifications": settings.numTrayNotifications().set(in.nextInt()); diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 915a4e487..34e281aac 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -25,13 +25,16 @@ import javafx.beans.value.ObservableValue; public class VaultSettings { + public static final boolean DEFAULT_MOUNT_AFTER_UNLOCK = true; + public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true; + private final Settings settings; private final String id; private final ObjectProperty path = new SimpleObjectProperty<>(); private final StringProperty mountName = new SimpleStringProperty(); private final StringProperty winDriveLetter = new SimpleStringProperty(); - private final BooleanProperty mountAfterUnlock = new SimpleBooleanProperty(); - private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(); + private final BooleanProperty mountAfterUnlock = new SimpleBooleanProperty(DEFAULT_MOUNT_AFTER_UNLOCK); + private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT); public VaultSettings(Settings settings, String id) { this.settings = settings; @@ -42,6 +45,7 @@ public class VaultSettings { mountName.addListener(this::somethingChanged); winDriveLetter.addListener(this::somethingChanged); mountAfterUnlock.addListener(this::somethingChanged); + revealAfterMount.addListener(this::somethingChanged); } private void somethingChanged(ObservableValue observable, Object oldValue, Object newValue) { diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java index 5ce31767e..6b32a06b3 100644 --- a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java @@ -32,7 +32,7 @@ public class SettingsJsonAdapterTest { Assert.assertTrue(settings.checkForUpdates().get()); Assert.assertEquals(2, settings.getDirectories().size()); Assert.assertEquals(8080, settings.port().get()); - Assert.assertTrue(settings.useIpv6().get()); + // Assert.assertTrue(settings.useIpv6().get()); temporarily ignored Assert.assertEquals(42, settings.numTrayNotifications().get()); Assert.assertEquals("dav", settings.preferredGvfsScheme().get()); } diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml deleted file mode 100644 index 455114bad..000000000 --- a/main/filesystem-charsets/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-charsets - Cryptomator filesystem: Charset compatibility layer - - - - org.cryptomator - filesystem-api - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml deleted file mode 100644 index e93d8b941..000000000 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-crypto-integration-tests - Cryptomator filesystem: Encryption layer tests - - - - org.cryptomator - filesystem-api - - - org.cryptomator - filesystem-crypto - - - org.cryptomator - filesystem-nameshortening - - - - - com.google.dagger - dagger - - - com.google.dagger - dagger-compiler - provided - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml deleted file mode 100644 index c6ba9f594..000000000 --- a/main/filesystem-crypto/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-crypto - Cryptomator filesystem: Encryption layer - - - 1.51 - 1.2.0 - - - - - org.cryptomator - filesystem-api - - - org.cryptomator - commons - - - - - org.cryptomator - siv-mode - ${sivmode.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.google.dagger - dagger - - - com.google.dagger - dagger-compiler - provided - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml deleted file mode 100644 index c7da5eaae..000000000 --- a/main/filesystem-inmemory/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-inmemory - Cryptomator filesystem: In-memory mock - - - - org.cryptomator - filesystem-api - - - - - org.cryptomator - commons-test - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml deleted file mode 100644 index d1e4bafe7..000000000 --- a/main/filesystem-invariants-tests/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-invariants-tests - Cryptomator filesystem: Invariants tests - Test only project which checks invariants of FileSystem implementations - - - - org.cryptomator - filesystem-api - - - org.cryptomator - filesystem-charsets - - - org.cryptomator - filesystem-crypto - - - org.cryptomator - filesystem-crypto-integration-tests - - - org.cryptomator - filesystem-inmemory - - - org.cryptomator - filesystem-nameshortening - - - org.cryptomator - filesystem-nio - - - org.cryptomator - filesystem-stats - - - org.cryptomator - commons-test - - - - com.google.dagger - dagger - - - com.google.dagger - dagger-compiler - provided - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml deleted file mode 100644 index e10828e96..000000000 --- a/main/filesystem-nameshortening/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-nameshortening - Cryptomator filesystem: Name shortening layer - - - - org.cryptomator - filesystem-api - - - org.cryptomator - commons - - - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.google.dagger - dagger - - - com.google.dagger - dagger-compiler - provided - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml deleted file mode 100644 index 7611668be..000000000 --- a/main/filesystem-nio/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-nio - Cryptomator filesystem: NIO-based physical layer - FileSystem implementation to access the real file system of an operating system - - - - org.cryptomator - commons - - - org.cryptomator - filesystem-api - - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - - com.google.guava - guava - - - - org.cryptomator - commons - - - - - org.cryptomator - commons-test - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml deleted file mode 100644 index 3ca32df9f..000000000 --- a/main/filesystem-stats/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - filesystem-stats - Cryptomator filesystem: Throughput statistics - - - - org.cryptomator - filesystem-api - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - - - - - org.jacoco - jacoco-maven-plugin - - - - \ No newline at end of file diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml deleted file mode 100644 index 3b0ca81c7..000000000 --- a/main/frontend-api/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - frontend-api - Cryptomator frontend: API - API for filesystem frontends - - - - org.cryptomator - filesystem-api - - - \ No newline at end of file diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml deleted file mode 100644 index 588eea667..000000000 --- a/main/frontend-webdav/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - 4.0.0 - - org.cryptomator - main - 1.2.4 - - frontend-webdav - Cryptomator frontend: WebDAV frontend - Provides access via WebDAV to filesystems - - - 2.11.3 - 9.3.3.v20150827 - - - - - org.cryptomator - filesystem-api - - - org.cryptomator - commons - - - org.cryptomator - frontend-api - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - org.apache.jackrabbit - jackrabbit-webdav - ${jackrabbit.version} - - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - - - com.google.guava - guava - - - - - org.apache.commons - commons-lang3 - - - commons-io - commons-io - - - - - com.google.dagger - dagger - - - com.google.dagger - dagger-compiler - provided - - - - - org.cryptomator - commons-test - - - org.cryptomator - filesystem-inmemory - - - org.cryptomator - filesystem-crypto-integration-tests - - - org.cryptomator - filesystem-nameshortening - test - - - org.cryptomator - filesystem-crypto - test - - - commons-httpclient - commons-httpclient - test - - - org.cryptomator - filesystem-nio - test - - - - - - - org.jacoco - jacoco-maven-plugin - - - - diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 9bca6a2f2..2883d4488 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 61d51a439..66efa7d10 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 0f862abca..8496ad2a0 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 0e44e1ac0..ae88eef09 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 pom Cryptomator @@ -28,9 +28,9 @@ 1.1.1 - 1.2.1 - 0.5.0 - 1.0.0 + 1.2.2 + 0.5.1 + 1.0.1 2.8.1 1.7.25 4.12 @@ -239,6 +239,7 @@ org.hamcrest hamcrest-all + test org.mockito diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index b45fb8d49..2fc2e118b 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 uber-jar Single über jar with all dependencies diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2d34ad55e..9de070ae8 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-rc2 + 1.3.0-rc3 ui Cryptomator GUI