root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x 

Closes gh-40804
This commit is contained in:
Andy Wilkinson 2024-05-17 10:37:27 +01:00
parent d38c1e06b3 6be5dbc034
commit c3e122d6ea
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
View File

@ -32,6 +32,7 @@ import org.assertj.core.api.Condition;
import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.TaskOutcome; import org.gradle.testkit.runner.TaskOutcome;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.condition.JRE;
@ -150,6 +151,7 @@ class PaketoBuilderTests {
} }
@Test @Test
@Disabled("0.4.292 of the builder launches an unpacked jar rather than the script in bin")
void bootDistZipJarApp() throws Exception { void bootDistZipJarApp() throws Exception {
writeMainClass(); writeMainClass();
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();