diff --git a/VERSION.txt b/VERSION.txt
index c5c3521655b..ba933eb51a1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,80 +1,33 @@
jetty-9.0.0-SNAPSHOT
-jetty-8.1.8,v20121105 - 05 November 2012
+jetty-9.0.0.M2 - 05 November 2012
+ 371170 MongoSessionManager LastAccessTimeTest fails
- + 388675 Non utf8 encoded query strings not decoded to parameter map using
- queryEncoding
- + 388706 Avoid unnecessary indirection through Charset.name
- + 389390 AnnotationConfiguration is ignored if the metadata-complete attribute
- is present in an override descriptor regardless of the value
- + 389452 if web-fragment metadata-complete==true still scan its related jar if
- there there is a ServletContainerInitializer, ensure webapp restarts work
- + 389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system
- property in javadoc for StdErrLog
- + 389956 Bad __context set in WebAppContext.start sequence with respect to ENC
- setup
- + 389965 OPTIONS should allow spaces in comma separated list
- + 390108 Servlet 3.0 API for programmatic login doesn't appear to work
- + 390161 Apply DeferredAuthentication fix to jaspi
- + 390163 Implement ServletRegistration.Dynamic.setServletSecurity
- + 390503 http-method-omission element not being processed
- + 390560 The method AnnotationParser.getAnnotationHandlers(String) always
- returns a empty collection.
- + 391080 Multipart temp files can be left on disk from Request.getPart and
- getParts
- + 391082 No exception if multipart input stream incomplete
- + 391188 Files written with Request.getPart().write(filename) should not be
- auto-deleted
- + 391483 fix bad javadoc example in shutdown handler
- + 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same
- response
- + 391623 Add option to --stop to wait for target jetty to stop
+ 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting
duplicate others for after ordering
+ + 392237 Split jaas from jetty-plus into jetty-jaas and port the
+ test-jaas-webapp from codehaus
+ 392239 Allow no error-code or exception for error-pages
+ + 392304 fixed intermittent client SSL failure. Correctly compact in flip2fill
+ 392525 Add option to --stop-wait to specify timeout
+ 392641 JDBC Sessions not scavenged if expired during downtime
+ 392812 MongoSessionIDManager never purges old sessions
+ + 392959 Review HttpClient.getConversation(long).
+ 393014 Mongodb purgevalid using query for purgeinvalid
+ 393015 Mongodb purge not rescheduled
+ 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server
+ 393218 add xsd=application/xml mime mapping to defaults
+ + 393291 Confusing log entry about (non) existing webAppSourceDirectory
+ + 393303 use jetty-web.xml to explicitly add the jetty packages that need
+ visability. This commit also sucked in some changes made to help with the
+ documentation process (improving deployer configuration management
+ 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
+ 393368 min websocket version
+ 393383 delay onClose call until closeOut is done
+ 393494 HashSessionManager can't delete unrestorable sessions on Windows
+ JETTY-1547 Jetty does not honor web.xml
web-app/jsp-config/jsp-property-group/default-content-type
-
-jetty-7.6.8.v20121105 - 05 November 2012
- + 371170 MongoSessionManager LastAccessTimeTest fails
- + 388675 Non utf8 encoded query strings not decoded to parameter map using
- queryEncoding
- + 389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system
- property in javadoc for StdErrLog
- + 389956 Bad __context set in WebAppContext.start sequence with respect to ENC
- setup
- + 389965 OPTIONS should allow spaces in comma separated list
- + 390161 Apply DeferredAuthentication fix to jaspi
- + 390560 The method AnnotationParser.getAnnotationHandlers(String) always
- returns a empty collection.
- + 391483 fix bad javadoc example in shutdown handler
- + 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same
- response
- + 391623 Add option to --stop to wait for target jetty to stop
- + 392239 Allow no error-code or exception for error-pages
- + 392525 Add option to --stop-wait to specify timeout
- + 392641 JDBC Sessions not scavenged if expired during downtime
- + 392812 MongoSessionIDManager never purges old sessions
- + 393014 Mongodb purgevalid using query for purgeinvalid
- + 393015 Mongodb purge not rescheduled
- + 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server
- + 393218 add xsd=application/xml mime mapping to defaults
- + 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
- + 393368 min websocket version
- + 393383 delay onClose call until closeOut is done
- + 393494 HashSessionManager can't delete unrestorable sessions on Windows
-
+ + JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly
+ + JETTY-1550 virtual WEB-INF not created if project has overlays
jetty-9.0.0.M1 - 15 October 2012
+ 369349 directory with spaces --dry-run fix
diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml
index 9d4e527042a..315edc10f0a 100644
--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -3,6 +3,7 @@
org.eclipse.jetty
jetty-project
9.0.0-SNAPSHOT
+ ../../pom.xml
4.0.0
org.eclipse.jetty
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index 132d7b41974..3906d254203 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -3,6 +3,7 @@
org.eclipse.jetty
jetty-project
9.0.0-SNAPSHOT
+ ../../pom.xml
4.0.0
example-jetty-embedded
diff --git a/pom.xml b/pom.xml
index b66f74042c6..e22e41bb2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,8 +412,7 @@
examples/async-rest
jetty-rewrite
jetty-nosql
- tests/test-sessions
- tests/test-webapps
+ tests