Greg Wilkins
|
1de53a888d
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
VERSION.txt
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-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http2/http2-alpn-tests/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/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-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
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-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-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-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
|
2015-03-11 10:39:38 +11:00 |
Jesse McConnell
|
e3fd0056cf
|
[maven-release-plugin] prepare for next development iteration
|
2015-03-10 08:00:22 -05:00 |
|
Jesse McConnell
|
9d648f4000
|
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
|
2015-03-10 08:00:14 -05:00 |
|
Jesse McConnell
|
1659d83978
|
[maven-release-plugin] prepare for next development iteration
|
2015-02-24 10:38:33 -06:00 |
|
Jesse McConnell
|
dc0c3f4c52
|
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
|
2015-02-24 10:38:28 -06:00 |
|
Greg Wilkins
|
e83549f4b4
|
fixed bad merge
|
2015-02-19 14:07:42 +11:00 |
|
Greg Wilkins
|
c22d79f673
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
VERSION.txt
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-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/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-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
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-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-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-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
|
2015-02-19 14:05:00 +11:00 |
|
Jesse McConnell
|
ce5db2ca55
|
[maven-release-plugin] prepare for next development iteration
|
2015-02-17 16:02:22 -06:00 |
|
Jesse McConnell
|
26b7597928
|
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
|
2015-02-17 16:02:16 -06:00 |
|
Greg Wilkins
|
2162455b72
|
Removed SPDY and NPN
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
|
2015-02-11 14:20:06 +11:00 |
|
Jesse McConnell
|
aa22842c20
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 17:48:29 -06:00 |
|
Jesse McConnell
|
8c58a9abc4
|
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
|
2015-01-16 17:48:23 -06:00 |
|
Jesse McConnell
|
81bb8411d1
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 12:06:36 -06:00 |
|
Jesse McConnell
|
7865f88b81
|
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
|
2015-01-16 12:06:30 -06:00 |
|
Jesse McConnell
|
db991355a2
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 10:41:45 -06:00 |
|
Jesse McConnell
|
6930abb8d3
|
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
|
2015-01-16 10:41:39 -06:00 |
|
Jesse McConnell
|
9225b124a4
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 08:21:35 -06:00 |
|
Jesse McConnell
|
ebd563e64d
|
[maven-release-plugin] prepare release 9.2.7.v20140116
|
2015-01-16 08:21:29 -06:00 |
Jan Bartel
|
bc22ba72dc
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-05 16:45:12 +01:00 |
|
Jan Bartel
|
1cc075cf98
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
|
2014-12-05 16:45:01 +01:00 |
|
Jesse McConnell
|
127b48c932
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-03 09:00:57 -06:00 |
|
Jesse McConnell
|
028f4b9610
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
|
2014-12-03 09:00:46 -06:00 |
|
Jesse McConnell
|
1263d1f3c8
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-03 08:26:47 -06:00 |
|
Jesse McConnell
|
5c7f706496
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
|
2014-12-03 08:26:35 -06:00 |
|
Jesse McConnell
|
09846e324d
|
[maven-release-plugin] prepare for next development iteration
|
2014-11-12 17:13:19 -06:00 |
|
Jesse McConnell
|
97d2bd95a6
|
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
|
2014-11-12 17:13:14 -06:00 |
|
Jesse McConnell
|
5d0595cabd
|
[maven-release-plugin] prepare for next development iteration
|
2014-11-03 13:46:58 -06:00 |
|
Jesse McConnell
|
772ff0bfd4
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
|
2014-11-03 13:46:52 -06:00 |
|
Jesse McConnell
|
1c4a08b35b
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-31 09:58:16 -05:00 |
|
Jesse McConnell
|
a4ff7bf841
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
|
2014-10-31 09:58:10 -05:00 |
|
Jesse McConnell
|
e1b73a64eb
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-30 11:28:41 -05:00 |
|
Jesse McConnell
|
5770cc1179
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
|
2014-10-30 11:28:35 -05:00 |
|
Jesse McConnell
|
58eb6740ec
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-28 14:20:30 -05:00 |
|
Jesse McConnell
|
19a44846cf
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
|
2014-10-28 14:20:24 -05:00 |
Joakim Erdfelt
|
9249ebb6ef
|
Using 9.2.4-SNAPSHOT for branch
|
2014-09-11 06:10:44 -07:00 |
|
Jesse McConnell
|
9bfeb2221f
|
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
|
2014-09-05 09:19:23 -05:00 |
|
Jesse McConnell
|
c034544ab9
|
reset for release
|
2014-09-05 08:10:15 -05:00 |
|
Jesse McConnell
|
c23e5f4889
|
[maven-release-plugin] prepare for next development iteration
|
2014-08-21 09:13:38 -05:00 |
|
Jesse McConnell
|
3347e11281
|
[maven-release-plugin] prepare release jetty-9.2.3.v20140821
|
2014-08-21 09:13:32 -05:00 |
|
Greg Wilkins
|
1c71040eca
|
moved config plugin to profile
|
2014-08-15 19:53:52 +10:00 |
|
Joakim Erdfelt
|
cb42ef2167
|
[maven-release-plugin] prepare for next development iteration
|
2014-07-23 11:18:01 -07:00 |
|
Joakim Erdfelt
|
dc62cb5ac7
|
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
|
2014-07-23 11:17:55 -07:00 |
Simone Bordet
|
334db9fe72
|
Updated version to 9.3.0-SNAPSHOT.
|
2014-06-16 21:33:03 +02:00 |
|
Jesse McConnell
|
c3ee0711ca
|
[maven-release-plugin] prepare for next development iteration
|
2014-06-09 13:37:54 -05:00 |
|
Jesse McConnell
|
06b494eeac
|
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
|
2014-06-09 13:37:49 -05:00 |
|
Greg Wilkins
|
8f4aeeeb8d
|
updated version to 10.0.0-SNAPSHOT
|
2014-06-04 15:08:54 +02:00 |
|
Jesse McConnell
|
2e859e4ae2
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-26 12:04:15 -05:00 |
|
Jesse McConnell
|
71ad2114c5
|
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
|
2014-05-26 12:04:08 -05:00 |
|
Jesse McConnell
|
d59dbe936b
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-23 09:59:19 -05:00 |
|
Jesse McConnell
|
edc7646a4c
|
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
|
2014-05-23 09:59:13 -05:00 |