Hacking

philwebb · Mar 20, 2024 · 61ce391 · 61ce391
1 parent 06be1a4
commit 61ce391
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java b/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java
@@ -34,11 +34,13 @@
  */
 public final class Extensions {
 
+	private static final String ROOT_COMPONENT_EXTENSION = "@springio/antora-extensions/root-component-extension";
+
 	private static final List<Extension> antora;
 	static {
 		List<Extension> extensions = new ArrayList<>();
-		extensions.add(new Extension("@springio/antora-extensions", "1.8.2",
-				"@springio/antora-extensions/root-component-extension"));
+		extensions.add(new Extension("@springio/antora-extensions", "1.8.2", ROOT_COMPONENT_EXTENSION,
+				"@springio/antora-extensions/static-page-extension"));
 		extensions.add(new Extension("@springio/antora-xref-extension", "1.0.0-alpha.3"));
 		extensions.add(new Extension("@springio/antora-zip-contents-collector-extension", "1.0.0-alpha.1"));
 		antora = List.copyOf(extensions);
@@ -106,7 +108,11 @@ void rootComponent(Consumer<RootComponent> rootComponent) {
 
 		List<Map<String, Object>> config() {
 			List<Map<String, Object>> config = new ArrayList<>();
-			this.extensions.forEach((name, customizations) -> {
+			Map<String, Map<String, Object>> orderedExtensions = new LinkedHashMap<>(this.extensions);
+			// The root component extension must be last
+			Map<String, Object> rootComponentConfig = orderedExtensions.remove(ROOT_COMPONENT_EXTENSION);
+			orderedExtensions.put(ROOT_COMPONENT_EXTENSION, rootComponentConfig);
+			orderedExtensions.forEach((name, customizations) -> {
 				Map<String, Object> extensionConfig = new LinkedHashMap<>();
 				extensionConfig.put("require", name);
 				if (customizations != null) {
@@ -175,7 +181,7 @@ void alwaysInclude(Map<String, String> alwaysInclude) {
 		class RootComponent extends Customizer {
 
 			RootComponent() {
-				super("@springio/antora-extensions/root-component-extension");
+				super(ROOT_COMPONENT_EXTENSION);
 			}
 
 			void name(String name) {

diff --git a/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml b/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml
@@ -1,7 +1,6 @@
 antora:
   extensions:
-  - require: '@springio/antora-extensions/root-component-extension'
-    root_component_name: spring-boot
+  - require: '@springio/antora-extensions/static-page-extension'
   - require: '@springio/antora-xref-extension'
     stub:
     - appendix:.*
@@ -15,6 +14,8 @@ antora:
     - project/build/generated/docs/antora-content/test-${version}-${name}-${classifier}.zip
     - project/build/generated/docs/antora-dependencies/test-${version}-${name}-${classifier}.zip
     version_file: gradle.properties
+  - require: '@springio/antora-extensions/root-component-extension'
+    root_component_name: spring-boot
 site:
   title: Spring Boot
 content: