From a9846744fe875dd040192ffa2bacf66f817f4ea7 Mon Sep 17 00:00:00 2001
From: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Fri, 21 Jan 2022 13:16:06 +0100
Subject: [PATCH] Update JavaFX to 17.0.2 (#2031)
Updating JavaFX inside Maven to 17.0.2 to fix JDK-8275723. This is only relevant for development on a Mac with an M1 processor.
---
.gitignore | 4 +++-
pom.xml | 2 +-
src/main/resources/license/THIRD-PARTY.txt | 8 ++++----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index be67207df..8e239b35e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,6 @@ pom.xml.versionsBackup
.idea/jarRepositories.xml
.idea/uiDesigner.xml
.idea/**/libraries/
-*.iml
\ No newline at end of file
+*.iml
+
+hs_err_pid*.log
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6f0243597..3caa9b899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
1.2.6
- 17.0.1
+ 17.0.2
3.12.0
3.18.2
2.2
diff --git a/src/main/resources/license/THIRD-PARTY.txt b/src/main/resources/license/THIRD-PARTY.txt
index ba4310dd5..9c9d92c7d 100644
--- a/src/main/resources/license/THIRD-PARTY.txt
+++ b/src/main/resources/license/THIRD-PARTY.txt
@@ -62,10 +62,10 @@ Cryptomator uses 40 third-party dependencies under the following licenses:
GPLv2:
- jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
GPLv2+CE:
- - javafx-base (org.openjfx:javafx-base:17.0.1 - https://openjdk.java.net/projects/openjfx/javafx-base/)
- - javafx-controls (org.openjfx:javafx-controls:17.0.1 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
- - javafx-fxml (org.openjfx:javafx-fxml:17.0.1 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
- - javafx-graphics (org.openjfx:javafx-graphics:17.0.1 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
+ - javafx-base (org.openjfx:javafx-base:17.0.2 - https://openjdk.java.net/projects/openjfx/javafx-base/)
+ - javafx-controls (org.openjfx:javafx-controls:17.0.2 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
+ - javafx-fxml (org.openjfx:javafx-fxml:17.0.2 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
+ - javafx-graphics (org.openjfx:javafx-graphics:17.0.2 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
LGPL 2.1:
- jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
LGPL-2.1-or-later: