Joakim Erdfelt c0f8a46c35

Merge branch 'jetty-9.4.x' into jetty-10.0.x ...

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java

2019-12-02 15:29:30 -06:00

..

src

Merge branch 'jetty-9.4.x' into jetty-10.0.x

2019-12-02 15:29:30 -06:00

pom.xml

Merge branch 'jetty-9.4.x' into jetty-10.0.x

2019-12-02 15:29:30 -06:00

README_INTEGRATION_TEST.md

Fixes #3332 jetty-maven-plugin - transitive deps in single war project (#3349)

2019-05-30 20:12:47 +10:00