Skip to content

Commit 4bf6f5f

Browse files
Update the embedded Java JVM on Windows. Resolves #515.
1 parent 1c225a0 commit 4bf6f5f

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<project.nameLowercase>irscrutinizer</project.nameLowercase>
23-
<bundledjdk_url_sans_file>https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/</bundledjdk_url_sans_file>
23+
<bundledjdk_url_sans_file.linux>https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/</bundledjdk_url_sans_file.linux>
2424
<bundledjdk.linux>OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz</bundledjdk.linux>
25-
<bundledjdk.windows>OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.5_10.zip</bundledjdk.windows>
25+
<bundledjdk_url_sans_file.windows>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/</bundledjdk_url_sans_file.windows>
26+
<bundledjdk.windows>OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.9_9.zip</bundledjdk.windows>
27+
<bundledjdk_url_sans_file.mac>*** Currently not working ***</bundledjdk_url_sans_file.mac>
2628
<bundledjdk.mac>OpenJDK11U-jdk_x64_mac_hotspot_11.0.5_10.tar.gz</bundledjdk.mac>
2729
<inno_path>${basedir}/Inno_Setup_6/ISCC.exe</inno_path>
2830
<maven.compiler.source>1.8</maven.compiler.source>

tools/extract_jdk_url.xsl

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@
99
</xsl:template>
1010

1111
<xsl:template match="pom:properties">
12-
<xsl:value-of select="pom:bundledjdk_url_sans_file"/>
1312
<xsl:choose>
14-
<xsl:when test="$SYSTEM = 'linux'">
15-
<xsl:value-of select="//pom:project/pom:properties/pom:bundledjdk.linux"/>
16-
</xsl:when>
17-
<xsl:when test="$SYSTEM = 'windows'">
18-
<xsl:value-of select="//pom:project/pom:properties/pom:bundledjdk.windows"/>
19-
</xsl:when>
20-
<xsl:when test="$SYSTEM = 'mac'">
21-
<xsl:value-of select="//pom:project/pom:properties/pom:bundledjdk.mac"/>
22-
</xsl:when>
23-
<xsl:otherwise>
24-
<xsl:text>ERROR</xsl:text>
25-
</xsl:otherwise>
26-
</xsl:choose>
13+
<xsl:when test="$SYSTEM = 'linux'">
14+
<xsl:value-of select="pom:bundledjdk_url_sans_file.linux"/>
15+
<xsl:value-of select="pom:bundledjdk.linux"/>
16+
</xsl:when>
17+
<xsl:when test="$SYSTEM = 'windows'">
18+
<xsl:value-of select="pom:bundledjdk_url_sans_file.windows"/>
19+
<xsl:value-of select="//pom:project/pom:properties/pom:bundledjdk.windows"/>
20+
</xsl:when>
21+
<xsl:when test="$SYSTEM = 'mac'">
22+
<xsl:value-of select="pom:bundledjdk_url_sans_file.mac"/>
23+
<xsl:value-of select="//pom:project/pom:properties/pom:bundledjdk.mac"/>
24+
</xsl:when>
25+
<xsl:otherwise>
26+
<xsl:text>ERROR</xsl:text>
27+
</xsl:otherwise>
28+
</xsl:choose>
2729
</xsl:template>
2830
</xsl:stylesheet>

0 commit comments

Comments
 (0)