LPD-29388 com.liferay.ide.maven.core: updates usages

liferay · Aug 2, 2024 · a4a702e · a4a702e
1 parent cebeee4
commit a4a702e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF b/maven/plugins/com.liferay.ide.maven.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: biz.aQute.bndlib,
  com.liferay.ide.project.core,
  com.liferay.ide.server.core,
  com.liferay.ide.theme.core,
+ com.liferay.release.util,
  org.apache.commons.io,
  org.apache.httpcomponents.httpclient,
  org.apache.httpcomponents.httpcore,

diff --git a/...y.ide.maven.core/src/com/liferay/ide/maven/core/LiferayMavenWorkspaceProjectProvider.java b/...y.ide.maven.core/src/com/liferay/ide/maven/core/LiferayMavenWorkspaceProjectProvider.java
@@ -15,22 +15,20 @@
 package com.liferay.ide.maven.core;
 
 import com.liferay.ide.core.ILiferayProject;
-import com.liferay.ide.core.ProductInfo;
 import com.liferay.ide.core.util.CoreUtil;
 import com.liferay.ide.core.util.FileUtil;
+import com.liferay.ide.core.util.ReleaseUtil;
 import com.liferay.ide.core.util.SapphireContentAccessor;
 import com.liferay.ide.core.workspace.LiferayWorkspaceUtil;
 import com.liferay.ide.core.workspace.WorkspaceConstants;
 import com.liferay.ide.project.core.ProjectCore;
 import com.liferay.ide.project.core.modules.BladeCLI;
-import com.liferay.ide.project.core.util.ProjectUtil;
 import com.liferay.ide.project.core.workspace.NewLiferayWorkspaceOp;
 import com.liferay.ide.project.core.workspace.NewLiferayWorkspaceProjectProvider;
+import com.liferay.release.util.ReleaseEntry;
 
 import java.io.File;
 
-import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 
 import org.apache.maven.model.Model;
@@ -61,7 +59,7 @@ public IStatus createNewProject(NewLiferayWorkspaceOp op, IProgressMonitor monit
 
 		IPath workspaceLocation = location.append(workspaceName);
 
-		String version = get(op.getTargetPlatform());
+		String version = get(op.getProductVersion());
 
 		StringBuilder sb = new StringBuilder();
 
@@ -93,29 +91,15 @@ public IStatus createNewProject(NewLiferayWorkspaceOp op, IProgressMonitor monit
 
 				String targetPlatform = get(op.getTargetPlatform());
 
-				Map<String, ProductInfo> productInfos = ProjectUtil.getProductInfos();
+				properties.setProperty(WorkspaceConstants.WORKSPACE_BOM_VERSION, targetPlatform);
 
-				ProductInfo productInfo = null;
+				ReleaseEntry releaseEntry = ReleaseUtil.getReleaseEntry(targetPlatform);
 
-				for (ProductInfo product : productInfos.values()) {
-					try {
-						if (Objects.equals(product.getTargetPlatformVersion(), targetPlatform)) {
-							productInfo = product;
+				if (releaseEntry != null) {
+					properties.setProperty(WorkspaceConstants.BUNDLE_URL_PROPERTY, releaseEntry.getBundleURL());
 
-							break;
-						}
-					}
-					catch (Exception exception) {
-						exception.printStackTrace();
-					}
+					MavenUtil.updateMavenPom(pomModel, pomFile);
 				}
-
-				properties.setProperty(WorkspaceConstants.WORKSPACE_BOM_VERSION, targetPlatform);
-
-				properties.setProperty(
-					WorkspaceConstants.BUNDLE_URL_PROPERTY, ProjectUtil.decodeBundleUrl(productInfo));
-
-				MavenUtil.updateMavenPom(pomModel, pomFile);
 			}
 			catch (Exception e) {
 				LiferayMavenCore.logError(e);