1438 Commits

Author	SHA1	Message	Date
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
Greg Wilkins	5011993ddf	Merge remote-tracking branch 'origin/master' into jetty-http2 ... 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-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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java 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-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-09-10 14:38:18 +10:00
Jesse McConnell	6ce4760cd3	set for dev	2014-09-09 10:27:03 -05:00
Jesse McConnell	480348aba9	set for release	2014-09-05 08:11:58 -05:00
Jesse McConnell	2e034c5749	reset for more dev	2014-08-21 11:58:18 -05:00
Jesse McConnell	3be7cded1d	set for release	2014-08-21 08:44:20 -05:00
Greg Wilkins	66980f2449	Merge remote-tracking branch 'origin/master' into jetty-http2 ... 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 examples/quickstart/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-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-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-dispatch-webapp/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-07-25 17:37:53 +10:00
Joakim Erdfelt	87e18ab06a	Updating VERSION.txt top section	2014-07-24 11:09:01 -07:00
Joakim Erdfelt	e7aa5edd37	Updating VERSION.txt top section	2014-07-23 08:50:31 -07:00
Simone Bordet	adaeeefe32	Merged branch 'master' into 'jetty-http2'.	2014-06-16 16:08:40 +02:00
Jesse McConnell	e5910e576e	set for dev	2014-06-10 08:18:51 -05:00
Jesse McConnell	9cdfaf5196	set for release	2014-06-09 13:09:32 -05:00
Greg Wilkins	8f4aeeeb8d	updated version to 10.0.0-SNAPSHOT	2014-06-04 15:08:54 +02:00
Jesse McConnell	175794d12a	set for release	2014-05-26 10:49:56 -05:00
Jesse McConnell	a21b88cfa0	set for dev	2014-05-23 11:12:01 -05:00
Jesse McConnell	0bf24e042a	set for release	2014-05-23 09:30:34 -05:00
Jesse McConnell	b12b125204	set for dev	2014-05-15 16:05:32 -05:00
Jesse McConnell	4c24fa120f	set for release	2014-05-15 07:51:26 -05:00
Jesse McConnell	042ce196a5	set for release	2014-05-08 11:15:31 -05:00
Jesse McConnell	7a2ea8c6dc	set for release	2014-04-09 09:56:58 -05:00
Jesse McConnell	34a1d3e109	set for dev	2014-04-02 16:25:26 -05:00
Jesse McConnell	46c1734817	Updating VERSION.txt top section	2014-04-01 09:01:59 -05:00
Jesse McConnell	c273401742	set for dev	2014-03-07 09:10:45 -06:00
Jesse McConnell	76429e55e4	set for release	2014-03-07 09:10:08 -06:00
Jesse McConnell	eb0aea46ce	set versions.txt file to new version and fix mistaken developmentVersion	2014-02-10 13:48:29 -06:00
Jesse McConnell	86f46c9ee4	Updating VERSION.txt top section	2014-02-10 10:48:14 -06:00
Jesse McConnell	d3b2072ad3	set for dev	2014-01-10 09:11:04 -06:00
Jesse McConnell	b4156e4862	set for release	2014-01-08 13:36:42 -06:00
Jesse McConnell	b55d8fa4c3	Updating VERSION.txt top section	2013-12-20 14:40:50 -06:00
Greg Wilkins	28f56f994e	updated versions	2013-11-29 09:26:12 +11:00
Joakim Erdfelt	dcae1860ae	Updating VERSION.txt top section	2013-11-16 07:20:33 -07:00
Joakim Erdfelt	47e0710faa	Updating VERSION.txt top section	2013-11-15 15:40:43 -07:00
Jesse McConnell	3a9861dea1	set for release	2013-11-14 15:02:40 -06:00
Jesse McConnell	45d65ab7c0	set for dev	2013-11-14 08:58:34 -06:00
Jesse McConnell	6db55c3863	set for release	2013-10-31 14:56:41 -05:00
Jesse McConnell	c920d0475a	set for dev	2013-10-24 17:27:42 -05:00
Jesse McConnell	66aa5a077f	set for release	2013-10-24 16:10:35 -05:00
Jesse McConnell	9e8d07337b	Merge branch 'jetty-9.1' into release-9.1	2013-10-24 16:09:18 -05:00
Greg Wilkins	defa3a04cf	Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: VERSION.txt aggregates/jetty-all/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-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/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-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-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-proxy/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-server/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/pom.xml jetty-websocket/websocket-api/pom.xml jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java jetty-websocket/websocket-client/pom.xml jetty-websocket/websocket-common/pom.xml jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java 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-loginservice/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-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-jetty-webapp/src/main/config/demo-base/webapps/test.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	2013-10-14 13:10:02 +11:00
Jesse McConnell	785fecb2bb	set for release	2013-09-30 20:49:56 -05:00
Jesse McConnell	6ec630f044	set for release	2013-09-30 12:35:22 -05:00
Jesse McConnell	0b3f431d27	set version back to 9.0.6-SNAPSHOT	2013-09-30 12:33:06 -05:00
Greg Wilkins	f2f8ec54c6	Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: aggregates/jetty-all/pom.xml examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java	2013-09-23 13:38:43 +10:00
Jesse McConnell	1f1ba9646b	set for release	2013-09-19 14:30:08 -05:00
Jesse McConnell	b781b00cc2	Merge branch 'master' into release-9	2013-09-19 14:29:01 -05:00
Greg Wilkins	002de9857e	Merge remote-tracking branch 'origin/master' into release-9.1	2013-09-19 17:16:08 +10:00
Greg Wilkins	be6f876621	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt aggregates/jetty-all/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 jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-proxy/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-server/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-jetty-webapp/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-09-19 17:08:40 +10:00
Greg Wilkins	52aba6f1aa	updated VERSIONS.txt with 7 relase	2013-09-19 17:01:46 +10:00
Jesse McConnell	2b4475b046	set for dev	2013-09-16 16:08:29 -05:00
Jesse McConnell	a816863c30	set for release	2013-09-16 12:15:36 -05:00
Joakim Erdfelt	105d02b3fe	Updating VERSION.txt top section	2013-09-16 10:01:06 -07:00
Joakim Erdfelt	43029a1476	Reverting VERSION.txt	2013-09-16 09:58:35 -07:00
Joakim Erdfelt	ceb07fdfcf	Minor update to VERSION.txt so that release-9 branch can be made	2013-09-16 09:24:56 -07:00
Greg Wilkins	dd5277576a	Updating VERSION.txt top section	2013-09-16 23:57:21 +10:00
Greg Wilkins	5ba684f009	reset VERSION to snapshot	2013-09-16 23:41:51 +10:00
Greg Wilkins	30bab30d9b	Revert "Merge branch 'release-8' into jetty-8" ... This reverts commit 463ef68dc3, reversing changes made to de544ddfbf.	2013-09-16 23:28:59 +10:00
Thomas Becker	5ab692b62e	Updating VERSION.txt top section	2013-09-11 12:26:24 +02:00
Thomas Becker	8fd97dad0e	Updating VERSION.txt top section	2013-09-10 17:42:53 +02:00
Jan Bartel	280000e88a	Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: VERSION.txt aggregates/jetty-all/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-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/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-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-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-proxy/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/HttpOutput.java 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-server/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/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-loginservice/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-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-jetty-webapp/src/main/config/demo/webapps/test.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	2013-08-29 12:59:32 +10:00
Jan Bartel	ab14c67b66	Update for reroll of release	2013-08-15 16:51:27 +10:00
Jesse McConnell	040f73f84f	set for release	2013-08-13 16:24:15 -05:00
Jesse McConnell	80945b64fe	set for release	2013-08-13 13:25:14 -05:00
Joakim Erdfelt	8636c7da45	Merge branch 'master' into jetty-9.1 ... Conflicts: jetty-maven-plugin/pom.xml pom.xml	2013-08-05 09:53:48 -07:00
Jan Bartel	e15d83e061	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt aggregates/jetty-all/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 jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-proxy/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-server/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-jetty-webapp/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-08-01 13:21:32 +10:00
Jan Bartel	5094dc059d	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-logback/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-equinoxtools/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/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-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-webapp-rfc2616/pom.xml	2013-08-01 12:40:23 +10:00
Jesse McConnell	2380d748f8	set for dev	2013-07-31 12:12:38 -05:00
Jesse McConnell	9db05ac2fa	set for dev	2013-07-31 12:09:17 -05:00
Jesse McConnell	ed660fffd7	set for release	2013-07-26 10:51:28 -05:00
Jesse McConnell	869389e857	set for release	2013-07-26 10:48:53 -05:00
Jesse McConnell	e59f1d2191	set for release	2013-07-26 10:30:55 -05:00
Jesse McConnell	6622e06841	set for release	2013-07-26 09:13:52 -05:00
Simone Bordet	2be4ca5921	Reverted VERSION.txt.	2013-07-26 13:45:41 +02:00
Jesse McConnell	e810727b55	set for dev	2013-07-25 15:09:03 -05:00
Jesse McConnell	a097e9ff3e	set for release	2013-07-25 11:04:03 -05:00
Jesse McConnell	3c9bcd3ece	set for release	2013-07-25 10:59:36 -05:00
Jesse McConnell	c805b15b3e	set for release	2013-07-25 07:17:10 -05:00
Jesse McConnell	7fce5e3950	set for release	2013-07-25 07:16:58 -05:00
Greg Wilkins	e4716e05e1	Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: aggregates/jetty-all/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-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/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-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-plus/pom.xml jetty-proxy/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-server/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/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-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java jetty-websocket/websocket-servlet/pom.xml jetty-xml/pom.xml pom.xml tests/pom.xml tests/test-continuation/pom.xml tests/test-loginservice/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-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	2013-06-27 09:12:28 +10:00
Joakim Erdfelt	bf3e6a4a53	Updating VERSION.txt top section	2013-06-25 16:35:16 -07:00
Joakim Erdfelt	e1d6329b02	Cherry picking GoAwayTest fix	2013-06-25 09:14:31 -07:00
Joakim Erdfelt	57c6199e3b	Updating VERSION.txt top section	2013-06-25 08:07:05 -07:00
Jesse McConnell	bc5f2da148	set Version for re-release	2013-06-21 15:23:22 -05:00
Jesse McConnell	b6df8a4978	set for release	2013-06-21 09:15:32 -05:00
Greg Wilkins	45d4cd3fcd	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt aggregates/jetty-all/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 jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-proxy/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/gzip/CompressedResponseWrapper.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipWithPipeliningTest.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java 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-server/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation-jetty6/pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-jetty-webapp/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-05-28 18:02:02 +10:00
Greg Wilkins	6ef865b153	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java jetty-spdy/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-webapp-rfc2616/pom.xml	2013-05-27 16:47:27 +10:00
Jesse McConnell	106a32a733	set for dev	2013-05-22 10:43:47 -05:00
Jesse McConnell	e5174f9cef	set for dev	2013-05-22 10:38:56 -05:00
Jesse McConnell	3dcceaed35	Updating VERSION.txt top section	2013-05-20 06:51:30 -05:00
Jesse McConnell	13fb43ea6d	Updating VERSION.txt top section	2013-05-20 06:48:15 -05:00
Jesse McConnell	da82de0acf	set release info	2013-05-06 17:41:16 -05:00
Jesse McConnell	c40761dd0b	set dev	2013-04-17 13:23:21 -05:00
Jesse McConnell	5b50fa3855	Updating VERSION.txt top section	2013-04-17 10:57:25 -05:00
Jesse McConnell	90c44af0e1	Updating VERSION.txt top section	2013-04-15 11:09:27 -05:00
Greg Wilkins	e4e514d10a	post 9.0.1	2013-04-11 06:24:45 +10:00
Greg Wilkins	1395675f21	Updating VERSION.txt top section	2013-04-08 11:23:41 +10:00
Greg Wilkins	4e8406f62d	Updating VERSION.txt top section	2013-04-08 08:20:58 +10:00
Greg Wilkins	1cb201ef14	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-distribution/src/main/resources/bin/jetty.sh jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/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-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-webapp-rfc2616/pom.xml	2013-03-14 12:40:29 +11:00
Greg Wilkins	9397ba8782	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt aggregates/jetty-all/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 jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-proxy/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-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/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-jetty-webapp/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-03-14 12:22:33 +11:00
Jesse McConnell	0959b5a848	set for dev	2013-03-12 14:24:55 -05:00
Jesse McConnell	728dada3b0	set for dev	2013-03-12 14:24:34 -05:00
Jesse McConnell	04732ab345	set for release	2013-03-12 08:38:25 -05:00
Jesse McConnell	c83e023ac3	set for release	2013-03-12 08:35:57 -05:00
Joakim Erdfelt	9025d21fb8	Updating VERSION.txt top section	2013-03-08 11:12:21 -07:00
Joakim Erdfelt	2f6dacfdb8	Updating VERSION.txt top section	2013-03-07 18:52:43 -07:00
Jesse McConnell	8ca017eeb1	set for release	2013-03-06 09:58:06 -06:00
Joakim Erdfelt	32865ab922	Updating VERSION.txt top section	2013-03-01 10:06:43 -07:00
Joakim Erdfelt	91b761e4a6	Updating VERSION.txt top section	2013-02-24 09:05:53 -07:00
Joakim Erdfelt	c96569d72a	Updating VERSION.txt top section	2013-02-24 07:52:21 -07:00
Jesse McConnell	a2fc2247c6	set for dev	2013-02-22 09:07:41 -06:00
Jesse McConnell	86b5d80628	Updating VERSION.txt top section	2013-02-22 07:12:03 -06:00
Jesse McConnell	885893f1a9	Updating VERSION.txt top section	2013-02-21 16:50:35 -06:00
Jesse McConnell	4d54f772c8	Updating VERSION.txt top section	2013-02-21 14:14:11 -06:00
Jesse McConnell	2bcc21350c	Updating VERSION.txt top section	2013-02-21 10:02:04 -06:00
Joakim Erdfelt	253aef11f8	Updating VERSION.txt top section	2013-02-01 10:09:19 -07:00
Joakim Erdfelt	bd6cf83057	Rolling back VERSION.txt	2013-02-01 09:45:10 -07:00
Joakim Erdfelt	c075edd4c5	Merge branch 'master' into release-9	2013-02-01 09:44:03 -07:00
Greg Wilkins	626f10678c	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt aggregates/jetty-all/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 jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-proxy/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-server/pom.xml jetty-spring/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-jetty-webapp/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-02-01 22:15:44 +11:00
Greg Wilkins	e8de7bd905	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-logback/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-equinoxtools/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/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-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-webapp-rfc2616/pom.xml	2013-02-01 18:22:04 +11:00
Jesse McConnell	678e038bfb	set for release	2013-01-31 13:46:59 -06:00
Jesse McConnell	1101aec2d1	set for dev	2013-01-31 13:20:34 -06:00
Jesse McConnell	0a1fbc7ea0	set for release	2013-01-31 11:08:08 -06:00
Jesse McConnell	81d3c76780	prep for dev	2013-01-31 10:41:05 -06:00
Jesse McConnell	ade2e15318	Set for release	2013-01-31 08:03:42 -06:00
Jesse McConnell	2e2c07dad9	Set for release	2013-01-31 08:02:54 -06:00
Jesse McConnell	fcdc53f883	prep for dev	2013-01-20 11:03:31 -06:00
Jesse McConnell	5d394859c5	set for release	2013-01-19 19:06:19 -06:00
Jesse McConnell	38319f4cb6	set for release	2013-01-18 10:49:25 -06:00
Joakim Erdfelt	3f5b182631	Updating VERSION.txt top section	2012-12-26 14:34:00 -07:00
Joakim Erdfelt	2bd3108657	Updating VERSION.txt top section	2012-12-26 12:29:38 -07:00
Joakim Erdfelt	b15268763d	Updating VERSION.txt top section	2012-12-21 10:43:20 -07:00
Jesse McConnell	e30e307367	test	2012-12-12 14:56:05 -06:00
Jesse McConnell	675d0c23ce	test	2012-12-12 14:55:33 -06:00
Hugues Malphettes	e999c45bad	394294 Start web-bundles started before jetty ... A web-bundle started before jetty-osgi should be deployed as a webapp when jetty-osgi starts. Thanks to Constantine Nosovsky for the patch.	2012-11-23 18:29:07 +08:00
Jesse McConnell	e21df17ad6	set for dev	2012-11-20 12:10:05 -06:00
Jesse McConnell	3a44196efd	set for release	2012-11-20 11:07:55 -06:00
Jesse McConnell	db76d8775a	reset for release	2012-11-20 09:49:47 -06:00
Jesse McConnell	aa1dcdbc6d	set for dev	2012-11-19 19:05:00 -06:00
Jesse McConnell	e6b25b82ea	set release version.txt	2012-11-19 17:43:55 -06:00
Greg Wilkins	f336511f87	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java	2012-11-08 14:58:10 +11:00
Greg Wilkins	b3274a6baa	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt	2012-11-08 14:41:01 +11:00
Jesse McConnell	d0819605af	set for dev	2012-11-06 12:01:06 -06:00
Jesse McConnell	edf898bdd1	set for dev	2012-11-06 09:00:48 -06:00
Jesse McConnell	a08536c8bc	set for dev	2012-11-06 08:18:06 -06:00
Jesse McConnell	32d0f950a9	set for dev	2012-11-06 08:15:05 -06:00
Jesse McConnell	6fc39fc781	set for release	2012-11-06 07:45:17 -06:00
Jesse McConnell	ec2fb110f1	reset	2012-11-06 07:44:12 -06:00
Jesse McConnell	7fadb8548b	set for release	2012-11-06 07:41:59 -06:00
Jesse McConnell	581779a9df	reset	2012-11-06 07:37:07 -06:00
Jan Bartel	6b04056371	Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt example-async-rest/async-rest-jar/pom.xml example-async-rest/async-rest-webapp/pom.xml example-async-rest/pom.xml example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/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-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/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-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-webapp-rfc2616/pom.xml	2012-11-06 16:12:00 +11:00
Jesse McConnell	9bf7d89190	set for dev	2012-11-05 14:39:50 -06:00
Jesse McConnell	c74a56582a	set for dev	2012-11-05 13:24:43 -06:00
Jesse McConnell	063efdc484	Updating VERSION.txt top section	2012-11-05 11:57:40 -06:00
Jesse McConnell	d3565e8610	Updating VERSION.txt top section	2012-11-05 11:55:10 -06:00
Jesse McConnell	92e2ad44fc	Updating VERSION.txt top section	2012-11-05 11:45:59 -06:00
Joakim Erdfelt	c388d0e586	VERSION.txt cleanup + issue refresh of 9.0.0.M1	2012-10-16 12:19:22 -07:00
Jesse McConnell	cd8f940bab	set for dev	2012-10-15 15:08:27 -05:00
Jesse McConnell	82316d886d	Updating VERSION.txt top section	2012-10-15 12:36:44 -05:00
Jesse McConnell	b3ee687eda	set for m0	2012-09-21 12:58:34 -05:00
Jesse McConnell	73d04ca247	set for release of milestone	2012-09-20 13:55:42 -05:00
Jesse McConnell	c7f8bdfee8	prep for dev	2012-09-10 16:10:42 -05:00
Jesse McConnell	ff2b988eff	prep for dev	2012-09-10 15:40:04 -05:00
Jesse McConnell	0c3f1b6ab1	prep for release	2012-09-10 13:15:40 -05:00
Jesse McConnell	4180d7e1f5	prepare for release	2012-09-10 12:59:04 -05:00
Jesse McConnell	83781bce8d	prepare for release	2012-09-10 12:57:18 -05:00
Jesse McConnell	33ce6e6787	prep for dev	2012-09-03 16:23:44 -05:00
Jesse McConnell	fb929aca20	prep for dev	2012-09-03 14:32:38 -05:00
Jesse McConnell	ff57f913e8	Updating VERSION.txt top section	2012-09-03 12:53:24 -05:00
Jesse McConnell	1587c3e8c5	Updating VERSION.txt top section	2012-09-03 12:49:16 -05:00
Thomas Becker	369bc035fc	jetty-9: jetty-spdy refactored to match jetty-9.	2012-07-27 16:18:47 +02:00
Jan Bartel	cdbec2c78b	Merge remote-tracking branch 'origin/master' into jetty-8	2012-07-26 19:05:51 +10:00
Thomas Becker	688eec732f	version.txt update	2012-07-25 20:20:17 +02:00
Jesse McConnell	3530da5515	reset for dev	2012-07-17 10:39:28 -05:00
Jesse McConnell	db2118df4a	reset for dev	2012-07-17 10:38:35 -05:00
Jesse McConnell	88922d3dc9	set for release	2012-07-16 12:58:26 -05:00
Jesse McConnell	5e8165e2db	set for release	2012-07-16 12:58:15 -05:00
Jesse McConnell	e082da1ce0	reset for release	2012-07-16 12:55:44 -05:00
Jesse McConnell	f59b2a0632	reset release	2012-07-16 12:54:36 -05:00
Jesse McConnell	957d39da17	merge master	2012-07-16 12:51:18 -05:00
Jesse McConnell	fc7c186cbf	reset for dev	2012-07-13 12:25:39 -05:00
Jesse McConnell	9353ef6461	reset for dev	2012-07-13 12:24:20 -05:00
Jesse McConnell	0d74198345	Updating VERSION.txt top section	2012-07-13 09:07:51 -05:00
Jesse McConnell	bcd2d66907	Updating VERSION.txt top section	2012-07-13 09:07:50 -05:00
Jesse McConnell	f7f0a5b22b	reset for dev	2012-05-24 18:01:08 -05:00
Jesse McConnell	2a4b7f49a1	reset for dev	2012-05-24 16:39:28 -05:00
Jesse McConnell	d0a92ebb54	Updating VERSION.txt top section	2012-05-24 09:02:07 -05:00
Jesse McConnell	aa7e1b699e	Updating VERSION.txt top section	2012-05-24 09:02:05 -05:00
Jesse McConnell	c7a9adaa32	reset for release	2012-05-24 08:33:44 -05:00
Jesse McConnell	c8fe38733f	reset versions for release	2012-05-24 08:30:26 -05:00
Jesse McConnell	b51f521772	set for dev	2012-05-22 16:49:20 -05:00
Jesse McConnell	1eb73bae2d	set for dev	2012-05-22 16:48:40 -05:00
Jesse McConnell	54d1ff7a19	Updating VERSION.txt top section	2012-05-22 11:54:50 -05:00
Jesse McConnell	a2ed87a046	Updating VERSION.txt top section	2012-05-22 11:52:59 -05:00
Jesse McConnell	fcf7a081ce	prep for dev	2012-04-16 12:54:29 -05:00
Jesse McConnell	582f92aa21	prep for dev	2012-04-16 12:53:30 -05:00
Jesse McConnell	1aba5dd41b	Updating VERSION.txt top section	2012-04-16 09:11:31 -05:00
Jesse McConnell	ff29659869	Updating VERSION.txt top section	2012-04-16 09:11:00 -05:00
Jesse McConnell	461282a573	Updating VERSION.txt top section	2012-04-16 09:10:25 -05:00
Simone Bordet	45b2c3b1b5	Merged from master after fixing typo in jetty-spdy.xml.	2012-04-16 15:55:49 +02:00
Jesse McConnell	9c4a58200b	prep for dev	2012-04-13 18:28:51 -05:00
Jesse McConnell	443fbdfe7d	set for dev	2012-04-13 17:09:34 -05:00
Jesse McConnell	71b3f75a90	Updating VERSION.txt top section	2012-04-13 15:05:26 -05:00
Jesse McConnell	193b0d6497	Updating VERSION.txt top section	2012-04-13 15:03:22 -05:00
Jesse McConnell	4f7c896b3d	merge from master	2012-04-13 14:10:30 -05:00
Jesse McConnell	f8b5c0040d	reset for release	2012-04-13 14:09:06 -05:00
Simone Bordet	72040202d4	Reverted release back to 8.1.3-SNAPSHOT.	2012-04-13 17:27:37 +02:00
Simone Bordet	85710fb9ea	Reverted release back to 7.6.3-SNAPSHOT.	2012-04-13 16:59:06 +02:00
Jesse McConnell	92c6b5338b	Updating VERSION.txt top section	2012-04-12 11:26:08 -05:00
Jesse McConnell	a164adc48e	Updating VERSION.txt top section	2012-04-12 10:38:19 -05:00
Jesse McConnell	7078716df4	Updating VERSION.txt top section	2012-04-12 10:01:24 -05:00
Jesse McConnell	7f06c73d6f	Updating VERSION.txt top section	2012-04-12 09:16:35 -05:00
Jesse McConnell	200d9b5de0	reset for dev	2012-03-09 00:42:24 -06:00
Jesse McConnell	3561bcbf40	set for dev	2012-03-08 21:53:24 -06:00
Jesse McConnell	fed765cf27	Updating VERSION.txt top section	2012-03-08 20:55:56 -06:00
Jesse McConnell	67f3f05d70	Updating VERSION.txt top section	2012-03-08 20:44:47 -06:00
Jesse McConnell	381615f52d	merge from master	2012-03-07 16:44:31 -06:00
Jesse McConnell	9b669b335e	update version	2012-03-02 10:47:20 -06:00
Jesse McConnell	fe6445ff7d	reset version for development	2012-03-02 09:26:30 -06:00
Jesse McConnell	c58092f6f7	Updating VERSION.txt top section	2012-03-02 08:14:17 -06:00
Jesse McConnell	22dce614a3	Updating VERSION.txt top section	2012-03-02 08:14:16 -06:00
Jesse McConnell	b391937bb8	update version	2012-02-15 16:09:42 -06:00
Jesse McConnell	56f72e6fa9	update version	2012-02-15 15:20:50 -06:00
Jesse McConnell	041bc101df	update version	2012-02-15 14:05:42 -06:00
Jesse McConnell	e0d7337fa3	Updating VERSION.txt top section	2012-02-15 13:58:49 -06:00
Jesse McConnell	25e1ce8a10	update version	2012-01-27 10:48:54 -06:00
Jesse McConnell	7a553b6469	set version	2012-01-27 09:06:02 -06:00
Jesse McConnell	11e7b1b1c1	update version	2012-01-27 07:52:29 -06:00
Jesse McConnell	8e65e81618	update version	2012-01-27 07:50:10 -06:00
Jesse McConnell	2a224cf377	update version	2012-01-25 12:03:15 -06:00
Jesse McConnell	704ce74f84	Updating VERSION.txt top section	2012-01-25 10:54:49 -06:00
Jesse McConnell	82126fbd91	Updating VERSION.txt top section	2012-01-25 10:53:45 -06:00
Jesse McConnell	3854701f85	Updating VERSION.txt top section	2012-01-25 09:08:12 -06:00
Jesse McConnell	bdabfe5dc5	reset version for dev	2012-01-20 13:51:34 -06:00
Jesse McConnell	240fd1bf14	set for release	2012-01-20 11:43:31 -06:00
Jesse McConnell	8f9722bf4a	Merge branch 'master' into jetty-8	2012-01-20 11:42:18 -06:00
Jesse McConnell	c2d33f8f69	set for dev	2012-01-20 11:34:23 -06:00
Jesse McConnell	1e3273d20c	set for release	2012-01-20 08:42:24 -06:00
Jesse McConnell	7cb15929f7	Merge branch 'master' into jetty-8	2012-01-17 13:37:28 -06:00
Jesse McConnell	90184ab3c3	Latest merge from master	2012-01-17 13:36:44 -06:00
Joakim Erdfelt	6da9a22c09	Minor update to VERSION.txt format	2012-01-17 11:21:18 -07:00
Jesse McConnell	593af6a226	update version	2012-01-13 12:25:01 -06:00
Jesse McConnell	38fa2d00d4	Updating VERSION.txt top section	2012-01-13 11:21:37 -06:00
Jesse McConnell	2eb1b3c3c4	Updating VERSION.txt top section	2012-01-13 09:20:05 -06:00
Jesse McConnell	60682d4b62	Updating VERSION.txt top section	2012-01-13 08:14:16 -06:00
Jan Bartel	1fbec51c8a	Merge remote-tracking branch 'origin/master' into jetty-8	2012-01-10 16:08:59 +11:00
Joakim Erdfelt	505a76df05	Updating VERSION.txt top section	2012-01-05 10:54:42 -07:00
Joakim Erdfelt	bbe48ddfbb	Updating version jetty-7.6.0.RC3 in VERSION.txt	2012-01-05 09:26:44 -07:00
hmalphettes	4f8cff8ccd	bug 367548 the nested package must not be imported twice in jetty-osgi-boot	2011-12-27 07:59:13 +08:00
Jesse McConnell	ed46b71f37	Merge branch 'master' into jetty-8	2011-12-23 07:44:29 -06:00
Jesse McConnell	30bd9ee000	update version	2011-12-22 16:54:19 -06:00
Jesse McConnell	64b42a1f0c	updating version.txt	2011-12-22 14:40:32 -06:00
Jesse McConnell	d7ba9772f6	Updating VERSION.txt top section	2011-12-22 12:56:08 -06:00
Jesse McConnell	06882e3c56	Updating VERSION.txt top section	2011-12-22 12:51:44 -06:00
hmalphettes	49556c0f40	bug 359329. missing import/export in jetty-plus jetty-jaspi	2011-12-09 16:52:58 +08:00
Jesse McConnell	c6d5d1713c	update version	2011-12-06 16:31:03 -06:00
Jesse McConnell	f188ea4c0f	Updating VERSION.txt top section	2011-12-06 15:15:56 -06:00
Jan Bartel	0363b8100f	Merge remote-tracking branch 'origin/master' into jetty-8	2011-12-05 15:24:22 +11:00
Jesse McConnell	8ef68e1e0e	Updating VERSION.txt top section	2011-12-04 15:33:07 -06:00
Jesse McConnell	56cd2df556	Updating VERSION.txt top section	2011-12-04 12:11:35 -06:00
hmalphettes	89afbdf31d	360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6	2011-12-02 17:27:26 +08:00
Greg Wilkins	24ccaec3da	Updating VERSION.txt top section	2011-11-30 15:50:25 +11:00
Greg Wilkins	46c10b2b8a	Updating VERSION.txt top section	2011-11-30 12:46:36 +11:00
Greg Wilkins	dc92728c00	Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: VERSION.txt	2011-11-30 12:21:02 +11:00
Greg Wilkins	0b066d3d8e	Updating VERSION.txt top section	2011-11-30 07:29:32 +11:00
Greg Wilkins	a47e07445a	Upating VERSION.txt top section	2011-11-29 13:08:26 +11:00
Greg Wilkins	f3b2289527	release version	2011-11-29 13:06:05 +11:00
Greg Wilkins	55d5020980	Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: VERSION.txt jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java jetty-server/src/main/java/org/eclipse/jetty/server/Response.java jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java	2011-11-29 09:06:25 +11:00
Greg Wilkins	11a79f7dee	check nonce count	2011-11-28 12:06:43 +11:00
Greg Wilkins	a9223fe208	ready for next release	2011-11-28 08:48:34 +11:00
Jesse McConnell	94124f7412	merge from master	2011-10-26 15:26:49 -05:00
Jesse McConnell	97d0d9d812	Updating VERSION.txt top section	2011-10-24 16:36:35 -05:00
Jesse McConnell	88bc111ac3	Updating VERSION.txt top section	2011-10-24 15:49:46 -05:00
Jesse McConnell	79c674a4ce	Updating VERSION.txt top section	2011-10-24 14:40:03 -05:00
Jesse McConnell	0405be3bed	Updating VERSION.txt top section	2011-10-24 14:31:16 -05:00
Jesse McConnell	2700581906	Merge from master	2011-10-13 07:59:30 -05:00
Jesse McConnell	ec1a23adc9	Updating VERSION.txt top section	2011-10-11 11:03:39 -05:00
Jesse McConnell	3e62343aae	Updating VERSION.txt top section	2011-10-11 09:48:57 -05:00
Jesse McConnell	2038d75c8c	Updating VERSION.txt top section	2011-10-11 09:47:05 -05:00
Jesse McConnell	925335dab2	merge from master	2011-10-11 09:43:27 -05:00
Jesse McConnell	55842580aa	Updating VERSION.txt top section	2011-10-11 08:25:05 -05:00
Jesse McConnell	22c15a8cb8	Updating VERSION.txt top section	2011-10-06 20:11:39 -05:00
Jesse McConnell	93c0cb62ca	Updating VERSION.txt top section	2011-10-06 19:38:14 -05:00
Jesse McConnell	3e1a8c08bc	Updating VERSION.txt top section	2011-10-06 17:32:47 -05:00
Jesse McConnell	97e286a1ab	update VERSION	2011-10-06 17:03:58 -05:00
Jesse McConnell	7958b033b0	Updating VERSION.txt top section	2011-10-06 09:22:28 -05:00
Jan Bartel	32dbb1bddb	Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-deploy/src/main/config/etc/jetty-deploy.xml jetty-distribution/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp-2.1/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java jetty-osgi/jetty-osgi-boot-logback/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-equinoxtools/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/jetty-osgi-servletbridge/pom.xml jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation-jetty6/pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/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-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2011-10-04 17:45:15 +11:00
hmalphettes	ab6ff817a3	JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi.	2011-10-03 09:37:53 +08:00
Simone Bordet	a699ffd869	Updated VERSION.txt for #353839.	2011-09-22 12:14:15 +02:00
Simone Bordet	0bd7519a2e	Fix for #358121 (Utf8Appendable refactored to use Bjoern Hoehrmann's decoder).	2011-09-21 15:54:53 +02:00
Jesse McConnell	9bcde10aa9	reset version for next release	2011-09-08 13:30:27 -05:00
Jesse McConnell	0046c5a9c2	set for next release	2011-09-08 12:45:59 -05:00
Jesse McConnell	721c8ab682	updating version.txt and resetting pom version to 8.0.1-SNAPSHOT	2011-09-08 11:54:53 -05:00
Jesse McConnell	37d0f53b0a	updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT	2011-09-08 11:40:37 -05:00
Jesse McConnell	f7e25b2a13	Updating VERSION.txt top section	2011-09-07 17:56:28 -05:00
Jesse McConnell	66af591b8c	Updating VERSION.txt top section	2011-09-07 17:52:40 -05:00
Jesse McConnell	336e3b383b	reset for release	2011-09-07 17:49:08 -05:00
Jesse McConnell	7c7fc30b90	Merge over from jetty 7 master	2011-09-07 16:08:35 -05:00
Jesse McConnell	7f5cafc717	Updating VERSION.txt top section	2011-09-07 10:46:08 -05:00
Jesse McConnell	4169d610b0	Updating VERSION.txt top section	2011-09-07 09:44:20 -05:00
Greg Wilkins	04385c5c3b	Fixed missing 7.4.5	2011-09-07 19:56:59 +10:00
Simone Bordet	b1f95541de	Fixes #356749 (WebSocket message length is computed wrongly when greater than 0xFFFF), and a bunch of other silly mistakes.	2011-09-06 00:18:02 +02:00
Simone Bordet	1f380606d1	Fixes #356695 (websocket packages should be provided), along with commit a8ce6e8878.	2011-09-05 11:29:43 +02:00
Jesse McConnell	639d12be02	Updating VERSION.txt top section	2011-09-01 12:04:40 -05:00
Jesse McConnell	bfcd3f6308	Updating VERSION.txt top section	2011-09-01 11:54:29 -05:00
Jesse McConnell	7f405070cb	Updating VERSION.txt top section	2011-09-01 10:57:29 -05:00
Jan Bartel	1e079f06c9	Merge remote-tracking branch 'origin/master' into jetty-8	2011-09-01 14:11:53 +10:00
Jesse McConnell	d959276c9a	Updating VERSION.txt top section	2011-08-31 13:58:27 -05:00
Jesse McConnell	0b1fff1a7a	Updating VERSION.txt top section	2011-08-31 13:56:53 -05:00
Joakim Erdfelt	b0b4c31dfe	Setting Next Development Version in VERSION.txt	2011-08-30 14:01:32 -07:00
Joakim Erdfelt	ce53687643	Updating VERSION.txt to 7.5.0.RC2	2011-08-30 12:29:07 -07:00
Jan Bartel	1ff02e56e2	356137 - Upgrade to jsp implementation version 2.1.3-b10	2011-08-30 11:26:21 +10:00
Michael Gorovoy	4bab65040d	356128 Removed integration tests from jetty-monitor module	2011-08-29 19:36:40 -04:00
Michael Gorovoy	0763e040e5	353014 TimeoutExchangeTest run time reduced ... Patch provided by Thomas Becker <tbecker@intalio.com>	2011-08-29 16:18:45 -04:00
Michael Gorovoy	1ba88a6a4b	352188 TestClient correctly processes --host option in jetty-websocket	2011-08-29 14:13:53 -04:00
Michael Gorovoy	103d7a87c2	353623 Added new methods to HttpExchange	2011-08-26 03:49:58 -04:00
Michael Gorovoy	19a8916982	353624 HttpURI accepts java.net.URI object in constructor	2011-08-25 18:51:29 -04:00
Michael Gorovoy	d40b9ccca5	Merge branch 'jetty1410'	2011-08-24 21:26:01 -04:00
Michael Gorovoy	a81611400d	354080 ServletContextHandler allows to replace any subordinate handler when restarted	2011-08-24 18:14:10 -04:00
Michael Gorovoy	07b8f08a37	JETTY-1410 HTTP client handles CONTINUE 100 response correctly	2011-08-23 16:20:37 +10:00
Joakim Erdfelt	b34ccc5915	Making VERSION.txt automatically update itself in the jetty-distribution tarball	2011-08-19 10:52:48 -07:00
Michael Gorovoy	bb03bb090b	Moved 355162 entry to correct release	2011-08-19 11:09:17 -04:00
Greg Wilkins	30603c013e	set version for RC1	2011-08-19 21:55:32 +10:00
Joakim Erdfelt	ffee22f357	Fixing NPE in jetty-version-maven-plugin	2011-08-18 14:36:08 -07:00
Michael Gorovoy	0720ba9c04	355162 Allow creating an empty resource collection	2011-08-18 17:13:25 -04:00
Joakim Erdfelt	64605e9129	Merging version-updates	2011-08-18 13:46:45 -07:00
Simone Bordet	fc55901661	Merge remote-tracking branch 'origin/master' ... Conflicts: VERSION.txt	2011-08-18 17:42:32 +02:00
Simone Bordet	2d6491b78f	Fixes #355103 (Make allowCredentials default to true in CrossOriginFilter).	2011-08-18 17:41:21 +02:00
Jan Bartel	817ecc25c3	Part of: JETTY-1414 HashLoginService doesn't refresh realm if specified config filename is not an absolute platform specific value	2011-08-18 16:10:33 +10:00
Michael Gorovoy	39fce10d74	335001 Eliminate expected exceptions from log when running in JBoss	2011-08-17 15:32:31 -04:00
Joakim Erdfelt	be4d0cf3ec	Updating VERSION.txt (in a branch) with formatting (and missed entries in 7.5.0.RC0) using jetty-version-maven-plugin	2011-08-16 11:42:20 -07:00
Jesse McConnell	4eef2c792a	set for release	2011-08-16 09:10:43 -05:00
Jan Bartel	6e8afd6795	Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: VERSION.txt	2011-08-16 11:35:46 +10:00
Joakim Erdfelt	c2c4234690	Fixing minor formatting issues in prep for jetty-version-maven-plugin	2011-08-15 12:54:42 -07:00
Jesse McConnell	0610ce4387	update for release	2011-08-15 14:03:25 -05:00
Michael Gorovoy	6fb751e216	354397 RewriteRegexRule handles special characters in regex group	2011-08-15 12:24:07 -04:00
Jan Bartel	a8d69f44c6	352565 - cookie httponly flag ignored	2011-08-15 17:13:51 +10:00
Jan Bartel	050cb83b35	Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java jetty-websocket/pom.xml	2011-08-12 18:43:15 +10:00
Jan Bartel	9315e1896d	354466 - Typo in example config of jetty-plus.xml	2011-08-11 19:31:47 +10:00