Merge pull request #298 from Karm/issue-297

Excludes provided dependency on an explicit MP version for Quarkus' p…
eclipse · May 1, 2020 · 13efb4f · 13efb4f
2 parents 63f9463 + 19ddc6b
commit 13efb4f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java
@@ -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;
@@ -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);
@@ -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) {