Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
13819295
Commit
13819295
authored
Aug 12, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Gradle 6.6
Closes gh-22905
parent
0841eab8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
22 deletions
+7
-22
gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.jar
+0
-0
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
gradlew
gradlew
+1
-1
gradlew.bat
gradlew.bat
+3
-18
GradleCompatibilityExtension.java
...ework/boot/gradle/junit/GradleCompatibilityExtension.java
+2
-2
No files found.
gradle/wrapper/gradle-wrapper.jar
View file @
13819295
No preview for this file type
gradle/wrapper/gradle-wrapper.properties
View file @
13819295
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-6.
4.1
-bin.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-6.
6
-bin.zip
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
gradlew
View file @
13819295
...
...
@@ -130,7 +130,7 @@ fi
if
[
"
$cygwin
"
=
"true"
-o
"
$msys
"
=
"true"
]
;
then
APP_HOME
=
`
cygpath
--path
--mixed
"
$APP_HOME
"
`
CLASSPATH
=
`
cygpath
--path
--mixed
"
$CLASSPATH
"
`
JAVACMD
=
`
cygpath
--unix
"
$JAVACMD
"
`
# We build the pattern for arguments to be converted via cygpath
...
...
gradlew.bat
View file @
13819295
...
...
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto
init
if "%ERRORLEVEL%" == "0" goto
execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
...
...
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto
init
if exist "%JAVA_EXE%" goto
execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
...
...
@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
...
...
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %
CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %
*
:end
@rem End local scope for the variables with windows NT shell
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View file @
13819295
...
...
@@ -45,10 +45,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
JavaVersion
javaVersion
=
JavaVersion
.
current
();
if
(
javaVersion
.
isCompatibleWith
(
JavaVersion
.
VERSION_14
)
||
javaVersion
.
isCompatibleWith
(
JavaVersion
.
VERSION_13
))
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"6.3"
,
"
default"
,
"6.5.1
"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"6.3"
,
"
6.4.1"
,
"6.5.1"
,
"default
"
);
}
else
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"5.6.4"
,
"6.3"
,
"
default"
,
"6.5.1
"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"5.6.4"
,
"6.3"
,
"
6.4.1"
,
"6.5.1"
,
"default
"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment