diff --git a/VERSION.txt b/VERSION.txt index 685f74efbc4..d5489f0851f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1256,7 +1256,7 @@ jetty-7.0.2.RC0 + Added IPAccessHandler + Updated Servlet3Continuation to final 3.0.20100224 + 305997 Coalesce buffers in ChannelEndPoint.flush() - + 306028 Enable TCP_NODELAY by default in client connectors <<<<<<< HEAD + + 306028 Enable TCP_NODELAY by default in client connectors jetty-8.0.0.M0 - 28 February 2010 + Updated servlet 3.0 spec 20100224 @@ -1264,10 +1264,6 @@ jetty-8.0.0.M0 - 28 February 2010 + Updated to cometd 1.0.1 jetty-7.0.1.v20091125 - 25 November 2009 - + ======= - -jetty-7.0.1.v20091125 - 25 November 2009 - + >>>>>>> origin/master + 274251 DefaultServlet supports exact match mode. + 288401 HttpExchange.cancel() Method Unimplemented + 289027 deobfuscate HttpClient SSL passwords diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index dcd397a6746..0d53bcd3393 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -115,7 +115,7 @@ - + org.eclipse.jetty jetty-deploy diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index a5be9c718da..23c992f8305 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -92,7 +92,7 @@ - + org.eclipse.jetty jetty-client diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 48dad96782e..c59259e0109 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -64,9 +64,9 @@ - org.mortbay.jetty - servlet-api - 3.0.20100224 + org.eclipse.jetty.orbit + javax.servlet + 3.0.0.v201112011016 provided diff --git a/jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml b/jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml index 2c45ca72fdc..95c9c2b9c27 100644 --- a/jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml +++ b/jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml @@ -1,7 +1,7 @@ - + src/main/resources/keystore.jks diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 49e91037206..9515f63bafe 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -76,7 +76,7 @@ - org.eclipse.jetty.test-jetty-webapp + org.eclipse.jetty.test-jetty-webapp javax.servlet,org.eclipse.jetty.servlets,* !com.acme*