Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x

jetty · Aug 20, 2024 · a72ae70 · a72ae70
2 parents 40e58a2 + 0cae635
commit a72ae70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...ugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java b/...ugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java
@@ -242,6 +242,10 @@ private boolean isArtifactOKForWebInfLib(Artifact artifact)
         if ("war".equalsIgnoreCase(artifact.getType()))
             return false;
 
+        //The dependency cannot be a pom
+        if ("pom".equalsIgnoreCase(artifact.getType()))
+            return false;
+
         //The dependency cannot be scope provided (those should be added to the plugin classpath)
         if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()))
             return false;

diff --git a/...ugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/AbstractUnassembledWebAppMojo.java b/...ugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/AbstractUnassembledWebAppMojo.java
@@ -242,6 +242,10 @@ private boolean isArtifactOKForWebInfLib(Artifact artifact)
         if ("war".equalsIgnoreCase(artifact.getType()))
             return false;
 
+        //The dependency cannot be a pom
+        if ("pom".equalsIgnoreCase(artifact.getType()))
+            return false;
+
         //The dependency cannot be scope provided (those should be added to the plugin classpath)
         if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()))
             return false;