From 83ce5dcee86de37eacaa6be376eed9cbb3717ef2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 Dec 2018 15:32:04 +0000 Subject: [PATCH] Add missing task output annotations to BootJar and BootWar Closes gh-15488 --- .../org/springframework/boot/gradle/tasks/bundling/BootJar.java | 2 ++ .../org/springframework/boot/gradle/tasks/bundling/BootWar.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java index 76ce216c2a1e..a9599e459ecd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java +++ b/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.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 void setExcludeDevtools(boolean excludeDevtools) { * @return a {@code CopySpec} for {@code BOOT-INF} * @since 2.0.3 */ + @Internal public CopySpec getBootInf() { CopySpec child = getProject().copySpec(); this.bootInf.with(child); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java index d97c995f2b6e..71d183fb85eb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java +++ b/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.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 void launchScript(Action action) { * @return the provided classpath */ @Optional + @Classpath public FileCollection getProvidedClasspath() { return this.providedClasspath; }