Merge branch '2.1.x'

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java

@@ -27,6 +27,7 @@ import org.gradle.api.file.FileCopyDetails;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.internal.file.copy.CopyAction;
 import org.gradle.api.specs.Spec;
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.bundling.Jar;
 
 /**
@@ -153,6 +154,7 @@ public class BootJar extends Jar implements BootArchive {
 	 * @return a {@code CopySpec} for {@code BOOT-INF}
 	 * @since 2.0.3
 	 */
+	@Internal
 	public CopySpec getBootInf() {
 		CopySpec child = getProject().copySpec();
 		this.bootInf.with(child);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java

@@ -27,6 +27,7 @@ import org.gradle.api.file.FileCopyDetails;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.internal.file.copy.CopyAction;
 import org.gradle.api.specs.Spec;
+import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.bundling.War;
 
@@ -114,6 +115,7 @@ public class BootWar extends War implements BootArchive {
 	 * @return the provided classpath
 	 */
 	@Optional
+	@Classpath
 	public FileCollection getProvidedClasspath() {
 		return this.providedClasspath;
 	}