Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-10-28 12:36:34 -0400
committerJoakim Erdfelt2014-10-28 12:36:34 -0400
commit607a560ebd3ee7fdd5faa50f2907edae7f9c8831 (patch)
treecbfd849f7a41b0b1a63a5b7cf379015349c33507 /jetty-server
parent6ff43a0af17f140a16b21241104c9ebbfa2dc5c6 (diff)
parent653cb32ede499319eec9a27e8392ca2e39064e3d (diff)
downloadorg.eclipse.jetty.project-607a560ebd3ee7fdd5faa50f2907edae7f9c8831.tar.gz
org.eclipse.jetty.project-607a560ebd3ee7fdd5faa50f2907edae7f9c8831.tar.xz
org.eclipse.jetty.project-607a560ebd3ee7fdd5faa50f2907edae7f9c8831.zip
Merge branch 'jetty-9.2.x' into cdi-testing
Diffstat (limited to 'jetty-server')
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index 2143d8dc7e..4ee2d5d9d0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -105,7 +105,7 @@ import org.eclipse.jetty.util.resource.Resource;
public class ContextHandler extends ScopedHandler implements Attributes, Graceful
{
public final static int SERVLET_MAJOR_VERSION=3;
- public final static int SERVLET_MINOR_VERSION=0;
+ public final static int SERVLET_MINOR_VERSION=1;
public static final Class<?>[] SERVLET_LISTENER_TYPES = new Class[] {ServletContextListener.class,
ServletContextAttributeListener.class,
ServletRequestListener.class,

Back to the top