Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing task output annotations to BootJar and BootWar

Browse Source 
Closes gh-15488
This commit is contained in:
Andy Wilkinson
2018-12-21 15:32:04 +00:00
parent 3cfcc9e9a7
commit 83ce5dcee8
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import org.gradle.api.file.FileCopyDetails;
import org.gradle.api.file.FileTreeElement; import org.gradle.api.file.FileTreeElement;
import org.gradle.api.internal.file.copy.CopyAction; import org.gradle.api.internal.file.copy.CopyAction;
import org.gradle.api.specs.Spec; import org.gradle.api.specs.Spec;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.bundling.Jar; 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} * @return a {@code CopySpec} for {@code BOOT-INF}
* @since 2.0.3 * @since 2.0.3
*/ */
@Internal
public CopySpec getBootInf() { public CopySpec getBootInf() {
CopySpec child = getProject().copySpec(); CopySpec child = getProject().copySpec();
this.bootInf.with(child); this.bootInf.with(child);

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

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