root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-03 13:12:40 +00:00
parent 85f176da08 dac249fb0d
commit 6b1a80ac2a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
View File

@ -127,8 +127,11 @@ class ProjectLibraries implements Libraries {
} }
else if (dependency instanceof ProjectDependency) { else if (dependency instanceof ProjectDependency) {
ProjectDependency projectDependency = (ProjectDependency) dependency; ProjectDependency projectDependency = (ProjectDependency) dependency;
libraries.addAll(getLibrariesForFileDependencies( Configuration dependencyConfiguration = projectDependency
projectDependency.getProjectConfiguration(), scope)); .getDependencyProject().getConfigurations()
.getByName(projectDependency.getConfiguration());
libraries.addAll(
getLibrariesForFileDependencies(dependencyConfiguration, scope));
} }
} }
return libraries; return libraries;