Joakim Erdfelt 7478c04351 Merge branch `jetty-9.3.x` into `jetty-9.4.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # Jenkinsfile # VERSION.txt # aggregates/jetty-all-compact3/pom.xml # aggregates/jetty-all/pom.xml # apache-jsp/pom.xml # apache-jstl/pom.xml # examples/async-rest/async-rest-jar/pom.xml # examples/async-rest/async-rest-webapp/pom.xml # examples/async-rest/pom.xml # examples/embedded/pom.xml # examples/pom.xml # jetty-alpn/jetty-alpn-client/pom.xml # jetty-alpn/jetty-alpn-java-client/pom.xml # jetty-alpn/jetty-alpn-java-server/pom.xml # jetty-alpn/jetty-alpn-server/pom.xml # jetty-alpn/pom.xml # jetty-annotations/pom.xml # jetty-ant/pom.xml # jetty-bom/pom.xml # jetty-cdi/cdi-core/pom.xml # jetty-cdi/cdi-full-servlet/pom.xml # jetty-cdi/cdi-servlet/pom.xml # jetty-cdi/cdi-websocket/pom.xml # jetty-cdi/pom.xml # jetty-cdi/test-cdi-webapp/pom.xml # jetty-client/pom.xml # jetty-continuation/pom.xml # jetty-deploy/pom.xml # jetty-distribution/pom.xml # jetty-documentation/pom.xml # jetty-fcgi/fcgi-client/pom.xml # jetty-fcgi/fcgi-server/pom.xml # jetty-fcgi/pom.xml # jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml # jetty-gcloud/jetty-gcloud-session-manager/pom.xml # jetty-gcloud/pom.xml # jetty-hazelcast/pom.xml # jetty-http-spi/pom.xml # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java # jetty-http/pom.xml # jetty-http2/http2-alpn-tests/pom.xml # jetty-http2/http2-client/pom.xml # jetty-http2/http2-common/pom.xml # jetty-http2/http2-hpack/pom.xml # jetty-http2/http2-http-client-transport/pom.xml # jetty-http2/http2-server/pom.xml # jetty-http2/pom.xml # jetty-infinispan/pom.xml # jetty-io/pom.xml # jetty-jaas/pom.xml # jetty-jaspi/pom.xml # jetty-jmx/pom.xml # jetty-jndi/pom.xml # jetty-jspc-maven-plugin/pom.xml # jetty-maven-plugin/pom.xml # jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java # jetty-monitor/pom.xml # jetty-nosql/pom.xml # jetty-osgi/jetty-osgi-alpn/pom.xml # jetty-osgi/jetty-osgi-boot-jsp/pom.xml # jetty-osgi/jetty-osgi-boot-warurl/pom.xml # jetty-osgi/jetty-osgi-boot/pom.xml # jetty-osgi/jetty-osgi-httpservice/pom.xml # jetty-osgi/pom.xml # jetty-osgi/test-jetty-osgi-context/pom.xml # jetty-osgi/test-jetty-osgi-fragment/pom.xml # jetty-osgi/test-jetty-osgi-webapp/pom.xml # jetty-osgi/test-jetty-osgi/pom.xml # jetty-plus/pom.xml # jetty-proxy/pom.xml # jetty-quickstart/pom.xml # jetty-rewrite/pom.xml # jetty-runner/pom.xml # jetty-security/pom.xml # jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java # jetty-server/pom.xml # jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java # jetty-servlet/pom.xml # jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java # jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java # jetty-servlets/pom.xml # jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java # jetty-spring/pom.xml # jetty-start/pom.xml # jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java # jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java # jetty-util-ajax/pom.xml # jetty-util/pom.xml # jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java # jetty-webapp/pom.xml # jetty-websocket/javax-websocket-client-impl/pom.xml # jetty-websocket/javax-websocket-server-impl/pom.xml # jetty-websocket/pom.xml # jetty-websocket/websocket-api/pom.xml # jetty-websocket/websocket-client/pom.xml # jetty-websocket/websocket-common/pom.xml # jetty-websocket/websocket-server/pom.xml # jetty-websocket/websocket-servlet/pom.xml # jetty-xml/pom.xml # pom.xml # tests/pom.xml # tests/test-continuation/pom.xml # tests/test-http-client-transport/pom.xml # tests/test-integration/pom.xml # tests/test-jmx/jmx-webapp-it/pom.xml # tests/test-jmx/jmx-webapp/pom.xml # tests/test-jmx/pom.xml # tests/test-loginservice/pom.xml # tests/test-quickstart/pom.xml # tests/test-sessions/pom.xml # tests/test-sessions/test-file-sessions/pom.xml # tests/test-sessions/test-gcloud-sessions/pom.xml # tests/test-sessions/test-infinispan-sessions/pom.xml # tests/test-sessions/test-jdbc-sessions/pom.xml # tests/test-sessions/test-memcached-sessions/pom.xml # tests/test-sessions/test-mongodb-sessions/pom.xml # tests/test-sessions/test-sessions-common/pom.xml # tests/test-webapps/pom.xml # tests/test-webapps/test-jaas-webapp/pom.xml # tests/test-webapps/test-jetty-webapp/pom.xml # tests/test-webapps/test-jndi-webapp/pom.xml # tests/test-webapps/test-mock-resources/pom.xml # tests/test-webapps/test-proxy-webapp/pom.xml # tests/test-webapps/test-servlet-spec/pom.xml # tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml # tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml # tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml # tests/test-webapps/test-webapp-rfc2616/pom.xml		2019-04-03 17:47:18 -05:00
..
clirr-gen-master-index.output-foot.html	api-change profile now works with master	2016-03-24 15:56:32 -07:00
clirr-gen-master-index.output-head.html	api-change profile now works with master	2016-03-24 15:56:32 -07:00
clirr-gen-master-index.output-html.xslt	api-change profile now works with master	2016-03-24 15:56:32 -07:00
clirr-gen-master-index.sh	api-change profile now works with master	2016-03-24 15:56:32 -07:00
git-log-csv.sh	Adding git log to csv example script for @jmcc0nn3ll	2018-02-08 08:47:11 -06:00
looptest.sh	Merge branch 'feature/looptest' into jetty-9.3.x	2016-06-06 07:02:25 -07:00
query-git-stats.sh	Adding some git query scripts for information gathering	2016-03-18 10:42:17 -07:00
release-jetty.sh	updated release script versions	2019-04-03 12:34:46 +11:00