Skip to content

Commit 07ee725

Browse files
committed
Align to Native Build Tools metadata repository default
Closes gh-39068
1 parent 8aef707 commit 07ee725

File tree

2 files changed

+1
-16
lines changed
  • spring-boot-project

2 files changed

+1
-16
lines changed

spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ publishing.publications.withType(MavenPublication) {
269269
delegate.artifactId('native-maven-plugin')
270270
configuration {
271271
delegate.classesDirectory('${project.build.outputDirectory}')
272-
metadataRepository {
273-
delegate.enabled('true')
274-
}
275272
delegate.requiredVersion('22.3')
276273
}
277274
executions {
@@ -315,9 +312,6 @@ publishing.publications.withType(MavenPublication) {
315312
delegate.artifactId('native-maven-plugin')
316313
configuration {
317314
delegate.classesDirectory('${project.build.outputDirectory}')
318-
metadataRepository {
319-
delegate.enabled('true')
320-
}
321315
delegate.requiredVersion('22.3')
322316
}
323317
executions {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,14 +22,12 @@
2222

2323
import org.graalvm.buildtools.gradle.NativeImagePlugin;
2424
import org.graalvm.buildtools.gradle.dsl.GraalVMExtension;
25-
import org.graalvm.buildtools.gradle.dsl.GraalVMReachabilityMetadataRepositoryExtension;
2625
import org.gradle.api.Action;
2726
import org.gradle.api.Plugin;
2827
import org.gradle.api.Project;
2928
import org.gradle.api.artifacts.Configuration;
3029
import org.gradle.api.file.FileCollection;
3130
import org.gradle.api.java.archives.Manifest;
32-
import org.gradle.api.plugins.ExtensionAware;
3331
import org.gradle.api.plugins.JavaPlugin;
3432
import org.gradle.api.plugins.JavaPluginExtension;
3533
import org.gradle.api.tasks.SourceSetContainer;
@@ -60,7 +58,6 @@ public void execute(Project project) {
6058
GraalVMExtension graalVmExtension = configureGraalVmExtension(project);
6159
configureMainNativeBinaryClasspath(project, sourceSets, graalVmExtension);
6260
configureTestNativeBinaryClasspath(sourceSets, graalVmExtension);
63-
configureGraalVmReachabilityExtension(graalVmExtension);
6461
copyReachabilityMetadataToBootJar(project);
6562
configureBootBuildImageToProduceANativeImage(project);
6663
configureJarManifestNativeAttribute(project);
@@ -99,12 +96,6 @@ private GraalVMExtension configureGraalVmExtension(Project project) {
9996
return extension;
10097
}
10198

102-
private void configureGraalVmReachabilityExtension(GraalVMExtension graalVmExtension) {
103-
GraalVMReachabilityMetadataRepositoryExtension extension = ((ExtensionAware) graalVmExtension).getExtensions()
104-
.getByType(GraalVMReachabilityMetadataRepositoryExtension.class);
105-
extension.getEnabled().set(true);
106-
}
107-
10899
private void copyReachabilityMetadataToBootJar(Project project) {
109100
project.getTasks()
110101
.named(SpringBootPlugin.BOOT_JAR_TASK_NAME, BootJar.class)

0 commit comments

Comments
 (0)