From abdb1ac04fd17c0c642e229b31f82a36e6ab33ef Mon Sep 17 00:00:00 2001 From: Lauren Wiebenga Date: Tue, 11 Jun 2024 08:48:51 -0500 Subject: [PATCH] Updates GcfJarLayout to write back classic loaders required for the current implementation of this project, before this change the default loaders would be used every time GcfJarLayout was invoked; also updates the pom for function-sample-gcp-http to use the latest development version of the spring cloud gcp adaptor Fixes gh-1085 --- .../cloud/function/adapter/gcp/layout/GcfJarLayout.java | 3 ++- spring-cloud-function-samples/function-sample-gcp-http/pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout/GcfJarLayout.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout/GcfJarLayout.java index 874e0c66a..5f80baa03 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout/GcfJarLayout.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout/GcfJarLayout.java @@ -21,6 +21,7 @@ import org.springframework.boot.loader.tools.CustomLoaderLayout; import org.springframework.boot.loader.tools.Layouts; import org.springframework.boot.loader.tools.LoaderClassesWriter; +import org.springframework.boot.loader.tools.LoaderImplementation; import org.springframework.cloud.function.adapter.gcp.GcfJarLauncher; /** @@ -46,7 +47,7 @@ public boolean isExecutable() { @Override public void writeLoadedClasses(LoaderClassesWriter writer) throws IOException { - writer.writeLoaderClasses(); + writer.writeLoaderClasses(LoaderImplementation.CLASSIC); String jarName = LAUNCHER_NAME.replaceAll("\\.", "/") + ".class"; writer.writeEntry( diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 6ed35880f..e260d2f8c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-function-adapter-gcp - 4.1.0-SNAPSHOT + ${spring-cloud-function.version}