Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #632 

Fix jetty version number
This commit is contained in:
Jan Bartel 2016-06-10 16:53:52 +10:00
parent d05865d555
commit 29fcd50354
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java
View File

@ -32,7 +32,7 @@ public class Jetty
pkg.getImplementationVersion() != null) pkg.getImplementationVersion() != null)
VERSION = pkg.getImplementationVersion(); VERSION = pkg.getImplementationVersion();
else else
VERSION = System.getProperty("jetty.version", "9.4.z-SNAPSHOT"); VERSION = System.getProperty("jetty.version", "10.0.z-SNAPSHOT");
POWERED_BY="<a href=\"http://eclipse.org/jetty\">Powered by Jetty:// "+VERSION+"</a>"; POWERED_BY="<a href=\"http://eclipse.org/jetty\">Powered by Jetty:// "+VERSION+"</a>";

6
tests/test-jmx/jmx-webapp-it/src/test/java/org/eclipse/jetty/test/jmx/JmxIT.java
View File

@ -39,6 +39,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.SimpleRequest; import org.eclipse.jetty.toolchain.test.SimpleRequest;
import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.jmx.ConnectorServer; import org.eclipse.jetty.jmx.ConnectorServer;
import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.NetworkConnector;
@ -88,10 +89,7 @@ public class JmxIT
context.setWar(war.getCanonicalPath()); context.setWar(war.getCanonicalPath());
context.setContextPath("/jmx-webapp"); context.setContextPath("/jmx-webapp");
Configuration.ClassList classlist = Configuration.ClassList context.addConfiguration(new AnnotationConfiguration());
.setServerDefault(__server);
classlist.addBefore("org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
"org.eclipse.jetty.annotations.AnnotationConfiguration");
context.setAttribute( context.setAttribute(
"org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern", "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",