Skip to content

Commit 8d63043

Browse files
committed
Merge branch '3.4.x' into 3.5.x
2 parents b61e38b + b43d2f2 commit 8d63043

File tree

1 file changed

+3
-3
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven

1 file changed

+3
-3
lines changed

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void whenAnEntryIsExcludedItDoesNotAppearInTheRepackagedJar(MavenBuild mavenBuil
198198
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
199199
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
200200
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
201-
.doesNotHaveEntryWithName("BOOT-INF/lib/servlet-api-2.5.jar");
201+
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/servlet-api-");
202202
});
203203
}
204204

@@ -252,7 +252,7 @@ void whenAGroupIsExcludedNoEntriesInThatGroupAppearInTheRepackagedJar(MavenBuild
252252
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
253253
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
254254
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
255-
.doesNotHaveEntryWithName("BOOT-INF/lib/log4j-api-2.4.1.jar");
255+
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
256256
});
257257
}
258258

@@ -392,7 +392,7 @@ void repackagedJarContainsTheLayersIndexByDefault(MavenBuild mavenBuild) {
392392
assertThat(layerIndex.get("application")).contains("BOOT-INF/lib/jar-release-0.0.1.RELEASE.jar",
393393
"BOOT-INF/lib/jar-snapshot-0.0.1.BUILD-SNAPSHOT.jar");
394394
assertThat(layerIndex.get("dependencies"))
395-
.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
395+
.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-"));
396396
}
397397
catch (IOException ex) {
398398
// Ignore

0 commit comments

Comments
 (0)