Merge branch '1.1.x'

spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java

@@ -63,4 +63,17 @@ public class MultiProjectRepackagingTests {
 		assertThat(jarFile.getEntry("lib/foo.jar"), notNullValue());
 		jarFile.close();
 	}
+
+	@Test
+	public void repackageWithRuntimeProjectDependency() throws Exception {
+		ProjectConnection project = new ProjectCreator()
+				.createProject("multi-project-runtime-project-dependency");
+		project.newBuild().forTasks("clean", "build")
+				.withArguments("-PbootVersion=" + BOOT_VERSION).run();
+		File buildLibs = new File(
+				"target/multi-project-runtime-project-dependency/projectA/build/libs");
+		JarFile jarFile = new JarFile(new File(buildLibs, "projectA.jar"));
+		assertThat(jarFile.getEntry("lib/projectB.jar"), notNullValue());
+		jarFile.close();
+	}
 }

spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle

@@ -0,0 +1,22 @@
+buildscript {
+	repositories {
+		mavenLocal()
+	}
+	dependencies {
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:${project.bootVersion}"
+	}
+}
+
+project(':projectA') {
+	apply plugin: 'spring-boot'
+	dependencies {
+		runtime project(':projectB')
+	}
+	bootRepackage {
+		mainClass 'com.foo.Bar'
+	}
+}
+
+project(':projectB') {
+	apply plugin: 'java'
+}

spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle

@@ -0,0 +1 @@
+include 'projectA', 'projectB'