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

Set the target file in the Model #40869

Merged
merged 2 commits into from
May 30, 2024
Merged

Set the target file in the Model #40869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ae1b3
Set the target file in the Model
gastaldi May 28, 2024
5a65e49
Use MojoUtils.readPom to read POM
gastaldi May 29, 2024
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
4 changes: 3 additions & 1 deletion ...aven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,9 @@ private static Properties loadPomProps(Path appJar, Path artifactIdPath) throws
}

public static Model readModel(final Path pomXml) throws IOException {
return readModel(Files.newInputStream(pomXml));
Model model = readModel(Files.newInputStream(pomXml));
model.setPomFile(pomXml.toFile());
return model;
}
gastaldi marked this conversation as resolved.
Show resolved Hide resolved

public static Model readModel(InputStream stream) throws IOException {
Expand Down
2 changes: 1 addition & 1 deletion ...ols-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ protected void refreshData() {
return;
}
try {
model = ModelUtils.readModel(projectPom);
model = MojoUtils.readPom(projectPom.toFile());
} catch (IOException e) {
throw new RuntimeException("Failed to read " + projectPom, e);
}
Expand Down
Loading