diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java index a7deb9c9b2a..a917d68db07 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java @@ -32,7 +32,7 @@ public class Jetty pkg.getImplementationVersion() != null) VERSION = pkg.getImplementationVersion(); else - VERSION = System.getProperty("jetty.version", "9.4.z-SNAPSHOT"); + VERSION = System.getProperty("jetty.version", "10.0.z-SNAPSHOT"); POWERED_BY="Powered by Jetty:// "+VERSION+""; diff --git a/tests/test-jmx/jmx-webapp-it/src/test/java/org/eclipse/jetty/test/jmx/JmxIT.java b/tests/test-jmx/jmx-webapp-it/src/test/java/org/eclipse/jetty/test/jmx/JmxIT.java index ff398b93f43..e7dcd94b35e 100644 --- a/tests/test-jmx/jmx-webapp-it/src/test/java/org/eclipse/jetty/test/jmx/JmxIT.java +++ b/tests/test-jmx/jmx-webapp-it/src/test/java/org/eclipse/jetty/test/jmx/JmxIT.java @@ -39,6 +39,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.SimpleRequest; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.jmx.ConnectorServer; import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.server.NetworkConnector; @@ -88,10 +89,7 @@ public class JmxIT context.setWar(war.getCanonicalPath()); context.setContextPath("/jmx-webapp"); - Configuration.ClassList classlist = Configuration.ClassList - .setServerDefault(__server); - classlist.addBefore("org.eclipse.jetty.webapp.JettyWebXmlConfiguration", - "org.eclipse.jetty.annotations.AnnotationConfiguration"); + context.addConfiguration(new AnnotationConfiguration()); context.setAttribute( "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",