From bfa2dbf68c84daaf6ccab2ee2891231851859fee Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 29 Nov 2018 16:51:29 +0100 Subject: [PATCH 01/35] 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 --- NOTICE.txt | 2 +- aggregates/jetty-all/pom.xml | 4 ++-- aggregates/jetty-websocket-all/pom.xml | 4 ++-- apache-jsp/pom.xml | 6 +----- apache-jsp/src/main/java/module-info.java | 2 +- .../java/org/eclipse/jetty/jstl/JspConfig.java | 2 +- examples/async-rest/async-rest-jar/pom.xml | 4 ++-- examples/async-rest/async-rest-webapp/pom.xml | 4 ++-- .../jetty/embedded/ServerWithAnnotations.java | 2 +- jetty-annotations/src/main/java/module-info.java | 2 +- jetty-ant/src/test/config/build.xml | 7 ++----- jetty-client/pom.xml | 8 ++++---- .../test/resources/jetty-deploymgr-contexts.xml | 2 +- .../screen-http-webapp-deploy-listconfig.adoc | 1 - .../startup/screen-list-modules.adoc | 1 - .../startup/startup-base-vs-home.adoc | 1 - .../administration/startup/startup-classpath.adoc | 1 - .../administration/startup/startup-jpms.adoc | 5 +---- .../administration/startup/startup-overview.adoc | 2 -- .../security/jetty-home-and-jetty-base.adoc | 2 -- .../development/maven/jetty-maven-plugin.adoc | 2 +- jetty-fcgi/fcgi-server/pom.xml | 4 ++-- .../fcgi-server/src/main/java/module-info.java | 2 +- jetty-home/pom.xml | 14 +++----------- jetty-http/pom.xml | 6 +++--- jetty-http/src/main/java/module-info.java | 2 +- jetty-http2/http2-client/pom.xml | 4 ++-- jetty-http2/http2-http-client-transport/pom.xml | 4 ++-- jetty-http2/http2-server/pom.xml | 4 ++-- jetty-jaas/src/main/java/module-info.java | 2 +- jetty-jaspi/src/main/java/module-info.java | 2 +- jetty-maven-plugin/src/it/it-parent-pom/pom.xml | 4 ++-- .../src/it/jetty-cdi-run-forked/pom.xml | 4 ++-- .../web/pom.xml | 4 ++-- .../jetty-simple-base/pom.xml | 6 ++---- .../jetty-simple-base/pom.xml | 5 ++--- .../jetty-run-mojo-it/jetty-simple-base/pom.xml | 5 ++--- .../jetty-simple-base/pom.xml | 5 ++--- .../jetty-simple-base/pom.xml | 5 ++--- .../jetty-start-mojo-it/jetty-simple-base/pom.xml | 5 ++--- .../src/it/run-mojo-gwt-it/beer-server/pom.xml | 4 ++-- .../jetty/maven/plugin/JettyWebAppContext.java | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 4 ++-- jetty-osgi/jetty-osgi-httpservice/pom.xml | 4 ++-- jetty-osgi/test-jetty-osgi-context/pom.xml | 4 ---- jetty-osgi/test-jetty-osgi-server/pom.xml | 4 ---- jetty-osgi/test-jetty-osgi/pom.xml | 5 ----- jetty-plus/src/main/java/module-info.java | 2 +- jetty-proxy/pom.xml | 4 ++-- jetty-proxy/src/main/java/module-info.java | 2 +- jetty-quickstart/pom.xml | 15 --------------- jetty-quickstart/src/main/java/module-info.java | 2 +- jetty-rewrite/pom.xml | 4 ++-- jetty-rewrite/src/main/java/module-info.java | 2 +- jetty-security/src/main/java/module-info.java | 2 +- jetty-server/pom.xml | 4 ++-- jetty-server/src/main/config/modules/server.mod | 6 +----- jetty-server/src/main/java/module-info.java | 2 +- jetty-servlet/src/main/java/module-info.java | 2 +- jetty-servlets/pom.xml | 6 +++--- jetty-servlets/src/main/java/module-info.java | 2 +- jetty-util-ajax/pom.xml | 4 ++-- jetty-util/pom.xml | 6 +++--- jetty-util/src/main/java/module-info.java | 2 +- jetty-webapp/src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 2 +- jetty-websocket/jetty-websocket-server/pom.xml | 4 ++-- .../src/main/java/module-info.java | 2 +- jetty-websocket/websocket-core/pom.xml | 1 + .../websocket-core/src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 2 +- pom.xml | 14 ++++---------- tests/jetty-jmh/pom.xml | 4 ++-- .../src/test/resources/RFC2616Base.xml | 2 +- .../java/org/eclipse/jetty/test/jmx/JmxIT.java | 4 ++-- tests/test-jmx/jmx-webapp/pom.xml | 4 ++-- tests/test-webapps/test-http2-webapp/pom.xml | 6 +++--- tests/test-webapps/test-jetty-webapp/pom.xml | 4 ++-- tests/test-webapps/test-jndi-webapp/pom.xml | 10 +++++----- tests/test-webapps/test-mock-resources/pom.xml | 4 ++-- tests/test-webapps/test-proxy-webapp/pom.xml | 6 +++--- .../test-container-initializer/pom.xml | 6 +++--- .../test-servlet-spec/test-spec-webapp/pom.xml | 6 +++--- .../test-servlet-spec/test-web-fragment/pom.xml | 11 ++--------- tests/test-webapps/test-webapp-rfc2616/pom.xml | 4 ++-- 85 files changed, 134 insertions(+), 211 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 9ca92f1f7044..9e1b0952d899 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -105,7 +105,7 @@ The following artifacts are CDDL + GPLv2 with classpath exception. https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html -org.eclipse.jetty.toolchain:jetty-schemas +org.eclipse.jetty.toolchain:jetty-servlet-api ------ Assorted diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 0dfad2ed81e6..d6d1cd7cdb5a 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -213,8 +213,8 @@ javax.websocket-api - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api javax.transaction diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index 90c71f63685c..197d244727ab 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -149,8 +149,8 @@ compile - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api compile diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 5526de7d7c2c..f33dc95b24a1 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -73,11 +73,7 @@ org.eclipse.jetty.toolchain - jetty-schemas - - - javax.servlet - javax.servlet-api + jetty-servlet-api org.mortbay.jasper diff --git a/apache-jsp/src/main/java/module-info.java b/apache-jsp/src/main/java/module-info.java index 6eee2fea064b..4fd2e75a50d5 100644 --- a/apache-jsp/src/main/java/module-info.java +++ b/apache-jsp/src/main/java/module-info.java @@ -30,7 +30,7 @@ requires java.xml; requires org.eclipse.jetty.util; requires org.mortbay.apache.jasper; - requires static javax.servlet.api; + requires static jetty.servlet.api; provides Log with JuliLog; provides ServletContainerInitializer with JettyJasperInitializer; 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 f0d7d8ad5f46..26196e0ec9a2 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 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"); + ".*/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/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 592c573dc6c3..2b0eb399e060 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/examples/async-rest/async-rest-jar/pom.xml @@ -25,8 +25,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index cad12670d5f2..91bb381eb86c 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -19,8 +19,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java index 8a3fdcb90cfd..709b726414a2 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java +++ b/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$"); + ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$"); server.setHandler(webapp); // Register new transaction manager in JNDI diff --git a/jetty-annotations/src/main/java/module-info.java b/jetty-annotations/src/main/java/module-info.java index 2df3534a1430..4934e5d17350 100644 --- a/jetty-annotations/src/main/java/module-info.java +++ b/jetty-annotations/src/main/java/module-info.java @@ -27,7 +27,7 @@ requires java.naming; requires java.annotation; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.objectweb.asm; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; diff --git a/jetty-ant/src/test/config/build.xml b/jetty-ant/src/test/config/build.xml index 9ca5fedf5bdc..49244b5df9ff 100644 --- a/jetty-ant/src/test/config/build.xml +++ b/jetty-ant/src/test/config/build.xml @@ -29,12 +29,9 @@ - + - - + diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 0fc0d39090af..e356cd3d1e75 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -20,9 +20,9 @@ @{argLine} - --add-reads org.eclipse.jetty.client=javax.servlet.api + --add-reads org.eclipse.jetty.client=jetty.servlet.api --add-modules java.security.jgss - --add-modules javax.servlet.api + --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.jmx --add-modules org.slf4j @@ -120,8 +120,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api test diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index b16fbd7101ee..15f43f81210e 100644 --- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -11,7 +11,7 @@ org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern - .*/servlet-api-[^/]*\.jar$ + .*/[^/]*servlet-api-[^/]*\.jar$ diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc index b63440dda76b..d3ce014792c5 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc @@ -66,7 +66,6 @@ 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 - 1: 3.1.0.M0 | ${jetty.home}/lib/jetty-schemas-3.1.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 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc index 8093141ecb82..8dea8a8793e0 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc @@ -247,7 +247,6 @@ Modules for tag '*': Depend: threadpool Optional: jvm, ext, resources, logging LIB: lib/servlet-api-3.1.jar - LIB: lib/jetty-schemas-3.1.jar LIB: lib/jetty-http-${jetty.version}.jar LIB: lib/jetty-server-${jetty.version}.jar LIB: lib/jetty-xml-${jetty.version}.jar diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc index 936341988707..24d549146896 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc @@ -159,7 +159,6 @@ Note: order presented here is how they would appear on the classpath. 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 - 5: 3.1.RC0 | ${jetty.home}/lib/jetty-schemas-3.1.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 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc index 648664e42f6f..89517e4295a8 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc @@ -69,7 +69,6 @@ Note: order presented here is how they would appear on the classpath. 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 - 5: 3.1.RC0 | ${jetty.home}/lib/jetty-schemas-3.1.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 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc index 51f3b6b29840..69b872b7ed52 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc @@ -69,16 +69,13 @@ 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/servlet-api-3.1.jar:/opt/jetty/lib/jetty-schemas-3.1.jar:/opt/jetty/lib/jetty-http-9.4.13-SNAPSHOT.jar:... ---patch-module servlet.api=/opt/jetty/lib/jetty-schemas-3.1.jar +--module-path /opt/jetty/lib/jetty-servlet-api-4.0.0.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 ... .... The `--module-path` option specifies the list of Jetty jars. This list depends on the Jetty modules that have been enabled via the link:#startup-modules[`--add-to-start`] command. -The `--patch-module` option is necessary for Servlet and JSP Containers to find XML DTDs and XML Schemas required to validate the various XML files present in web applications (such as `web.xml` and others). - 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. diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc index 6193508a0760..9fe6b61d694f 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc @@ -163,7 +163,6 @@ 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 - 1: 3.1.RC0 | ${jetty.home}/lib/jetty-schemas-3.1.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 @@ -193,7 +192,6 @@ The following is the equivalent Java command line for what the `start.jar` boots -Djetty.base=$JETTY_BASE \ -cp \ $JETTY_HOME/lib/servlet-api-3.1.jar\ -:$JETTY_HOME/lib/jetty-schemas-3.1.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\ diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc index 2aeb1174b03b..1e3f118cca7c 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc @@ -210,7 +210,6 @@ 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 - 1: 3.1.RC0 | ${jetty.home}/lib/jetty-schemas-3.1.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 @@ -385,7 +384,6 @@ Module: security Module: server LIB: lib/servlet-api-3.1.jar - LIB: lib/jetty-schemas-3.1.jar LIB: lib/jetty-http-${jetty.version}.jar LIB: lib/jetty-continuation-${jetty.version}.jar LIB: lib/jetty-server-${jetty.version}.jar diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc index a0fd6bacc421..9ec12c038dc7 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc +++ b/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$|.*/servlet-api-[^/]*\.jar$|.*javax.servlet.jsp.jstl-[^/]*\.jar|.*taglibs-standard-impl-.*\.jar`. +Defaults to `.*/javax.servlet-[^/]*\.jar$|.*/[^/]*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. diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 6b1ba00392be..725e33083042 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -21,8 +21,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.jetty.fcgi diff --git a/jetty-fcgi/fcgi-server/src/main/java/module-info.java b/jetty-fcgi/fcgi-server/src/main/java/module-info.java index 1632a75a0b44..052e45b25cd7 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/module-info.java +++ b/jetty-fcgi/fcgi-server/src/main/java/module-info.java @@ -21,7 +21,7 @@ exports org.eclipse.jetty.fcgi.server; exports org.eclipse.jetty.fcgi.server.proxy; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.io; diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 5a0e6c12012f..9fc9350dedee 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -284,21 +284,13 @@ - - javax.servlet - javax.servlet-api - ${servlet.api.version} - true - ${assembly-directory}/lib - servlet-api-4.0.jar - org.eclipse.jetty.toolchain - jetty-schemas - ${servlet.schema.version} + jetty-servlet-api + ${servlet.api.version} true ${assembly-directory}/lib - jetty-schemas-4.0.jar + jetty-servlet-api-${servlet.api.version}.jar diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index d18cafe4a8fb..3d6f0580d0d8 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -27,8 +27,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided @@ -44,7 +44,7 @@ maven-surefire-plugin - @{argLine} --add-modules javax.servlet.api + @{argLine} --add-modules jetty.servlet.api diff --git a/jetty-http/src/main/java/module-info.java b/jetty-http/src/main/java/module-info.java index 43ad7b78ddd1..1c4e6ee3c057 100644 --- a/jetty-http/src/main/java/module-info.java +++ b/jetty-http/src/main/java/module-info.java @@ -26,7 +26,7 @@ requires org.eclipse.jetty.util; requires org.eclipse.jetty.io; - requires static javax.servlet.api; + requires static jetty.servlet.api; uses HttpFieldPreEncoder; diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 733ae5a100d3..40e7c02386e7 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -22,8 +22,8 @@ @{argLine} - --add-reads org.eclipse.jetty.http2.client=javax.servlet.api - --add-modules javax.servlet.api + --add-reads org.eclipse.jetty.http2.client=jetty.servlet.api + --add-modules jetty.servlet.api diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index c0eff88e3bee..abd4d78f91f5 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -22,8 +22,8 @@ @{argLine} - --add-reads org.eclipse.jetty.http2.http.client.transport=javax.servlet.api - --add-modules javax.servlet.api + --add-reads org.eclipse.jetty.http2.http.client.transport=jetty.servlet.api + --add-modules jetty.servlet.api diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 98cccc400193..12523304c703 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -22,8 +22,8 @@ @{argLine} - --add-reads org.eclipse.jetty.http2.server=javax.servlet.api - --add-modules javax.servlet.api + --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api + --add-modules jetty.servlet.api diff --git a/jetty-jaas/src/main/java/module-info.java b/jetty-jaas/src/main/java/module-info.java index 90453ec31281..95f6eeb1a8b4 100644 --- a/jetty-jaas/src/main/java/module-info.java +++ b/jetty-jaas/src/main/java/module-info.java @@ -23,7 +23,7 @@ exports org.eclipse.jetty.jaas.spi; requires java.naming; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.server; requires org.eclipse.jetty.security; diff --git a/jetty-jaspi/src/main/java/module-info.java b/jetty-jaspi/src/main/java/module-info.java index c5f183621b01..11a0242fe032 100644 --- a/jetty-jaspi/src/main/java/module-info.java +++ b/jetty-jaspi/src/main/java/module-info.java @@ -22,7 +22,7 @@ exports org.eclipse.jetty.security.jaspi.callback; exports org.eclipse.jetty.security.jaspi.modules; - requires javax.servlet.api; + requires jetty.servlet.api; requires javax.security.auth.message; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; diff --git a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml index 1336aa212e3a..e2abaea00013 100644 --- a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml +++ b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml @@ -21,8 +21,8 @@ 2.6 - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api @servlet.api.version@ provided diff --git a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml index 0933746e86a6..6787fc1d4369 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml @@ -25,8 +25,8 @@ weld-servlet - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/pom.xml b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/pom.xml index 22b6754fa9ee..69a29e1e4377 100755 --- a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/pom.xml @@ -18,8 +18,8 @@ provided - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml index fdcc1c714000..f6e2fd01cc4c 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml @@ -15,11 +15,9 @@ Jetty :: Simple :: Base - - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml index 10adc6ec1c05..b44e131b87da 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml @@ -16,9 +16,8 @@ - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml index 05c9b0335f07..2bebc902d0bc 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml @@ -16,9 +16,8 @@ - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml index 1fa6323df0fa..ebca593cdc46 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml @@ -16,9 +16,8 @@ - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml index 0269200449ef..aa635b3af2ad 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml @@ -16,9 +16,8 @@ - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml index dbefb81281d3..399a0f4639f4 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml @@ -16,9 +16,8 @@ - javax.servlet - javax.servlet-api - jar + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml index 9e6afd3bd7a3..1417ac272636 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml @@ -26,8 +26,8 @@ gwt-servlet - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java index 8ee3b205367a..3c3a168dfa87 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java +++ b/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$|.*/[^/]*servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar"; private static final String WEB_INF_CLASSES_PREFIX = "/WEB-INF/classes"; diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index cdd302d168f8..853c7db1d2d7 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -33,8 +33,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 0499f0742fde..3f8808902f75 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -31,8 +31,8 @@ provided - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 834a32fbfa03..2202e3c93a2f 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -28,10 +28,6 @@ org.eclipse.osgi.services provided - - org.eclipse.jetty.toolchain - jetty-schemas - diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index 9e481ce7cc2f..b47c195df90d 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -28,10 +28,6 @@ org.eclipse.osgi.services provided - - org.eclipse.jetty.toolchain - jetty-schemas - diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index b18305c56195..83c6ebc86aa4 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -336,11 +336,6 @@ ${project.version} test - - org.eclipse.jetty.toolchain - jetty-schemas - runtime - org.eclipse.jetty jetty-plus diff --git a/jetty-plus/src/main/java/module-info.java b/jetty-plus/src/main/java/module-info.java index 9e9c95713600..756b5b5b27bf 100644 --- a/jetty-plus/src/main/java/module-info.java +++ b/jetty-plus/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires org.eclipse.jetty.webapp; requires org.eclipse.jetty.xml; requires static java.sql; - requires static javax.servlet.api; + requires static jetty.servlet.api; requires static org.eclipse.jetty.server; requires static org.eclipse.jetty.servlet; diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index e11616afd14c..6d42eb1d74d9 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -29,8 +29,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-proxy/src/main/java/module-info.java b/jetty-proxy/src/main/java/module-info.java index 15726e41ef22..839950945e01 100644 --- a/jetty-proxy/src/main/java/module-info.java +++ b/jetty-proxy/src/main/java/module-info.java @@ -20,7 +20,7 @@ { exports org.eclipse.jetty.proxy; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.io; diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 7c1aa1979ca4..5201a06d0538 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -13,23 +13,8 @@ ${project.groupId}.quickstart - ${settings.localRepository}/org/eclipse/jetty/toolchain/jetty-schemas/${servlet.schema.version}/jetty-schemas-${servlet.schema.version}.jar - - - - maven-surefire-plugin - - - @{argLine} - --patch-module javax.servlet.api=${jetty-schemas-jar} - - - - - - org.eclipse.jetty diff --git a/jetty-quickstart/src/main/java/module-info.java b/jetty-quickstart/src/main/java/module-info.java index 51ef5bd10ce4..dfbf1da472d4 100644 --- a/jetty-quickstart/src/main/java/module-info.java +++ b/jetty-quickstart/src/main/java/module-info.java @@ -20,7 +20,7 @@ { exports org.eclipse.jetty.quickstart; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.annotations; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 9240dcdc9303..a40e4b0e9d77 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -34,8 +34,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api diff --git a/jetty-rewrite/src/main/java/module-info.java b/jetty-rewrite/src/main/java/module-info.java index e707d547d532..a10478318de5 100644 --- a/jetty-rewrite/src/main/java/module-info.java +++ b/jetty-rewrite/src/main/java/module-info.java @@ -21,7 +21,7 @@ exports org.eclipse.jetty.rewrite; exports org.eclipse.jetty.rewrite.handler; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.io; diff --git a/jetty-security/src/main/java/module-info.java b/jetty-security/src/main/java/module-info.java index c0308bdcc945..757fef25996f 100644 --- a/jetty-security/src/main/java/module-info.java +++ b/jetty-security/src/main/java/module-info.java @@ -21,7 +21,7 @@ exports org.eclipse.jetty.security; exports org.eclipse.jetty.security.authentication; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.server; diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index c29ba648e512..a49b18098f60 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -42,8 +42,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.jetty diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod index bf31c6bb2a4d..3a29b1b8995c 100644 --- a/jetty-server/src/main/config/modules/server.mod +++ b/jetty-server/src/main/config/modules/server.mod @@ -13,8 +13,7 @@ logging threadpool [lib] -lib/servlet-api-4.0.jar -lib/jetty-schemas-4.0.jar +lib/jetty-servlet-api-4.0.0-SNAPSHOT.jar lib/jetty-http-${jetty.version}.jar lib/jetty-server-${jetty.version}.jar lib/jetty-xml-${jetty.version}.jar @@ -24,9 +23,6 @@ lib/jetty-io-${jetty.version}.jar [xml] etc/jetty.xml -[jpms] -patch-module: servlet.api=lib/jetty-schemas-${servlet.schema.version}.jar - [ini-template] ### Common HTTP configuration ## Scheme to use to build URIs for secure redirects diff --git a/jetty-server/src/main/java/module-info.java b/jetty-server/src/main/java/module-info.java index 9111f0131087..7a4fe00a71e8 100644 --- a/jetty-server/src/main/java/module-info.java +++ b/jetty-server/src/main/java/module-info.java @@ -25,7 +25,7 @@ exports org.eclipse.jetty.server.handler.jmx to org.eclipse.jetty.jmx; exports org.eclipse.jetty.server.session; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.io; diff --git a/jetty-servlet/src/main/java/module-info.java b/jetty-servlet/src/main/java/module-info.java index d34df7042864..7b5dc57327a1 100644 --- a/jetty-servlet/src/main/java/module-info.java +++ b/jetty-servlet/src/main/java/module-info.java @@ -22,7 +22,7 @@ exports org.eclipse.jetty.servlet.jmx to org.eclipse.jetty.jmx; exports org.eclipse.jetty.servlet.listener; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.server; diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index d45b9b35d1d8..f19d89e71ac0 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -24,7 +24,7 @@ @{argLine} - --add-modules javax.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 @@ -63,8 +63,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-servlets/src/main/java/module-info.java b/jetty-servlets/src/main/java/module-info.java index a8b2ebce89fc..f908755c484e 100644 --- a/jetty-servlets/src/main/java/module-info.java +++ b/jetty-servlets/src/main/java/module-info.java @@ -20,7 +20,7 @@ { exports org.eclipse.jetty.servlets; - requires static javax.servlet.api; + requires static jetty.servlet.api; requires static org.eclipse.jetty.util; requires static org.eclipse.jetty.io; requires static org.eclipse.jetty.http; diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 0cea72acb56f..6fcf4b1e14fa 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -30,8 +30,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 1f0e5bbaebb7..a6fed7cb0fc7 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -64,7 +64,7 @@ ${settings.localRepository} - @{argLine} --add-modules javax.servlet.api,org.slf4j + @{argLine} --add-modules jetty.servlet.api,org.slf4j @@ -72,8 +72,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/jetty-util/src/main/java/module-info.java b/jetty-util/src/main/java/module-info.java index 5db68242ff49..6744f628530f 100644 --- a/jetty-util/src/main/java/module-info.java +++ b/jetty-util/src/main/java/module-info.java @@ -37,7 +37,7 @@ requires static java.logging; requires static java.sql; requires static java.xml; - requires static javax.servlet.api; + requires static jetty.servlet.api; requires static org.slf4j; uses CredentialProvider; diff --git a/jetty-webapp/src/main/java/module-info.java b/jetty-webapp/src/main/java/module-info.java index d4c93900cc46..93dbde561dc3 100644 --- a/jetty-webapp/src/main/java/module-info.java +++ b/jetty-webapp/src/main/java/module-info.java @@ -24,7 +24,7 @@ requires java.instrument; requires java.xml; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.security; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java b/jetty-websocket/javax-websocket-server/src/main/java/module-info.java index 7a0804d52749..931536697819 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/module-info.java @@ -28,7 +28,7 @@ { exports org.eclipse.jetty.websocket.jsr356.server; - requires javax.servlet.api; + requires jetty.servlet.api; requires javax.websocket.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; diff --git a/jetty-websocket/jetty-websocket-server/pom.xml b/jetty-websocket/jetty-websocket-server/pom.xml index 3baa91b36134..a3d648667fe8 100644 --- a/jetty-websocket/jetty-websocket-server/pom.xml +++ b/jetty-websocket/jetty-websocket-server/pom.xml @@ -48,8 +48,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/module-info.java b/jetty-websocket/jetty-websocket-server/src/main/java/module-info.java index bd20f4573f33..b2240d89e245 100644 --- a/jetty-websocket/jetty-websocket-server/src/main/java/module-info.java +++ b/jetty-websocket/jetty-websocket-server/src/main/java/module-info.java @@ -26,7 +26,7 @@ { exports org.eclipse.jetty.websocket.server; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.servlet; requires org.eclipse.jetty.webapp; diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml index d02d69eddc5f..bf3087e63b95 100644 --- a/jetty-websocket/websocket-core/pom.xml +++ b/jetty-websocket/websocket-core/pom.xml @@ -87,6 +87,7 @@ org.eclipse.jetty.orbit:javax.servlet org.mortbay.jetty:servlet-api jetty:servlet-api + jetty-servlet-api diff --git a/jetty-websocket/websocket-core/src/main/java/module-info.java b/jetty-websocket/websocket-core/src/main/java/module-info.java index a95176297cd9..fa1986800a2c 100644 --- a/jetty-websocket/websocket-core/src/main/java/module-info.java +++ b/jetty-websocket/websocket-core/src/main/java/module-info.java @@ -32,7 +32,7 @@ exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.util; exports org.eclipse.jetty.websocket.core.internal.compress to org.eclipse.jetty.util; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.io; requires org.eclipse.jetty.http; diff --git a/jetty-websocket/websocket-servlet/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java index 7ae0f2c0cbe2..b6b6f05e453c 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/module-info.java +++ b/jetty-websocket/websocket-servlet/src/main/java/module-info.java @@ -20,7 +20,7 @@ { exports org.eclipse.jetty.websocket.servlet; - requires javax.servlet.api; + requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.eclipse.jetty.http; requires org.eclipse.jetty.io; diff --git a/pom.xml b/pom.xml index b398cc6c88fc..e8cc1ce656ae 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,7 @@ 1.2.3 5.1.1.RELEASE 1.2 - 4.0.1 - 4.0.3 + 4.0.0-SNAPSHOT 8.5.33 undefined @@ -892,9 +891,9 @@ - javax.servlet - javax.servlet-api - ${servlet.api.version} + org.eclipse.jetty.toolchain + jetty-servlet-api + ${servlet.api.version} javax.websocket @@ -932,11 +931,6 @@ 1.0.0.v201108011116 - - org.eclipse.jetty.toolchain - jetty-schemas - ${servlet.schema.version} - org.mortbay.jasper apache-jsp diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 61bb15457752..3146756e7737 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -89,8 +89,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.jetty.toolchain diff --git a/tests/test-integration/src/test/resources/RFC2616Base.xml b/tests/test-integration/src/test/resources/RFC2616Base.xml index 4d600f7c7b5a..1724b9f72d2f 100644 --- a/tests/test-integration/src/test/resources/RFC2616Base.xml +++ b/tests/test-integration/src/test/resources/RFC2616Base.xml @@ -80,7 +80,7 @@ org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern - .*/servlet-api-[^/]*\.jar$ + .*/[^/]*servlet-api-[^/]*\.jar$ 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 789e606881d9..f94fe6486515 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 @@ -45,11 +45,11 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; @Disabled public class JmxIT @@ -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$"); + ".*/javax.servlet-[^/]*\\.jar$|.*/[^/]*servlet-api-[^/]*\\.jar$"); _server.setHandler(context); MBeanContainer mbContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer()); diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 08242d62024f..38445f8c86fb 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -16,8 +16,8 @@ - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 5f1c631ca012..7db6283bc92e 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -63,9 +63,9 @@ ${project.version} - javax.servlet - javax.servlet-api - provided + org.eclipse.jetty.toolchain + jetty-servlet-api + provided org.eclipse.jetty diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 02a23f705fe7..01075539b3ef 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -143,8 +143,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml index 649bc2e37443..dc65328ed212 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/tests/test-webapps/test-jndi-webapp/pom.xml @@ -117,11 +117,11 @@ javax.transaction-api provided - - javax.servlet - javax.servlet-api - provided - + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + org.eclipse.jetty.orbit javax.mail.glassfish diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index f9a15cc57c50..a4eb8672234a 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -49,8 +49,8 @@ provided - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index eb339f6a695c..5dd0f619c08f 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -41,9 +41,9 @@ ${project.version} - javax.servlet - javax.servlet-api - provided + org.eclipse.jetty.toolchain + jetty-servlet-api + provided diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 62859f26f39d..2bcff72d3ff2 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -48,8 +48,8 @@ ${project.version} - javax.servlet - javax.servlet-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided From 707c9ec322a39e468e3cba31866d2b6b603eb9ab Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 29 Nov 2018 17:29:08 +0100 Subject: [PATCH 02/35] Issue #3162 - Use Jetty specific Servlet API jar. Future proof reference of the jetty-servlet-api.jar. Signed-off-by: Simone Bordet --- jetty-server/src/main/config/modules/server.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod index 3a29b1b8995c..d10d42f2c8f8 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.0.0-SNAPSHOT.jar +lib/jetty-servlet-api-4.*.jar lib/jetty-http-${jetty.version}.jar lib/jetty-server-${jetty.version}.jar lib/jetty-xml-${jetty.version}.jar From 8ff82423f90ce48fcad324c0d9f5bbc60e0ccfa2 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 29 Nov 2018 17:36:09 +0100 Subject: [PATCH 03/35] Issue #3162 - Use Jetty specific Servlet API jar. Removed references to jetty-osgi-servlet-api. Signed-off-by: Simone Bordet --- .../asciidoc/development/frameworks/osgi.adoc | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 3 +-- .../eclipse/jetty/osgi/test/TestOSGiUtil.java | 17 ++++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc index f6290572cf71..827d5278dbee 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc @@ -45,7 +45,7 @@ Here's the absolute minimal set of Jetty jars: |jetty-webapp |org.eclipse.jetty.webapp |jetty-deploy |org.eclipse.jetty.deploy |jetty-xml |org.eclipse.jetty.xml -|jetty-osgi-servlet-api |org.eclipse.jetty.osgi-servlet-api +|jetty-servlet-api |org.eclipse.jetty.servlet-api |=================================================== You *must also install the Apache Aries SPI Fly bundles* as many parts of Jetty - for example ALPN, websocket, annotations - use the `ServiceLoader` mechanism, which requires an OSGi Service Loader Mediator like SPI Fly: diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 83c6ebc86aa4..0ea55a8781e1 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -134,8 +134,7 @@ org.eclipse.jetty.toolchain - jetty-osgi-servlet-api - 4.0.1 + jetty-servlet-api org.apache.geronimo.specs diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java index b541adcf7547..6ad30ce3f703 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java @@ -18,13 +18,6 @@ package org.eclipse.jetty.osgi.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -44,7 +37,6 @@ import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.ssl.SslContextFactory; - import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.osgi.framework.Bundle; @@ -52,6 +44,13 @@ import org.osgi.framework.ServiceReference; import org.osgi.service.http.HttpService; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; + /** * Helper methods for pax-exam tests */ @@ -107,7 +106,7 @@ public static List