Skip to content

Commit 7bd9873

Browse files
committed
Raise the minimum supported version of Gradle to 7.5
Closes spring-projectsgh-31215
1 parent ccbd62f commit 7bd9873

File tree

8 files changed

+19
-11
lines changed

8 files changed

+19
-11
lines changed

gradle/wrapper/gradle-wrapper.jar

935 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+6
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ set -- \
205205
org.gradle.wrapper.GradleWrapperMain \
206206
"$@"
207207

208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
212+
fi
213+
208214
# Use "xargs" to parse quoted args.
209215
#
210216
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+8-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
43+
if %ERRORLEVEL% equ 0 goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7575

7676
:end
7777
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
78+
if %ERRORLEVEL% equ 0 goto mainEnd
7979

8080
:fail
8181
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8282
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
83+
set EXIT_CODE=%ERRORLEVEL%
84+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
85+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
86+
exit /b %EXIT_CODE%
8587

8688
:mainEnd
8789
if "%OS%"=="Windows_NT" endlocal

spring-boot-project/spring-boot-docs/src/docs/asciidoc/build-tool-plugins/gradle.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[build-tool-plugins.gradle]]
22
== Spring Boot Gradle Plugin
33
The Spring Boot Gradle Plugin provides Spring Boot support in Gradle, letting you package executable jar or war archives, run Spring Boot applications, and use the dependency management provided by `spring-boot-dependencies`.
4-
It requires Gradle 7.x (7.4 or later).
4+
It requires Gradle 7.x (7.5 or later).
55
See the plugin's documentation to learn more:
66

77
* Reference ({spring-boot-gradle-plugin-docs}[HTML] and {spring-boot-gradle-plugin-pdfdocs}[PDF])

spring-boot-project/spring-boot-docs/src/docs/asciidoc/getting-started/installing.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ More details on getting started with Spring Boot and Maven can be found in the {
4545

4646
[[getting-started.installing.java.gradle]]
4747
==== Gradle Installation
48-
Spring Boot is compatible with Gradle 7.x (7.4 or later).
48+
Spring Boot is compatible with Gradle 7.x (7.5 or later).
4949
If you do not already have Gradle installed, you can follow the instructions at https://gradle.org.
5050

5151
Spring Boot dependencies can be declared by using the `org.springframework.boot` `group`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/getting-started/system-requirements.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Explicit build support is provided for the following build tools:
1212
| 3.5+
1313

1414
| Gradle
15-
| 7.x (7.4 or later)
15+
| 7.x (7.5 or later)
1616
|===
1717

1818

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/introduction.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
= Introduction
33
The Spring Boot Gradle Plugin provides Spring Boot support in https://gradle.org[Gradle].
44
It allows you to package executable jar or war archives, run Spring Boot applications, and use the dependency management provided by `spring-boot-dependencies`.
5-
Spring Boot's Gradle plugin requires Gradle 7.x (7.4 or later) and can be used with Gradle's {gradle-userguide}/configuration_cache.html[configuration cache].
5+
Spring Boot's Gradle plugin requires Gradle 7.x (7.5 or later) and can be used with Gradle's {gradle-userguide}/configuration_cache.html[configuration cache].
66

77
In addition to this user guide, {api-documentation}[API documentation] is also available.

0 commit comments

Comments
 (0)