diff --git a/VERSION.txt b/VERSION.txt index bd03f29b818..b700f03bc81 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.3.0-SNAPSHOT + JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating session (further update) + + 319178 test failure fix in jetty-util on windows + 320457 add SPNEGO support + 324505 Implement API login + 328872 Multi Jetty xml files not loading if directory is referenced in jetty.conf diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java index 957eaee5951..eedbfa87911 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java @@ -62,6 +62,9 @@ public class LogTest String err = _out.toString(); _out.reset(); + err = err.replaceAll("\r\n","\n"); + text = text.replaceAll("\r\n","\n"); + if (err.indexOf(text)>=0) return;