Commit Graph

234 Commits

Author SHA1 Message Date
Joakim Erdfelt 459e04d3b2 [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-24 08:13:26 -07:00
Jesse McConnell a6c48312f6 [maven-release-plugin] prepare for next development iteration 2013-02-22 07:53:11 -06:00
Jesse McConnell 484162de79 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-22 07:52:48 -06:00
Jesse McConnell 48e9e9c36c [maven-release-plugin] prepare for next development iteration 2013-02-21 17:44:16 -06:00
Jesse McConnell ca072f9c82 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 17:43:59 -06:00
Jesse McConnell 85a9371c2e [maven-release-plugin] prepare for next development iteration 2013-02-21 14:37:06 -06:00
Jesse McConnell 2b5abf7ed2 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 14:36:57 -06:00
Jesse McConnell 95eefd5381 [maven-release-plugin] prepare for next development iteration 2013-02-21 11:10:53 -06:00
Jesse McConnell 399828d833 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 11:10:35 -06:00
Jan Bartel 9be9910cde 227244 Remove import of backport-util-concurrent Arrays class 2013-02-20 09:34:30 +11:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Jesse McConnell a84f52d037 update jetty-maven-plugin to 1.7 compiler plugin (remove 1.5 actually) 2013-01-28 12:17:14 -06:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Jan Bartel d087a88caf 397114 run-forked with waitForChild=false can lock up 2013-01-10 17:52:07 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Jan Bartel b819c07cc9 396474 add websocket server classes to jetty-maven-plugin classpath 2012-12-13 19:58:50 +11:00
Jan Bartel d9b34930d5 396460 Make ServerConnector configurable with jetty-maven-plugin 2012-12-13 19:58:50 +11:00
Jan Bartel 2a5a8e0998 JETTY-846 Support maven-war-plugin configuration for jetty-maven-plugin; fix NPE 2012-11-19 13:52:34 +11:00
Jan Bartel b000fa4f34 394545 Add jetty-jaas dependency to jetty-maven-plugin 2012-11-19 12:21:01 +11:00
Jan Bartel fe773d22e1 JETTY-846 Support maven-war-plugin overlay configuration with jetty:run 2012-11-19 12:06:26 +11:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Jesse McConnell 2ab0ef25bd resolve issues between jetty 8 and jetty 9 maven plugin that jan noticed 2012-11-01 12:08:07 -05:00
Jan Bartel 8186794775 JETTY-1550 virtual WEB-INF not created if project has overlays 2012-11-01 15:37:17 +11:00
Jan Bartel e466fa06b9 393291 Confusing log entry about (non) existing webAppSourceDirectory 2012-11-01 11:44:40 +11:00
Jesse McConnell a1fa7d4fdd update maven plugins tools api dependencies to something that will clear CQ 2012-10-18 11:15:29 -05:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Jesse McConnell 2e81b63807 add jetty-jsp into build and add jetty-jspc-maven-plugin in as well 2012-08-29 11:08:52 -05:00
Jesse McConnell 79861eaa05 adding in jetty-maven-plugin 2012-08-28 09:35:45 -05:00