From f0bc8ee73c5bf09ccf62a823c9498e826849b6d9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 2 Jun 2020 08:59:14 +0100 Subject: [PATCH] Fix version placeholder replacement in Gradle plugin docs Closes gh-21640 --- .../org/springframework/boot/build/AsciidoctorConventions.java | 1 - .../src/docs/gradle/getting-started/apply-plugin-release.gradle | 2 +- .../docs/gradle/getting-started/apply-plugin-release.gradle.kts | 2 +- .../docs/gradle/getting-started/apply-plugin-snapshot.gradle | 2 +- .../src/docs/gradle/getting-started/typical-plugins.gradle | 2 +- .../src/docs/gradle/getting-started/typical-plugins.gradle.kts | 2 +- .../integrating-with-actuator/build-info-additional.gradle | 2 +- .../integrating-with-actuator/build-info-additional.gradle.kts | 2 +- .../gradle/integrating-with-actuator/build-info-basic.gradle | 2 +- .../integrating-with-actuator/build-info-basic.gradle.kts | 2 +- .../integrating-with-actuator/build-info-custom-values.gradle | 2 +- .../build-info-custom-values.gradle.kts | 2 +- .../managing-dependencies/configure-bom-with-plugins.gradle.kts | 2 +- .../src/docs/gradle/managing-dependencies/configure-bom.gradle | 2 +- .../docs/gradle/managing-dependencies/configure-bom.gradle.kts | 2 +- .../src/docs/gradle/managing-dependencies/custom-version.gradle | 2 +- .../docs/gradle/managing-dependencies/custom-version.gradle.kts | 2 +- .../managing-dependencies/depend-on-plugin-milestone.gradle | 2 +- .../managing-dependencies/depend-on-plugin-release.gradle | 2 +- .../managing-dependencies/depend-on-plugin-release.gradle.kts | 2 +- .../managing-dependencies/depend-on-plugin-snapshot.gradle | 2 +- .../src/docs/gradle/managing-dependencies/dependencies.gradle | 2 +- .../docs/gradle/managing-dependencies/dependencies.gradle.kts | 2 +- .../docs/gradle/packaging/application-plugin-main-class.gradle | 2 +- .../gradle/packaging/application-plugin-main-class.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-build-image-builder.gradle | 2 +- .../docs/gradle/packaging/boot-build-image-builder.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-build-image-env-proxy.gradle | 2 +- .../docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-build-image-env.gradle | 2 +- .../src/docs/gradle/packaging/boot-build-image-env.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-build-image-name.gradle | 2 +- .../src/docs/gradle/packaging/boot-build-image-name.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-jar-and-jar.gradle | 2 +- .../src/docs/gradle/packaging/boot-jar-and-jar.gradle.kts | 2 +- .../docs/gradle/packaging/boot-jar-custom-launch-script.gradle | 2 +- .../gradle/packaging/boot-jar-custom-launch-script.gradle.kts | 2 +- .../docs/gradle/packaging/boot-jar-include-launch-script.gradle | 2 +- .../gradle/packaging/boot-jar-include-launch-script.gradle.kts | 2 +- .../gradle/packaging/boot-jar-launch-script-properties.gradle | 2 +- .../packaging/boot-jar-launch-script-properties.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-jar-layered-custom.gradle | 2 +- .../docs/gradle/packaging/boot-jar-layered-custom.gradle.kts | 2 +- .../docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle | 2 +- .../gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-jar-layered.gradle | 2 +- .../src/docs/gradle/packaging/boot-jar-layered.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-jar-main-class.gradle | 2 +- .../src/docs/gradle/packaging/boot-jar-main-class.gradle.kts | 2 +- .../docs/gradle/packaging/boot-jar-manifest-main-class.gradle | 2 +- .../gradle/packaging/boot-jar-manifest-main-class.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-jar-requires-unpack.gradle | 2 +- .../docs/gradle/packaging/boot-jar-requires-unpack.gradle.kts | 2 +- .../src/docs/gradle/packaging/boot-war-include-devtools.gradle | 2 +- .../docs/gradle/packaging/boot-war-include-devtools.gradle.kts | 2 +- .../docs/gradle/packaging/boot-war-properties-launcher.gradle | 2 +- .../gradle/packaging/boot-war-properties-launcher.gradle.kts | 2 +- .../src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle | 2 +- .../docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts | 2 +- .../src/docs/gradle/packaging/war-container-dependency.gradle | 2 +- .../docs/gradle/packaging/war-container-dependency.gradle.kts | 2 +- .../src/docs/gradle/publishing/maven-publish.gradle | 2 +- .../src/docs/gradle/publishing/maven-publish.gradle.kts | 2 +- .../src/docs/gradle/publishing/maven.gradle | 2 +- .../src/docs/gradle/publishing/maven.gradle.kts | 2 +- .../gradle/running/application-plugin-main-class-name.gradle | 2 +- .../running/application-plugin-main-class-name.gradle.kts | 2 +- .../gradle/running/boot-run-disable-optimized-launch.gradle | 2 +- .../gradle/running/boot-run-disable-optimized-launch.gradle.kts | 2 +- .../src/docs/gradle/running/boot-run-main.gradle | 2 +- .../src/docs/gradle/running/boot-run-main.gradle.kts | 2 +- .../src/docs/gradle/running/boot-run-source-resources.gradle | 2 +- .../docs/gradle/running/boot-run-source-resources.gradle.kts | 2 +- .../docs/gradle/running/spring-boot-dsl-main-class-name.gradle | 2 +- .../gradle/running/spring-boot-dsl-main-class-name.gradle.kts | 2 +- 75 files changed, 74 insertions(+), 75 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java index f42d025dcf..7c567d3798 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java @@ -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); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle index cf13509ffd..eea03ac0f6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle @@ -1,3 +1,3 @@ plugins { - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle.kts index 5f006ab6d2..fead5b05c8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-release.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-snapshot.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-snapshot.gradle index 5872a19b77..5ffae4676a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-snapshot.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/apply-plugin-snapshot.gradle @@ -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}' } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle index 8484298eab..2ac90b8a46 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::apply[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle.kts index c36c966466..f395172ce5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle.kts @@ -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") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle index 229b164591..0412ea4ea8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::additional[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle.kts index 3010287baa..3e8c00e8a5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-additional.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::additional[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle index ffa081cbdb..b8554d1402 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::build-info[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle.kts index 73741e41c9..7eb212645a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-basic.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::build-info[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle index c52d515f28..961789da4b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::custom-values[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle.kts index eabad8c284..da5f8717cb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/integrating-with-actuator/build-info-custom-values.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::custom-values[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts index 3dfcde8bb2..9f22625463 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts @@ -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}" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle index c2de91e1e8..2c11b81900 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::configure-bom[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts index cd20e55cc0..43dd49deed 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle index 211f37a404..ab3d25436f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle @@ -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' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts index c7695d6f69..0e0dc5388f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts @@ -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") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-milestone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-milestone.gradle index 9b8007b8dd..7aa042b4c6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-milestone.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-milestone.gradle @@ -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}' } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle index 9bde7c2d3f..88fba72d15 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle @@ -1,3 +1,3 @@ plugins { - id 'org.springframework.boot' version '{version}' apply false + id 'org.springframework.boot' version '{gradle-project-version}' apply false } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle.kts index b8acfc1f5a..5bebec31c3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-release.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("org.springframework.boot") version "{version}" apply false + id("org.springframework.boot") version "{gradle-project-version}" apply false } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-snapshot.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-snapshot.gradle index ab0eb4b2cb..82b97382ce 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-snapshot.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/depend-on-plugin-snapshot.gradle @@ -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}' } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle index acc9bee30a..64e49cc307 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle @@ -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' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle.kts index fb31765267..c1392e1cfe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/dependencies.gradle.kts @@ -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") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle index 992486aeae..0ba3914ff4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle.kts index d5d442769e..6caa427809 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/application-plugin-main-class.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::main-class[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle index 481b9f1602..7c4192ce81 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle.kts index ea225bd34b..b657594c65 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle index cbfe8bc92f..a70bf09879 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts index b337349cd7..8977fde10e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle index 4fec7c4b99..48ebb54139 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts index f2446ecb34..5fb0396383 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle index d3f776235d..5212fd9677 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle.kts index 8ee6fdc6ad..b100e7071d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle index 17345aae90..45b72f9278 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::enable-jar[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle.kts index 50291ab488..5d78503226 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle index b2f0c04e2c..e59f2e749b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle.kts index 9e20e7fa15..7d67b9a5a0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-custom-launch-script.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle index fb503be900..399b7b40ed 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle.kts index 4a7306e089..87cd8f0d5c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-include-launch-script.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle index 09dc1b3c16..9d8d00b1be 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle.kts index a389cf44df..2756ac2a09 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-launch-script-properties.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle index dea2f0c059..86f4587bc7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts index 3cb6a6f4f0..43fd557dd8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle index 4fe2da44f4..c40f27076d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts index dc06abf1c7..7cefd7bcfd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle index 502f87f4c6..2391a6610f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootJar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle.kts index 2d6735740a..f37aa1db7a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle index 09a972481f..73d57e6bc3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::main-class[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle.kts index 306d8774bd..b0cd5dd296 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-main-class.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle index 1e983b5f0b..766fa759e8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::main-class[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle.kts index b0f7040046..d26c9f5cda 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-manifest-main-class.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle index d8735a3bc7..c028e804f4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } repositories { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle.kts index 32e238e010..ea45aea59b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-requires-unpack.gradle.kts @@ -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 { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle index 88204c6767..b32b45eeae 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle @@ -1,6 +1,6 @@ plugins { id 'war' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootWar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle.kts index cd8f7abbd7..5ff9582c27 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-include-devtools.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle index 1996ff5a0f..e86f7924fc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle @@ -1,6 +1,6 @@ plugins { id 'war' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } bootWar { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle.kts index e2f78bbb65..14a893ac4f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-war-properties-launcher.gradle.kts @@ -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") { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle index 6ef52ffaff..ffe2239d33 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::main-class[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts index c07ab49cfa..7d1059687a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts @@ -1,6 +1,6 @@ plugins { war - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::main-class[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle index 276c59710a..ad0f0b53e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle @@ -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' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle.kts index 92c4cb080c..7ea6688bcb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/war-container-dependency.gradle.kts @@ -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") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle index b3b06bbd22..610ceb0a0c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle.kts index b07e1b9084..cc6df0ffa4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven-publish.gradle.kts @@ -1,7 +1,7 @@ plugins { java `maven-publish` - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::publishing[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle index 37e5d90df2..6f5714457b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle.kts index 35caea2043..680605a126 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/publishing/maven.gradle.kts @@ -1,7 +1,7 @@ plugins { java maven - id("org.springframework.boot") version "{version}" + id("org.springframework.boot") version "{gradle-project-version}" } // tag::upload[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle index cb8473a997..726e5c157a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle.kts index 6cf2ddcc62..fb0c711bcd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/application-plugin-main-class-name.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle index 2c6b6499b1..4b95b69db9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::launch[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle.kts index ac80c50b3a..d5e2e24516 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-disable-optimized-launch.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle index aad2b96a43..3f3ab9e392 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::main[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle.kts index 380ef98f5f..77d6bd64cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-main.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle index ba8bd7ace8..4fcb59a01a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '{version}' + id 'org.springframework.boot' version '{gradle-project-version}' } // tag::source-resources[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle.kts index 9e8f5ec4bf..fed809bfe1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/boot-run-source-resources.gradle.kts @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle index 793ac5bacd..c491bab4ee 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle @@ -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[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle.kts index 9c0e2371ad..81c32d39de 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/running/spring-boot-dsl-main-class-name.gradle.kts @@ -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[]