Merge branch '2.3.x'

Closes gh-21651
This commit is contained in:
Andy Wilkinson 2020-06-02 09:42:34 +01:00
commit 399d0f7b95
75 changed files with 74 additions and 75 deletions

View File

@ -151,7 +151,6 @@ class AsciidoctorConventions {
attributes.put("attribute-missing", "warn");
attributes.put("github-tag", determineGitHubTag(project));
attributes.put("spring-boot-artifactory-repo", ArtifactoryRepository.forProject(project));
attributes.put("version", "{gradle-project-version}");
attributes.put("revnumber", null);
asciidoctorTask.attributes(attributes);
}

View File

@ -1,3 +1,3 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}

View File

@ -1,3 +1,3 @@
plugins {
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}

View File

@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{gradle-project-version}'
}
}

View File

@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::apply[]

View File

@ -1,7 +1,7 @@
// tag::apply[]
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
apply(plugin = "io.spring.dependency-management")

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::additional[]

View File

@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::additional[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::build-info[]

View File

@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::build-info[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::custom-values[]

View File

@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::custom-values[]

View File

@ -3,7 +3,7 @@ import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
// tag::configure-bom[]
plugins {
java
id("org.springframework.boot") version "{version}" apply false
id("org.springframework.boot") version "{gradle-project-version}" apply false
id("io.spring.dependency-management") version "{dependency-management-plugin-version}"
}

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::configure-bom[]

View File

@ -2,7 +2,7 @@ import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::configure-bom[]

View File

@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
apply plugin: 'io.spring.dependency-management'

View File

@ -1,7 +1,7 @@
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
plugins {
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
apply(plugin = "io.spring.dependency-management")

View File

@ -4,6 +4,6 @@ buildscript {
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{gradle-project-version}'
}
}

View File

@ -1,3 +1,3 @@
plugins {
id 'org.springframework.boot' version '{version}' apply false
id 'org.springframework.boot' version '{gradle-project-version}' apply false
}

View File

@ -1,3 +1,3 @@
plugins {
id("org.springframework.boot") version "{version}" apply false
id("org.springframework.boot") version "{gradle-project-version}" apply false
}

View File

@ -4,6 +4,6 @@ buildscript {
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{version}'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:{gradle-project-version}'
}
}

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
apply plugin: 'io.spring.dependency-management'

View File

@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
apply(plugin = "io.spring.dependency-management")

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -1,7 +1,7 @@
plugins {
java
application
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::enable-jar[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::enable-jar[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootJar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootJar>("bootJar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
repositories {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
repositories {

View File

@ -1,6 +1,6 @@
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootWar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootWar
plugins {
war
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootWar>("bootWar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
bootWar {

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootWar
plugins {
war
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
tasks.getByName<BootWar>("bootWar") {

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
war
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
apply plugin: 'io.spring.dependency-management'

View File

@ -1,6 +1,6 @@
plugins {
war
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
apply(plugin = "io.spring.dependency-management")

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'maven-publish'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::publishing[]

View File

@ -1,7 +1,7 @@
plugins {
java
`maven-publish`
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::publishing[]

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'maven'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::upload[]

View File

@ -1,7 +1,7 @@
plugins {
java
maven
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::upload[]

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
java
application
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::launch[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::launch[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main[]

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::source-resources[]

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
java
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::source-resources[]

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'application'
id 'org.springframework.boot' version '{version}'
id 'org.springframework.boot' version '{gradle-project-version}'
}
// tag::main-class[]

View File

@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
java
application
id("org.springframework.boot") version "{version}"
id("org.springframework.boot") version "{gradle-project-version}"
}
// tag::main-class[]