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-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2023-03-20 13:58:11 -05:00
parent 41d1048006 574ad3b4da
commit 705d68ebf3
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
View File

@ -63,13 +63,12 @@ public class JettyEffectiveWebXml extends AbstractUnassembledWebAppMojo
} }
} }
Path start = path.getName(0);
int count = path.getNameCount(); if ((path == null) || (path.startsWith("src") || !path.endsWith(".war")))
Path end = path.getName(count > 0 ? count - 1 : count); {
//if the war is not assembled, we must configure it
if (start.startsWith("src") || !end.toString().endsWith(".war"))
super.configureUnassembledWebApp(); super.configureUnassembledWebApp();
} }
}
/** /**
* Override so we can call the parent's method in a different order. * Override so we can call the parent's method in a different order.