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
b9281e323d
commit
0d89f29e1b
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ logging
|
|||
threadpool
|
||||
|
||||
[lib]
|
||||
lib/jetty-servlet-api-4.*.jar
|
||||
lib/jetty-servlet-api-4.0.*.jar
|
||||
lib/jetty-http-${jetty.version}.jar
|
||||
lib/jetty-server-${jetty.version}.jar
|
||||
lib/jetty-xml-${jetty.version}.jar
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<configuration>
|
||||
<argLine>
|
||||
@{argLine} ${jetty.surefire.argLine}
|
||||
--add-modules jetty..servlet.api
|
||||
--add-modules jetty.servlet.api
|
||||
--add-modules org.eclipse.jetty.util
|
||||
--add-modules org.eclipse.jetty.io
|
||||
--add-modules org.eclipse.jetty.http
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -25,7 +25,7 @@
|
|||
<logback.version>1.3.0-alpha4</logback.version>
|
||||
<spring-version>5.1.1.RELEASE</spring-version>
|
||||
<jetty-test-policy.version>1.2</jetty-test-policy.version>
|
||||
<servlet.api.version>4.0.1-SNAPSHOT</servlet.api.version>
|
||||
<servlet.api.version>4.0.1</servlet.api.version>
|
||||
<jsp.version>9.0.14.1</jsp.version>
|
||||
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
|
||||
<alpn.version>undefined</alpn.version>
|
||||
|
@ -903,7 +903,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-servlet-api</artifactId>
|
||||
<version>${servlet.api.version}</version>
|
||||
<version>${servlet.api.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.websocket</groupId>
|
||||
|
|
Loading…
Reference in New Issue