753 Commits

Author	SHA1	Message	Date
Joakim Erdfelt	591b0a2e37	Post-Merge build fixes	2018-06-12 12:54:41 -05:00
Joakim Erdfelt	0cd4dacbac	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # VERSION.txt # aggregates/jetty-all-compact3/pom.xml # aggregates/jetty-all/pom.xml # apache-jsp/pom.xml # apache-jstl/pom.xml # examples/async-rest/async-rest-jar/pom.xml # examples/async-rest/async-rest-webapp/pom.xml # examples/async-rest/pom.xml # examples/embedded/pom.xml # examples/pom.xml # jetty-alpn/jetty-alpn-client/pom.xml # jetty-alpn/jetty-alpn-conscrypt-client/pom.xml # jetty-alpn/jetty-alpn-conscrypt-server/pom.xml # jetty-alpn/jetty-alpn-java-client/pom.xml # jetty-alpn/jetty-alpn-java-server/pom.xml # jetty-alpn/jetty-alpn-openjdk8-client/pom.xml # jetty-alpn/jetty-alpn-openjdk8-server/pom.xml # jetty-alpn/jetty-alpn-server/pom.xml # jetty-alpn/pom.xml # jetty-annotations/pom.xml # jetty-ant/pom.xml # jetty-bom/pom.xml # jetty-cdi/cdi-2/pom.xml # jetty-cdi/cdi-core/pom.xml # jetty-cdi/cdi-full-servlet/pom.xml # jetty-cdi/cdi-servlet/pom.xml # jetty-cdi/cdi-websocket/pom.xml # jetty-cdi/pom.xml # jetty-cdi/test-cdi-webapp/pom.xml # jetty-client/pom.xml # jetty-continuation/pom.xml # jetty-deploy/pom.xml # jetty-distribution/pom.xml # jetty-documentation/pom.xml # jetty-fcgi/fcgi-client/pom.xml # jetty-fcgi/fcgi-server/pom.xml # jetty-fcgi/pom.xml # jetty-gcloud/jetty-gcloud-session-manager/pom.xml # jetty-gcloud/pom.xml # jetty-hazelcast/pom.xml # jetty-home/pom.xml # jetty-http-spi/pom.xml # jetty-http/pom.xml # jetty-http2/http2-alpn-tests/pom.xml # jetty-http2/http2-client/pom.xml # jetty-http2/http2-common/pom.xml # jetty-http2/http2-hpack/pom.xml # jetty-http2/http2-http-client-transport/pom.xml # jetty-http2/http2-server/pom.xml # jetty-http2/pom.xml # jetty-infinispan/pom.xml # jetty-io/pom.xml # jetty-jaas/pom.xml # jetty-jaspi/pom.xml # jetty-jmx/pom.xml # jetty-jndi/pom.xml # jetty-jspc-maven-plugin/pom.xml # jetty-maven-plugin/pom.xml # jetty-memcached/jetty-memcached-sessions/pom.xml # jetty-memcached/pom.xml # jetty-nosql/pom.xml # jetty-osgi/jetty-osgi-alpn/pom.xml # jetty-osgi/jetty-osgi-boot-jsp/pom.xml # jetty-osgi/jetty-osgi-boot-warurl/pom.xml # jetty-osgi/jetty-osgi-boot/pom.xml # jetty-osgi/jetty-osgi-httpservice/pom.xml # jetty-osgi/pom.xml # jetty-osgi/test-jetty-osgi-context/pom.xml # jetty-osgi/test-jetty-osgi-fragment/pom.xml # jetty-osgi/test-jetty-osgi-server/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/config/etc/jetty-http.xml # jetty-server/src/main/config/etc/jetty-ssl.xml # jetty-servlet/pom.xml # jetty-servlets/pom.xml # jetty-spring/pom.xml # jetty-start/pom.xml # jetty-unixsocket/pom.xml # jetty-util-ajax/pom.xml # jetty-util/pom.xml # jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java # jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java # jetty-webapp/pom.xml # jetty-websocket/javax-websocket-client-impl/pom.xml # jetty-websocket/javax-websocket-server-impl/pom.xml # jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java # jetty-websocket/pom.xml # jetty-websocket/websocket-api/pom.xml # jetty-websocket/websocket-client/pom.xml # jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java # jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java # jetty-websocket/websocket-common/pom.xml # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java # jetty-websocket/websocket-server/pom.xml # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java # jetty-websocket/websocket-servlet/pom.xml # jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java # jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java # jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java # jetty-xml/pom.xml # pom.xml # tests/pom.xml # tests/test-continuation/pom.xml # tests/test-http-client-transport/pom.xml # tests/test-integration/pom.xml # tests/test-jmx/jmx-webapp-it/pom.xml # tests/test-jmx/jmx-webapp/pom.xml # tests/test-jmx/pom.xml # tests/test-loginservice/pom.xml # tests/test-quickstart/pom.xml # tests/test-sessions/pom.xml # tests/test-sessions/test-file-sessions/pom.xml # tests/test-sessions/test-gcloud-sessions/pom.xml # tests/test-sessions/test-hazelcast-sessions/pom.xml # tests/test-sessions/test-infinispan-sessions/pom.xml # tests/test-sessions/test-jdbc-sessions/pom.xml # tests/test-sessions/test-memcached-sessions/pom.xml # tests/test-sessions/test-mongodb-sessions/pom.xml # tests/test-sessions/test-sessions-common/pom.xml # tests/test-webapps/pom.xml # tests/test-webapps/test-http2-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	2018-06-12 11:11:38 -05:00
Joakim Erdfelt	0e6c91b604	Updating to version 9.2.26-SNAPSHOT	2018-06-06 18:54:58 -05:00
Joakim Erdfelt	4830fd15e9	Updating to version 9.2.25.v20180606	2018-06-06 16:42:54 -05:00
Joakim Erdfelt	e4bfe00dce	Updating to version 9.4.12-SNAPSHOT	2018-06-05 14:18:37 -05:00
Joakim Erdfelt	d5fc0523cf	Updating to version 9.4.11.v20180605	2018-06-05 13:23:02 -05:00
Joakim Erdfelt	5eefa90e05	Updating to version 9.3.25-SNAPSHOT	2018-06-05 13:13:07 -05:00
Joakim Erdfelt	84205aa28f	Updating to version 9.3.24.v20180605	2018-06-05 12:11:03 -05:00
Joakim Erdfelt	f0ff571c98	Reverting version to 9.3.24-SNAPSHOT	2018-06-05 12:06:58 -05:00
Joakim Erdfelt	13640c297c	Bumping version to 9.3.25-SNAPSHOT	2018-06-05 11:58:37 -05:00
Joakim Erdfelt	1732ffca51	Updating to version 9.4.11-SNAPSHOT	2018-05-03 11:48:05 -05:00
Joakim Erdfelt	daa59876e6	Updating to version 9.4.10.v20180503	2018-05-03 10:55:19 -05:00
Joakim Erdfelt	8763c6065d	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2018-04-20 11:32:46 -05:00
Olivier Lamy	f36eba4577	class.newInstance is deprecated #2435 (#2437) ... * Class.newInstance() is deprecated in Java 9+ #2435 Signed-off-by: olivier lamy <oliver.lamy@gmail.com>	2018-04-17 19:07:20 +10:00
Joakim Erdfelt	1c04f9838d	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed	2018-03-22 16:42:42 -05:00
Joakim Erdfelt	c3cc138a3b	Updating to version 9.4.10-SNAPSHOT	2018-03-20 08:25:59 -05:00
Joakim Erdfelt	1f8159b1e4	Updating to version 9.4.9.v20180320	2018-03-20 07:18:24 -05:00
WalkerWatch	534b8ea38b	Add edit warning for .mod files. Resolves #173	2018-03-15 13:23:42 -04:00
Joakim Erdfelt	e3e3f9eb0b	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed	2018-03-06 11:16:25 -06:00
Lachlan Roberts	a639ee9275	Resolved errorprone MissingOverride warnings #2206 ... `@Override` was added to methods which were missing the annotation #2206 Signed-off-by: Lachlan Roberts <lachlan@webtide.com>	2018-03-01 13:59:25 +11:00
Joakim Erdfelt	a05b157c03	Updating to version 9.3.24-SNAPSHOT	2018-02-28 16:39:30 -06:00
Joakim Erdfelt	0554f8d8b4	Updating to version 9.3.23.v20180228	2018-02-28 15:45:57 -06:00
Joakim Erdfelt	3001c8af2f	Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x	2018-02-07 15:35:04 -06:00
Joakim Erdfelt	d5a0878019	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2018-01-09 10:08:30 -06:00
Joakim Erdfelt	41ed9f29f4	Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x	2018-01-09 09:37:25 -06:00
Joakim Erdfelt	fa4c7b0ca9	Issue #2108 - Updating license headers for year 2018	2018-01-09 08:39:37 -06:00
Joakim Erdfelt	067fc5d2d8	Issue #2108 - Upgrade licenses for 2018	2018-01-09 07:42:06 -06:00
Joakim Erdfelt	bd01e1877a	Updating to version 9.2.25-SNAPSHOT	2018-01-05 11:35:42 -06:00
Joakim Erdfelt	a617842695	Updating to version 9.2.24.v20180105	2018-01-05 10:11:08 -06:00
Joakim Erdfelt	2dd970b055	Updating to version 9.2.24-SNAPSHOT	2017-12-18 10:43:47 -06:00
Joakim Erdfelt	cdbe733684	Updating to version 9.2.23.v20171218	2017-12-18 09:06:48 -06:00
Joakim Erdfelt	ff53002fac	Updating to version 9.4.9-SNAPSHOT	2017-11-21 13:11:31 -07:00
Joakim Erdfelt	82b8fb23f7	Updating to version 9.4.8.v20171121	2017-11-21 12:33:52 -07:00
Jesse McConnell	a72eb0001d	Updating to version 9.3.23-SNAPSHOT	2017-10-30 15:39:57 -05:00
Jesse McConnell	705048cc49	Updating to version 9.3.22.v20171030	2017-10-30 15:16:29 -05:00
Joakim Erdfelt	d9865a02ba	Updating to version 9.4.8-SNAPSHOT	2017-09-14 08:44:27 -07:00
Joakim Erdfelt	80fb788d0c	Updating to version 9.4.7.v20170914	2017-09-14 07:35:18 -07:00
Jan Bartel	56e40b3011	Issue #1597 ... Reinstate changes after incorrect merge from jetty-9.4.x branch.	2017-08-30 12:26:05 +10:00
Joakim Erdfelt	3ec5f8fa3d	Merge remote-tracking branch 'origin/jetty-9.4.x'	2017-08-09 16:21:08 -07:00
Joakim Erdfelt	1311052b15	Cleaning up state of branch to match the original jetty-9.4.x ... + Does not include changes to /jetty-cdi/ + Does not include changes to /jetty-websocket/ for javax.websocket-1.1	2017-08-08 09:47:04 -07:00
Joakim Erdfelt	ce4a8df311	Fixing module [name] warning	2017-08-08 09:14:59 -07:00
Jan Bartel	3296c01e8e	Issue #1600	2017-08-08 09:13:29 -07:00
Jan Bartel	77d96ff36d	Issue ##1597 ... Make osgi import of javax.mail optional	2017-08-08 09:13:18 -07:00
Joakim Erdfelt	3fdbcffbbd	Updating to version 9.2.23-SNAPSHOT	2017-08-08 09:12:55 -07:00
Joakim Erdfelt	a7bcac6d75	Updating to version 9.3.20.v20170531	2017-08-08 09:07:35 -07:00
Joakim Erdfelt	11a544d6ac	Updating to version 9.3.22-SNAPSHOT	2017-08-01 11:26:37 -07:00
Joakim Erdfelt	bb1d69ca52	Updating to version 9.3.21.M0	2017-08-01 10:47:04 -07:00
Jan Bartel	21b1ecef7b	Issue #1597 ... Removed javax.mail and javax.transaction jars and tidied up dependencies for test webapps.	2017-06-21 16:20:01 +02:00
Jan Bartel	c115b4a229	Issue #1597 ... A change to jetty-jndi/pom.xml was not merged from jetty-9.4.x	2017-06-09 20:15:22 +02:00
Joakim Erdfelt	76ace004b6	Merge remote-tracking branch 'origin/jetty-9.4.x'	2017-06-09 09:17:43 -07:00
Jan Bartel	10a6e5fa5e	Issue #1600	2017-06-09 11:55:21 +02:00
Joakim Erdfelt	5ee1c7a533	Merge branch 'release-9.4.6' into jetty-9.4.x	2017-06-07 10:01:11 -07:00
Jan Bartel	4204061bd4	Issue ##1597 ... Make osgi import of javax.mail optional	2017-06-07 11:59:53 +02:00
Joakim Erdfelt	4d2c299fe8	Updating to version 9.2.23-SNAPSHOT	2017-06-06 08:55:12 -07:00
Joakim Erdfelt	0af30bce5a	Updating to version 9.2.22.v20170606	2017-06-06 07:03:05 -07:00
Joakim Erdfelt	6a3c40e935	Updating to version 9.4.7-SNAPSHOT	2017-05-31 17:26:34 -07:00
Joakim Erdfelt	8ba0f2d95d	Updating to version 9.4.6.v20170531	2017-05-31 16:22:52 -07:00
Joakim Erdfelt	429380d36a	Updating to version 9.3.21-SNAPSHOT	2017-05-31 16:10:04 -07:00
Joakim Erdfelt	0f3b1cbe36	Updating to version 9.3.20.v20170531	2017-05-31 15:24:57 -07:00
Joakim Erdfelt	cf56168f7d	Updating to version 9.3.20-SNAPSHOT	2017-05-02 15:26:56 -07:00
Joakim Erdfelt	d36d57d5c7	Updating to version 9.3.19.v20170502	2017-05-02 14:31:51 -07:00
Joakim Erdfelt	782f36f157	Updating to version 9.4.6-SNAPSHOT	2017-05-02 14:29:09 -07:00
Joakim Erdfelt	9d8ad7489c	Updating to version 9.4.5.v20170502	2017-05-02 13:22:18 -07:00
Joakim Erdfelt	92ea5bda21	Updating to version 9.4.5-SNAPSHOT	2017-04-14 14:43:36 -07:00
Joakim Erdfelt	3dc8f557c6	Updating to version 9.4.4.v20170414	2017-04-14 13:20:17 -07:00
Joakim Erdfelt	9e2aeda052	Updating to version 9.3.19-SNAPSHOT	2017-04-06 07:47:53 -07:00
Joakim Erdfelt	63273aa40b	Updating to version 9.3.18.v20170406	2017-04-06 06:31:02 -07:00
Joakim Erdfelt	1360b863dc	Updating to version 9.4.4-SNAPSHOT	2017-03-17 10:53:54 -07:00
Joakim Erdfelt	95e94b49d8	Updating to version 9.4.3.v20170317	2017-03-17 09:54:58 -07:00
Joakim Erdfelt	a6a0ab991f	Updating to version 9.3.18-SNAPSHOT	2017-03-17 09:48:19 -07:00
Joakim Erdfelt	307d23975e	Updating to version 9.3.17.v20170317	2017-03-17 09:07:39 -07:00
Joakim Erdfelt	523fab30bd	Updating to version 9.4.3-SNAPSHOT	2017-02-20 08:13:31 -07:00
Joakim Erdfelt	4a674b9cc9	Updating to version 9.4.2.v20170220	2017-02-20 06:22:45 -07:00
Jesse McConnell	e695fc80d6	Updating to version 9.2.22-SNAPSHOT	2017-01-20 12:32:51 -06:00
Jesse McConnell	513b5e5f90	Updating to version 9.2.21.v20170120	2017-01-20 12:32:00 -06:00
Jesse McConnell	d0c33ebe8b	Updating to version 9.4.2-SNAPSHOT	2017-01-20 10:49:06 -06:00
Jesse McConnell	556ecbcdcf	Updating to version 9.4.1.v20170120	2017-01-20 09:47:53 -06:00
Jesse McConnell	66b43ecda8	Updating to version 9.3.17-SNAPSHOT	2017-01-20 09:33:43 -06:00
Jesse McConnell	df03355d00	Updating to version 9.3.16.v20170120	2017-01-20 09:06:48 -06:00
Simone Bordet	cef2ff9522	Happy New Year 2017.	2017-01-19 19:31:53 +01:00
Simone Bordet	0c8273f2ca	Happy New Year 2017.	2017-01-19 19:26:41 +01:00
Simone Bordet	07838b057f	Happy New Year 2017.	2017-01-19 18:54:03 +01:00
Simone Bordet	347c48d657	Revert "resolve merge and update license headers" ... This reverts commit 53b31b03dd, reversing changes made to 4565c186d7.	2017-01-19 18:26:43 +01:00
Jesse McConnell	53b31b03dd	resolve merge and update license headers	2017-01-19 09:33:16 -06:00
Jesse McConnell	ce3e6dafec	update license headers to 2017	2017-01-19 09:30:00 -06:00
Joakim Erdfelt	7494914ff6	Updating to version 9.3.16-SNAPSHOT	2016-12-20 13:09:32 -07:00
Joakim Erdfelt	680ecd646b	Updating to version 9.3.15.v20161220	2016-12-20 12:31:58 -07:00
Joakim Erdfelt	6b3b59df43	Updating to version 9.2.21-SNAPSHOT	2016-12-16 16:23:06 -07:00
Joakim Erdfelt	bcbcee7f23	Updating to version 9.2.20.v20161216	2016-12-16 15:47:41 -07:00
Jesse McConnell	6a7e5dd4f5	Updating to version 9.4.1-SNAPSHOT	2016-12-08 09:41:50 -06:00
Jesse McConnell	c54efb5929	Updating to version 9.4.0.v20161208	2016-12-08 08:56:45 -06:00
Jesse McConnell	f8338b3f59	Updating to version 9.4.1-SNAPSHOT	2016-12-07 10:32:41 -06:00
Jesse McConnell	dac1d17a2d	Updating to version 9.4.0.v20161207	2016-12-07 09:47:30 -06:00
Joakim Erdfelt	2c38511828	Updating to version 9.3.15-SNAPSHOT	2016-10-28 13:01:34 -07:00
Joakim Erdfelt	14611d2f76	Updating to version 9.3.14.v20161028	2016-10-28 12:21:02 -07:00
Joakim Erdfelt	ade14ba34b	Updating to version 9.3.14-SNAPSHOT	2016-10-14 11:33:51 -07:00
Joakim Erdfelt	c3a78e70a8	Updating to version 9.3.13.v20161014	2016-10-14 10:39:37 -07:00
Jesse McConnell	863913b64e	set for dev	2016-09-30 19:05:47 +00:00
Jesse McConnell	b91cc8a4ea	set for release	2016-09-30 18:01:20 +00:00
Joakim Erdfelt	6cf10172ca	Updating to version 9.3.13-SNAPSHOT	2016-09-15 07:34:52 -07:00
Joakim Erdfelt	8b35fdc5a5	Updating to version 9.3.12.v20160915	2016-09-15 06:48:16 -07:00
Joakim Erdfelt	fb7da26ad2	Updating to version 9.2.20-SNAPSHOT	2016-09-08 13:04:11 -07:00
Joakim Erdfelt	7b94bc32f4	Updating to version 9.2.19.v20160908	2016-09-08 12:11:44 -07:00
Joakim Erdfelt	6e1b1cdb36	Updating to version 9.3.12-SNAPSHOT	2016-07-21 19:07:19 -07:00
Joakim Erdfelt	9fd6d4354e	Updating to version 9.3.11.v20160721	2016-07-21 18:37:09 -07:00
Joakim Erdfelt	0b18340179	Updating to version 9.2.19-SNAPSHOT	2016-07-21 13:10:23 -07:00
Joakim Erdfelt	d3ff3423f0	Updating to version 9.2.18.v20160721	2016-07-21 12:35:26 -07:00
Jesse McConnell	ae931538ab	[maven-release-plugin] prepare for next development iteration	2016-06-22 13:59:10 -05:00
Jesse McConnell	df1ed4fb03	[maven-release-plugin] prepare release jetty-9.3.11.M0	2016-06-22 13:59:06 -05:00
Jesse McConnell	030ec61837	[maven-release-plugin] prepare for next development iteration	2016-06-22 09:14:25 -05:00
Jesse McConnell	9a4cb41122	[maven-release-plugin] prepare release jetty-9.3.11.M0	2016-06-22 09:14:21 -05:00
Jesse McConnell	e7034117ea	[maven-release-plugin] prepare for next development iteration	2016-06-21 08:50:13 -05:00
Jesse McConnell	16c435c69d	[maven-release-plugin] prepare release jetty-9.3.10.v20160621	2016-06-21 08:50:09 -05:00
Jesse McConnell	dc4574f380	[maven-release-plugin] prepare for next development iteration	2016-05-17 17:30:17 -05:00
Jesse McConnell	0bbebec1e0	[maven-release-plugin] prepare release jetty-9.3.9.v20160517	2016-05-17 17:30:13 -05:00
Jesse McConnell	d5c6793e6a	[maven-release-plugin] prepare for next development iteration	2016-05-17 15:33:46 -05:00
Jesse McConnell	0bab7e6616	[maven-release-plugin] prepare release jetty-9.2.17.v20160517	2016-05-17 15:33:42 -05:00
Greg Wilkins	a5ad291add	Squashed commit of the following: (#528) ... commit 4bf6b7c951 Merge: a50e882 301fc12 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Apr 27 12:12:08 2016 +1000 Merge branch 'master' into jetty-9.4.x-Feature commit a50e8825a3 Author: Greg Wilkins <gregw@webtide.com> Date: Sat Apr 23 09:38:00 2016 +1000 work in progress commit 4e286266c0 Merge: 5ae7da0 f550fcd Author: Greg Wilkins <gregw@webtide.com> Date: Thu Apr 21 16:34:12 2016 +1000 Merge branch 'master' into jetty-9.4.x-Feature commit 5ae7da049b Author: Greg Wilkins <gregw@webtide.com> Date: Thu Apr 21 12:12:24 2016 +1000 Work in progress on Features commit adfc430ad4 Author: Jan Bartel <janb@webtide.com> Date: Wed Apr 20 22:05:55 2016 +1000 Refactor Configurations.isEnabledByDefault, enable all configurations by default. commit 70cca692cc Author: Jan Bartel <janb@webtide.com> Date: Wed Apr 20 17:32:22 2016 +1000 Fix features for jsp with osgi commit 22d2b251e9 Merge: 571d503 2c4cdbe Author: Greg Wilkins <gregw@webtide.com> Date: Thu Apr 14 16:19:43 2016 +1000 Merge branch 'master' into jetty-9.4.x-Feature commit 571d50315e Author: Greg Wilkins <gregw@webtide.com> Date: Wed Apr 13 15:36:36 2016 +1000 code comment commit d9b229f298 Author: Greg Wilkins <gregw@webtide.com> Date: Sat Apr 9 21:24:22 2016 +1000 fixed quickstart validation commit 154d58bf62 Merge: 8e54aad ef92338 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Apr 8 18:25:17 2016 +1000 Merge branch 'master' into jetty-9.4.x-Feature commit 8e54aad414 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Apr 8 18:21:30 2016 +1000 general cleanup of Configuration and ClasspathPattern usage commit 65f8e5dbd0 Merge: ea1deda 2fb9b55 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Apr 8 09:15:28 2016 +1000 Merge branch 'master' into jetty-9.4.x-Feature commit ea1deda4f9 Merge: cfe9c83 f92588c Author: Greg Wilkins <gregw@webtide.com> Date: Tue Mar 15 18:21:56 2016 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit cfe9c83691 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Mar 15 17:57:23 2016 +1100 work in progress commit 725be8c051 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Mar 15 10:11:49 2016 +1100 work in progress commit 61d2c07534 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Mar 11 14:01:00 2016 +1100 progress on OSGi commit a977536c7d Author: Greg Wilkins <gregw@webtide.com> Date: Fri Mar 11 12:52:33 2016 +1100 Fixed plugin commit f08b84ba0e Merge: f19bd2c 8a24798 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Mar 11 12:21:55 2016 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit f19bd2c65a Author: Greg Wilkins <gregw@webtide.com> Date: Fri Mar 11 12:21:06 2016 +1100 work in progress... all but OSGi commit 2f15c3e4f9 Merge: 36b5687 7b1486b Author: Greg Wilkins <gregw@webtide.com> Date: Thu Mar 10 16:52:43 2016 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 36b5687329 Merge: 13d914a e7081d7 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Mar 10 07:20:05 2016 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 13d914aa7c Author: Greg Wilkins <gregw@webtide.com> Date: Thu Mar 10 04:41:30 2016 +1100 Work in progress on Features Moved jar discovery to META-INF commit d41bd264ad Author: Greg Wilkins <gregw@webtide.com> Date: Sat Mar 5 17:48:15 2016 +0100 Work in progress towards new quickstart arch commit c5c23698c4 Merge: fd34007 692aae0 Author: Greg Wilkins <gregw@webtide.com> Date: Sat Mar 5 11:29:18 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit fd34007c3d Author: Greg Wilkins <gregw@webtide.com> Date: Sat Mar 5 11:04:35 2016 +0100 Work in progress on Features for QuickStart commit c5f0c80cd2 Merge: 0e6d886 b61c5ff Author: Greg Wilkins <gregw@webtide.com> Date: Fri Mar 4 16:05:23 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit 0e6d886b01 Merge: d150405 2b67e04 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Mar 2 17:32:36 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit d1504055de Merge: 22a6cd0 3300d54 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Mar 2 15:21:20 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit 22a6cd05b7 Author: Greg Wilkins <gregw@webtide.com> Date: Mon Feb 29 20:53:17 2016 +0100 Features work in progress convert more server/system classes to Configurations commit 037e04bfe5 Merge: add9876 bb08b65 Author: Greg Wilkins <gregw@webtide.com> Date: Mon Feb 29 17:11:04 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit add9876f83 Merge: 5263f15 eb5e25c Author: Greg Wilkins <gregw@webtide.com> Date: Thu Feb 25 10:11:08 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit 5263f15acd Merge: 89803ae 21fdaf5 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Feb 23 14:35:31 2016 +0100 Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature commit 89803aec95 Merge: 5fed7c7 779317d Author: Greg Wilkins <gregw@webtide.com> Date: Tue Feb 16 16:09:38 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit 5fed7c713f Author: Greg Wilkins <gregw@webtide.com> Date: Tue Feb 16 11:21:13 2016 +0100 fixed merge commit ec22a1ba0b Merge: 4c8257d d0541e5 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Feb 16 10:53:16 2016 +0100 Merge branch 'master' into jetty-9.4.x-Feature commit 4c8257d23b Author: Greg Wilkins <gregw@webtide.com> Date: Thu Dec 17 09:34:28 2015 +1100 Do not default quickstart commit 57ce87770a Merge: 14bde1f 96e4d72 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Dec 16 17:16:14 2015 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 14bde1f696 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Dec 4 16:26:58 2015 +1100 work in progress on Configurations as services commit 46ce2aef3a Merge: 9e82fa0 ae9dc79 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Dec 4 10:11:09 2015 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 9e82fa0a22 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Dec 4 08:52:37 2015 +1100 work in progress to Configurations as ServiceLoader commit 6e11f22de4 Merge: 120e330 5afa348 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Dec 3 18:16:14 2015 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 120e33034f Merge: 6c5b95d 384caf0 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Dec 3 14:20:52 2015 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 6c5b95d6b8 Merge: 722eb60 5e40bf2 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Dec 2 11:16:37 2015 +1100 Merge branch 'master' into jetty-9.4.x-Feature commit 722eb60ce5 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Nov 27 13:58:16 2015 +1100 Configurations can add server/system classes commit 2972354db7 Author: Greg Wilkins <gregw@webtide.com> Date: Fri Nov 27 11:47:03 2015 +1100 Self ordering WebApp Configurations Signed-off-by: Greg Wilkins <gregw@webtide.com>	2016-05-02 17:55:54 +10:00
Joakim Erdfelt	c09f31a51d	Bumping up master to version 10.0.0-SNAPSHOT	2016-04-29 11:47:15 -07:00
Joakim Erdfelt	939505c342	Updating to version 9.2.17-SNAPSHOT	2016-04-14 14:03:21 -07:00
Joakim Erdfelt	778fac638d	Updating to version 9.2.16.v20160414	2016-04-14 13:21:34 -07:00
Joakim Erdfelt	47bbd9364d	Revert "Updating to version 9.2.16.v20160414" ... This reverts commit 29ae63855b.	2016-04-14 13:19:59 -07:00
Joakim Erdfelt	29ae63855b	Updating to version 9.2.16.v20160414	2016-04-14 13:17:21 -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	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
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
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	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	ac24196b0d	Happy New Year 2016	2016-01-04 14:34:20 -07:00
Joakim Erdfelt	cd39fd84fe	Happy New Year 2016	2016-01-04 14:31:22 -07:00
Joakim Erdfelt	b5db18378d	Happy New Year 2016	2016-01-04 14:21:26 -07:00
Greg Wilkins	ff0d1b4c14	481903 Module Descriptions	2015-11-12 10:48:04 +11: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
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	2cce7510e1	Updating to 9.3.5-SNAPSHOT	2015-10-08 17:49:09 -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
Jesse McConnell	6409366499	[maven-release-plugin] prepare for next development iteration	2015-08-27 10:11:29 -05:00
Jesse McConnell	3086adc965	[maven-release-plugin] prepare release jetty-9.3.3.v20150827	2015-08-27 10:11:21 -05:00
Jesse McConnell	f8734f23ce	[maven-release-plugin] prepare for next development iteration	2015-08-25 14:10:01 -05:00
Jesse McConnell	e9edf4c24b	[maven-release-plugin] prepare release jetty-9.3.3.v20150825	2015-08-25 14:09:54 -05:00