Skip to content

Commit 19ddc6b

Browse files
committed
Excludes provided dependency on an explicit MP version for Quarkus' pom.xml
Fixes #297 Signed-off-by: Michal Karm Babacek <[email protected]>
1 parent 63f9463 commit 19ddc6b

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.maven.model.Build;
2626
import org.apache.maven.model.Model;
2727
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
28+
import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer;
2829
import org.eclipse.microprofile.starter.core.addon.AddonManager;
2930
import org.eclipse.microprofile.starter.core.exception.TechnicalException;
3031
import org.eclipse.microprofile.starter.core.model.JavaSEVersion;
@@ -144,7 +145,7 @@ private Model createSingleModule(JessieModel model) {
144145
pomFile.addProperty("failOnMissingWebXml", "false");
145146

146147
pomFile.addProperty("final.name", model.getMaven().getArtifactId());
147-
148+
148149
Build build = new Build();
149150
build.setFinalName(model.getMaven().getArtifactId());
150151
pomFile.setBuild(build);
@@ -158,8 +159,13 @@ private void addDependencies(Model pomFile, JessieModel model) {
158159
}
159160

160161
private void addJavaMPDependencies(Model pomFile, JessieModel model) {
161-
mavenHelper.addDependency(pomFile, "org.eclipse.microprofile", "microprofile",
162-
model.getSpecification().getMicroProfileVersion().getMavenVersion(), "provided", "pom");
162+
/*
163+
* Quarkus should not have explicitly enforced MP version in its generated pom.xml
164+
*/
165+
if (!SupportedServer.QUARKUS.getCode().equals(model.getOptions().get("mp.server").getSingleValue())) {
166+
mavenHelper.addDependency(pomFile, "org.eclipse.microprofile", "microprofile",
167+
model.getSpecification().getMicroProfileVersion().getMavenVersion(), "provided", "pom");
168+
}
163169
}
164170

165171
private void addJavaSEVersionProperties(Model pomFile, JessieModel model) {

0 commit comments

Comments
 (0)