From 330b1cbf7d1689af175fe8f225696669dc64232a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 25 Jun 2020 17:15:07 +0200 Subject: [PATCH] derived resources after dependency update [ci skip] --- .idea/compiler.xml | 28 +++++++------------ .../main/resources/license/THIRD-PARTY.txt | 10 +++---- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1c7121872..e8dfd8106 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,34 +7,26 @@ - - + + - - - - - - - - - + + + - + + + + - - - - - - + diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index 778a08e2d..a988029e9 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -22,10 +22,10 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.23 - http://github.com/jnr/jnr-unixsocket) - 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.27 - https://github.com/google/dagger) + - Dagger (com.google.dagger:dagger:2.22 - 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.2-jre - https://github.com/google/guava/guava) + - Guava: Google Core Libraries for Java (com.google.guava:guava:29.0-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/) @@ -33,7 +33,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) - - Apache Commons Lang (org.apache.commons:commons-lang3:3.9 - http://commons.apache.org/proper/commons-lang/) + - Apache Commons Lang (org.apache.commons:commons-lang3:3.10 - https://commons.apache.org/proper/commons-lang/) - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - http://hc.apache.org/httpcomponents-core-ga) - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.0 - http://jackrabbit.apache.org/jackrabbit-webdav/) - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.28.v20200408 - http://www.eclipse.org/jetty) @@ -75,13 +75,13 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) MIT License: - - java jwt (com.auth0:java-jwt:3.10.2 - https://github.com/auth0/java-jwt) + - java jwt (com.auth0:java-jwt:3.10.3 - https://github.com/auth0/java-jwt) - java-utils (com.github.hypfvieh:java-utils:1.0.6 - https://github.com/hypfvieh/java-utils) - 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.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 - https://github.com/swiesend/secret-service) - - Checker Qual (org.checkerframework:checker-qual:2.10.0 - https://checkerframework.org) + - Checker Qual (org.checkerframework:checker-qual:2.11.1 - 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/)