SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumbed s-c-build version to 2.3.0.RELEASE in preparation for 3.0.7.RELEASE

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-05-28 11:34:23 +02:00
parent 19ab6b9946
commit 6633bd62f7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>2.2.4.BUILD-SNAPSHOT</version> <version>2.3.0.RELEASE</version>
<relativePath/> <relativePath/>
</parent> </parent>

9
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java
View File

@@ -20,7 +20,9 @@ import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.net.URL; import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -195,7 +197,12 @@ class FunctionArchiveDeployer extends JarLauncher {
} }
private List<Archive> discoverClassPathAcrhives() throws Exception { 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)) { if (CollectionUtils.isEmpty(classPathArchives)) {
classPathArchives.add(this.getArchive()); classPathArchives.add(this.getArchive());
} }