From bcfba219008e97c83cab11b4a127f3d979c8a896 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 17:46:58 +0200 Subject: [PATCH] Create third-party-license file in target directory, use plugin defaults to let it placed inside jar --- pom.xml | 1 - .../java/org/cryptomator/ui/preferences/AboutController.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 96b5e2cc4..94668e5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -355,7 +355,6 @@ generate-resources - ${project.basedir}/src/main/resources/license THIRD-PARTY.txt compile org\.cryptomator diff --git a/src/main/java/org/cryptomator/ui/preferences/AboutController.java b/src/main/java/org/cryptomator/ui/preferences/AboutController.java index 758e0113b..f418843ee 100644 --- a/src/main/java/org/cryptomator/ui/preferences/AboutController.java +++ b/src/main/java/org/cryptomator/ui/preferences/AboutController.java @@ -29,10 +29,10 @@ public class AboutController implements FxController { } private static String loadThirdPartyLicenseFile() { - try (InputStream in = AboutController.class.getResourceAsStream("/license/THIRD-PARTY.txt")) { + try (InputStream in = AboutController.class.getResourceAsStream("/THIRD-PARTY.txt")) { return CharStreams.toString(new InputStreamReader(in)); } catch (IOException | NullPointerException e) { - LOG.error("Failed to load /license/THIRD-PARTY.txt", e); + LOG.error("Failed to load /THIRD-PARTY.txt", e); return ""; } }