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

Excludes provided dependency on an explicit MP version for Quarkus' p… #298

Merged
merged 1 commit into from
May 1, 2020
Merged

Excludes provided dependency on an explicit MP version for Quarkus' p… #298

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: 9 additions & 3 deletions src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer;
import org.eclipse.microprofile.starter.core.addon.AddonManager;
import org.eclipse.microprofile.starter.core.exception.TechnicalException;
import org.eclipse.microprofile.starter.core.model.JavaSEVersion;
Expand Down Expand Up @@ -144,7 +145,7 @@ private Model createSingleModule(JessieModel model) {
pomFile.addProperty("failOnMissingWebXml", "false");

pomFile.addProperty("final.name", model.getMaven().getArtifactId());

Build build = new Build();
build.setFinalName(model.getMaven().getArtifactId());
pomFile.setBuild(build);
Expand All @@ -158,8 +159,13 @@ private void addDependencies(Model pomFile, JessieModel model) {
}

private void addJavaMPDependencies(Model pomFile, JessieModel model) {
mavenHelper.addDependency(pomFile, "org.eclipse.microprofile", "microprofile",
model.getSpecification().getMicroProfileVersion().getMavenVersion(), "provided", "pom");
/*
* Quarkus should not have explicitly enforced MP version in its generated pom.xml
*/
if (!SupportedServer.QUARKUS.getCode().equals(model.getOptions().get("mp.server").getSingleValue())) {
mavenHelper.addDependency(pomFile, "org.eclipse.microprofile", "microprofile",
model.getSpecification().getMicroProfileVersion().getMavenVersion(), "provided", "pom");
}
}

private void addJavaSEVersionProperties(Model pomFile, JessieModel model) {
Expand Down