Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Simone Bordet 2018-11-29 16:51:29 +01:00
parent b9281e323d
commit 0d89f29e1b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ public class JspConfig
{ {
context.setAttribute("javax.servlet.context.tempdir", scratchDir); context.setAttribute("javax.servlet.context.tempdir", scratchDir);
context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern", 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.setWar(baseUri.toASCIIString());
context.setResourceBase(baseUri.toASCIIString()); context.setResourceBase(baseUri.toASCIIString());
} }

2
jetty-server/src/main/config/modules/server.mod
View File

@ -13,7 +13,7 @@ logging
threadpool threadpool
[lib] [lib]
lib/jetty-servlet-api-4.*.jar lib/jetty-servlet-api-4.0.*.jar
lib/jetty-http-${jetty.version}.jar lib/jetty-http-${jetty.version}.jar
lib/jetty-server-${jetty.version}.jar lib/jetty-server-${jetty.version}.jar
lib/jetty-xml-${jetty.version}.jar lib/jetty-xml-${jetty.version}.jar

2
jetty-servlets/pom.xml
View File

@ -24,7 +24,7 @@
<configuration> <configuration>
<argLine> <argLine>
@{argLine} ${jetty.surefire.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.util
--add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.io
--add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.http

2
pom.xml
View File

@ -25,7 +25,7 @@
<logback.version>1.3.0-alpha4</logback.version> <logback.version>1.3.0-alpha4</logback.version>
<spring-version>5.1.1.RELEASE</spring-version> <spring-version>5.1.1.RELEASE</spring-version>
<jetty-test-policy.version>1.2</jetty-test-policy.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> <jsp.version>9.0.14.1</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons --> <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version> <alpn.version>undefined</alpn.version>