Skip to content

Commit 350dec4

Browse files
committed
Merge branch '3.5.x'
2 parents 6555c0d + 4c414b9 commit 350dec4

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,14 @@ void versionMismatchBetweenTransitiveDevelopmentOnlyImplementationDependenciesDo
243243
.filter((entry) -> !entry.isDirectory())
244244
.map(JarEntry::getName)
245245
.filter((name) -> name.startsWith(this.libPath));
246-
assertThat(libEntryNames).containsExactly(this.libPath + "two-1.0.jar",
247-
this.libPath + "commons-io-2.19.0.jar");
246+
if (this.gradleBuild.gradleVersionIsLessThan("9.0.0-rc-1")) {
247+
assertThat(libEntryNames).containsExactly(this.libPath + "two-1.0.jar",
248+
this.libPath + "commons-io-2.19.0.jar");
249+
}
250+
else {
251+
assertThat(libEntryNames).containsExactly(this.libPath + "commons-io-2.19.0.jar",
252+
this.libPath + "two-1.0.jar");
253+
}
248254
}
249255
}
250256

0 commit comments

Comments
 (0)