From 244b2b6d70a87f40e4e66ce64ace0e148c3b9fd9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 2 Nov 2020 12:33:12 -0600 Subject: [PATCH] Fixing bad Container Include Jar pattern. + It was matching on jetty-util-ajax-#.jar as well. Signed-off-by: Joakim Erdfelt --- .../org/eclipse/jetty/webapp/WebInfConfigurationTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java index 962c0eb8e054..aa8718c53699 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java @@ -67,7 +67,7 @@ public void testFindAndFilterContainerPaths() { WebInfConfiguration config = new WebInfConfiguration(); WebAppContext context = new WebAppContext(); - context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[^/]*\\.jar$|.*/jetty-util/target/classes/"); + context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[0-9][^/]*\\.jar$|.*/jetty-util/target/classes/"); WebAppClassLoader loader = new WebAppClassLoader(context); context.setClassLoader(loader); @@ -89,7 +89,7 @@ public void testFindAndFilterContainerPathsJDK9() { WebInfConfiguration config = new WebInfConfiguration(); WebAppContext context = new WebAppContext(); - context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[^/]*\\.jar$|.*/jetty-util/target/classes/$|.*/foo-bar-janb.jar"); + context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[0-9][^/]*\\.jar$|.*/jetty-util/target/classes/$|.*/foo-bar-janb.jar"); WebAppClassLoader loader = new WebAppClassLoader(context); context.setClassLoader(loader); config.findAndFilterContainerPaths(context); @@ -117,7 +117,7 @@ public void testFindAndFilterContainerPathsTarget8() WebInfConfiguration config = new WebInfConfiguration(); WebAppContext context = new WebAppContext(); context.setAttribute(JavaVersion.JAVA_TARGET_PLATFORM, "8"); - context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[^/]*\\.jar$|.*/jetty-util/target/classes/$|.*/foo-bar-janb.jar"); + context.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/jetty-util-[0-9][^/]*\\.jar$|.*/jetty-util/target/classes/$|.*/foo-bar-janb.jar"); WebAppClassLoader loader = new WebAppClassLoader(context); context.setClassLoader(loader); config.findAndFilterContainerPaths(context);