REVERT due to "java.lang.module.FindException: Module jdk.unsupported…

….desktop not found, required by javafx.swing"

build.xml

@@ -112,10 +112,10 @@
 		<attribute name="dest" />
 		<sequential>
 			<exec executable="powershell" dir="${dir.cache}" failonerror="yes" osFamily="windows">
-				<arg line="get-java get jre x86_64" />
+				<arg line="get-java get jdk x86_64" />
 			</exec>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" osFamily="unix">
-				<arg line="get jre x86_64 Windows" />
+				<arg line="get jdk x86_64 Windows" />
 			</exec>
 			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Windows-x86_64-jre.zip" dest="@{dest}">
 				<patternset refid="pattern.jre" />
@@ -140,16 +140,16 @@
 		<attribute name="dest" />
 		<sequential>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
-				<arg line="get jre x86_64 Darwin" />
+				<arg line="get jdk x86_64 Darwin" />
 			</exec>
-			<untar src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jre.tar.gz" dest="@{dest}/jdk-${jre.version}.jre" compression="gzip">
+			<untar src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jre.tar.gz" dest="@{dest}/jdk-${jre.version}.jdk" compression="gzip">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jfx x86_64 Darwin" />
 			</exec>
-			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jfx.tar.gz" dest="@{dest}/jdk-${jre.version}.jre/Contents/Home/ext/modules">
+			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jfx.tar.gz" dest="@{dest}/jdk-${jre.version}.jdk/Contents/Home/ext/modules">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</unzip>
@@ -190,15 +190,15 @@
 			<bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="@{dir}" executablename="${package.name}.launcher" name="${application.name}" displayname="${application.name}.launcher" version="${revision}" shortversion="${application.version}" identifier="@{identifier}" mainclassname="${main.class}" icon="${dir.installer}/icons/${package.name}.icns" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true">
 				<arch name="x86_64" />
 
-				<runtime dir="@{dir}/jdk-${jre.version}.jre/Contents/Home" if:true="@{runtime}">
+				<runtime dir="@{dir}/jdk-${jre.version}.jdk/Contents/Home" if:true="@{runtime}">
 					<include name="**/*" />
 				</runtime>
 
 				<classpath dir="${dir.dist}/lib" />
 				<librarypath dir="${dir.lib}/native/mac-x86_64" />
 
 				<option value="--module-path" />
-				<option value="$APP_ROOT/Contents/PlugIns/jdk-${jre.version}.jre/Contents/Home/ext/modules/lib" />
+				<option value="$APP_ROOT/Contents/PlugIns/jdk-${jre.version}.jdk/Contents/Home/ext/modules/lib" />
 				<option value="--add-modules" />
 				<option value="ALL-MODULE-PATH" />
 
@@ -439,13 +439,13 @@
 			</fileset>
 		</delete>
 
-		<property name="path.app.jre" location="${path.app}/Contents/PlugIns/jdk-${jre.version}.jre" />
+		<property name="path.app.jre" location="${path.app}/Contents/PlugIns/jdk-${jre.version}.jdk" />
 
 		<!-- MAS validation is a bit buggy and requires even libraries and frameworks to have a unique CFBundleIdentifier Collision -->
 		<replace file="${path.app.jre}/Contents/Info.plist" token="net.java.openjdk.${jre.version}.jdk" value="${package.identifier}.jdk" encoding="UTF-8" summary="true" />
 
 		<!-- fix broken symlink -->
-		<copy file="${dir.staging}/jdk-${jre.version}.jre/Contents/Home/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />
+		<copy file="${dir.staging}/jdk-${jre.version}.jdk/Contents/Home/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />
 
 		<!-- fix permissions (fpcalc and jspawnhelper be executable and signed with inherit entitlements) -->
 		<chmod perm="+x">