fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Antora component from spring-boot to boot

Browse Source 
Closes gh-40131
This commit is contained in:
Phillip Webb 2024-03-28 13:21:27 -07:00
parent ad79c373f8
commit 10260c084b
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java
View File

@ -43,8 +43,7 @@ import org.springframework.boot.build.constraints.ExtractVersionConstraints;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* Conventions that are applied in the presence of the {@link AntoraPlugin} and * Conventions that are applied in the presence of the {@link AntoraPlugin}.
* {@link GenerateAntoraYmlPlugin}.
* *
* @author Phillip Webb * @author Phillip Webb
*/ */
@ -90,7 +89,7 @@ public class AntoraConventions {
ExtractVersionConstraints dependencyVersionsTask) { ExtractVersionConstraints dependencyVersionsTask) {
generateAntoraYmlTask.getOutputs().doNotCacheIf("getAsciidocAttributes() changes output", (task) -> true); generateAntoraYmlTask.getOutputs().doNotCacheIf("getAsciidocAttributes() changes output", (task) -> true);
generateAntoraYmlTask.dependsOn(dependencyVersionsTask); generateAntoraYmlTask.dependsOn(dependencyVersionsTask);
generateAntoraYmlTask.setProperty("componentName", "spring-boot"); generateAntoraYmlTask.setProperty("componentName", "boot");
generateAntoraYmlTask.setProperty("outputFile", generateAntoraYmlTask.setProperty("outputFile",
new File(project.getBuildDir(), "generated/docs/antora-yml/antora.yml")); new File(project.getBuildDir(), "generated/docs/antora-yml/antora.yml"));
generateAntoraYmlTask.setProperty("yml", getDefaultYml(project)); generateAntoraYmlTask.setProperty("yml", getDefaultYml(project));

2
buildSrc/src/main/java/org/springframework/boot/build/antora/GenerateAntoraPlaybook.java
View File

@ -119,7 +119,7 @@ public abstract class GenerateAntoraPlaybook extends DefaultTask {
zipContentsCollector.locations(antoraContent, antoraDepenencies); zipContentsCollector.locations(antoraContent, antoraDepenencies);
zipContentsCollector.alwaysInclude(getAlwaysInclude().getOrNull()); zipContentsCollector.alwaysInclude(getAlwaysInclude().getOrNull());
}); });
extensions.rootComponent((rootComponent) -> rootComponent.name("spring-boot")); extensions.rootComponent((rootComponent) -> rootComponent.name("boot"));
})); }));
Map<String, Object> asciidoc = (Map<String, Object>) data.get("asciidoc"); Map<String, Object> asciidoc = (Map<String, Object>) data.get("asciidoc");
asciidoc.put("extensions", Extensions.asciidoc()); asciidoc.put("extensions", Extensions.asciidoc());

2
buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml
View File

@ -15,7 +15,7 @@ antora:
- project/build/generated/docs/antora-dependencies-content/test-${version}-${name}-${classifier}.zip - project/build/generated/docs/antora-dependencies-content/test-${version}-${name}-${classifier}.zip
version_file: gradle.properties version_file: gradle.properties
- require: '@springio/antora-extensions/root-component-extension' - require: '@springio/antora-extensions/root-component-extension'
root_component_name: spring-boot root_component_name: boot
site: site:
title: Spring Boot title: Spring Boot
content: content:

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/antora/antora.yml
View File

@ -1,4 +1,4 @@
name: spring-boot name: boot
version: true version: true
ext: ext:
zip_contents_collector: zip_contents_collector:

2
spring-boot-project/spring-boot-docs/src/docs/antora/antora.yml
View File

@ -1,4 +1,4 @@
name: spring-boot name: boot
version: true version: true
ext: ext:
zip_contents_collector: zip_contents_collector:

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/antora.yml
View File

@ -1,4 +1,4 @@
name: spring-boot name: boot
version: true version: true
ext: ext:
zip_contents_collector: zip_contents_collector:

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/antora.yml
View File

@ -1,4 +1,4 @@
name: spring-boot name: boot
version: true version: true
ext: ext:
zip_contents_collector: zip_contents_collector: