Upgrade to Kotlin 2.1.10

- Upgrade kotlinVersion to 2.1.10
- Remove org.jetbrains.kotlin:kotlin-compiler-embeddable from dependencies
- Replace deprecated kotlinOptions with compilerOptions
- Update KotlinConventions of ConventionsPlugin to set Kotlin apiVersion
  and languageVersion to 2.1
- Move spring-boot-doc Kotlin examples to kotlin subpackage to prevent
  Redeclaration compile error
- Upgrade PluginClasspathGradleBuild to inject missed Kotlin compiler
  related jars

See spring-projectsgh-38539

Signed-off-by: Dmitry Sulman <[email protected]>

Author: dmitrysulman

buildSrc/build.gradle

@@ -42,7 +42,6 @@ dependencies {
 	implementation("org.apache.maven:maven-embedder:${mavenVersion}")
 	implementation("org.antora:gradle-antora-plugin:1.0.0")
 	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
 	implementation("org.springframework:spring-context")
 	implementation("org.springframework:spring-core")
 	implementation("org.springframework:spring-web")

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,9 @@
  * When the {@link AntoraPlugin} is applied, the conventions in {@link AntoraConventions}
  * are applied.
  *
+ * When the {@code org.jetbrains.kotlin.jvm} plugin is applied, the conventions in
+ * {@link KotlinConventions} are applied.
+ *
  * @author Andy Wilkinson
  * @author Christoph Dreis
  * @author Mike Smithson

buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@
 import org.gradle.api.Project;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions;
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget;
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions;
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 
 /**
@@ -35,7 +37,7 @@
  * <ul>
  * <li>{@link KotlinCompile} tasks are configured to:
  * <ul>
- * <li>Use {@code apiVersion} and {@code languageVersion} 1.7.
+ * <li>Use {@code apiVersion} and {@code languageVersion} 2.1.
  * <li>Use {@code jvmTarget} 17.
  * <li>Treat all warnings as errors
  * <li>Suppress version warnings
@@ -56,14 +58,14 @@ void apply(Project project) {
 	}
 
 	private void configure(KotlinCompile compile) {
-		KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
-		kotlinOptions.setApiVersion("1.7");
-		kotlinOptions.setLanguageVersion("1.7");
-		kotlinOptions.setJvmTarget("17");
-		kotlinOptions.setAllWarningsAsErrors(true);
-		List<String> freeCompilerArgs = new ArrayList<>(kotlinOptions.getFreeCompilerArgs());
+		KotlinJvmCompilerOptions kotlinOptions = compile.getCompilerOptions();
+		kotlinOptions.getApiVersion().set(KotlinVersion.KOTLIN_2_1);
+		kotlinOptions.getLanguageVersion().set(KotlinVersion.KOTLIN_2_1);
+		kotlinOptions.getJvmTarget().set(JvmTarget.JVM_17);
+		kotlinOptions.getAllWarningsAsErrors().set(true);
+		List<String> freeCompilerArgs = new ArrayList<>(kotlinOptions.getFreeCompilerArgs().get());
 		freeCompilerArgs.add("-Xsuppress-version-warnings");
-		kotlinOptions.setFreeCompilerArgs(freeCompilerArgs);
+		kotlinOptions.getFreeCompilerArgs().set(freeCompilerArgs);
 	}
 
 	private void configureDokkatoo(Project project) {

buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties

@@ -1,7 +1,7 @@
 # === INCLUDE-CODE LOCATIONS ===
 
 include-java=ROOT:example$java/org/springframework/boot/docs
-include-kotlin= ROOT:example$kotlin/org/springframework/boot/docs
+include-kotlin= ROOT:example$kotlin/org/springframework/boot/docs/kotlin
 
 # === URLs ===
 

gradle.properties

@@ -14,7 +14,7 @@ hamcrestVersion=3.0
 jacksonVersion=2.18.2
 javaFormatVersion=0.0.43
 junitJupiterVersion=5.11.4
-kotlinVersion=1.9.25
+kotlinVersion=2.1.10
 mavenVersion=3.9.4
 mockitoVersion=5.15.2
 nativeBuildToolsVersion=0.10.5

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1193,8 +1193,9 @@ bom {
 	}
 	library("Kotlin", "${kotlinVersion}") {
 		prohibit {
-			versionRange "[2.0.0-Beta1,)"
-			because "it exceeds our baseline"
+			contains "-Beta"
+			contains "-RC"
+			because "we don't want betas or release candidates"
 		}
 		group("org.jetbrains.kotlin") {
 			imports = [

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/nosql/cassandra/connecting/User.java

@@ -16,6 +16,6 @@
 
 package org.springframework.boot.docs.data.nosql.cassandra.connecting;
 
-class User {
+public class User {
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/Server.java

@@ -16,12 +16,12 @@
 
 package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes;
 
-class Server {
+public class Server {
 
-	Server(Object remoteAddress) {
+	public Server(Object remoteAddress) {
 	}
 
-	void start() {
+	public void start() {
 	}
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/CacheCompletelyBrokenException.java

@@ -16,6 +16,6 @@
 
 package org.springframework.boot.docs.features.springapplication.applicationavailability.managing;
 
-class CacheCompletelyBrokenException extends RuntimeException {
+public class CacheCompletelyBrokenException extends RuntimeException {
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyErrorBody.java

@@ -16,9 +16,9 @@
 
 package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;
 
-class MyErrorBody {
+public class MyErrorBody {
 
-	MyErrorBody(int value, String message) {
+	public MyErrorBody(int value, String message) {
 	}
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyException.java

@@ -16,6 +16,6 @@
 
 package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;
 
-class MyException extends RuntimeException {
+public class MyException extends RuntimeException {
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/SomeController.java

@@ -16,6 +16,6 @@
 
 package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;
 
-class SomeController {
+public class SomeController {
 
 }

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/cloudfoundry/customcontextpath/MyCloudFoundryConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/cloudfoundry/customcontextpath/MyCloudFoundryConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.cloudfoundry.customcontextpath
+package org.springframework.boot.docs.kotlin.actuator.cloudfoundry.customcontextpath
 
 import jakarta.servlet.GenericServlet
 import jakarta.servlet.Servlet

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/cloudfoundry/customcontextpath/MyReactiveCloudFoundryConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/cloudfoundry/customcontextpath/MyReactiveCloudFoundryConfiguration.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.boot.docs.actuator.cloudfoundry.customcontextpath
+package org.springframework.boot.docs.kotlin.actuator.cloudfoundry.customcontextpath
 
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.health.reactivehealthindicators
+package org.springframework.boot.docs.kotlin.actuator.endpoints.health.reactivehealthindicators
 
 import org.springframework.boot.actuate.health.Health
 import org.springframework.boot.actuate.health.ReactiveHealthIndicator

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/writingcustomhealthindicators/MyHealthIndicator.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/health/writingcustomhealthindicators/MyHealthIndicator.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.health.writingcustomhealthindicators
+package org.springframework.boot.docs.kotlin.actuator.endpoints.health.writingcustomhealthindicators
 
 import org.springframework.boot.actuate.health.Health
 import org.springframework.boot.actuate.health.HealthIndicator

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/implementingcustom/CustomData.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/implementingcustom/CustomData.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.implementingcustom
+package org.springframework.boot.docs.kotlin.actuator.endpoints.implementingcustom
 
 class CustomData(val name: String, val counter: Int)

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/implementingcustom/MyEndpoint.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/implementingcustom/MyEndpoint.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.implementingcustom
+package org.springframework.boot.docs.kotlin.actuator.endpoints.implementingcustom
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/info/writingcustominfocontributors/MyInfoContributor.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/info/writingcustominfocontributors/MyInfoContributor.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.info.writingcustominfocontributors
+package org.springframework.boot.docs.kotlin.actuator.endpoints.info.writingcustominfocontributors
 
 import org.springframework.boot.actuate.info.Info
 import org.springframework.boot.actuate.info.InfoContributor

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/security/exposeall/MySecurityConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.security.exposeall
+package org.springframework.boot.docs.kotlin.actuator.endpoints.security.exposeall
 
 import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
 import org.springframework.context.annotation.Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/endpoints/security/typical/MySecurityConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.endpoints.security.typical
+package org.springframework.boot.docs.kotlin.actuator.endpoints.security.typical
 
 import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
 import org.springframework.context.annotation.Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/customizing/MyMetricsFilterConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/customizing/MyMetricsFilterConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.customizing
+package org.springframework.boot.docs.kotlin.actuator.metrics.customizing
 
 import io.micrometer.core.instrument.config.MeterFilter
 import org.springframework.context.annotation.Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/export/graphite/MyGraphiteConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/export/graphite/MyGraphiteConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.export.graphite
+package org.springframework.boot.docs.kotlin.actuator.metrics.export.graphite
 
 import io.micrometer.core.instrument.Clock
 import io.micrometer.core.instrument.Meter

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/export/jmx/MyJmxConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/export/jmx/MyJmxConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.export.jmx
+package org.springframework.boot.docs.kotlin.actuator.metrics.export.jmx
 
 import io.micrometer.core.instrument.Clock
 import io.micrometer.core.instrument.Meter

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/gettingstarted/commontags/MyMeterRegistryConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/gettingstarted/commontags/MyMeterRegistryConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.gettingstarted.commontags
+package org.springframework.boot.docs.kotlin.actuator.metrics.gettingstarted.commontags
 
 import io.micrometer.core.instrument.MeterRegistry
 import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/gettingstarted/specifictype/MyMeterRegistryConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/gettingstarted/specifictype/MyMeterRegistryConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.gettingstarted.specifictype
+package org.springframework.boot.docs.kotlin.actuator.metrics.gettingstarted.specifictype
 
 import io.micrometer.core.instrument.Meter
 import io.micrometer.core.instrument.config.NamingConvention

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/registeringcustom/Dictionary.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/registeringcustom/Dictionary.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.registeringcustom
+package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom
 
 internal class Dictionary {
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/registeringcustom/MyBean.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/registeringcustom/MyBean.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.registeringcustom
+package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom
 
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Tags

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/registeringcustom/MyMeterBinderConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/registeringcustom/MyMeterBinderConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.registeringcustom
+package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom
 
 import io.micrometer.core.instrument.Gauge
 import io.micrometer.core.instrument.binder.MeterBinder

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/registeringcustom/Queue.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/registeringcustom/Queue.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.registeringcustom
+package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom
 
 class Queue {
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/supported/mongodb/command/CustomCommandTagsProvider.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/supported/mongodb/command/CustomCommandTagsProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.supported.mongodb.command
+package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.command
 
 import com.mongodb.event.CommandEvent
 import io.micrometer.core.instrument.Tag

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/supported/mongodb/command/MyCommandTagsProviderConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/supported/mongodb/command/MyCommandTagsProviderConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.supported.mongodb.command
+package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.command
 
 import io.micrometer.core.instrument.binder.mongodb.MongoCommandTagsProvider
 import org.springframework.context.annotation.Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/supported/mongodb/connectionpool/CustomConnectionPoolTagsProvider.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/supported/mongodb/connectionpool/CustomConnectionPoolTagsProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.supported.mongodb.connectionpool
+package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.connectionpool
 
 import com.mongodb.event.ConnectionPoolCreatedEvent
 import io.micrometer.core.instrument.Tag

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/metrics/supported/mongodb/connectionpool/MyConnectionPoolTagsProviderConfiguration.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/actuator/metrics/supported/mongodb/connectionpool/MyConnectionPoolTagsProviderConfiguration.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.actuator.metrics.supported.mongodb.connectionpool
+package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.connectionpool
 
 import io.micrometer.core.instrument.binder.mongodb.MongoConnectionPoolTagsProvider
 import org.springframework.context.annotation.Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/buildtoolplugins/otherbuildsystems/examplerepackageimplementation/MyBuildTool.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/buildtoolplugins/otherbuildsystems/examplerepackageimplementation/MyBuildTool.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.buildtoolplugins.otherbuildsystems.examplerepackageimplementation
+package org.springframework.boot.docs.kotlin.buildtoolplugins.otherbuildsystems.examplerepackageimplementation
 
 import org.springframework.boot.loader.tools.Library
 import org.springframework.boot.loader.tools.LibraryCallback

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration
+package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import java.util.Arrays

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration
+package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt renamed to spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/kotlin/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration.nestedproperties
+package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration.nestedproperties
 
 import org.springframework.boot.context.properties.ConfigurationProperties