diff --git a/pom.xml b/pom.xml index e6ec12417..16411e337 100644 --- a/pom.xml +++ b/pom.xml @@ -24,23 +24,23 @@ 16 - 2.1.0-beta8 + 2.1.0-beta9 1.0.0-rc1 1.0.0-beta2 1.0.0-beta2 1.0.0-beta1 1.3.1 1.3.1 - 1.2.4 + 1.2.5 16 3.12.0 - 3.17.0 + 3.18.1 2.2 30.1.1-jre 2.37 - 2.8.6 + 2.8.7 1.7.31 1.2.3 @@ -190,7 +190,7 @@ com.google.jimfs jimfs - 1.1 + 1.2 test @@ -236,12 +236,12 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 org.owasp dependency-check-maven - 6.0.3 + 6.2.2 diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java index 3efe333b3..57cf6eb62 100644 --- a/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java +++ b/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java @@ -47,10 +47,10 @@ class HealthCheckTask extends Task { this.check = Objects.requireNonNull(check); this.results = FXCollections.observableArrayList(Result::observables); try { - updateTitle(resourceBundle.getString("health." + check.identifier())); + updateTitle(resourceBundle.getString("health." + check.name())); } catch (MissingResourceException e) { - LOG.warn("Missing proper name for health check {}, falling back to default.", check.identifier()); - updateTitle(check.identifier()); + LOG.warn("Missing proper name for health check {}, falling back to default.", check.name()); + updateTitle(check.name()); } this.durationInMillis = new SimpleLongProperty(-1); this.chosenForExecution = new SimpleBooleanProperty(); @@ -74,12 +74,12 @@ class HealthCheckTask extends Task { @Override protected void scheduled() { - LOG.info("starting {}", check.identifier()); + LOG.info("starting {}", check.name()); } @Override protected void done() { - LOG.info("finished {}", check.identifier()); + LOG.info("finished {}", check.name()); } /* Getter */ diff --git a/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/src/main/java/org/cryptomator/ui/health/ReportWriter.java index 6039901ef..4366d14f0 100644 --- a/src/main/java/org/cryptomator/ui/health/ReportWriter.java +++ b/src/main/java/org/cryptomator/ui/health/ReportWriter.java @@ -64,10 +64,10 @@ public class ReportWriter { writer.write(REPORT_HEADER.formatted(vaultConfig.getId(), vault.getDisplayName(), vault.getPath())); for (var task : tasks) { if (task.getState() == Worker.State.READY) { - LOG.debug("Skipping not performed check {}.", task.getCheck().identifier()); + LOG.debug("Skipping not performed check {}.", task.getCheck().name()); continue; } - writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().identifier())); + writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().name())); switch (task.getState()) { case SUCCEEDED -> { writer.write("STATUS: SUCCESS\nRESULTS:\n"); @@ -77,7 +77,7 @@ public class ReportWriter { } case CANCELLED -> writer.write("STATUS: CANCELED\n"); case FAILED -> { - writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().identifier()); + writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().name()); writer.write(prepareFailureMsg(task)); } case RUNNING, SCHEDULED -> throw new IllegalStateException("Checks are still running."); diff --git a/src/main/resources/license/THIRD-PARTY.txt b/src/main/resources/license/THIRD-PARTY.txt index 2d234f01c..6c58b1eee 100644 --- a/src/main/resources/license/THIRD-PARTY.txt +++ b/src/main/resources/license/THIRD-PARTY.txt @@ -18,7 +18,7 @@ Cryptomator uses 45 third-party dependencies under the following licenses: - jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants) - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi) - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) - - Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson) + - Gson (com.google.code.gson:gson:2.8.7 - https://github.com/google/gson/gson) - Dagger (com.google.dagger:dagger:2.37 - https://github.com/google/dagger) - error-prone annotations (com.google.errorprone:error_prone_annotations:2.5.1 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) @@ -32,12 +32,12 @@ Cryptomator uses 45 third-party dependencies under the following licenses: - Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/) - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.14 - http://hc.apache.org/httpcomponents-core-ga) - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.5 - http://jackrabbit.apache.org/jackrabbit-webdav/) - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.3 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.3 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.3 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.3 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.3 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.3 - https://eclipse.org/jetty/jetty-util) + - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.6 - https://eclipse.org/jetty/jetty-http) + - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.6 - https://eclipse.org/jetty/jetty-io) + - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.6 - https://eclipse.org/jetty/jetty-security) + - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.6 - https://eclipse.org/jetty/jetty-server) + - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.6 - https://eclipse.org/jetty/jetty-servlet) + - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.6 - https://eclipse.org/jetty/jetty-util) - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) BSD: - asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/) @@ -48,12 +48,12 @@ Cryptomator uses 45 third-party dependencies under the following licenses: Eclipse Public License - Version 1.0: - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) Eclipse Public License - Version 2.0: - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.3 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.3 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.3 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.3 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.3 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.3 - https://eclipse.org/jetty/jetty-util) + - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.6 - https://eclipse.org/jetty/jetty-http) + - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.6 - https://eclipse.org/jetty/jetty-io) + - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.6 - https://eclipse.org/jetty/jetty-security) + - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.6 - https://eclipse.org/jetty/jetty-server) + - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.6 - https://eclipse.org/jetty/jetty-servlet) + - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.6 - https://eclipse.org/jetty/jetty-util) Eclipse Public License - v 1.0: - Logback Classic Module (ch.qos.logback:logback-classic:1.2.3 - http://logback.qos.ch/logback-classic) - Logback Core Module (ch.qos.logback:logback-core:1.2.3 - http://logback.qos.ch/logback-core) @@ -74,7 +74,7 @@ Cryptomator uses 45 third-party dependencies under the following licenses: - Java Native Access (net.java.dev.jna:jna:5.7.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.7.0 - https://github.com/java-native-access/jna) MIT License: - - java jwt (com.auth0:java-jwt:3.17.0 - https://github.com/auth0/java-jwt) + - java jwt (com.auth0:java-jwt:3.18.1 - https://github.com/auth0/java-jwt) - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - jnr-fuse (com.github.serceman:jnr-fuse:0.5.5 - https://github.com/SerCeMan/jnr-fuse) - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)