From b46698774d8f4742718bae05c43eef22e33f9e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Feb 2025 12:28:20 +0100 Subject: [PATCH] Upgrade to Native Build Tools Plugin 0.10.5 Closes gh-44141 --- gradle.properties | 2 +- .../boot/gradle/testkit/PluginClasspathGradleBuild.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 854d4c9223..2667fc40ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ junitJupiterVersion=5.10.5 kotlinVersion=1.9.25 mavenVersion=3.9.4 mockitoVersion=5.11.0 -nativeBuildToolsVersion=0.10.4 +nativeBuildToolsVersion=0.10.5 snakeYamlVersion=2.2 springFrameworkVersion=6.1.17-SNAPSHOT springFramework60xVersion=6.0.23 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java index f5a9e6029e..0197098a04 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 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. @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.core.Versioned; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; @@ -86,8 +85,9 @@ public class PluginClasspathGradleBuild extends GradleBuild { new File(pathOfJarContaining(HttpVersionPolicy.class)), new File(pathOfJarContaining(Module.class)), new File(pathOfJarContaining(Versioned.class)), new File(pathOfJarContaining(ParameterNamesModule.class)), - new File(pathOfJarContaining(JsonView.class)), new File(pathOfJarContaining(Platform.class)), - new File(pathOfJarContaining(Toml.class)), new File(pathOfJarContaining(Lexer.class)), + new File(pathOfJarContaining("com.github.openjson.JSONObject")), + new File(pathOfJarContaining(Platform.class)), new File(pathOfJarContaining(Toml.class)), + new File(pathOfJarContaining(Lexer.class)), new File(pathOfJarContaining("org.graalvm.buildtools.gradle.NativeImagePlugin")), new File(pathOfJarContaining("org.graalvm.reachability.GraalVMReachabilityMetadataRepository")), new File(pathOfJarContaining("org.graalvm.buildtools.utils.SharedConstants")));