From cceea1c7c12c91e02a9f993ca88280140a9e4050 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 Mar 2020 17:57:17 +0100 Subject: [PATCH] Updated dependencies --- .idea/compiler.xml | 10 +++++----- main/pom.xml | 10 +++++----- main/ui/src/main/resources/license/THIRD-PARTY.txt | 11 +++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 943b0492d..d6a3de953 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,10 +7,10 @@ - - + + - + @@ -20,7 +20,7 @@ - + @@ -32,9 +32,9 @@ - + diff --git a/main/pom.xml b/main/pom.xml index 6dd95a8d6..38266ccaa 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ UTF-8 - 1.9.3 + 1.9.4 2.2.2 1.2.3 1.1.13 @@ -35,15 +35,15 @@ 3.9 3.10.0 1.0.3 - 28.1-jre - 2.26 + 28.2-jre + 2.27 2.8.6 1.7.30 1.2.3 - 5.6.0 - 3.3.0 + 5.6.1 + 3.3.3 2.2 diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index d327e63da..02ee15631 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -11,7 +11,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. -Cryptomator uses 50 third-party dependencies under the following licenses: +Cryptomator uses 49 third-party dependencies under the following licenses: Apache License v2.0: - HKDF-RFC5869 (at.favre.lib:hkdf:1.0.2 - https://github.com/patrickfav/hkdf) - jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi) @@ -20,10 +20,10 @@ Cryptomator uses 50 third-party dependencies under the following licenses: - 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) - - Dagger (com.google.dagger:dagger:2.26 - https://github.com/google/dagger) - - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.2 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) + - Dagger (com.google.dagger:dagger:2.27 - https://github.com/google/dagger) + - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - 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) - - Guava: Google Core Libraries for Java (com.google.guava:guava:28.1-jre - https://github.com/google/guava/guava) + - Guava: Google Core Libraries for Java (com.google.guava:guava:28.2-jre - https://github.com/google/guava/guava) - Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) - J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/) - Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) @@ -78,8 +78,7 @@ Cryptomator uses 50 third-party dependencies under the following licenses: - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j) - secret-service (de.swiesend:secret-service:1.0.0-RC.3 - https://github.com/swiesend/secret-service) - - Checker Qual (org.checkerframework:checker-qual:2.8.1 - https://checkerframework.org) - - Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.18 - http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations) + - Checker Qual (org.checkerframework:checker-qual:2.10.0 - https://checkerframework.org) - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) The BSD 2-Clause License: - EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/)