From e01997410c8f193ce26d8289b15c6fc553cce05e Mon Sep 17 00:00:00 2001 From: Anna Suszter Date: Tue, 18 Feb 2025 13:54:31 +0100 Subject: [PATCH 1/2] LPD-48410 uses CoreUtil.parseVersion --- .../com/liferay/ide/server/core/portal/PortalTomcatBundle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/plugins/com.liferay.ide.server.core/src/com/liferay/ide/server/core/portal/PortalTomcatBundle.java b/tools/plugins/com.liferay.ide.server.core/src/com/liferay/ide/server/core/portal/PortalTomcatBundle.java index ec83aaef13..2594c2bc9a 100644 --- a/tools/plugins/com.liferay.ide.server.core/src/com/liferay/ide/server/core/portal/PortalTomcatBundle.java +++ b/tools/plugins/com.liferay.ide.server.core/src/com/liferay/ide/server/core/portal/PortalTomcatBundle.java @@ -315,7 +315,7 @@ private String[] _getRuntimeVMArgs(IVMInstall vmInstall) { args.add("-Dcatalina.base=\"" + bundlePath.toPortableString() + "\""); args.add("-Dcatalina.home=\"" + bundlePath.toPortableString() + "\""); - Version portalVersion = new Version(getVersion()); + Version portalVersion = CoreUtil.parseVersion(getVersion()); if (portalVersion.compareTo(new Version("7.0.0")) > 0) { args.add("-Djdk.tls.ephemeralDHKeySize=2048"); From 44e695ac3dbc08dab8f99930b9a9c8137a24ccb4 Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Wed, 19 Feb 2025 10:12:35 -0600 Subject: [PATCH 2/2] LPD-48410 .github: fixes action failure: updates cache action in workflow --- .github/workflows/publish.yml | 2 +- .github/workflows/verify.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5c42528f9c..e5cbd57d33 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: with: java-version: 1.8 - name: Cache m2 repo - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 460372857f..df6e07d643 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -46,7 +46,7 @@ jobs: cache: maven - name: Cache - uses: actions/cache@v1.1.0 + uses: actions/cache@v4 with: path: liferay-ide-m2-repository/.cache/download-maven-plugin key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}