From cc16402ee49143356f333d8c127576b255a439f5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 24 Sep 2017 16:26:15 +0100 Subject: [PATCH] Update war packaging tests to reflect change in Tomcat's dependencies See gh-10395 --- .../org/springframework/boot/gradle/WarPackagingTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 809228541d4..a2088750822 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 @@ -1,5 +1,5 @@ /* - * 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"); * you may not use this file except in compliance with the License. @@ -45,8 +45,8 @@ public class WarPackagingTests { private static final String WEB_INF_LIB_PREFIX = "WEB-INF/lib/"; private static final Set TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet( - Arrays.asList("spring-boot-starter-tomcat-", "tomcat-embed-core-", - "tomcat-embed-el-", "tomcat-embed-websocket-")); + Arrays.asList("spring-boot-starter-tomcat-", "tomcat-annotations", + "tomcat-embed-core-", "tomcat-embed-el-", "tomcat-embed-websocket-")); private static final Set JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet( Arrays.asList("spring-boot-starter-jetty-", "jetty-continuation",