From 075b5c1b181969f42dd6abd5b30062aeee9f499a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 30 Mar 2015 15:15:32 +0100 Subject: [PATCH] Update war packaging tests following removal of jetty-jsp See gh-2680 --- .../springframework/boot/gradle/WarPackagingTests.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java index c135e2741e..274453e924 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java @@ -52,12 +52,9 @@ public class WarPackagingTests { "tomcat-embed-websocket-")); private static final Set JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet( - Arrays.asList("spring-boot-starter-jetty-", "jetty-util-", "jetty-xml-", - "jetty-schemas-", "javax.servlet-", "jetty-io-", "jetty-http-", - "jetty-server-", "jetty-security-", "jetty-servlet-", - "jetty-webapp-", "javax.servlet.jsp-2", "javax.servlet.jsp-api-", - "javax.servlet.jsp.jstl-1.2.2", "javax.servlet.jsp.jstl-1.2.0", - "javax.el-", "org.eclipse.jdt.core-", "jetty-jsp-", "websocket-api", + Arrays.asList("spring-boot-starter-jetty-", "jetty-util-", "javax.servlet-", + "jetty-io-", "jetty-http-", "jetty-server-", "jetty-security-", + "jetty-servlet-", "jetty-webapp-", "websocket-api", "javax.annotation-api", "jetty-plus", "javax-websocket-server-impl-", "asm-", "javax.websocket-api-", "asm-tree-", "asm-commons-", "websocket-common-", "jetty-annotations-",