Merge branch '1.5.x'

8 years ago · 6b1a80ac2a
parent 85f176da08 dac249fb0d
commit 6b1a80ac2a
1 changed files with 5 additions and 2 deletions
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
@ -127,8 +127,11 @@ class ProjectLibraries implements Libraries {
 			}
 			else if (dependency instanceof ProjectDependency) {
 				ProjectDependency projectDependency = (ProjectDependency) dependency;
-				libraries.addAll(getLibrariesForFileDependencies(
-						projectDependency.getProjectConfiguration(), scope));
+				Configuration dependencyConfiguration = projectDependency
+						.getDependencyProject().getConfigurations()
+						.getByName(projectDependency.getConfiguration());
+				libraries.addAll(
+						getLibrariesForFileDependencies(dependencyConfiguration, scope));
 			}
 		}
 		return libraries;