Skip to content

Commit

Permalink
IDE-4957 Track missing artifact problem on maven jsf project
Browse files Browse the repository at this point in the history
  • Loading branch information
DL-EthanSun authored and gamerson committed Apr 30, 2021
1 parent 43ff872 commit 431947e
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
import org.eclipse.m2e.core.project.LocalProjectScanner;
import org.eclipse.m2e.core.project.MavenProjectInfo;
import org.eclipse.m2e.core.project.MavenUpdateRequest;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.wtp.ProjectUtils;
Expand Down Expand Up @@ -596,7 +597,8 @@ protected IStatus run(IProgressMonitor monitor) {

projectConfigurationManager.importProjects(projectsToImport, importConfiguration, monitor);

projectConfigurationManager.updateProjectConfiguration(project, monitor);
projectConfigurationManager.updateProjectConfiguration(
new MavenUpdateRequest(project, false, true), monitor);
}
catch (Exception e) {
return LiferayMavenCore.createErrorStatus("Error Updating project:" + project.getName(), e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@
import com.liferay.ide.maven.core.aether.AetherUtil;
import com.liferay.ide.project.core.NewLiferayProjectProvider;
import com.liferay.ide.project.core.jsf.NewLiferayJSFModuleProjectOp;
import com.liferay.ide.project.core.modules.BaseModuleOp;

import java.io.File;

import java.util.Properties;

import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;

import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.repository.RemoteRepository;
Expand All @@ -37,6 +42,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.internal.MavenPluginActivator;
import org.eclipse.m2e.core.internal.embedder.MavenImpl;
import org.eclipse.sapphire.Value;
Expand All @@ -61,6 +67,33 @@ public IStatus createNewProject(NewLiferayJSFModuleProjectOp op, IProgressMonito

FileUtil.delete(projectLocation.append("build.gradle"));

NewLiferayProjectProvider<BaseModuleOp> projectProvider = get(op.getProjectProvider());

String projectType = projectProvider.getShortName();

if (projectType.equals("maven-jsf")) {
IPath pomPath = projectLocation.append(IMavenConstants.POM_FILE_NAME);

File pomFile = FileUtil.getFile(pomPath);

try {
Model mavenModel = MavenUtil.getMavenModel(pomFile);

Parent parent = mavenModel.getParent();

String parentArtifactId = parent.getArtifactId();

if (parentArtifactId.equals("com.liferay.faces.archetype.parent")) {
mavenModel.setParent(null);

MavenUtil.updateMavenPom(mavenModel, pomPath.toFile());
}
}
catch (Exception exception) {
LiferayMavenCore.logError(exception);
}
}

Value<String> projectNameValue = op.getProjectName();

String projectName = projectNameValue.content();
Expand Down

0 comments on commit 431947e

Please sign in to comment.