Joakim Erdfelt
|
2c4cdbe259
|
Merge branch 'jetty-9.3.x'
|
2016-04-13 11:52:53 -07:00 |
Joakim Erdfelt
|
6fb338e50d
|
Updating to version 9.3.9-SNAPSHOT
|
2016-04-11 16:20:50 -07:00 |
Joakim Erdfelt
|
bb4f3c4882
|
Updating to version 9.3.9.M1
|
2016-04-11 15:35:22 -07:00 |
Joakim Erdfelt
|
3624339ec6
|
Merge branch 'jetty-9.3.x'
|
2016-03-16 10:29:29 -07:00 |
Joakim Erdfelt
|
ca5bedb97f
|
Improving VERSION.txt language
|
2016-03-16 10:20:41 -07:00 |
Joakim Erdfelt
|
c68d3b1d8d
|
Updating to version 9.3.9-SNAPSHOT
|
2016-03-14 09:07:52 -07:00 |
Joakim Erdfelt
|
1f3b3f31f4
|
Updating to version 9.3.8.v20160314
|
2016-03-14 08:30:20 -07:00 |
Simone Bordet
|
21abfb0351
|
Merged branch 'jetty-9.3.x' into 'master'.
|
2016-03-01 15:35:49 +01:00 |
Joakim Erdfelt
|
bf4a634d0b
|
Merge branch 'release-9.3.8' into jetty-9.3.x
|
2016-02-29 11:45:29 -07:00 |
Joakim Erdfelt
|
cfc2dc2b01
|
Merge branch 'jetty-9.3.x'
|
2016-02-26 08:22:39 -07:00 |
Joakim Erdfelt
|
aed05a1e36
|
Merge branch 'jetty-9.2.x' into jetty-9.3.x
|
2016-02-26 08:22:12 -07:00 |
Joakim Erdfelt
|
9111aeb690
|
Updating to version 9.3.8-SNAPSHOT
|
2016-02-25 11:06:14 -07:00 |
Joakim Erdfelt
|
bee564c7d9
|
Updating to version 9.3.8.RC0
|
2016-02-25 10:28:00 -07:00 |
Joakim Erdfelt
|
f98dde5e5b
|
Updating to version 9.2.16-SNAPSHOT
|
2016-02-10 15:36:41 -07:00 |
Joakim Erdfelt
|
9b6890d3c1
|
Updating to version 9.2.15.v20160210
|
2016-02-10 14:49:12 -07:00 |
Simone Bordet
|
56c0bc768c
|
Merged branch 'jetty9.3.x' into 'master'.
|
2016-01-21 17:52:37 +01:00 |
Joakim Erdfelt
|
e0ce545ad7
|
Updating to version 9.3.8-SNAPSHOT
|
2016-01-15 17:15:14 -07:00 |
Joakim Erdfelt
|
c0b191119b
|
Updating to version 9.3.7.v20160115
|
2016-01-15 16:40:15 -07:00 |
Joakim Erdfelt
|
c51a35203c
|
Merge branch 'jetty-9.3.x'
|
2016-01-14 10:00:53 -07:00 |
Greg Wilkins
|
c5cbc64e77
|
Merge remote-tracking branch 'origin/jetty-9.3.x'
|
2016-01-14 11:00:06 +11:00 |
Joakim Erdfelt
|
b7f9c9aca9
|
Updating to version 9.3.7-SNAPSHOT
|
2016-01-13 08:21:01 -07:00 |
Joakim Erdfelt
|
21ca3f6690
|
Updating to version 9.3.7.RC1
|
2016-01-13 07:30:24 -07:00 |
Joakim Erdfelt
|
f257765f33
|
Updating to version 9.3.7-SNAPSHOT
|
2016-01-05 11:51:04 -07:00 |
Joakim Erdfelt
|
e81912f98c
|
Updating to version 9.3.7.RC0
|
2016-01-05 11:17:28 -07:00 |
Simone Bordet
|
9aa6dc1e7d
|
Merged branch 'jetty-9.3.x' into 'master'.
|
2015-12-08 13:02:55 +01:00 |
Simone Bordet
|
9c673e542d
|
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
|
2015-12-08 13:02:20 +01:00 |
Simone Bordet
|
65d33f8b49
|
Merged branch 'jetty-9.3.x' into 'master'.
|
2015-11-18 21:40:51 +01:00 |
Joakim Erdfelt
|
edf686fe0a
|
Updating to version 9.3.7-SNAPSHOT
|
2015-11-06 12:13:00 -07:00 |
Joakim Erdfelt
|
d737e1c638
|
Updating to version 9.3.6.v20151106
|
2015-11-06 11:09:32 -07:00 |
Joakim Erdfelt
|
ec8f8d3e4f
|
Updating to version 9.2.15-SNAPSHOT
|
2015-11-06 11:06:48 -07:00 |
Joakim Erdfelt
|
ecba378f5c
|
Updating to version 9.2.14.v20151106
|
2015-11-06 10:32:14 -07:00 |
Simone Bordet
|
964afc3020
|
Merged branch 'jetty-9.3.x' into 'master'.
|
2015-10-19 12:35:26 +02:00 |
Joakim Erdfelt
|
dde32787c4
|
Updating to version 9.3.6-SNAPSHOT
|
2015-10-12 15:47:37 -07:00 |
Joakim Erdfelt
|
29722bd880
|
Updating to version 9.3.5.v20151012
|
2015-10-12 15:10:39 -07:00 |
Joakim Erdfelt
|
9cf0e34a1d
|
Updating to version 9.4.0-SNAPSHOT
|
2015-10-07 15:41:32 -07:00 |
Joakim Erdfelt
|
37296bec3c
|
Updating to version 9.3.4.v20151007
|
2015-10-07 14:58:38 -07:00 |
Joakim Erdfelt
|
e2205d2365
|
Correcting version
|
2015-09-03 10:45:23 -07:00 |
Jesse McConnell
|
cb4cd620d5
|
set for dev
|
2015-09-03 12:39:19 -05:00 |
Jesse McConnell
|
bf02158f66
|
set for release
|
2015-08-27 08:33:01 -05:00 |
Jesse McConnell
|
7a2f4df2c9
|
set for release
|
2015-08-25 11:57:52 -05:00 |
Simone Bordet
|
542ef22ba8
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2015-08-05 17:50:25 +02:00 |
Joakim Erdfelt
|
b3718bbfd8
|
Updating VERSION.txt for SNAPSHOT
|
2015-08-03 12:51:41 -07:00 |
Joakim Erdfelt
|
f95b41fa7c
|
Updating VERSION.txt description
|
2015-08-03 10:44:55 -07:00 |
Joakim Erdfelt
|
9e4fdb10bf
|
Updating VERSION.txt for SNAPSHOT
|
2015-08-03 10:36:14 -07:00 |
Joakim Erdfelt
|
b4cbf0dfca
|
Updating VERSION.txt top section
|
2015-07-30 09:13:35 -07:00 |
Joakim Erdfelt
|
e36af707e2
|
9.3.2, not 9.3.3
|
2015-07-30 06:33:03 -07:00 |
Joakim Erdfelt
|
4a7a577d75
|
Updating VERSION.txt top section
|
2015-07-30 06:31:39 -07:00 |
Jesse McConnell
|
ef31612f5f
|
set for dev
|
2015-07-17 12:14:56 -05:00 |
Jesse McConnell
|
4b8a6e584f
|
Merge branch 'release-9.3.1'
|
2015-07-17 12:10:49 -05:00 |
Simone Bordet
|
5bb942b5c1
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2015-07-16 19:10:12 +02:00 |
Jesse McConnell
|
505037a832
|
set for release
|
2015-07-14 09:53:15 -05:00 |
Jesse McConnell
|
eb3defa6ef
|
set for release
|
2015-07-09 10:50:58 -05:00 |
Joakim Erdfelt
|
02bac59d0b
|
Adding missing Jetty 9.3.0.RC1 section
|
2015-06-15 10:27:08 -07:00 |
Joakim Erdfelt
|
cf6c4a914e
|
Updating version to 9.3.1-SNAPSHOT
|
2015-06-15 10:25:49 -07:00 |
Joakim Erdfelt
|
68746609d6
|
Updating VERSION.txt
|
2015-06-12 09:31:09 -07:00 |
Joakim Erdfelt
|
4d267f08b7
|
Updating VERSION.txt top section
|
2015-06-11 13:10:25 -07:00 |
Simone Bordet
|
87b1ae44f8
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2015-06-05 12:34:47 +02:00 |
Jesse McConnell
|
f42ea615b6
|
set for release
|
2015-05-29 08:38:59 -05:00 |
Jesse McConnell
|
57d0594e73
|
set for development
|
2015-05-28 10:56:18 -05:00 |
Jesse McConnell
|
cfbb26beda
|
set for release
|
2015-05-28 09:09:07 -05:00 |
Joakim Erdfelt
|
6347dfef19
|
Updating VERSION.txt for missing 9.3.0 entries
|
2015-05-21 08:57:12 -07:00 |
Greg Wilkins
|
15eb1081e9
|
test commit
|
2015-04-30 08:57:34 +10:00 |
Simone Bordet
|
cd4ab9f369
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2015-03-26 11:54:40 +01:00 |
Jesse McConnell
|
7bc2d50bf7
|
set for dev
|
2015-03-25 09:54:16 -05:00 |
Jesse McConnell
|
cf544ef708
|
update for milestone release
|
2015-03-25 08:13:39 -05:00 |
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
|
21f6bb6edf
|
set for relesae
|
2015-03-10 07:28:11 -05:00 |
Jesse McConnell
|
8d9b7613c9
|
add for dev
|
2015-03-10 07:27:11 -05:00 |
Joakim Erdfelt
|
e5fdf98d19
|
Merge branch '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-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-24 14:53:54 -07:00 |
Jesse McConnell
|
12031d77af
|
set for release
|
2015-02-24 10:06:46 -06:00 |
Jesse McConnell
|
33b5cc80bb
|
set for release
|
2015-02-24 10:06:13 -06:00 |
Joakim Erdfelt
|
a0967a935f
|
Setting 9.2.9-SNAPSHOT
|
2015-02-19 10:21:13 -07: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
|
10bb88f90d
|
set for release
|
2015-02-17 15:30:59 -06:00 |
Greg Wilkins
|
8c2e82c1b6
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
|
2015-01-23 14:58:39 +01:00 |
Greg Wilkins
|
d59887980d
|
updated VERSION.txt with latest jetty-7/8 releases
|
2015-01-23 14:56:54 +01:00 |
Joakim Erdfelt
|
48e5157731
|
Merge branch '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-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-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-01-21 11:00:54 -07:00 |
Jesse McConnell
|
b3f4578d7d
|
yeah, I just did that
|
2015-01-16 11:36:19 -06:00 |
Jesse McConnell
|
c6e98e1e92
|
set for release
|
2015-01-16 10:11:07 -06:00 |
Greg Wilkins
|
d161bdcb36
|
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-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-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
|
2014-12-11 13:50:21 +01:00 |
Jan Bartel
|
98e1869594
|
Update for release reroll.
|
2014-12-05 15:42:25 +01:00 |
Greg Wilkins
|
88ddab9892
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
VERSION.txt
|
2014-12-04 01:33:56 +11:00 |
Jesse McConnell
|
a3b89897d3
|
set for release
|
2014-12-03 07:25:36 -06:00 |
Greg Wilkins
|
aeccef2154
|
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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
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-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
|
2014-11-19 13:37:48 +11:00 |
Jesse McConnell
|
6bcbdf67aa
|
set for dev
|
2014-11-13 09:51:08 -06:00 |
Jesse McConnell
|
1e854936a2
|
set for release
|
2014-11-12 16:43:31 -06:00 |
Greg Wilkins
|
ac87e8c389
|
fixed bad merge of VERSION.TXT
|
2014-11-12 14:19:44 +11:00 |
Greg Wilkins
|
50b6391be1
|
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-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-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
|
2014-11-05 10:36:57 +11:00 |
Jesse McConnell
|
8df8b2b158
|
set for release
|
2014-11-03 13:17:20 -06:00 |
Jesse McConnell
|
bed3e61f35
|
set for fix
|
2014-11-03 13:16:21 -06:00 |
Simone Bordet
|
64597b318c
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2014-11-03 17:25:37 +01:00 |
Jesse McConnell
|
7c35f04152
|
set for release
|
2014-10-31 09:28:38 -05:00 |
Greg Wilkins
|
d970e3d58b
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
VERSION.txt
|
2014-10-31 07:43:53 +11:00 |
Jesse McConnell
|
19d9456756
|
set for release
|
2014-10-30 10:58:44 -05:00 |
Joakim Erdfelt
|
8899f6d360
|
Merge branch 'jetty-9.2.x'
Conflicts:
VERSION.txt
|
2014-10-29 15:52:05 -07:00 |
Jesse McConnell
|
c34a7add2a
|
set for release
|
2014-10-28 13:23:44 -05:00 |
Simone Bordet
|
8d2acb6817
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2014-10-28 11:55:44 +01:00 |
Jesse McConnell
|
3a40db32ad
|
set for dev
|
2014-10-27 17:30:38 -05:00 |
Jesse McConnell
|
5caabc8a65
|
set for reease
|
2014-10-27 15:46:32 -05:00 |
Jesse McConnell
|
6f7581084c
|
set for release
|
2014-09-24 09:53:10 -05:00 |