Merge pull request #17498 from aloubyansky/deployments-on-rt-cp

Catch more deployment artifacts on the runtime CP
quarkusio · May 31, 2021 · fe4d4ce · fe4d4ce
2 parents b6567c5 + baeb13c
commit fe4d4ce
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -740,9 +740,15 @@ private void visitDeploymentDep(RootNode rootDeployment, DependencyNode dep) thr
             return;
         }
         final Node node = rootDeployment.expectedDeploymentNodes.get(key);
-        if (node != null && !node.present) {
-            node.present = true;
-            --rootDeployment.deploymentDepsTotal;
+
+        if (node != null) {
+            if (!node.present) {
+                node.present = true;
+                --rootDeployment.deploymentDepsTotal;
+                if (rootDeployment.allRtDeps.contains(key)) {
+                    rootDeployment.deploymentsOnRtCp.add(key);
+                }
+            }
         } else if (!rootDeployment.allRtDeps.contains(key)) {
             final AppArtifactKey deployment = getDeploymentKey(artifact);
             if (deployment != null) {
@@ -1019,7 +1025,8 @@ private static class RootNode extends Node {
         }
 
         boolean hasErrors() {
-            return deploymentDepsTotal != 0 || runtimeCp != 0 || !unexpectedDeploymentDeps.isEmpty();
+            return deploymentDepsTotal != 0 || runtimeCp != 0 || !unexpectedDeploymentDeps.isEmpty()
+                    || !deploymentsOnRtCp.isEmpty();
         }
     }