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>
This commit is contained in:
parent
aeb200e583
commit
bfa2dbf68c
|
@ -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
|
||||
|
|
|
@ -213,8 +213,8 @@
|
|||
<artifactId>javax.websocket-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
|
|
|
@ -149,8 +149,8 @@
|
|||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -73,11 +73,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jasper</groupId>
|
||||
|
|
|
@ -30,7 +30,7 @@ module org.eclipse.jetty.apache.jsp
|
|||
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;
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -53,7 +53,7 @@ public class ServerWithAnnotations
|
|||
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
|
||||
|
|
|
@ -27,7 +27,7 @@ module org.eclipse.jetty.annotations
|
|||
|
||||
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;
|
||||
|
|
|
@ -29,12 +29,9 @@
|
|||
<loginServices>
|
||||
<hashLoginService name="Test Realm" config="realm.properties"/>
|
||||
</loginServices>
|
||||
<webApp
|
||||
war="test.war"
|
||||
contextpath="/test" >
|
||||
<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=".*/[^/]*servlet-api-[^/]*\.jar$"/>
|
||||
</attributes>
|
||||
</webApp>
|
||||
</jetty.run>
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{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
|
||||
</argLine>
|
||||
|
@ -120,8 +120,8 @@
|
|||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
<Call name="setContextAttribute">
|
||||
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
|
||||
<Arg>.*/servlet-api-[^/]*\.jar$</Arg>
|
||||
<Arg>.*/[^/]*servlet-api-[^/]*\.jar$</Arg>
|
||||
</Call>
|
||||
|
||||
<Call id="webappprovider" name="addAppProvider">
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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\
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.fcgi</groupId>
|
||||
|
|
|
@ -21,7 +21,7 @@ module org.eclipse.jetty.fcgi.server
|
|||
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;
|
||||
|
|
|
@ -285,20 +285,12 @@
|
|||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<version>${servlet.api.version}</version>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib</outputDirectory>
|
||||
<destFileName>servlet-api-4.0.jar</destFileName>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
<version>${servlet.schema.version}</version>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib</outputDirectory>
|
||||
<destFileName>jetty-schemas-4.0.jar</destFileName>
|
||||
<destFileName>jetty-servlet-api-${servlet.api.version}.jar</destFileName>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
@ -44,7 +44,7 @@
|
|||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<argLine>@{argLine} --add-modules javax.servlet.api</argLine>
|
||||
<argLine>@{argLine} --add-modules jetty.servlet.api</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
@ -26,7 +26,7 @@ module org.eclipse.jetty.http
|
|||
|
||||
requires org.eclipse.jetty.util;
|
||||
requires org.eclipse.jetty.io;
|
||||
requires static javax.servlet.api;
|
||||
requires static jetty.servlet.api;
|
||||
|
||||
uses HttpFieldPreEncoder;
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{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
|
||||
</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{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
|
||||
</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{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
|
||||
</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
@ -23,7 +23,7 @@ module org.eclipse.jetty.jaas
|
|||
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;
|
||||
|
|
|
@ -22,7 +22,7 @@ module org.eclipse.jetty.security.jaspi
|
|||
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;
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
<version>2.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<version>@servlet.api.version@</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<artifactId>weld-servlet</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -15,11 +15,9 @@
|
|||
<name>Jetty :: Simple :: Base</name>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<type>jar</type>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -26,8 +26,8 @@
|
|||
<artifactId>gwt-servlet</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -33,8 +33,8 @@
|
|||
</dependency>
|
||||
<!-- Servlet Deps -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<!-- JSP Deps -->
|
||||
<dependency>
|
||||
|
|
|
@ -31,8 +31,8 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -28,10 +28,6 @@
|
|||
<artifactId>org.eclipse.osgi.services</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -28,10 +28,6 @@
|
|||
<artifactId>org.eclipse.osgi.services</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -336,11 +336,6 @@
|
|||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-plus</artifactId>
|
||||
|
|
|
@ -35,7 +35,7 @@ module org.eclipse.jetty.plus
|
|||
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;
|
||||
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -20,7 +20,7 @@ module org.eclipse.jetty.proxy
|
|||
{
|
||||
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;
|
||||
|
|
|
@ -13,23 +13,8 @@
|
|||
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.quickstart</bundle-symbolic-name>
|
||||
<jetty-schemas-jar>${settings.localRepository}/org/eclipse/jetty/toolchain/jetty-schemas/${servlet.schema.version}/jetty-schemas-${servlet.schema.version}.jar</jetty-schemas-jar>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<argLine>
|
||||
@{argLine}
|
||||
--patch-module javax.servlet.api=${jetty-schemas-jar}
|
||||
</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
|
|
|
@ -20,7 +20,7 @@ module org.eclipse.jetty.quickstart
|
|||
{
|
||||
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;
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
@ -21,7 +21,7 @@ module org.eclipse.jetty.rewrite
|
|||
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;
|
||||
|
|
|
@ -21,7 +21,7 @@ module org.eclipse.jetty.security
|
|||
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;
|
||||
|
|
|
@ -42,8 +42,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,7 +25,7 @@ module org.eclipse.jetty.server
|
|||
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;
|
||||
|
|
|
@ -22,7 +22,7 @@ module org.eclipse.jetty.servlet
|
|||
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;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{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 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -20,7 +20,7 @@ module org.eclipse.jetty.servlets
|
|||
{
|
||||
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;
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
<systemPropertyVariables>
|
||||
<mavenRepoPath>${settings.localRepository}</mavenRepoPath>
|
||||
</systemPropertyVariables>
|
||||
<argLine>@{argLine} --add-modules javax.servlet.api,org.slf4j</argLine>
|
||||
<argLine>@{argLine} --add-modules jetty.servlet.api,org.slf4j</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
@ -72,8 +72,8 @@
|
|||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -37,7 +37,7 @@ module org.eclipse.jetty.util
|
|||
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;
|
||||
|
|
|
@ -24,7 +24,7 @@ module org.eclipse.jetty.webapp
|
|||
|
||||
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;
|
||||
|
|
|
@ -28,7 +28,7 @@ module org.eclipse.jetty.websocket.javax.server
|
|||
{
|
||||
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;
|
||||
|
|
|
@ -48,8 +48,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ module org.eclipse.jetty.websocket.jetty.server
|
|||
{
|
||||
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;
|
||||
|
|
|
@ -87,6 +87,7 @@
|
|||
<include>org.eclipse.jetty.orbit:javax.servlet</include>
|
||||
<include>org.mortbay.jetty:servlet-api</include>
|
||||
<include>jetty:servlet-api</include>
|
||||
<include>jetty-servlet-api</include>
|
||||
</includes>
|
||||
</bannedDependencies>
|
||||
</rules>
|
||||
|
|
|
@ -32,7 +32,7 @@ module org.eclipse.jetty.websocket.core
|
|||
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;
|
||||
|
|
|
@ -20,7 +20,7 @@ module org.eclipse.jetty.websocket.servlet
|
|||
{
|
||||
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;
|
||||
|
|
14
pom.xml
14
pom.xml
|
@ -48,8 +48,7 @@
|
|||
<logback.version>1.2.3</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</servlet.api.version>
|
||||
<servlet.schema.version>4.0.3</servlet.schema.version>
|
||||
<servlet.api.version>4.0.0-SNAPSHOT</servlet.api.version>
|
||||
<jsp.version>8.5.33</jsp.version>
|
||||
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
|
||||
<alpn.version>undefined</alpn.version>
|
||||
|
@ -892,9 +891,9 @@
|
|||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>${servlet.api.version}</version>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<version>${servlet.api.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.websocket</groupId>
|
||||
|
@ -932,11 +931,6 @@
|
|||
<version>1.0.0.v201108011116</version>
|
||||
</dependency>
|
||||
<!-- JSP Deps -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-schemas</artifactId>
|
||||
<version>${servlet.schema.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jasper</groupId>
|
||||
<artifactId>apache-jsp</artifactId>
|
||||
|
|
|
@ -89,8 +89,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
|
|
|
@ -80,7 +80,7 @@
|
|||
</Set>
|
||||
<Call name="setContextAttribute">
|
||||
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
|
||||
<Arg>.*/servlet-api-[^/]*\.jar$</Arg>
|
||||
<Arg>.*/[^/]*servlet-api-[^/]*\.jar$</Arg>
|
||||
</Call>
|
||||
|
||||
<Call id="webappprovider" name="addAppProvider">
|
||||
|
|
|
@ -45,11 +45,11 @@ import org.junit.jupiter.api.BeforeEach;
|
|||
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 class JmxIT
|
|||
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());
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -63,9 +63,9 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
|
|
|
@ -143,8 +143,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -117,11 +117,11 @@
|
|||
<artifactId>javax.transaction-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||
<artifactId>javax.mail.glassfish</artifactId>
|
||||
|
|
|
@ -49,8 +49,8 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
|
|
|
@ -32,9 +32,9 @@
|
|||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -185,9 +185,9 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
|
|
|
@ -15,16 +15,9 @@
|
|||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||
<artifactId>javax.servlet</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -48,8 +48,8 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
Loading…
Reference in New Issue