Merge branch '2.3.x'

Closes gh-21651
pull/21653/head
Andy Wilkinson 5 years ago
commit 399d0f7b95

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

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

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

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

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

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

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

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

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

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

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

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

@ -3,7 +3,7 @@ import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
// tag::configure-bom[] // tag::configure-bom[]
plugins { plugins {
java 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}" id("io.spring.dependency-management") version "{dependency-management-plugin-version}"
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save