Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jan Bartel 2024-08-21 09:35:27 +10:00
parent 40e58a2340 0cae6351f4
commit a72ae7007b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java
View File

@ -242,6 +242,10 @@ public abstract class AbstractUnassembledWebAppMojo extends AbstractWebAppMojo
if ("war".equalsIgnoreCase(artifact.getType())) if ("war".equalsIgnoreCase(artifact.getType()))
return false; 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) //The dependency cannot be scope provided (those should be added to the plugin classpath)
if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()))
return false; return false;

4
jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/AbstractUnassembledWebAppMojo.java
View File

@ -242,6 +242,10 @@ public abstract class AbstractUnassembledWebAppMojo extends AbstractWebAppMojo
if ("war".equalsIgnoreCase(artifact.getType())) if ("war".equalsIgnoreCase(artifact.getType()))
return false; 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) //The dependency cannot be scope provided (those should be added to the plugin classpath)
if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()))
return false; return false;