From 392a0d881e5681d60f3f0d5b0efbff242a3a74ab Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 14 Dec 2021 09:33:13 +0100
Subject: [PATCH] Update Kotlin versions

---
 pom.xml                                               |  2 +-
 spring-cloud-function-context/pom.xml                 |  8 ++++----
 spring-cloud-function-kotlin/pom.xml                  |  6 +++---
 .../function-sample-kotlin-web/pom.xml                | 11 ++++-------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 618a2cb37..8bc1e2b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.5-SNAPSHOT</version>
+		<version>3.0.5</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index 4d6096b3a..baa0c76bf 100644
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -84,13 +84,13 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>1.6.0-RC2</version>
+			<version>1.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>1.6.0-RC2</version>
+			<version>1.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -117,7 +117,7 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>1.6.0-RC2</version>
+				<version>1.6.0</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -156,7 +156,7 @@
 					<dependency>
 						<groupId>org.jetbrains.kotlin</groupId>
 						<artifactId>kotlin-maven-allopen</artifactId>
-						<version>1.6.0-RC2</version>
+						<version>1.6.0</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml
index aa982b630..8ea20829c 100644
--- a/spring-cloud-function-kotlin/pom.xml
+++ b/spring-cloud-function-kotlin/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>1.6.0-RC2</version>
+			<version>1.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
@@ -65,7 +65,7 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>1.6.0-RC2</version>
+				<version>1.6.0</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -94,7 +94,7 @@
 					<dependency>
 						<groupId>org.jetbrains.kotlin</groupId>
 						<artifactId>kotlin-maven-allopen</artifactId>
-						<version>1.6.0-RC2</version>
+						<version>1.6.0</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
index 53ec794d2..f80c9d44d 100644
--- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
+++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<kotlin.version>1.6.0-RC2</kotlin.version>
+		<kotlin.version>1.6.0</kotlin.version>
 	</properties>
 
 	<dependencies>
@@ -28,27 +28,25 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-kotlin</artifactId>
-			<version>3.1.5-SNAPSHOT</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-web</artifactId>
-			<version>3.1.5-SNAPSHOT</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-context</artifactId>
-			<version>3.1.5-SNAPSHOT</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -68,7 +66,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>