Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Moritz Halbritter
2024-02-12 10:19:46 +01:00
parent a62d4e620c 4387b79831
commit 7f55cae90f
50 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,6 +349,7 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
}
catch (IOException ex) {
// Ignore
}
});
}

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java
View File

@@ -167,6 +167,7 @@ class WarIntegrationTests extends AbstractArchiveIntegrationTests {
.anyMatch((dependency) -> dependency.startsWith("WEB-INF/lib-provided/"));
}
catch (IOException ex) {
// Ignore
}
});
}