Merge branch '2.7.x' into 3.0.x

Closes gh-34391
spring-projects · Feb 27, 2023 · 814b77c · 814b77c
2 parents 4234ce7 + 81882ec
commit 814b77c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle b/...ot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle
@@ -1,9 +1,9 @@
+// tag::apply[]
 plugins {
+	id 'java'
 	id 'org.springframework.boot' version '{gradle-project-version}'
 }
 
-// tag::apply[]
-apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 // end::apply[]
 

diff --git a/...spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts b/...spring-boot-gradle-plugin/src/docs/gradle/packaging/spring-boot-dsl-main-class.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	war
+	java
 	id("org.springframework.boot") version "{gradle-project-version}"
 }