Update to latest launch4j + misc fixes

build.gradle

@@ -30,7 +30,7 @@ plugins {
     id 'pmd'                                            // PMD for Java, configured further below
     id 'idea'                                           // For IntelliJ IDEA users
     id "de.undercouch.download" version '5.4.0'         // Shows download percentage
-    id 'edu.sc.seis.launch4j' version '2.5.4'           // Creates launch4j
+    id 'edu.sc.seis.launch4j' version '3.0.0'           // Creates launch4j
     id 'com.github.ben-manes.versions' version '0.46.0' // Checks versions for plugins and dependencies
     id "com.dorongold.task-tree" version '2.1.1'        // Prints the task dependency tree
     id 'org.openjfx.javafxplugin' version '0.0.14'      // JavaFX support
@@ -594,7 +594,7 @@ task downloadJRE {
 
 task downloadJavaFXModules(dependsOn: downloadJRE) {
     // We support Windows/Mac/Linux - x64, Mac/Linux - aarch64, and Windows x86 (32-bit)
-    def major = "17.0.6"
+    def major = "17.0.7"
     def archs = ['x64', 'x86', 'aarch64']
     def osList = ["windows", "mac", "linux"]
 

code/gradle/release.gradle

@@ -165,10 +165,10 @@ task layoutNsisBase(type: Copy, dependsOn: [runtimeZip, createExe, copyToLibs, j
 launch4j {
     mainClassName = 'pcgen.system.Main'
     icon = "${projectDir}/installers/win-installer/Local/pcgen.ico"
-    jdkPreference = 'preferJre'
+    requiresJdk = false     // false means it'll grab a JRE first if available
     maxHeapPercent = 80
     stayAlive = false
-    jreRuntimeBits = "64/32"
+    requires64Bit = false   // false means it auto-selects 64 or 32 bit as required.
     bundledJrePath = '.'
     dontWrapJar = true
     splashFileName = "${projectDir}/installers/win-installer/Local/splash.bmp"
@@ -179,10 +179,10 @@ launch4j {
     copyright = "PCGen's source-code is distributed under the GNU Lesser General Public License (LGPL)"
     version = "${shortVerNum}"
     jvmOptions = ["-Dsun.java2d.dpiaware=false"]
-    downloadUrl = "https://jdk.java.net/"
+    downloadUrl = "http://pcgen.org/download/"
 }
 
-task layoutNsisOptional(type: Copy, dependsOn: [copyToOutput]) {
+task layoutNsisOptional(type: Copy, dependsOn: ['copyToOutput', 'runtime']) {
     description="Assemble the optional files for PCGen installations"
     into nsisOptionFolder
 

code/src/itest/pcgen/output/testsupport/AbstractOutputTestCase.java

@@ -26,6 +26,7 @@
 import java.util.Locale;
 import java.util.Map;
 
+import pcgen.base.spotbugs.SuppressFBWarnings;
 import pcgen.cdom.enumeration.CharID;
 import pcgen.cdom.enumeration.DataSetID;
 import pcgen.cdom.facet.FacetLibrary;
@@ -51,12 +52,14 @@ public void setUp() throws Exception
 		id = CharID.getID(dsid);
 	}
 
+	// We deliberately allow users to inject templating code for custom character sheets
+	@SuppressFBWarnings("TEMPLATE_INJECTION_FREEMARKER")
 	protected void processThroughFreeMarker(String testString,
 	                                        String expectedResult)
 	{
 		try
 		{
-			Configuration c = new Configuration(Configuration.VERSION_2_3_28);
+			Configuration c = new Configuration(Configuration.VERSION_2_3_32);
 			Template t = new Template("test", testString, c);
 			StringWriter sw = new StringWriter();
 			BufferedWriter bw = new BufferedWriter(sw);
@@ -67,10 +70,8 @@ protected void processThroughFreeMarker(String testString,
 		}
 		catch (IOException | TemplateException e)
 		{
-			e.printStackTrace();
 			fail(e.getLocalizedMessage());
 		}
 	}
 
-
 }

code/src/testResources/pcgen/lang/cleaned.properties

@@ -1,4 +1,4 @@
-# LanguageBundle.properties with all unused keys removed as at 2022-10-02T12:59:59.393795
+# LanguageBundle.properties with all unused keys removed as at 2023-05-25T03:40:39.790121
 # LanguageBundle.properties with all unused keys removed as at 2012-08-27T07:34:45+10:00
 
 # Note: Trailing spaces are used in a number of places in this file. Please do 

code/src/testResources/pcgen/lang/unused.properties

@@ -1,4 +1,4 @@
-# LanguageBundle.properties with all used keys removed as at 2022-10-02T12:59:59.456803
+# LanguageBundle.properties with all used keys removed as at 2023-05-25T03:40:39.837381
 # LanguageBundle.properties with all unused keys removed as at 2012-08-27T07:34:45+10:00
 
 # Note: Trailing spaces are used in a number of places in this file. Please do