Преглед изворни кода

Create third-party-license file in target directory, use plugin defaults to let it placed inside jar

Armin Schrenk пре 3 година
родитељ
комит
bcfba21900
2 измењених фајлова са 2 додато и 3 уклоњено
  1. 0 1
      pom.xml
  2. 2 2
      src/main/java/org/cryptomator/ui/preferences/AboutController.java

+ 0 - 1
pom.xml

@@ -355,7 +355,6 @@
 						</goals>
 						<phase>generate-resources</phase>
 						<configuration>
-							<outputDirectory>${project.basedir}/src/main/resources/license</outputDirectory>
 							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
 							<includedScopes>compile</includedScopes>
 							<excludedGroups>org\.cryptomator</excludedGroups>

+ 2 - 2
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 "";
 		}
 	}