From 0479967ff0cf596c184d3a8f82a3e4f566df46c6 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 26 Feb 2022 03:41:13 +0100 Subject: [PATCH 1/2] Use Gradles task configuration avoidance APIs in the reference docs see https://github.com/spring-projects/spring-boot/pull/29762 see https://docs.gradle.org/7.0/userguide/task_configuration_avoidance.html --- .../asciidoc/configuration-metadata/annotation-processor.adoc | 4 +++- .../src/docs/asciidoc/howto/properties-and-configuration.adoc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc index 863744561328..31f95c9761ca 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc @@ -33,7 +33,9 @@ If you are using an `additional-spring-configuration-metadata.json` file, the `c [source,gradle,indent=0,subs="verbatim"] ---- - compileJava.inputs.files(processResources) + tasks.named('compileJava') { + inputs.files(processResources) + } ---- This dependency ensures that the additional metadata is available when the annotation processor runs during compilation. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc index 6090889e6383..539a09c8716f 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc @@ -71,7 +71,7 @@ You can automatically expand properties from the Gradle project by configuring t [source,gradle,indent=0,subs="verbatim"] ---- - processResources { + tasks.named('processResources', Copy) { expand(project.properties) } ---- From 932d3ef3e113205c78651c0e6b766c8c83242e45 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Mon, 28 Feb 2022 14:59:34 +0100 Subject: [PATCH 2/2] Use Gradles task configuration avoidance APIs in the reference docs --- .../asciidoc/configuration-metadata/annotation-processor.adoc | 2 +- .../src/docs/asciidoc/deployment/installing.adoc | 2 +- .../src/docs/asciidoc/howto/properties-and-configuration.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc index 31f95c9761ca..6aa025bf7347 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/configuration-metadata/annotation-processor.adoc @@ -34,7 +34,7 @@ If you are using an `additional-spring-configuration-metadata.json` file, the `c [source,gradle,indent=0,subs="verbatim"] ---- tasks.named('compileJava') { - inputs.files(processResources) + inputs.files(tasks.named('processResources')) } ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/installing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/installing.adoc index 71931d050fcc..ce221ed4f9f0 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/installing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/installing.adoc @@ -30,7 +30,7 @@ The following example shows the equivalent Gradle configuration: [source,gradle,indent=0,subs="verbatim"] ---- - bootJar { + tasks.named('bootJar') { launchScript() } ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc index 539a09c8716f..d05c5f85234f 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc @@ -71,7 +71,7 @@ You can automatically expand properties from the Gradle project by configuring t [source,gradle,indent=0,subs="verbatim"] ---- - tasks.named('processResources', Copy) { + tasks.named('processResources') { expand(project.properties) } ----