Correct XML from merge

jetty · Jan 21, 2025 · f92901d · f92901d
1 parent 8f32176
commit f92901d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jetty-ee11/jetty-ee11-tests/jetty-ee11-test-integration/src/test/resources/deploy.xml b/jetty-ee11/jetty-ee11-tests/jetty-ee11-test-integration/src/test/resources/deploy.xml
@@ -30,7 +30,7 @@
               <Set name="extractWars">true</Set>
               <Set name="containerScanJarPattern">
                 <Property name="jetty.deploy.containerScanJarPattern">
-                  <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
+                  <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
                 </Property>
               </Set>
               <Set name="webInfScanJarPattern" property="jetty.deploy.webInfScanJarPattern" />

diff --git a/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml b/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml
@@ -23,7 +23,7 @@
     <Set name="configurationClasses" property="jetty.deploy.configurationClasses" />
     <Set name="containerScanJarPattern">
       <Property name="jetty.deploy.containerScanJarPattern">
-                <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
+        <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
       </Property>
     </Set>
     <Set name="webInfScanJarPattern" property="jetty.deploy.webInfScanJarPattern" />