From 896bb763fa1ba36e8a294363720959ffd05a73bb Mon Sep 17 00:00:00 2001
From: Simon Jiang <simon.jiang@liferay.com>
Date: Tue, 28 Nov 2023 16:25:29 +0800
Subject: [PATCH] IDE-5114 let installer support jdk 17

---
 .../liferay-workspace-with-devstudio.xml      | 30 +++++++++---------
 .../liferay-workspace/liferay-workspace.xml   | 31 ++++++-------------
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml b/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml
index bc2f453938..e6e132f696 100644
--- a/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml
+++ b/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml
@@ -95,21 +95,6 @@
                 <isTrue value="${clitools}"/>
             </conditionRuleList>
         </if>
-        <if>
-            <actionList>
-                <setInstallerVariable name="extraArgumentForJdk17" value=" --add-opens java.prefs/java.util.prefs=ALL-UNNAMED"/>
-            </actionList>
-            <ruleList>
-                <compareValues>
-                    <logic>equals</logic>
-                    <value1>${java_version}</value1>
-                    <value2>17</value2>
-                </compareValues>
-            </ruleList>   
-            <elseActionList>
-                <setInstallerVariable name="extraArgumentForJdk17" value=""/>
-            </elseActionList>
-        </if>
         <if>
             <actionList>
                 <if>
@@ -424,6 +409,21 @@ ${java_executable}
                 </if>
             </elseActionList>
         </if>
+        <if>
+            <actionList>
+                <setInstallerVariable name="extraArgumentForJdk17" value="--add-opens java.prefs/java.util.prefs=ALL-UNNAMED"/>
+            </actionList>
+            <conditionRuleList>
+                <compareText>
+                    <logic>contains</logic>
+                    <text>${java_version}</text>
+                    <value>17</value>
+                </compareText>
+            </conditionRuleList>
+            <elseActionList>
+                <setInstallerVariable name="extraArgumentForJdk17" value=""/>
+            </elseActionList>
+        </if>
         <if>
             <actionList>
                 <include>
diff --git a/build/installers/liferay-workspace/liferay-workspace.xml b/build/installers/liferay-workspace/liferay-workspace.xml
index e2fb9d0efc..c2afca798d 100644
--- a/build/installers/liferay-workspace/liferay-workspace.xml
+++ b/build/installers/liferay-workspace/liferay-workspace.xml
@@ -240,39 +240,26 @@
                 </if>
             </elseActionList>
         </if>
+        <pathManipulation>
+            <action>nativeAbsolutize</action>
+            <path>${java_executable}/..</path>
+            <variable>java_bin_dir</variable>
+        </pathManipulation>
         <if>
             <actionList>
-                <setInstallerVariable name="extraArgumentForJdk17" value=" --add-opens java.prefs/java.util.prefs=ALL-UNNAMED"/>
+                <setInstallerVariable name="extraArgumentForJdk17" value="--add-opens java.prefs/java.util.prefs=ALL-UNNAMED"/>
             </actionList>
             <conditionRuleList>
                 <compareText>
-                    <logic>equals</logic>
-                    <nocase>1</nocase>
+                    <logic>contains</logic>
                     <text>${java_version}</text>
                     <value>17</value>
                 </compareText>
             </conditionRuleList>
             <elseActionList>
-                <if>
-                    <actionList>
-                        <setInstallerVariable name="extraArgumentForJdk17" value=""/>
-                    </actionList>
-                    <conditionRuleList>
-                        <compareText>
-                            <logic>contains</logic>
-                            <nocase>1</nocase>
-                            <text>${java_version}</text>
-                            <value>17</value>
-                        </compareText>
-                    </conditionRuleList>
-                </if>
+                <setInstallerVariable name="extraArgumentForJdk17" value=""/>
             </elseActionList>
-        </if>        
-        <pathManipulation>
-            <action>nativeAbsolutize</action>
-            <path>${java_executable}/..</path>
-            <variable>java_bin_dir</variable>
-        </pathManipulation>
+        </if>
         <include>
             <file>../components/run-java-jpm-win.xml</file>
         </include>