Joakim Erdfelt 6ae7427d55 Merge branch 'jetty-9.4.x' into jetty-10.0.x ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # examples/embedded/pom.xml # examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java # examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java		2019-09-11 09:42:56 -05:00
..
test-container-initializer	Updating to version 9.4.21-SNAPSHOT	2019-08-13 17:34:20 -05:00
test-spec-webapp	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2019-09-11 09:42:56 -05:00
test-web-fragment	Updating to version 9.4.21-SNAPSHOT	2019-08-13 17:34:20 -05:00
pom.xml	Updating to version 9.4.21-SNAPSHOT	2019-08-13 17:34:20 -05:00