From 61ef4e2c0361c5074dd1428e8b4cdf89abfde4a3 Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Sat, 25 Nov 2023 11:27:54 +0800 Subject: [PATCH 1/4] IDE-5114 add macos certificate support --- .../liferay-workspace-with-devstudio.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..f2f6f626c9 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 @@ -795,7 +795,9 @@ ${java_executable} Liferay, Inc 600 + ${env(WINDOWS_SIGNING_PASSWORD)} + ${build_project_directory}/osx-signing.p12 + ${env(OSX_SIGNING_PASSWORD)}--> java_executable From 6de5f323cdaae4cdd13f775e5a847fe441d34198 Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Mon, 27 Nov 2023 20:27:41 +0800 Subject: [PATCH 2/4] IDE-5114 fix jdk 17 error --- .../components/run-java-jpm-win.xml | 2 +- build/installers/components/run-java-jpm.xml | 4 +-- .../components/run-jpm-install-blade-win.xml | 2 +- .../components/run-jpm-install-blade.xml | 3 +- .../components/run-jpm-install-bnd-win.xml | 4 +-- .../components/run-jpm-install-bnd.xml | 6 ++-- .../components/run-jpm-install-gw-win.xml | 2 +- .../components/run-jpm-install-gw.xml | 6 ++-- .../liferay-workspace-with-devstudio.xml | 21 +++++++++++-- .../liferay.pfx | Bin 0 -> 2723 bytes .../liferay-workspace/liferay-workspace.xml | 28 ++++++++++++++++++ build/parent/pom.xml | 2 +- 12 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 build/installers/liferay-workspace-with-devstudio/liferay.pfx 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 f2f6f626c9..057cc7d69e 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,6 +95,23 @@ + + + + + + + equals + ${java_version} + 17 + + + + + + + + @@ -794,9 +811,9 @@ ${java_executable} Liferay, Inc 600 - 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 0000000000000000000000000000000000000000..285cc904fd88b02b1b7932b075d3f5621b184656 GIT binary patch literal 2723 zcmai$X*3iJ7sr{!GH5W_i4bEvm_al|7&Ih%WoeKlWKZ^ejD44_vagXXOW7JCS+b4^ z*+RB#SqfPn&w1a|^YQs`&pr3|Klj{kzjKjzNDhD!h{QwgP|+g7vElm+l+={Dc!)X( z4^cVCiby=D=HG}a7Y`~pN9Riv=Pl#kgc5o0&j4mXY9dAc9qEzWAQ}Xn4b?P)l7x+JU6@`gU!@P5s>DSggIvmbmGai?7J!-v^w z6zfB)e8=;>VHhzuA&yl*F+itKm-^9q2q)F?+O0}b7>?r#X2{&wEhR5F|LWkU=1*#Y z*sMCZswu7nj?3bfeN%?}GQBaIj@o;oUSH+gZ{GDYK#o|O;ir3uy0XnoqGyNs2bd>4t)YR*ZOxZUPo;C@&A7jxM5mTzMM;y&Fx zk#ik?ubT6<=*=-XrKc53uXjq!LNl{tBtx42qIq}aVT}x;pdza^g^WH7xO0VL7!J#1 zKL#GYCP^j^8)_n==mc7w>wR5U4+l+*&OSrn-aaE5)b8(M>-8z~q3^M>^fLETGR)e2 zP}25rVk+MjbG84AGibA4sGg*>Dksx5j^lJ@mp0kNv>klXevng5$6nsgR;gdjIU!56 zac-d#m&cbm?ex z5r?YwX&9U&2{mJ8C|BE^;W{5IjXkZRsv1i>BV(+?UfjY&i3nM_UY9GWE7| zynLcdSyvVs_sm&-saZiwP=7hgT{FL+`zsgJpNc+=#F_-K&1N^w>)0rtmVM&FFVaMM zFa7FkzUL-pOd=<7OieBrV`JptL+z&MFgTPu<%(tOB99K;&LMK0{z@_G%c6BCQ}$o^ z3rNjZT0x42S=V{>9L(W*%K=PZ!c8ZzJJ@TuD?>`^@*yH_OX9X}>NDe0jEZxzmD)}; zqT+16Z9S3<8W7-UKzvne^qXwD-h=+UK8mbqKc<2~#wyyruE7BN7%`|N&^U=C=A?e} zE=Ri!7hS5d&g=ZUrI=sZInQhsvnVl6OmoMF5{a`B|YC;t*{GAUitFA zCQEBTjkVatkm;{?G9&E)%V(S-p+8#s1gu_R)lTvT8oqOMW<5m|?s2uuM$b;j6{132 z#H)^qYgrFjEA=Pml8Jf_w}x{@ekw7mmW^;>4+s;-#EGj*RZ4Q`!S5zNJn|Y)KNzd! z4)Uz4az{<*gp;kC;}DuAcn&XU|Kih#1YX?P&)s~$8@k#u!yulUT^ecXK#}*p8XpQT z5Fas4LZ#E~Y*z%R7G5q-jDZstw${L z0p}s=9E$yyz&e+N-kKXTvHhpOoRp!TX$XS!Hd$a6W(y$z2oD-+e{^3hG81-CU#B2w z+5?Smst+`NRaUxkV<0eI@U$-BRMubbN#j&D9~lmaGGqukwqJ#%DKn+ed;g9LZ&-2F>#JzLBNY}p3OJB*g%1K%DYFc(oc^rXbT8?VmUKLe(D1{2WK3-$xC~u%) zE%unKwc00|C1Q96V?d(|Dt}-1rx#QJCRZP)V9ASHC5aDaRGv<7R7~P_b!DP6F);b{ z$<*wc$We4P!p|(Qvp!h)#_IrlSG)-OHnP{ zmQS?Xew&ie9+u^tFBLBkV9<-xJdYh89&&MJ6_jtNph(|Hdp~r?=yC_E1Zf>*Vu2cjv zB0+45iTTY{m18^Y4`&$AU#f!4g%=<|mbd9nJ`w@MQqcDmk3F^tcNExwinGKfQznTn zCM^~5oXOZGW)17yXgOo05J6)5B=kVC+xvv>&(>#k`kn6VMCg>kL6>F{&uk-C&GQUL8x<{AvKC+8m#G3sQxdhL1kJ$vY&G1YCPn4EUaD78Z z-5OupucK#GOn3TK#Ky>zZ&Xt69RQn}X$!(bW}yM9b<+-7A=81@i;sI6G4O#(M2NS;z6#6OdOcQjhL|it8^_c05N7nPn^%ozWiDxw%av+hKRzOj zAx@rPl4N^W&K(sP@p~d%kWp3sPV4aMZ|d1S578lSu9v zF0!2qz2T@coa@@qpWWIhsf;CYz>AcUB$DSd4`knBhQOM=^WFg{!4x1qV%ot`F)~F + + + + + + + equals + 1 + ${java_version} + 17 + + + + + + + + + + contains + 1 + ${java_version} + 17 + + + + + nativeAbsolutize ${java_executable}/.. 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/ From 632c406d1fd713e495081fb1cc0c2d212e3b1b5e Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Mon, 27 Nov 2023 21:29:58 +0800 Subject: [PATCH 3/4] IDE-5114 update jdk settings --- .../liferay-workspace-with-devstudio.xml | 4 +--- 1 file changed, 1 insertion(+), 3 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 057cc7d69e..bc2f453938 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 @@ -107,9 +107,7 @@ - - - + From 896bb763fa1ba36e8a294363720959ffd05a73bb Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Tue, 28 Nov 2023 16:25:29 +0800 Subject: [PATCH 4/4] 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 @@ - - - - - - - equals - ${java_version} - 17 - - - - - - @@ -424,6 +409,21 @@ ${java_executable} + + + + + + + contains + ${java_version} + 17 + + + + + + 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 @@ + + nativeAbsolutize + ${java_executable}/.. + java_bin_dir + - + - equals - 1 + contains ${java_version} 17 - - - - - - - contains - 1 - ${java_version} - 17 - - - + - - - nativeAbsolutize - ${java_executable}/.. - java_bin_dir - + ../components/run-java-jpm-win.xml