Issue #3162 - Use Jetty specific Servlet API jar.

Updated references to Servlet jar to "jetty-servlet-api".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java

@@ -33,7 +33,7 @@ public static void init(WebAppContext context, URI baseUri, File scratchDir)
     {
         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");
+ ".*/jetty-servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
         context.setWar(baseUri.toASCIIString());
         context.setResourceBase(baseUri.toASCIIString());
     }

examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java

@@ -25,7 +25,6 @@
 import org.eclipse.jetty.annotations.AnnotationConfiguration;
 import org.eclipse.jetty.deploy.DeploymentManager;
 import org.eclipse.jetty.deploy.PropertiesConfigurationManager;
-import org.eclipse.jetty.deploy.bindings.DebugListenerBinding;
 import org.eclipse.jetty.deploy.providers.WebAppProvider;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.jmx.MBeanContainer;
@@ -35,7 +34,6 @@
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.server.AsyncRequestLogWriter;
 import org.eclipse.jetty.server.CustomRequestLog;
-import org.eclipse.jetty.server.DebugListener;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -174,7 +172,7 @@ public static void main( String[] args ) throws Exception
         deployer.setContexts(contexts);
         deployer.setContextAttribute(
                 "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-                ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$");
+                ".*/jetty-servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$");
 
         WebAppProvider webapp_provider = new WebAppProvider();
         webapp_provider.setMonitoredDirName(jetty_base + "/webapps");

examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java

@@ -76,7 +76,7 @@ public static void main( String[] args ) throws Exception
         // scan for them instead.
         webapp.setAttribute(
                 "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-                ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" );
+                ".*/jetty-servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" );
 
         // A WebAppContext is a ContextHandler as well so it needs to be set to
         // the server so it is aware of where to

examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java

@@ -53,7 +53,7 @@ public static final void main( String args[] ) throws Exception
         webapp.setWar(warFile.getAbsolutePath());
         webapp.setAttribute(
                 "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-                ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$");
+                ".*/jetty-servlet-api-[^/]*\\.jar$");
         server.setHandler(webapp);
 
         // Register new transaction manager in JNDI

jetty-ant/src/test/config/build.xml

@@ -31,7 +31,7 @@
       </loginServices>
       <webApp war="test.war" contextpath="/test" >
         <attributes>
-          <attribute name="org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" value=".*/[^/]*servlet-api-[^/]*\.jar$"/>
+          <attribute name="org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" value=".*/jetty-servlet-api-[^/]*\.jar$"/>
         </attributes>
       </webApp>
     </jetty.run>

jetty-deploy/src/main/config/etc/jetty-deploy.xml

@@ -18,7 +18,7 @@
         </Set>
         <Call name="setContextAttribute">
           <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
+          <Arg>.*/jetty-servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
         </Call>
 
         <!-- Add a customize step to the deployment lifecycle -->

jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml

@@ -11,7 +11,7 @@
 
         <Call name="setContextAttribute">
           <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$</Arg>
+          <Arg>.*/jetty-servlet-api-[^/]*\.jar$</Arg>
         </Call>
 
         <Call id="webappprovider" name="addAppProvider">

jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc

@@ -196,7 +196,7 @@ How to use the converter:
 
 [source, screen, subs="{sub-order}"]
 ----
-java -cp servlet-api-3.1.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:[other classpath]  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter
+java -cp jetty-servlet-api-4.0.2.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:[other classpath]  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter
 
 Usage:  InfinispanSessionLegacyConverter [-Dhost=127.0.0.1] [-Dverbose=true|false] <cache-name> [check]
 ----
@@ -216,7 +216,7 @@ The following command will attempt to convert all sessions in the cached named `
 
 [source, screen, subs="{sub-order}"]
 ----
-java -cp servlet-api-3.1.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:/my/custom/classes  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter -Dhost=myhost my-remote-cache
+java -cp jetty-servlet-api-4.0.2.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:/my/custom/classes  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter -Dhost=myhost my-remote-cache
 ----
 
 If the converter fails to convert a session, an error message and stacktrace will be printed and the conversion will abort. The failed session should be untouched, however _it is prudent to take a backup of your cache before attempting the conversion_.

jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc

@@ -65,7 +65,7 @@ Jetty Server Classpath:
 Version Information on 11 entries in the classpath.
 Note: order presented here is how they would appear on the classpath.
       changes to the --module=name command line options will be reflected here.
- 0:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 0:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar
  2:           {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar
  3:           {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar
  4:           {VERSION} | ${jetty.home}/lib/jetty-xml-{VERSION}.jar

jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc

@@ -246,7 +246,7 @@ Modules for tag '*':
            : Enables the core Jetty server on the classpath.
      Depend: threadpool
    Optional: jvm, ext, resources, logging
-        LIB: lib/servlet-api-3.1.jar
+        LIB: lib/jetty-servlet-api-4.0.2.jar
         LIB: lib/jetty-http-${jetty.version}.jar
         LIB: lib/jetty-server-${jetty.version}.jar
         LIB: lib/jetty-xml-${jetty.version}.jar

jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc

@@ -158,7 +158,7 @@ Note: order presented here is how they would appear on the classpath.
  1:      1.4.1.v201005082020 | ${jetty.base}/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
  2:          {VERSION} | ${jetty.base}/lib/ext/test-mock-resources-{VERSION}.jar
  3:                    (dir) | ${jetty.home}/resources
- 4:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 4:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar
  6:          {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar
  7:          {VERSION} | ${jetty.home}/lib/jetty-continuation-{VERSION}.jar
  8:          {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar

jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc

@@ -68,7 +68,7 @@ Note: order presented here is how they would appear on the classpath.
  1:      1.4.1.v201005082020 | ${jetty.base}/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
  2:               {VERSION} | ${jetty.base}/lib/ext/test-mock-resources-{VERSION}.jar
  3:                    (dir) | ${jetty.home}/resources
- 4:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 4:                    4.0.2 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar
  6:               {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar
  7:               {VERSION} | ${jetty.home}/lib/jetty-continuation-{VERSION}.jar
  8:               {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar

jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc

@@ -69,7 +69,7 @@ This will give an output looking something like this (broken in sections for cla
 [source, screen, subs="{sub-order}"]
 ....
 /opt/openjdk-11+28/bin/java
---module-path /opt/jetty/lib/jetty-servlet-api-4.0.0.jar:/opt/jetty/lib/jetty-http-9.4.13-SNAPSHOT.jar:...
+--module-path /opt/jetty/lib/jetty-servlet-api-4.0.2.jar:/opt/jetty/lib/jetty-http-9.4.13-SNAPSHOT.jar:...
 --module org.eclipse.jetty.xml/org.eclipse.jetty.xml.XmlConfiguration /opt/jetty/etc/jetty-threadpool.xml /opt/jetty/etc/jetty.xml ...
 ....
 
@@ -79,7 +79,7 @@ This list depends on the Jetty modules that have been enabled via the link:#star
 The `--module` option tells the JVM to run main class `XmlConfiguration` from the `org.eclipse.jetty.xml` module, with the given XML files as program arguments.
 
 When the JVM starts, module `org.eclipse.jetty.xml` is added to the set of JPMS _root modules_; all other Jetty modules, being automatic, will be resolved and added to the module graph.
-JAR files that are not modules, such as `servlet-api-3.1.jar`, are on the module-path and therefore will be made automatic modules by the JVM (hence the derived module name `servlet.api` for this jar, referenced by the `--patch-module` command line option above).
+JAR files that are not modules, such as `jetty-servlet-api-4.0.2.jar`, are on the module-path and therefore will be made automatic modules by the JVM (hence the derived module name `servlet.api` for this jar, referenced by the `--patch-module` command line option above).
 
 [[jpms-advanced-config]]
 ==== Advanced JPMS Configuration

jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc

@@ -103,7 +103,7 @@ Following the server dependency, the `${jetty.home}/modules/server.mod` file inc
 ....
 [jetty-distribution-{VERSION}]$ cat modules/server.mod
 [lib]
-lib/servlet-api-3.1.jar
+lib/jetty-servlet-api-4.0.2.jar
 lib/jetty-http-${jetty.version}.jar
 lib/jetty-server-${jetty.version}.jar
 lib/jetty-xml-${jetty.version}.jar
@@ -162,7 +162,7 @@ Jetty Server Classpath:
 Version Information on 7 entries in the classpath.
 Note: order presented here is how they would appear on the classpath.
       changes to the --module=name command line options will be reflected here.
- 0:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 0:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar
  2:               {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar
  3:               {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar
  4:               {VERSION} | ${jetty.home}/lib/jetty-xml-{VERSION}.jar
@@ -191,7 +191,7 @@ The following is the equivalent Java command line for what the `start.jar` boots
 [jetty-distribution-{VERSION}]$ java -Djetty.home=$JETTY_HOME \
 -Djetty.base=$JETTY_BASE \
 -cp \
- $JETTY_HOME/lib/servlet-api-3.1.jar\
+ $JETTY_HOME/lib/jetty-servlet-api-4.0.2.jar\
 :$JETTY_HOME/lib/jetty-http-$JETTY_VERSION.jar\
 :$JETTY_HOME/lib/jetty-server-$JETTY_VERSION.jar \
 :$JETTY_HOME/lib/jetty-xml-$JETTY_VERSION.jar\

jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc

@@ -209,7 +209,7 @@ Jetty Server Classpath:
 Version Information on 11 entries in the classpath.
 : order presented here is how they would appear on the classpath.
       changes to the --module=name command line options will be reflected here.
- 0:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 0:                    4.0.2 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar
  2:                {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar
  3:                {VERSION} | ${jetty.home}/lib/jetty-continuation-{VERSION}.jar
  4:                {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar
@@ -383,7 +383,7 @@ Module: security
   depends: [server]
 
 Module: server
-      LIB: lib/servlet-api-3.1.jar
+      LIB: lib/jetty-servlet-api-4.0.2.jar
       LIB: lib/jetty-http-${jetty.version}.jar
       LIB: lib/jetty-continuation-${jetty.version}.jar
       LIB: lib/jetty-server-${jetty.version}.jar

jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc

@@ -324,7 +324,7 @@ Defaults to "true".
 Controls whether any overlaid wars are added before or after the original base resource(s) of the webapp.
 See the section on link:#using-overlaid-wars[overlaid wars] for more information.
 containerIncludeJarPattern;;
-Defaults to `.*/javax.servlet-[^/]*\.jar$|.*/jetty-servlet-api-[^/]*\.jar$|.*javax.servlet.jsp.jstl-[^/]*\.jar|.*taglibs-standard-impl-.*\.jar`.
+Defaults to `.*/jetty-servlet-api-[^/]*\.jar$|.*javax.servlet.jsp.jstl-[^/]*\.jar|.*taglibs-standard-impl-.*\.jar`.
 This is a pattern that is applied to the names of the jars on the container's classpath (ie the classpath of the plugin, not that of the webapp) that should be scanned for fragments, tlds, annotations etc.
 This is analogous to the context attribute link:#container-include-jar-pattern[org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern] that is documented link:#container-include-jar-pattern[here].
 You can define extra patterns of jars that will be included in the scan.

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java

@@ -62,7 +62,7 @@ public class JettyWebAppContext extends WebAppContext
 {
     private static final Logger LOG = Log.getLogger(JettyWebAppContext.class);
 
-    private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar";
+    private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/javax.servlet-[^/]*\\.jar$|.*/jetty-servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar";
 
     private static final String WEB_INF_CLASSES_PREFIX = "/WEB-INF/classes";
 

tests/test-integration/src/test/resources/RFC2616Base.xml

@@ -80,7 +80,7 @@
         </Set>
         <Call name="setContextAttribute">
           <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$</Arg>
+          <Arg>.*/jetty-servlet-api-[^/]*\.jar$</Arg>
         </Call>
 
         <Call id="webappprovider" name="addAppProvider">

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

@@ -94,7 +94,7 @@ public void startJetty() throws Exception
         context.addConfiguration(new AnnotationConfiguration());
 
         context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-                ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$");
+                ".*/jetty-servlet-api-[^/]*\\.jar$");
         _server.setHandler(context);
 
         MBeanContainer mbContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer());

tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java

@@ -134,7 +134,7 @@ public static void main(String[] args) throws Exception
         webapp.setResourceBase(jetty_root.resolve("tests/test-webapps/test-jetty-webapp/src/main/webapp").toString());
         webapp.setAttribute(MetaInfConfiguration.CONTAINER_JAR_PATTERN,
             ".*/test-jetty-webapp/target/classes.*$|" +
-            ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\\.jar$"
+            ".*/jetty-servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\\.jar$"
         );
 
         webapp.setAttribute("testAttribute","testValue");

tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml

@@ -150,7 +150,7 @@
            <war>src/main/webapp</war>
            <descriptor>src/main/webapp/WEB-INF/web.xml</descriptor>
            <contextPath>/test-spec</contextPath>
-            <containerIncludeJarPattern>.*/javax.servlet-[^/]*\.jar$</containerIncludeJarPattern>
+            <containerIncludeJarPattern>.*/jetty-servlet-api-[^/]*\.jar$</containerIncludeJarPattern>
             <configurationDiscovered>true</configurationDiscovered>
             <jettyEnvXml>${basedir}/src/main/webapp/WEB-INF/jetty-env.xml</jettyEnvXml>
          </webAppConfig>