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

Interpolate correctly resource paths in maven project inside maven server implementation #5180

Merged
merged 1 commit into from
May 23, 2017
Merged

Interpolate correctly resource paths in maven project inside maven server implementation #5180

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
12 changes: 7 additions & 5 deletions ...ver/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ public List<String> getValues(String attributeName) throws ValueStorageException
return readFromPom(attributeName);
}

final MavenProject mavenProject = mavenProjectManager.getMavenProject(projectFolder.getPath().toString());
if (mavenProject != null) {
return getFromMavenProject(mavenProject, attributeName);
} else {
//Temporary commented due to incorrect resolving maven project attributes from project model, instead of resolving project
//attributes from the maven server, we'll read and parse pom.xml directly by our own.
// final MavenProject mavenProject = mavenProjectManager.getMavenProject(projectFolder.getPath().toString());
// if (mavenProject != null) {
// return getFromMavenProject(mavenProject, attributeName);
// } else {
return readFromPom(attributeName);
}
// }
} catch (ServerException | ForbiddenException | IOException e) {
throwReadException(e);
} catch (XMLTreeException e) {
Expand Down