Permalink
Browse files

Merge branch '2.1.x'

  • Loading branch information...
2 parents c1ee3ef + f9b9cc1 commit d90a8a0fc3162c3f40322bc234dedfc269841c05 @graemerocher graemerocher committed May 15, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -446,6 +446,7 @@ class BuildSettings extends AbstractBuildSettings {
}()
private List<File> findAndRemovePluginDependencies(String scope, List<File> jarFiles, List<File> scopePluginDependencies) {
+ jarFiles = jarFiles?.findAll { it != null} ?: []
def pluginZips = jarFiles.findAll { it.name.endsWith(".zip") }
for (z in pluginZips) {
if (!pluginDependencies.contains(z)) {

0 comments on commit d90a8a0

Please sign in to comment.