From 0d89f29e1bf0a51010d033f4cd5f510c620f6e8d Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 29 Nov 2018 16:51:29 +0100
Subject: [PATCH] Issue #3162 - Use Jetty specific Servlet API jar.

* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../src/test/java/org/eclipse/jetty/jstl/JspConfig.java       | 2 +-
 jetty-server/src/main/config/modules/server.mod               | 2 +-
 jetty-servlets/pom.xml                                        | 2 +-
 pom.xml                                                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java b/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
index 773588a977e..7e0ce3ad8ed 100644
--- a/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
+++ b/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
@@ -33,7 +33,7 @@ public class JspConfig
     {
         context.setAttribute("javax.servlet.context.tempdir", scratchDir);
         context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
- ".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
+ ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
         context.setWar(baseUri.toASCIIString());
         context.setResourceBase(baseUri.toASCIIString());
     }
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index d10d42f2c8f..3bb975f84fd 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -13,7 +13,7 @@ logging
 threadpool
 
 [lib]
-lib/jetty-servlet-api-4.*.jar
+lib/jetty-servlet-api-4.0.*.jar
 lib/jetty-http-${jetty.version}.jar
 lib/jetty-server-${jetty.version}.jar
 lib/jetty-xml-${jetty.version}.jar
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index af52c98a412..de246581f57 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -24,7 +24,7 @@
         <configuration>
           <argLine>
             @{argLine} ${jetty.surefire.argLine}
-            --add-modules jetty..servlet.api
+            --add-modules jetty.servlet.api
             --add-modules org.eclipse.jetty.util
             --add-modules org.eclipse.jetty.io
             --add-modules org.eclipse.jetty.http
diff --git a/pom.xml b/pom.xml
index 0cb3a5c74a5..de2da048293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <logback.version>1.3.0-alpha4</logback.version>
     <spring-version>5.1.1.RELEASE</spring-version>
     <jetty-test-policy.version>1.2</jetty-test-policy.version>
-    <servlet.api.version>4.0.1-SNAPSHOT</servlet.api.version>
+    <servlet.api.version>4.0.1</servlet.api.version>
     <jsp.version>9.0.14.1</jsp.version>
     <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
     <alpn.version>undefined</alpn.version>
@@ -903,7 +903,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.toolchain</groupId>
         <artifactId>jetty-servlet-api</artifactId>
-        <version>${servlet.api.version}</version>
+         <version>${servlet.api.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.websocket</groupId>