Skip to content

S
spring-boot
Commit 608b1e65 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Relax servlet check 

Relax the servlet version check in Maven integration tests.

See gh-1797
parent 3a9d6242
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
View file @ 608b1e65
...@@ -174,7 +174,7 @@ public class Verify { ...@@ -174,7 +174,7 @@ public class Verify {
super.verifyZipEntries(verifier); super.verifyZipEntries(verifier);
verifier.assertHasEntryNameStartingWith("lib/spring-context"); verifier.assertHasEntryNameStartingWith("lib/spring-context");
verifier.assertHasEntryNameStartingWith("lib/spring-core"); 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/" assertTrue("Unpacked launcher classes", verifier.hasEntry("org/"
+ "springframework/boot/loader/JarLauncher.class")); + "springframework/boot/loader/JarLauncher.class"));
assertTrue("Own classes", verifier.hasEntry("org/" assertTrue("Own classes", verifier.hasEntry("org/"
...@@ -201,7 +201,7 @@ public class Verify { ...@@ -201,7 +201,7 @@ public class Verify {
super.verifyZipEntries(verifier); super.verifyZipEntries(verifier);
verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-context"); verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-context");
verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-core"); 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/" assertTrue("Unpacked launcher classes", verifier.hasEntry("org/"
+ "springframework/boot/loader/JarLauncher.class")); + "springframework/boot/loader/JarLauncher.class"));
assertTrue("Own classes", verifier.hasEntry("WEB-INF/classes/org/" assertTrue("Own classes", verifier.hasEntry("WEB-INF/classes/org/"
......
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