Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Raise minimum supported version of Gradle to 4.10 and encourage use of 5.x

Browse Source 
Closes gh-16681
This commit is contained in:
Andy Wilkinson 2019-05-03 13:07:15 +01:00
parent 1f897ad923
commit f35b91a172
9 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
View File

@ -169,7 +169,8 @@ Advanced configuration options and examples are available in the
== Spring Boot Gradle Plugin == Spring Boot Gradle Plugin
The Spring Boot Gradle Plugin provides Spring Boot support in Gradle, letting you package 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 executable jar or war archives, run Spring Boot applications, and use the dependency
management provided by `spring-boot-dependencies`. It requires Gradle 4.4 or later. Please management provided by `spring-boot-dependencies`. It requires Gradle 5.x (4.10 is also
supported but this support is deprecated and will be removed in a future release). Please
refer to the plugin's documentation to learn more: refer to the plugin's documentation to learn more:
* Reference ({spring-boot-gradle-plugin}/reference/html[HTML] and * Reference ({spring-boot-gradle-plugin}/reference/html[HTML] and

7
spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
View File

@ -52,7 +52,7 @@ Explicit build support is provided for the following build tools:
|3.3+ |3.3+
|Gradle |Gradle
|4.4+ |5.x (4.10 is also supported but in a deprecated form)
|=== |===
@ -201,8 +201,9 @@ scope.
[[getting-started-gradle-installation]] [[getting-started-gradle-installation]]
==== Gradle Installation ==== Gradle Installation
Spring Boot is compatible with Gradle 4.4 and later. If you do not already have Gradle Spring Boot is compatible with 5.x. 4.10 is also supported but this support is deprecated
installed, you can follow the instructions at https://gradle.org. and will be removed in a future release. If you do not already have Gradle installed, you
can follow the instructions at https://gradle.org.
Spring Boot dependencies can be declared by using the `org.springframework.boot` `group`. Spring Boot dependencies can be declared by using the `org.springframework.boot` `group`.
Typically, your project declares dependencies to one or more Typically, your project declares dependencies to one or more

BIN
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

32
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/getting-started.adoc
View File

@ -19,18 +19,10 @@ include::../gradle/getting-started/apply-plugin-release.gradle.kts[]
---- ----
endif::[] endif::[]
ifeval::["{version-type}" == "MILESTONE"] ifeval::["{version-type}" == "MILESTONE"]
The plugin is published to the Spring milestones repository. For Gradle versions less The plugin is published to the Spring milestones repository. Gradle can be configured to
than 4.10, this means that you must apply the plugin imperatively: use the milestones repository and the plugin can then be applied using the `plugins`
block. To configure Gradle to use the milestones repository, add the following to your
[source,groovy,indent=0,subs="verbatim,attributes"] `settings.gradle` (Groovy) or `settings.gradle.kts` (Kotlin):
----
include::../gradle/getting-started/apply-plugin-milestone.gradle[]
----
For Gradle 4.10 and above, Gradle can be configured to use the milestones repository
and it can be applied using the `plugins` block. To configure Gradle to use the milestones
repository, add the following to your `settings.gradle` (Groovy) or `settings.gradle.kts`
(Kotlin):
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"] [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
.Groovy .Groovy
@ -59,18 +51,10 @@ include::../gradle/getting-started/apply-plugin-release.gradle.kts[]
---- ----
endif::[] endif::[]
ifeval::["{version-type}" == "SNAPSHOT"] ifeval::["{version-type}" == "SNAPSHOT"]
The plugin is published to the Spring snapshots repository. For Gradle versions less The plugin is published to the Spring snapshots repository. Gradle can be configured to
than 4.10, this means that you must apply the plugin imperatively: use the snapshots repository and the plugin can then be applied using the `plugins`
block. To configure Gradle to use the snapshots repository, add the following to your
[source,groovy,indent=0,subs="verbatim,attributes"] `settings.gradle` (Groovy) or `settings.gradle.kts` (Kotlin):
----
include::../gradle/getting-started/apply-plugin-milestone.gradle[]
----
For Gradle 4.10 and above, Gradle can be configured to use the snapshots repository
and it can be applied using the `plugins` block. To configure Gradle to use the snapshots
repository, add the following to your `settings.gradle` (Groovy) or `settings.gradle.kts`
(Kotlin):
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"] [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
.Groovy .Groovy

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc
View File

@ -39,8 +39,8 @@ Andy Wilkinson
The Spring Boot Gradle Plugin provides Spring Boot support in https://gradle.org[Gradle], The Spring Boot Gradle Plugin provides Spring Boot support in https://gradle.org[Gradle],
allowing you to package executable jar or war archives, run Spring Boot applications, and allowing you to package executable jar or war archives, run Spring Boot applications, and
use the dependency management provided by `spring-boot-dependencies`. Spring Boot's use the dependency management provided by `spring-boot-dependencies`. Spring Boot's
Gradle plugin requires Gradle 4.4 or later. If you choose to use the newer Kotlin DSL, Gradle plugin requires Gradle 5.x (4.10 is also supported but this support is deprecated
it requires Gradle 4.10 or later. and will be removed in a future release).
In addition to this user guide, {api-documentation}[API documentation] is also available. In addition to this user guide, {api-documentation}[API documentation] is also available.

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/apply-plugin-milestone.gradle
View File

@ -1,11 +0,0 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-milestone' }
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}'
}
}
apply plugin: 'org.springframework.boot'

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 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.
@ -119,7 +119,6 @@ class BootZipCopyAction implements CopyAction {
return () -> true; return () -> true;
} }
@SuppressWarnings("unchecked")
private Spec<FileTreeElement> createExclusionSpec( private Spec<FileTreeElement> createExclusionSpec(
Spec<FileTreeElement> loaderEntries) { Spec<FileTreeElement> loaderEntries) {
return Specs.union(loaderEntries, this.exclusions); return Specs.union(loaderEntries, this.exclusions);

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java
View File

@ -38,9 +38,8 @@ import org.springframework.boot.gradle.testkit.GradleBuild;
*/ */
public final class GradleCompatibilitySuite extends Suite { public final class GradleCompatibilitySuite extends Suite {
private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.5.1", private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "5.0",
"4.6", "4.7", "4.8.1", "4.9", "4.10.3", "5.0", "5.1.1", "5.2.1", "5.3.1", "5.1.1", "5.2.1", "5.3.1", "5.4.1");
"5.4.1");
public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError { public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
super(clazz, createRunners(clazz)); super(clazz, createRunners(clazz));