Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1855274] Fix: evaluate effective pom will break app service/spring cloud deployment #5535

Merged
merged 1 commit into from
Jul 18, 2021
Merged

[#1855274] Fix: evaluate effective pom will break app service/spring cloud deployment #5535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions ...insAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/MavenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import com.intellij.openapi.project.Project;
import com.microsoft.azure.toolkit.intellij.springcloud.dependency.SpringCloudDependencyManager;
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.DocumentException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.model.MavenExplicitProfiles;
import org.jetbrains.idea.maven.project.*;
Expand Down Expand Up @@ -39,20 +39,15 @@ public static String getTargetFile(@NotNull MavenProject mavenProject) {

public static String getSpringBootFinalJarFilePath(@NotNull Project ideaProject,
@NotNull MavenProject mavenProject) {
String finalName = null;
String finalName = mavenProject.getFinalName();
try {
String xml = evaluateEffectivePom(ideaProject, mavenProject);
final String xml = evaluateEffectivePom(ideaProject, mavenProject);
if (StringUtils.isNotEmpty(xml) && xml.contains(SPRING_BOOT_MAVEN_PLUGIN)) {
SpringCloudDependencyManager manager = new SpringCloudDependencyManager(xml);
finalName = manager.getPluginConfiguration("org.springframework.boot",
SPRING_BOOT_MAVEN_PLUGIN, "finalName");

final SpringCloudDependencyManager manager = new SpringCloudDependencyManager(xml);
finalName = manager.getPluginConfiguration("org.springframework.boot", SPRING_BOOT_MAVEN_PLUGIN, "finalName");
}
} catch (MavenProcessCanceledException | DocumentException ex) {
// ignore
}
if (StringUtils.isEmpty(finalName)) {
finalName = mavenProject.getFinalName();
} catch (final Exception ex) {
AzureMessager.getMessager().warning(String.format("Can not evaluate effective pom, fall back to final jar %s", finalName));
}
return Paths.get(mavenProject.getBuildDirectory(), finalName + "." + mavenProject.getPackaging()).toString();
}
Expand All @@ -61,9 +56,9 @@ public static String evaluateEffectivePom(@NotNull Project ideaProject,
@NotNull MavenProject mavenProject) throws MavenProcessCanceledException {
final MavenProjectsManager projectsManager = MavenProjectsManager.getInstance(ideaProject);

MavenEmbeddersManager embeddersManager = projectsManager.getEmbeddersManager();
MavenExplicitProfiles profiles = mavenProject.getActivatedProfilesIds();
MavenEmbedderWrapper embedder = embeddersManager.getEmbedder(mavenProject,
final MavenEmbeddersManager embeddersManager = projectsManager.getEmbeddersManager();
final MavenExplicitProfiles profiles = mavenProject.getActivatedProfilesIds();
final MavenEmbedderWrapper embedder = embeddersManager.getEmbedder(mavenProject,
MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE);
embedder.clearCachesFor(mavenProject.getMavenId());
return embedder.evaluateEffectivePom(mavenProject.getFile(),
Expand Down