From 762c5ad3b00627abbffefc14642c9489ffbafad1 Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Fri, 24 Nov 2023 11:51:34 +0800 Subject: [PATCH] IDE-5116 remove duplicate parameter --- .../upgrade-planner.product | 1 - .../liferay-workspace-with-devstudio/liferay.pfx | Bin 2531 -> 0 bytes build/parent/pom.xml | 4 ++-- .../com/liferay/ide/gradle/core/GradleUtil.java | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 build/installers/liferay-workspace-with-devstudio/liferay.pfx diff --git a/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product b/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product index 9f565af3e4..35eed9107e 100644 --- a/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product +++ b/build/com.liferay.ide.upgrade.planner-repository/upgrade-planner.product @@ -37,7 +37,6 @@ openFile -Xms40m -Xmx1024m -Xdock:icon=../Resources/UpgradePlanner.icns --XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/build/installers/liferay-workspace-with-devstudio/liferay.pfx b/build/installers/liferay-workspace-with-devstudio/liferay.pfx deleted file mode 100644 index 97d300972d96f6bc65b278542bba3074d047b59a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2531 zcmai$X*3iH8^>pi5ffv}zVAz6FqROqG^i|PDcfMk5*aeKq%qBF>5?VWZ5Xb7&%SSo z2n|A*X>ct~$#z4+Ag_Dg_jEtr56^kd|NlSFc|JYA^T2Rye=-37`=T_xz&m#{@C-pn zDaA{*Ezb8i28-f68JB!i=3+#W1!jTZIss2Z>WWAG*2!iJlnF#|HpbC6#%|z8FzveT z@7Z17=9jJd!+$f3JCop!ttPSWKfX>OwMeO&H;jiz45);2E+~qJ%f)@}wzCf#x^2Dg z)ov+b#j|;37=N}1#RaJ}wu@cVA+MI;nVKhIG_5+S_iLiSu1IO*pKYRn)xm{UDpC@-T$DNYzJfDd;PT z8#}&8qRKqDG4TvsN1Cs3B8WE%GJ57A~^iz;HSK{d&I6qo9wV^ zd8Pu%5Fw)KNaM$mxQdAU!W3sm%WwD~YmMU64{^5^#+(RPdL?|USN7amoi*G^^Fj}2 z#f~>m)m+m2yGlmMS>F(UgPE+ZaR|Soc4>ih%LgX}-%S6g=ycM2-h#4VLD9+F-JGbKVUzyb;h#wd!=M*~h zIDqprpmIEwCx-Af0efRRRbCzZIGM2ZefmePFtl7=NWP-QBoCn%cVnuBRxRR}*Z-sJ z(5u*a@9hNJ9zxFYh`x^Fyol@EM+Z&?%d6OiLQ}kpuQi0g*2517-bvcm%E&Mr82{^j z{{{jW!;AxmoZ3OB<o z6+Z%Fm~qVSLu$lI8u$6;8a68Z?;@z37dxt*=hiJO(CLzAxukkOh8DP36EJTBNWuBv z?4hc`s}{8JU75uUhM-(5xMkmdd+y4MEC;IJ5*JxkYsu1dQ+hGZR=sHeez$K~e3U${ z7TY%g(HO2hsdK?S1_hxc|oMi$9gH8$zfSgMOq-d@56w-wjT85 zZo>HJCAzoF@+X7`f^KJHsILv0O!WJtH!pXhznfNs6-~{mPyTMxndS`bx-He+OBB8K z_C+W-q8v(N*0I>rk)!2eef2JMGob5Uth1pBDpAB>|%^PE;MEyDS4> zrV~g@X2ibO0jC$l}))s3BL31qg-!U>CSrw9L&4@95F5)-g}<=wCLq- z$#SD~>2CDTn{{HhABOQw_O)&0h+4By9G+`>xD2jk&9x`+6?k)m&AVwbkX2JrQq zp^6Ssj)|UkO3j}0O&07J!q5Eqjq+RNtG^fzE707}OjjB6o=MO%D>dZ@hl&j<`LjE{ z{HeN;Mr|go`nJ30%yE8KTag$eOd4sIx2^30+Iwyi8zi`BPNxmNI^t0)C%JtAiD3P( zJ=Das`MNcx;mF{xR+i>U+!m3)H)R*kZ91Dw%790I0xpa7dhLixoip?Qior*Cp$odh z8uFD9n**!!Dm1ENmp|)S#A~aCm}U@xL8Jv$+#uc zmi?vy0LkH9U7{~PF?eq(=Dw)Pw9b5CfDbpwyAs!Ch&6S2h^bOLB4XE$kKL&$24<6+ z-cB^1tZVbWQ?W7{`3km4;-8hFMl9ES78TC`fXHL zl<0d-yX=vgU>*6qFOH{A*yBVd^lBU+)nU5DZ|JTuQGgj?~f!+R!bCs(S3~ io(>*{>k>QH=tta=-@*}|%&d|;G~4Ti?_B>z?SBD~z>~uO diff --git a/build/parent/pom.xml b/build/parent/pom.xml index 0896659c8a..e32e9253e6 100644 --- a/build/parent/pom.xml +++ b/build/parent/pom.xml @@ -27,9 +27,9 @@ Liferay IDE Parent - https://repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/blade/com.liferay.blade.cli/5.0.1-SNAPSHOT/com.liferay.blade.cli-5.0.1-20231122.160114-7.jar + https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/blade/com.liferay.blade.cli/5.0.1-SNAPSHOT/com.liferay.blade.cli-5.0.1-20231122.160114-7.jar 85762ef6e35197599a3e18c2e78da50f - https://repository.liferay.com/nexus/content/repositories/public/com/liferay/blade/com.liferay.blade.cli/3.9.2/com.liferay.blade.cli-3.9.2.jar + https://repository-cdn.liferay.com/nexus/content/repositories/public/com/liferay/blade/com.liferay.blade.cli/3.9.2/com.liferay.blade.cli-3.9.2.jar 08aedcb6bacc3166060d0032f9489dd1 https://us-east-1.linodeobjects.com/devtools-s3.liferay.com/liferay-ide-files/docs/code-upgrade-docs-20210312.zip c4bce64c362ecffcce300f31e88b2e63 diff --git a/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java b/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java index 55215926aa..fe0bbbcaf0 100644 --- a/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java +++ b/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java @@ -343,9 +343,9 @@ public static String runGradleTask( try { IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall(); - + File jvmInstallLocation = defaultVMInstall.getInstallLocation(); - + if (redirectOutput) { OutputStream outputStream = new ByteArrayOutputStream();