Merge branch '2.3.x' into 2.4.x

Closes gh-25307

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/publishing.adoc

@@ -3,42 +3,45 @@
 
 
 
-[[publishing-your-application-maven]]
+[[publishing-your-application-maven-publish]]
-=== Publishing with the Maven Plugin
+=== Publishing with the Maven-publish Plugin
-When the {maven-plugin}[`maven` plugin] is applied, an `Upload` task for the `bootArchives` configuration named `uploadBootArchives` is automatically created.
+To publish your Spring Boot jar or war, add it to the publication using the `artifact` method on `MavenPublication`.
-By default, the `bootArchives` configuration contains the archive produced by the `bootJar` or `bootWar` task.
+Pass the task that produces that artifact that you wish to publish to the `artifact` method.
-The `uploadBootArchives` task can be configured to publish the archive to a Maven repository:
+For example, to publish the artifact produced by the default `bootJar` task:
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
 .Groovy
 ----
-include::../gradle/publishing/maven.gradle[tags=upload]
+include::../gradle/publishing/maven-publish.gradle[tags=publishing]
 ----
 
 [source,kotlin,indent=0,subs="verbatim,attributes",role="secondary"]
 .Kotlin
 ----
-include::../gradle/publishing/maven.gradle.kts[tags=upload]
+include::../gradle/publishing/maven-publish.gradle.kts[tags=publishing]
 ----
 
 
 
-[[publishing-your-application-maven-publish]]
+[[publishing-your-application-maven]]
-=== Publishing with the Maven-publish Plugin
+=== Publishing with the Maven Plugin
-To publish your Spring Boot jar or war, add it to the publication using the `artifact` method on `MavenPublication`.
+WARNING: The `maven` plugin has been deprecated in Gradle 6 and has been removed in Gradle 7.
-Pass the task that produces that artifact that you wish to publish to the `artifact` method.
+Please use the `maven-publish` plugin instead.
-For example, to publish the artifact produced by the default `bootJar` task:
+
+When the {maven-plugin}[`maven` plugin] is applied, an `Upload` task for the `bootArchives` configuration named `uploadBootArchives` is automatically created.
+By default, the `bootArchives` configuration contains the archive produced by the `bootJar` or `bootWar` task.
+The `uploadBootArchives` task can be configured to publish the archive to a Maven repository:
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
 .Groovy
 ----
-include::../gradle/publishing/maven-publish.gradle[tags=publishing]
+include::../gradle/publishing/maven.gradle[tags=upload]
 ----
 
 [source,kotlin,indent=0,subs="verbatim,attributes",role="secondary"]
 .Kotlin
 ----
-include::../gradle/publishing/maven-publish.gradle.kts[tags=publishing]
+include::../gradle/publishing/maven.gradle.kts[tags=upload]
 ----