Merge branch '3.3.x'

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle

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

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle.kts

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

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle

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

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle.kts

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

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/getting-started.adoc

@@ -3,7 +3,34 @@
 
 To get started with the plugin it needs to be applied to your project.
 
-ifeval::["{artifact-release-type}" == "release"]
+ifeval::["{build-type}" == "commercial"]
+The plugin is published to the Spring Commercial repository.
+You will have to configure your build to access this repository.
+This is usual done through a local artifact repository that mirrors the content of the Spring Commercial repository.
+Alternatively, while it is not recommended, the Spring Commercial repository can also be accessed directly.
+In either case, see https://docs.vmware.com/en/Tanzu-Spring-Runtime/Commercial/Tanzu-Spring-Runtime/spring-enterprise-subscription.html[the Tanzu Spring Runtime documentation] for further details.
+
+With access to the Spring Commercial repository configured in `settings.gradle` or `settings.gradle.kts`, the plugin can be applied using the `plugins` block:
+
+[tabs]
+======
+Groovy::
++
+[source,groovy,indent=0,subs="verbatim,attributes"]
+----
+include::example$getting-started/apply-plugin-commercial.gradle[]
+----
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,attributes"]
+----
+include::example$getting-started/apply-plugin-commercial.gradle.kts[]
+----
+======
+endif::[]
+
+
+ifeval::["{build-and-artifact-release-type}" == "opensource-release"]
 The plugin is https://plugins.gradle.org/plugin/org.springframework.boot[published to Gradle's plugin portal] and can be applied using the `plugins` block:
 
 [tabs]
@@ -23,7 +50,7 @@ include::example$getting-started/apply-plugin-release.gradle.kts[]
 ======
 endif::[]
 
-ifeval::["{artifact-release-type}" == "milestone"]
+ifeval::["{build-and-artifact-release-type}" == "opensource-milestone"]
 The plugin is published to the Spring milestones repository.
 Gradle can be configured to use the milestones repository and the plugin can then be applied using the `plugins` block.
 To configure Gradle to use the milestones repository, add the following to your `settings.gradle` (Groovy) or `settings.gradle.kts` (Kotlin):
@@ -63,7 +90,7 @@ include::example$getting-started/apply-plugin-release.gradle.kts[]
 ======
 endif::[]
 
-ifeval::["{artifact-release-type}" == "snapshot"]
+ifeval::["{build-and-artifact-release-type}" == "opensource-snapshot"]
 The plugin is published to the Spring snapshots repository.
 Gradle can be configured to use the snapshots repository and the plugin can then be applied using the `plugins` block.
 To configure Gradle to use the snapshots repository, add the following to your `settings.gradle` (Groovy) or `settings.gradle.kts` (Kotlin):

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/managing-dependencies.adoc

@@ -70,7 +70,25 @@ The `SpringBootPlugin` class provides a `BOM_COORDINATES` constant that can be u
 
 First, configure the project to depend on the Spring Boot plugin but do not apply it:
 
-ifeval::["{artifact-release-type}" == "release"]
+ifeval::["{build-type}" == "commercial"]
+[tabs]
+======
+Groovy::
++
+[source,groovy,indent=0,subs="verbatim,attributes"]
+----
+include::example$managing-dependencies/depend-on-plugin-commercial.gradle[]
+----
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,attributes"]
+----
+include::example$managing-dependencies/depend-on-plugin-commercial.gradle.kts[]
+----
+======
+endif::[]
+
+ifeval::["{build-and-artifact-release-type}" == "opensource-release"]
 [tabs]
 ======
 Groovy::
@@ -88,7 +106,7 @@ include::example$managing-dependencies/depend-on-plugin-release.gradle.kts[]
 ======
 endif::[]
 
-ifeval::["{artifact-release-type}" == "milestone"]
+ifeval::["{build-and-artifact-release-type}" == "opensource-milestone"]
 [tabs]
 ======
 Groovy::
@@ -106,7 +124,7 @@ include::example$managing-dependencies/depend-on-plugin-release.gradle.kts[]
 ======
 endif::[]
 
-ifeval::["{artifact-release-type}" == "snapshot"]
+ifeval::["{build-and-artifact-release-type}" == "opensource-snapshot"]
 [tabs]
 ======
 Groovy::