Merge branch '2.7.x' into 3.0.x

Closes gh-34391

Author: wilkinsona

Diff for: spring-boot-project/spring-boot-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 for: spring-boot-project/spring-boot-tools/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}"
 }