From 159e2108a298554aa60d0bd8d44e7ef1f999ed27 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 31 Oct 2018 11:19:42 +0100
Subject: [PATCH] Upgraded Kotlin plugin

---
 spring-cloud-function-context/pom.xml                     | 5 +----
 .../cloud/function/web/util/HeaderUtils.java              | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index b300db026..798efeb57 100644
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -13,9 +13,6 @@
 		<artifactId>spring-cloud-function-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<kotlin.version>1.2.61</kotlin.version>
-	</properties>
 
 	<dependencies>
 		<dependency>
@@ -66,7 +63,7 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
+				<version>1.2.71</version>
 				<executions>
 					<execution>
 						<id>compile</id>
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
index 863c142f5..cb831b972 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
@@ -71,10 +71,6 @@ public class HeaderUtils {
 		return result;
 	}
 
-	private static Collection<?> multi(Object value) {
-		return value instanceof Collection ? (Collection<?>) value : Arrays.asList(value);
-	}
-
 	public static MessageHeaders fromHttp(HttpHeaders headers) {
 		Map<String, Object> map = new LinkedHashMap<>();
 		for (String name : headers.keySet()) {
@@ -86,4 +82,8 @@ public class HeaderUtils {
 		}
 		return new MessageHeaders(map);
 	}
+
+	private static Collection<?> multi(Object value) {
+		return value instanceof Collection ? (Collection<?>) value : Arrays.asList(value);
+	}
 }