LPD-56478 remove usages of VersionUtil class

Author: annasuszter

tools/plugins/com.liferay.ide.core/src/com/liferay/ide/core/workspace/LiferayWorkspaceUtil.java

@@ -23,7 +23,6 @@
 import com.liferay.ide.core.util.FileUtil;
 import com.liferay.ide.core.util.PropertiesUtil;
 import com.liferay.ide.core.util.ReleaseUtil;
-import com.liferay.ide.core.util.VersionUtil;
 import com.liferay.release.util.ReleaseEntry;
 
 import java.io.File;
@@ -230,12 +229,11 @@ public static String getLiferayWorkspaceProjectVersion() {
 			return null;
 		}
 
-		String simplifiedTargetPlatformVersion = VersionUtil.simplifyTargetPlatformVersion(
-			liferayWorkspaceProject.getTargetPlatformVersion());
+		String targetPlatformVersion = liferayWorkspaceProject.getTargetPlatformVersion();
 
-		if (CoreUtil.isNotNullOrEmpty(simplifiedTargetPlatformVersion)) {
+		if (CoreUtil.isNotNullOrEmpty(targetPlatformVersion)) {
 			try {
-				ReleaseEntry releaseEntry = ReleaseUtil.getReleaseEntry(simplifiedTargetPlatformVersion);
+				ReleaseEntry releaseEntry = ReleaseUtil.getReleaseEntry(targetPlatformVersion);
 
 				return releaseEntry.getProductGroupVersion();
 			}

tools/plugins/com.liferay.ide.project.core/src/com/liferay/ide/project/core/modules/fragment/LiferayRuntimeNameValidationService.java

@@ -17,7 +17,6 @@
 import com.liferay.ide.core.IWorkspaceProject;
 import com.liferay.ide.core.util.CoreUtil;
 import com.liferay.ide.core.util.SapphireContentAccessor;
-import com.liferay.ide.core.util.VersionUtil;
 import com.liferay.ide.core.workspace.LiferayWorkspaceUtil;
 import com.liferay.ide.server.core.portal.PortalRuntime;
 import com.liferay.ide.server.util.ServerUtil;
@@ -65,8 +64,7 @@ protected Status compute() {
 					"make it point to an existing runtime.");
 		}
 
-		String targetPlatformVersion = VersionUtil.simplifyTargetPlatformVersion(
-			liferayWorkspaceProject.getTargetPlatformVersion());
+		String targetPlatformVersion = liferayWorkspaceProject.getTargetPlatformVersion();
 
 		if (Objects.nonNull(targetPlatformVersion)) {
 			PortalRuntime liferayRuntime = (PortalRuntime)runtime.loadAdapter(

tools/plugins/com.liferay.ide.upgrade.problems.core/src/com/liferay/ide/upgrade/problems/core/internal/commands/SwitchToUseReleaseAPIDependencyCommand.java

@@ -15,7 +15,6 @@
 package com.liferay.ide.upgrade.problems.core.internal.commands;
 
 import com.liferay.ide.core.IWorkspaceProject;
-import com.liferay.ide.core.util.VersionUtil;
 import com.liferay.ide.core.workspace.LiferayWorkspaceUtil;
 import com.liferay.ide.core.workspace.WorkspaceConstants;
 import com.liferay.ide.gradle.core.GradleUtil;
@@ -106,29 +105,29 @@ private List<String> _getAllDependenciesArtifactIds() {
 			return Collections.emptyList();
 		}
 
-		String simplifiedVersion = VersionUtil.simplifyTargetPlatformVersion(
-			gradleWorkspaceProject.getTargetPlatformVersion());
+		String targetPlatformVersion = gradleWorkspaceProject.getTargetPlatformVersion();
 
-		if (Objects.isNull(simplifiedVersion)) {
+		if (Objects.isNull(targetPlatformVersion)) {
 			return Collections.emptyList();
 		}
 
 		String productKey = gradleWorkspaceProject.getProperty(WorkspaceConstants.WORKSPACE_PRODUCT_PROPERTY, null);
 
 		List<String> allArtifactIds = new ArrayList<>();
 
-		String[] versionParts = simplifiedVersion.split("\\.");
+		String[] versionParts = targetPlatformVersion.split("\\.");
 
 		if (productKey.startsWith("dxp")) {
-			simplifiedVersion = versionParts[0] + "." + versionParts[1] + "." + versionParts[2] + ".x";
+			targetPlatformVersion = versionParts[0] + "." + versionParts[1] + "." + versionParts[2] + ".x";
 		}
 		else if (productKey.startsWith("portal")) {
-			simplifiedVersion = versionParts[0] + "." + versionParts[1] + ".x";
+			targetPlatformVersion = versionParts[0] + "." + versionParts[1] + ".x";
 		}
 
 		Class<?> clazz = SwitchToUseReleaseAPIDependencyCommand.class;
 
-		try (InputStream inputStream = clazz.getResourceAsStream("/release-api/" + simplifiedVersion + "-versions.txt");
+		try (InputStream inputStream = clazz.getResourceAsStream(
+				"/release-api/" + targetPlatformVersion + "-versions.txt");
 			BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) {
 
 			String dependency = null;