root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Upgrade to Gradle 8.14
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details

This commit is contained in:
Andy Wilkinson 2025-04-25 14:08:39 +01:00
parent 52c0e0af08
commit c420786eed
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

4
gradlew vendored
View File

@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@" "$@"
# Stop when "xargs" is not available. # Stop when "xargs" is not available.

4
gradlew.bat vendored
View File

@ -70,11 +70,11 @@ goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -52,6 +52,7 @@ class KotlinPluginActionIntegrationTests {
@Test @Test
void kotlinVersionPropertyIsSet() { void kotlinVersionPropertyIsSet() {
expectConfigurationCacheRequestedDeprecationWarning();
String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath") String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
.getOutput(); .getOutput();
assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+"); assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
@ -59,6 +60,7 @@ class KotlinPluginActionIntegrationTests {
@Test @Test
void kotlinCompileTasksUseJavaParametersFlagByDefault() { void kotlinCompileTasksUseJavaParametersFlagByDefault() {
expectConfigurationCacheRequestedDeprecationWarning();
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: true") .contains("compileKotlin java parameters: true")
.contains("compileTestKotlin java parameters: true"); .contains("compileTestKotlin java parameters: true");
@ -66,6 +68,7 @@ class KotlinPluginActionIntegrationTests {
@Test @Test
void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() { void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
expectConfigurationCacheRequestedDeprecationWarning();
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: false") .contains("compileKotlin java parameters: false")
.contains("compileTestKotlin java parameters: false"); .contains("compileTestKotlin java parameters: false");
@ -73,6 +76,7 @@ class KotlinPluginActionIntegrationTests {
@Test @Test
void taskConfigurationIsAvoided() throws IOException { void taskConfigurationIsAvoided() throws IOException {
expectConfigurationCacheRequestedDeprecationWarning();
BuildResult result = this.gradleBuild.build("help"); BuildResult result = this.gradleBuild.build("help");
String output = result.getOutput(); String output = result.getOutput();
BufferedReader reader = new BufferedReader(new StringReader(output)); BufferedReader reader = new BufferedReader(new StringReader(output));
@ -86,4 +90,9 @@ class KotlinPluginActionIntegrationTests {
assertThat(configured).containsExactlyInAnyOrder("help", "compileJava", "clean"); assertThat(configured).containsExactlyInAnyOrder("help", "compileJava", "clean");
} }
private void expectConfigurationCacheRequestedDeprecationWarning() {
this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.14")
.expectDeprecationMessages("The StartParameter.isConfigurationCacheRequested property has been deprecated");
}
} }