From 6633bd62f72ffab83d8546b83c9205c287029fb7 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Thu, 28 May 2020 11:34:23 +0200
Subject: [PATCH] Bumbed s-c-build version to 2.3.0.RELEASE in preparation for
 3.0.7.RELEASE

---
 pom.xml                                                  | 2 +-
 .../cloud/function/deployer/FunctionArchiveDeployer.java | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 212e62e31..476d8af81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.4.BUILD-SNAPSHOT</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java
index 6322bad32..edc76d9cf 100644
--- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java
+++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java
@@ -20,7 +20,9 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -195,7 +197,12 @@ class FunctionArchiveDeployer extends JarLauncher {
 	}
 
 	private List<Archive> discoverClassPathAcrhives() throws Exception {
-		List<Archive> classPathArchives = getClassPathArchives();
+		Iterator<Archive> iter = getClassPathArchivesIterator();
+		List<Archive> classPathArchives = new ArrayList<>();
+		while (iter.hasNext()) {
+			classPathArchives.add(iter.next());
+		}
+//		List<Archive> classPathArchives = getClassPathArchives();
 		if (CollectionUtils.isEmpty(classPathArchives)) {
 			classPathArchives.add(this.getArchive());
 		}