diff --git a/build/installers/components/run-java-jpm-win.xml b/build/installers/components/run-java-jpm-win.xml index bc00a8cf6c..839e39072c 100644 --- a/build/installers/components/run-java-jpm-win.xml +++ b/build/installers/components/run-java-jpm-win.xml @@ -1,6 +1,6 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init --jvmlocation "${java_bin_dir}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init --jvmlocation "${java_bin_dir}" windows diff --git a/build/installers/components/run-java-jpm.xml b/build/installers/components/run-java-jpm.xml index 1418e489c1..2af812ca6b 100644 --- a/build/installers/components/run-java-jpm.xml +++ b/build/installers/components/run-java-jpm.xml @@ -1,10 +1,10 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" -u -b "${userHome}" -h "${jpmSettingPath}" -B "${jpmSystemPath}" init 1 windows - + \ No newline at end of file diff --git a/build/installers/components/run-jpm-install-blade-win.xml b/build/installers/components/run-jpm-install-blade-win.xml index e8faf9cf11..f0a8434bed 100644 --- a/build/installers/components/run-jpm-install-blade-win.xml +++ b/build/installers/components/run-jpm-install-blade-win.xml @@ -1,6 +1,6 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bladeFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bladeFilePath}" windows diff --git a/build/installers/components/run-jpm-install-blade.xml b/build/installers/components/run-jpm-install-blade.xml index 7af13d0422..3e948b312d 100644 --- a/build/installers/components/run-jpm-install-blade.xml +++ b/build/installers/components/run-jpm-install-blade.xml @@ -1,6 +1,6 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bladeFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bladeFilePath}" 1 @@ -8,3 +8,4 @@ + diff --git a/build/installers/components/run-jpm-install-bnd-win.xml b/build/installers/components/run-jpm-install-bnd-win.xml index 9ba28735a4..23278f9b1a 100644 --- a/build/installers/components/run-jpm-install-bnd-win.xml +++ b/build/installers/components/run-jpm-install-bnd-win.xml @@ -1,9 +1,9 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bndFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${bndFilePath}" windows - + \ No newline at end of file diff --git a/build/installers/components/run-jpm-install-bnd.xml b/build/installers/components/run-jpm-install-bnd.xml index 76905cc04a..964206af80 100644 --- a/build/installers/components/run-jpm-install-bnd.xml +++ b/build/installers/components/run-jpm-install-bnd.xml @@ -1,10 +1,10 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bndFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${bndFilePath}" 1 windows - + - + \ No newline at end of file diff --git a/build/installers/components/run-jpm-install-gw-win.xml b/build/installers/components/run-jpm-install-gw-win.xml index bd1e87b7b5..bc86ee1b34 100644 --- a/build/installers/components/run-jpm-install-gw-win.xml +++ b/build/installers/components/run-jpm-install-gw-win.xml @@ -1,6 +1,6 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${gwFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install --jvmlocation "${java_bin_dir}" -fl "${gwFilePath}" windows diff --git a/build/installers/components/run-jpm-install-gw.xml b/build/installers/components/run-jpm-install-gw.xml index 6c1e3f9abe..924d39c804 100644 --- a/build/installers/components/run-jpm-install-gw.xml +++ b/build/installers/components/run-jpm-install-gw.xml @@ -1,10 +1,10 @@ ${java_executable} - -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${gwFilePath}" + ${extraArgumentForJdk17} -jar "${installdir}${platform_path_separator}biz.aQute.jpm.run.jar" install -fl "${gwFilePath}" 1 windows - + - + \ No newline at end of file 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 8ecce735b8..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 @@ -409,6 +409,21 @@ ${java_executable} + + + + + + + contains + ${java_version} + 17 + + + + + + @@ -794,8 +809,10 @@ ${java_executable} Liferay, Inc 600 - + java_executable diff --git a/build/installers/liferay-workspace-with-devstudio/liferay.pfx b/build/installers/liferay-workspace-with-devstudio/liferay.pfx new file mode 100644 index 0000000000..285cc904fd Binary files /dev/null and b/build/installers/liferay-workspace-with-devstudio/liferay.pfx differ diff --git a/build/installers/liferay-workspace/liferay-workspace.xml b/build/installers/liferay-workspace/liferay-workspace.xml index f1eacaf949..c2afca798d 100644 --- a/build/installers/liferay-workspace/liferay-workspace.xml +++ b/build/installers/liferay-workspace/liferay-workspace.xml @@ -245,6 +245,21 @@ ${java_executable}/.. java_bin_dir + + + + + + + contains + ${java_version} + 17 + + + + + + ../components/run-java-jpm-win.xml diff --git a/build/parent/pom.xml b/build/parent/pom.xml index e32e9253e6..9cc654147d 100644 --- a/build/parent/pom.xml +++ b/build/parent/pom.xml @@ -34,7 +34,7 @@ https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/liferay-ide-files/docs/code-upgrade-docs-20210312.zip c4bce64c362ecffcce300f31e88b2e63 https://bndtools.jfrog.io/artifactory/update-latest/org/bndtools/org.bndtools.p2/7.0.0/org.bndtools.p2-7.0.0.jar! - https://download.eclipse.org/releases/2023-12/202311171000/ + https://download.eclipse.org/releases/2023-12/202311241000/ https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/eclipse/eclipse-wtp-xml-search/ https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.8.v20231117-1658/ https://files.liferay.org.es/staged/public-files/liferay-ide/unstable/build/com.liferay.ide.testing-repository/target/repository/