Skip to content

Commit abdb1ac

Browse files
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
1 parent faeb0f7 commit abdb1ac

File tree

2 files changed

+3
-2
lines changed
  • spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout
  • spring-cloud-function-samples/function-sample-gcp-http

2 files changed

+3
-2
lines changed

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/layout/GcfJarLayout.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.boot.loader.tools.CustomLoaderLayout;
2222
import org.springframework.boot.loader.tools.Layouts;
2323
import org.springframework.boot.loader.tools.LoaderClassesWriter;
24+
import org.springframework.boot.loader.tools.LoaderImplementation;
2425
import org.springframework.cloud.function.adapter.gcp.GcfJarLauncher;
2526

2627
/**
@@ -46,7 +47,7 @@ public boolean isExecutable() {
4647

4748
@Override
4849
public void writeLoadedClasses(LoaderClassesWriter writer) throws IOException {
49-
writer.writeLoaderClasses();
50+
writer.writeLoaderClasses(LoaderImplementation.CLASSIC);
5051

5152
String jarName = LAUNCHER_NAME.replaceAll("\\.", "/") + ".class";
5253
writer.writeEntry(

spring-cloud-function-samples/function-sample-gcp-http/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-function-adapter-gcp</artifactId>
30-
<version>4.1.0-SNAPSHOT</version>
30+
<version>${spring-cloud-function.version}</version>
3131
</dependency>
3232

3333
<!-- test dependencies -->

0 commit comments

Comments
 (0)