Jetty upgrade