Skip to content

S
spring-boot
Commit bca1b926 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge pull request #20213 from dreis2211 

* gh-20213:
  Upgrade to Gradle 6.2

Closes gh-20213
parents 16111f12 866c441d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
gradle/wrapper/gradle-wrapper.properties
View file @ bca1b926
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View file @ bca1b926
...@@ -43,10 +43,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio ...@@ -43,10 +43,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
static { static {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) { if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
GRADLE_VERSIONS = Arrays.asList("6.0.1", "default"); GRADLE_VERSIONS = Arrays.asList("6.0.1", "6.1.1", "default");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.0.1", "default"); GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.0.1", "6.1.1", "default");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment