From 07ee7254a6905f6c346ea00592c0147a210b9c74 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 5 Feb 2024 08:42:30 +0100 Subject: [PATCH] Align to Native Build Tools metadata repository default Closes gh-39068 --- .../spring-boot-starter-parent/build.gradle | 6 ------ .../boot/gradle/plugin/NativeImagePluginAction.java | 11 +---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle index 32d88db7691..14974ef3207 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle @@ -269,9 +269,6 @@ publishing.publications.withType(MavenPublication) { delegate.artifactId('native-maven-plugin') configuration { delegate.classesDirectory('${project.build.outputDirectory}') - metadataRepository { - delegate.enabled('true') - } delegate.requiredVersion('22.3') } executions { @@ -315,9 +312,6 @@ publishing.publications.withType(MavenPublication) { delegate.artifactId('native-maven-plugin') configuration { delegate.classesDirectory('${project.build.outputDirectory}') - metadataRepository { - delegate.enabled('true') - } delegate.requiredVersion('22.3') } executions { 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 c4689c80b24..c41b71f70b2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,14 +22,12 @@ import java.util.stream.Collectors; 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.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.file.FileCollection; import org.gradle.api.java.archives.Manifest; -import org.gradle.api.plugins.ExtensionAware; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.SourceSetContainer; @@ -60,7 +58,6 @@ class NativeImagePluginAction implements PluginApplicationAction { GraalVMExtension graalVmExtension = configureGraalVmExtension(project); configureMainNativeBinaryClasspath(project, sourceSets, graalVmExtension); configureTestNativeBinaryClasspath(sourceSets, graalVmExtension); - configureGraalVmReachabilityExtension(graalVmExtension); copyReachabilityMetadataToBootJar(project); configureBootBuildImageToProduceANativeImage(project); configureJarManifestNativeAttribute(project); @@ -99,12 +96,6 @@ class NativeImagePluginAction implements PluginApplicationAction { return extension; } - private void configureGraalVmReachabilityExtension(GraalVMExtension graalVmExtension) { - GraalVMReachabilityMetadataRepositoryExtension extension = ((ExtensionAware) graalVmExtension).getExtensions() - .getByType(GraalVMReachabilityMetadataRepositoryExtension.class); - extension.getEnabled().set(true); - } - private void copyReachabilityMetadataToBootJar(Project project) { project.getTasks() .named(SpringBootPlugin.BOOT_JAR_TASK_NAME, BootJar.class)