From 945ca00b5bbafc8392abcb53a5ec7f3260e64d09 Mon Sep 17 00:00:00 2001
From: sdeleuze <sdeleuze@pivotal.io>
Date: Fri, 1 Dec 2017 11:06:29 +0100
Subject: [PATCH] Upgrade to Kotlin 1.2

apiVersion and languageVersion options are set to 1.1
in order to avoid incompatibilities with Kotlin 1.1
based projects.

Closes gh-11235
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 spring-boot-project/spring-boot-parent/pom.xml       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index d40edb20ce..64dd6a439c 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -106,7 +106,7 @@
 		<junit.version>4.12</junit.version>
 		<junit-jupiter.version>5.0.2</junit-jupiter.version>
 		<junit-platform.version>1.0.2</junit-platform.version>
-		<kotlin.version>1.1.61</kotlin.version>
+		<kotlin.version>1.2.0</kotlin.version>
 		<lettuce.version>5.0.1.RELEASE</lettuce.version>
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.10.0</log4j2.version>
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index b91c947068..ea1e7a16fe 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -287,6 +287,8 @@
 					<version>${kotlin.version}</version>
 					<configuration>
 						<jvmTarget>${java.version}</jvmTarget>
+						<apiVersion>1.1</apiVersion>
+						<languageVersion>1.1</languageVersion>
 					</configuration>
 				</plugin>
 				<plugin>