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

Fix pattern to scan for container jars to match servlet api

This commit is contained in:
Jan Bartel 2022-07-05 11:03:51 +10:00
parent a4b9f19e26
commit 8f853f7fb6
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml
View File

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

2
jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml
View File

@ -49,7 +49,7 @@
<Get name="properties"> <Get name="properties">
<Put name="jetty.deploy.containerScanJarPattern"> <Put name="jetty.deploy.containerScanJarPattern">
<Property name="jetty.deploy.containerScanJarPattern"> <Property name="jetty.deploy.containerScanJarPattern">
<Default>.*jakarta.servlet.jsp.jstl-.*\.jar$</Default> <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
</Property> </Property>
</Put> </Put>
<Put name="jetty.deploy.webInfScanJarPattern"> <Put name="jetty.deploy.webInfScanJarPattern">

2
jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod
View File

@ -42,7 +42,7 @@ etc/jetty-ee10-deploy.xml
# jetty.deploy.tempDir= # jetty.deploy.tempDir=
## Pattern to select jars from the container classloader to be scanned (or null to scan no jars) ## Pattern to select jars from the container classloader to be scanned (or null to scan no jars)
# jetty.deploy.containerScanJarPattern=.*jakarta.servlet.jsp.jstl-.*\.jar$ # jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
## Pattern to select jars from the container classloader to be scanned (or null to scan all jars). ## Pattern to select jars from the container classloader to be scanned (or null to scan all jars).
# jetty.deploy.webInfScanJarPattern= # jetty.deploy.webInfScanJarPattern=

2
jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml
View File

@ -41,7 +41,7 @@
<Get name="properties"> <Get name="properties">
<Put name="jetty.deploy.containerScanJarPattern"> <Put name="jetty.deploy.containerScanJarPattern">
<Property name="jetty.deploy.containerScanJarPattern"> <Property name="jetty.deploy.containerScanJarPattern">
<Default>.*jakarta.servlet.jsp.jstl-.*\.jar$</Default> <Default>.*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
</Property> </Property>
</Put> </Put>
<Put name="jetty.deploy.webInfScanJarPattern"> <Put name="jetty.deploy.webInfScanJarPattern">

2
jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-deploy.mod
View File

@ -42,7 +42,7 @@ etc/jetty-ee9-deploy.xml
# jetty.deploy.tempDir= # jetty.deploy.tempDir=
## Pattern to select jars from the container classloader to be scanned (or null to scan no jars) ## Pattern to select jars from the container classloader to be scanned (or null to scan no jars)
# jetty.deploy.containerScanJarPattern=.*jakarta.servlet.jsp.jstl-.*\.jar$ # jetty.deploy.containerScanJarPattern=.*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
## Pattern to select jars from the container classloader to be scanned (or null to scan all jars). ## Pattern to select jars from the container classloader to be scanned (or null to scan all jars).
# jetty.deploy.webInfScanJarPattern= # jetty.deploy.webInfScanJarPattern=