diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java index 1ae66ec959..7526220cb4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java @@ -24,7 +24,6 @@ import org.graalvm.buildtools.gradle.NativeImagePlugin; import org.graalvm.buildtools.gradle.dsl.GraalVMExtension; import org.graalvm.buildtools.gradle.dsl.GraalVMReachabilityMetadataRepositoryExtension; import org.gradle.api.Action; -import org.gradle.api.GradleException; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -96,15 +95,6 @@ class NativeImagePluginAction implements PluginApplicationAction { private GraalVMExtension configureGraalVmExtension(Project project) { GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class); extension.getToolchainDetection().set(false); - extension.getBinaries().configureEach((options) -> { - try { - options.getRequiredVersion().convention("22.3"); - } - catch (NoSuchMethodError ex) { - throw new GradleException("Incompatible version of org.graalvm.buildtools.native plugin. " - + "Please upgrade to 0.9.17 or later."); - } - }); return extension; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java index e25e6c0455..877fc0ec24 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java @@ -115,12 +115,6 @@ class NativeImagePluginActionIntegrationTests { projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses")); } - @TestTemplate - void nativeImageBinariesRequireGraal22Dot3() { - BuildResult result = this.gradleBuild.build("requiredGraalVersion"); - assertThat(result.getOutput()).contains("custom: 22.3", "main: 22.3", "test: 22.3"); - } - private String projectPath(String path) { try { return new File(this.gradleBuild.getProjectDir(), path).getCanonicalPath(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests-nativeImageBinariesRequireGraal22Dot3.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests-nativeImageBinariesRequireGraal22Dot3.gradle deleted file mode 100644 index 6745e6b4b3..0000000000 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests-nativeImageBinariesRequireGraal22Dot3.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'org.springframework.boot' version '{version}' - id 'java' -} - -apply plugin: 'org.graalvm.buildtools.native' - -repositories { - mavenCentral() -} - -graalvmNative { - binaries { - custom { - } - } -} - -task('requiredGraalVersion') { - doFirst { - graalvmNative.binaries.asMap.each { name, binary -> - println "${name}: ${binary.requiredVersion.get()}" - } - } -}