Skip to content

Commit 1e9435d

Browse files
authored
Remove Java 17 from Windows installer (#724)
1 parent 0ce568f commit 1e9435d

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

msi/build/jenkins.wxs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,10 @@
168168
Return="check"
169169
Impersonate="no" />
170170

171-
<!-- This will find the JRE/JDK directory either Java 17 or 21 (prefer 21) -->
171+
<!-- This will find the JRE/JDK directory either Java 21 or 25 (prefer 25) -->
172172
<Property Id="JAVA_HOME">
173-
<RegistrySearch Id="JDK25_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\25" Name="JavaHome" Type="raw" Win64="yes" />
174173
<RegistrySearch Id="JDK21_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\21" Name="JavaHome" Type="raw" Win64="yes" />
175-
<RegistrySearch Id="JDK17_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\17" Name="JavaHome" Type="raw" Win64="yes" />
174+
<RegistrySearch Id="JDK25_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\25" Name="JavaHome" Type="raw" Win64="yes" />
176175
</Property>
177176

178177
<Property Id="ARPPRODUCTICON" Value="installer.ico" />
@@ -369,9 +368,9 @@
369368
<Publish Event="DoAction" Value="ValidateJavaHome" Order="1">1</Publish>
370369

371370
<!-- Spawn the error dialog if java.exe can't be found. -->
372-
<Publish Property="ERROR_TITLE" Value="!(loc.JavaHomeDlgErrorTitle)" Order="2"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "17" AND JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
373-
<Publish Property="ERROR_MESSAGE" Value="!(loc.JavaHomeDlgErrorMessage)" Order="3"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "17" AND JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
374-
<Publish Event="SpawnDialog" Value="GenericErrorDlg" Order="4"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "17" AND JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
371+
<Publish Property="ERROR_TITLE" Value="!(loc.JavaHomeDlgErrorTitle)" Order="2"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
372+
<Publish Property="ERROR_MESSAGE" Value="!(loc.JavaHomeDlgErrorMessage)" Order="3"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
373+
<Publish Event="SpawnDialog" Value="GenericErrorDlg" Order="4"><![CDATA[JAVA_EXE_FOUND = "0" OR (JAVA_EXE_VERSION <> "21" AND JAVA_EXE_VERSION <> "25")]]></Publish>
375374
<Publish Property="JAVA_HOME" Value="[JAVA_HOME]">1</Publish>
376375
</Control>
377376
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />

0 commit comments

Comments
 (0)