Merge branch '3.2.x'

Closes gh-40640
spring-projects · May 8, 2024 · 0f8062f · 0f8062f
2 parents fb64e95 + ed42ed7
commit 0f8062f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...e-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/...e-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
@@ -300,7 +300,6 @@ void plainWarApp() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(max = JRE.JAVA_17)
 	void nativeApp() throws Exception {
 		this.gradleBuild.expectDeprecationMessages("uses or overrides a deprecated API");
 		this.gradleBuild.expectDeprecationMessages("has been deprecated and marked for removal");

diff --git a/...mTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle b/...mTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle
@@ -34,5 +34,7 @@ bootJar {
 }
 
 bootBuildImage {
-	environment = ['BP_NATIVE_IMAGE': 'true']
+	environment = ['BP_NATIVE_IMAGE': 'true',
+					//see https://github.com/paketo-buildpacks/native-image/issues/321
+				   'BP_NATIVE_IMAGE_BUILD_ARGUMENTS': '-H:-AddAllFileSystemProviders']
 }