Merge pull request #374 from simonjhy/IDE-5114

IDE-5114 Adding a trusted Certificate for IDE and Dev Studio releases in MacOS
liferay · Nov 29, 2023 · 9f06001 · 9f06001
2 parents ee8fc3b + 896bb76
commit 9f06001
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 17 deletions.
diff --git a/build/installers/components/run-java-jpm-win.xml b/build/installers/components/run-java-jpm-win.xml
@@ -1,6 +1,6 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init --jvmlocation "${java_bin_dir}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init --jvmlocation "${java_bin_dir}"</programArguments>
     <ruleList>
         <platformTest>
             <type>windows</type>

diff --git a/build/installers/components/run-java-jpm.xml b/build/installers/components/run-java-jpm.xml
@@ -1,10 +1,10 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init</programArguments>
     <ruleList>
         <platformTest>
             <negate>1</negate>
             <type>windows</type>
         </platformTest>
     </ruleList>
-</runProgram>
+</runProgram>
diff --git a/build/installers/components/run-jpm-install-blade-win.xml b/build/installers/components/run-jpm-install-blade-win.xml
@@ -1,6 +1,6 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bladeFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bladeFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <type>windows</type>

diff --git a/build/installers/components/run-jpm-install-blade.xml b/build/installers/components/run-jpm-install-blade.xml
@@ -1,10 +1,11 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bladeFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bladeFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <negate>1</negate>
             <type>windows</type>
         </platformTest>
     </ruleList>
 </runProgram>
+
diff --git a/build/installers/components/run-jpm-install-bnd-win.xml b/build/installers/components/run-jpm-install-bnd-win.xml
@@ -1,9 +1,9 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bndFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bndFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <type>windows</type>
-        </platformTest>
+        </platformTest>    
     </ruleList>
 </runProgram>
diff --git a/build/installers/components/run-jpm-install-bnd.xml b/build/installers/components/run-jpm-install-bnd.xml
@@ -1,10 +1,10 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bndFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bndFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <negate>1</negate>
             <type>windows</type>
-        </platformTest>
+        </platformTest>      
     </ruleList>
-</runProgram>
+</runProgram>
diff --git a/build/installers/components/run-jpm-install-gw-win.xml b/build/installers/components/run-jpm-install-gw-win.xml
@@ -1,6 +1,6 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${gwFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${gwFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <type>windows</type>

diff --git a/build/installers/components/run-jpm-install-gw.xml b/build/installers/components/run-jpm-install-gw.xml
@@ -1,10 +1,10 @@
 <runProgram>
     <program>${java_executable}</program>
-    <programArguments> -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${gwFilePath}"</programArguments>
+    <programArguments>${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${gwFilePath}"</programArguments>
     <ruleList>
         <platformTest>
             <negate>1</negate>
             <type>windows</type>
-        </platformTest>
+        </platformTest>          
     </ruleList>
-</runProgram>
+</runProgram>
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
@@ -409,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>
@@ -794,8 +809,10 @@ ${java_executable}
     <startMenuGroupName></startMenuGroupName>
     <vendor>Liferay, Inc</vendor>
     <width>600</width>
-    <!-- <windowsSigningPkcs12File>${build_project_directory}/liferay.pfx</windowsSigningPkcs12File>
-    <windowsSigningPkcs12Password>${env(WINDOWS_SIGNING_PASSWORD)}</windowsSigningPkcs12Password> -->
+    <!-- windowsSigningPkcs12File>${build_project_directory}/liferay.pfx</windowsSigningPkcs12File>
+    <windowsSigningPkcs12Password>${env(WINDOWS_SIGNING_PASSWORD)}</windowsSigningPkcs12Password>
+    <<osxSigningPkcs12File>${build_project_directory}/osx-signing.p12</osxSigningPkcs12File>
+    <osxSigningPkcs12Password>${env(OSX_SIGNING_PASSWORD)}</osxSigningPkcs12Password>-->
     <parameterList>
         <fileParameter>
             <name>java_executable</name>

diff --git a/build/installers/liferay-workspace-with-devstudio/liferay.pfx b/build/installers/liferay-workspace-with-devstudio/liferay.pfx
diff --git a/build/installers/liferay-workspace/liferay-workspace.xml b/build/installers/liferay-workspace/liferay-workspace.xml
@@ -245,6 +245,21 @@
             <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"/>
+            </actionList>
+            <conditionRuleList>
+                <compareText>
+                    <logic>contains</logic>
+                    <text>${java_version}</text>
+                    <value>17</value>
+                </compareText>
+            </conditionRuleList>
+            <elseActionList>
+                <setInstallerVariable name="extraArgumentForJdk17" value=""/>
+            </elseActionList>
+        </if>
         <include>
             <file>../components/run-java-jpm-win.xml</file>
         </include>

diff --git a/build/parent/pom.xml b/build/parent/pom.xml
@@ -34,7 +34,7 @@
         <upgrade-plan-content-zip-url>https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/liferay-ide-files/docs/code-upgrade-docs-20210312.zip</upgrade-plan-content-zip-url>
         <upgrade-plan-content-zip-md5>c4bce64c362ecffcce300f31e88b2e63</upgrade-plan-content-zip-md5>
         <bndtools-site>https://bndtools.jfrog.io/artifactory/update-latest/org/bndtools/org.bndtools.p2/7.0.0/org.bndtools.p2-7.0.0.jar!</bndtools-site>
-        <eclipse-site>https://download.eclipse.org/releases/2023-12/202311171000/</eclipse-site>
+        <eclipse-site>https://download.eclipse.org/releases/2023-12/202311241000/</eclipse-site>
         <eclipse-xml-search-site>https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/eclipse/eclipse-wtp-xml-search/</eclipse-xml-search-site>
         <gradle-site>https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.8.v20231117-1658/</gradle-site>
         <liferay-ide-swtbot-testing-site>https://files.liferay.org.es/staged/public-files/liferay-ide/unstable/build/com.liferay.ide.testing-repository/target/repository/</liferay-ide-swtbot-testing-site>