From c251b6de46d2a1f8c0aee38c99d06318cbeacd6e Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Thu, 2 Apr 2020 18:17:24 -0400
Subject: [PATCH] The classloader trick won't be needed after
 https://github.com/GoogleCloudPlatform/functions-framework-java/commit/a3d23cc12df52cb10ee0102e50cd54eb943527e6

---
 .../spring-cloud-function-adapter-gcp/pom.xml              | 7 ++++---
 .../cloud/function/adapter/gcloud/FunctionInvoker.java     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
index 2c2bd5734..942ea2e28 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
@@ -17,14 +17,15 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<google.cloud.functions.version>1.0.0-alpha-2-rc3</google.cloud.functions.version>
+		<google.cloud.functions.api.version>1.0.0-alpha-2-rc3</google.cloud.functions.api.version>
+		<google.cloud.functions.invoker.version>1.0.0-alpha-2-rc4</google.cloud.functions.invoker.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.google.cloud.functions</groupId>
 			<artifactId>functions-framework-api</artifactId>
-			<version>${google.cloud.functions.version}</version>
+			<version>${google.cloud.functions.api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -44,7 +45,7 @@
 		<dependency>
 			<groupId>com.google.cloud.functions.invoker</groupId>
 			<artifactId>java-function-invoker</artifactId>
-			<version>${google.cloud.functions.version}</version>
+			<version>${google.cloud.functions.invoker.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
index 2a6b2666e..adeae7907 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
@@ -56,7 +56,7 @@ public class FunctionInvoker
 
 	private void init() {
 		System.setProperty("spring.http.converters.preferred-json-mapper", "gson");
-		Thread.currentThread() //TODO investigate if it is necessary
+		Thread.currentThread() // TODO: remove after upgrading to 1.0.0-alpha-2-rc5
 				.setContextClassLoader(FunctionInvoker.class.getClassLoader());
 		initialize(null);
 	}