From 608b1e65a12eb1369b2000a82bff3ce7a0805597 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 13 Nov 2014 19:13:52 -0800 Subject: [PATCH] Relax servlet check Relax the servlet version check in Maven integration tests. See gh-1797 --- .../src/test/java/org/springframework/boot/maven/Verify.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java index 40bfc645663..53c20e8432d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java @@ -174,7 +174,7 @@ public class Verify { super.verifyZipEntries(verifier); verifier.assertHasEntryNameStartingWith("lib/spring-context"); verifier.assertHasEntryNameStartingWith("lib/spring-core"); - verifier.assertHasEntryNameStartingWith("lib/javax.servlet-api-3.0.1.jar"); + verifier.assertHasEntryNameStartingWith("lib/javax.servlet-api-3"); assertTrue("Unpacked launcher classes", verifier.hasEntry("org/" + "springframework/boot/loader/JarLauncher.class")); assertTrue("Own classes", verifier.hasEntry("org/" @@ -201,7 +201,7 @@ public class Verify { super.verifyZipEntries(verifier); verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-context"); verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-core"); - verifier.assertHasEntryNameStartingWith("WEB-INF/lib-provided/javax.servlet-api-3.0.1.jar"); + verifier.assertHasEntryNameStartingWith("WEB-INF/lib-provided/javax.servlet-api-3"); assertTrue("Unpacked launcher classes", verifier.hasEntry("org/" + "springframework/boot/loader/JarLauncher.class")); assertTrue("Own classes", verifier.hasEntry("WEB-INF/classes/org/"