Merge pull request #1318 from spring-cloud/gcp-jar-launcher

Attempts to micrate away from the classic loader

Author: spencergibb

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml

@@ -42,11 +42,6 @@
 			<artifactId>spring-boot-loader-tools</artifactId>
 			<version>${spring-boot.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-loader-classic</artifactId>
-			<version>${spring-boot.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-loader</artifactId>

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

@@ -22,8 +22,7 @@
 import com.google.cloud.functions.HttpResponse;
 import com.google.cloud.functions.RawBackgroundFunction;
 
-import org.springframework.boot.loader.JarLauncher;
-import org.springframework.boot.loader.jar.JarFile;
+import org.springframework.boot.loader.launch.JarLauncher;
 
 /**
  * The launcher class written at the top-level of the output JAR to be deployed to
@@ -39,14 +38,15 @@ public class GcfJarLauncher extends JarLauncher implements HttpFunction, RawBack
 	private final Object delegate;
 
 	public GcfJarLauncher() throws Exception {
-		JarFile.registerUrlProtocolHandler();
+		//JarFile.registerUrlProtocolHandler();
 
-		this.loader = createClassLoader(getClassPathArchivesIterator());
+		this.loader = createClassLoader(getClassPathUrls());
 
 		Class<?> clazz = this.loader
 			.loadClass("org.springframework.cloud.function.adapter.gcp.FunctionInvoker");
 		this.delegate = clazz.getConstructor().newInstance();
 	}
+
 	@Override
 	public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws Exception {
 		Thread.currentThread().setContextClassLoader(this.loader);

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

@@ -21,7 +21,6 @@
 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;
 
 /**
@@ -47,7 +46,7 @@ public boolean isExecutable() {
 
 	@Override
 	public void writeLoadedClasses(LoaderClassesWriter writer) throws IOException {
-		writer.writeLoaderClasses(LoaderImplementation.CLASSIC);
+		writer.writeLoaderClasses();
 
 		String jarName = LAUNCHER_NAME.replaceAll("\\.", "/") + ".class";
 		writer.writeEntry(