Joakim Erdfelt 075040e88e Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java		2019-08-07 05:31:02 -05:00
..
src	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-08-07 05:31:02 -05:00
.gitignore	adding in jetty-maven-plugin	2012-08-28 09:35:45 -05: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
pom.xml	Updating to version 10.0.0-SNAPSHOT	2019-07-12 06:54:56 +10:00