Merge branch '3.2.x' into 3.3.x

mhalbritter · mhalbritter · commit dbe50732e35f · 2024-11-14T15:08:33.000+01:00
Closes gh-43161
diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle
@@ -33,7 +33,5 @@ bootJar {
 }
 
 bootBuildImage {
-	environment = ['BP_NATIVE_IMAGE': 'true',
-					//see https://github.com/paketo-buildpacks/native-image/issues/321
-				   'BP_NATIVE_IMAGE_BUILD_ARGUMENTS': '-H:-AddAllFileSystemProviders']
+	environment = ['BP_NATIVE_IMAGE': 'true']
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,5 @@ bootJar {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`bootBuildImage {`
`36`		`- environment = ['BP_NATIVE_IMAGE': 'true',`
`37`		`- //see https://github.com/paketo-buildpacks/native-image/issues/321`
`38`		`- 'BP_NATIVE_IMAGE_BUILD_ARGUMENTS': '-H:-AddAllFileSystemProviders']`
	`36`	`+ environment = ['BP_NATIVE_IMAGE': 'true']`
`39`	`37`	`}`