Skip to content

S
spring-boot
Commit cc16402e authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Update war packaging tests to reflect change in Tomcat's dependencies 

See gh-10395
parent b53f108d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
View file @ cc16402e
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -45,8 +45,8 @@ public class WarPackagingTests { ...@@ -45,8 +45,8 @@ public class WarPackagingTests {
private static final String WEB_INF_LIB_PREFIX = "WEB-INF/lib/"; private static final String WEB_INF_LIB_PREFIX = "WEB-INF/lib/";
private static final Set<String> TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>( private static final Set<String> TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
Arrays.asList("spring-boot-starter-tomcat-", "tomcat-embed-core-", Arrays.asList("spring-boot-starter-tomcat-", "tomcat-annotations",
"tomcat-embed-el-", "tomcat-embed-websocket-")); "tomcat-embed-core-", "tomcat-embed-el-", "tomcat-embed-websocket-"));
private static final Set<String> JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>( private static final Set<String> JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
Arrays.asList("spring-boot-starter-jetty-", "jetty-continuation", Arrays.asList("spring-boot-starter-jetty-", "jetty-continuation",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment