Use Kotlin configuration from Spring Cloud Build

Author: ryanjbaxter

pom.xml

@@ -68,7 +68,6 @@
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
 
-		<contract.kotlin.version>1.8.22</contract.kotlin.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<sisu-inject-plexus.version>2.6.0</sisu-inject-plexus.version>
 
@@ -435,28 +434,10 @@
 				<artifactId>xercesImpl</artifactId>
 				<version>${xerces.version}</version>
 			</dependency>
-			<!-- Kotlin versions aligned with Gradle -->
-			<dependency>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<artifactId>kotlin-bom</artifactId>
-				<version>${contract.kotlin.version}</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
-				<version>${contract.kotlin.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<artifactId>kotlin-daemon-embeddable</artifactId>
-				<version>${contract.kotlin.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<artifactId>kotlin-compiler-embeddable</artifactId>
-				<version>${contract.kotlin.version}</version>
+				<version>${kotlin.version}</version>
 			</dependency>
 
 			<!-- Ensure that we don't have 2 sets of slf4j on the classpath -->

specs/spring-cloud-contract-spec-kotlin/pom.xml

@@ -42,10 +42,6 @@
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-script-util</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -62,44 +58,15 @@
 		<testSourceDirectory>src/test/kotlin</testSourceDirectory>
 		<plugins>
 			<plugin>
-				<!-- Based on instructions here - https://kotlinlang.org/docs/reference/using-maven.html -->
+				<!-- Version and base configuration inherited from spring-cloud-build parent -->
 				<artifactId>kotlin-maven-plugin</artifactId>
-				<version>${contract.kotlin.version}</version>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<configuration>
-					<jvmTarget>17</jvmTarget>
+					<args combine.children="append">
+						<arg>-Xjvm-default=all</arg>
+						<arg>-Xbackend-threads=0</arg>
+					</args>
 				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-						<configuration>
-							<args>
-								<arg>-Xjvm-default=all</arg>
-								<arg>-Xbackend-threads=0</arg>
-							</args>
-							<javaParameters>true</javaParameters>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.jetbrains.dokka</groupId>