From 42f30a9bd9775c7cdfeb0fdea38e4963dfc7b095 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:05:23 -0500 Subject: [PATCH 1/2] Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs (#1821) Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.6 to 3.2.0-alpha.8. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.6...v3.2.0-alpha.8) --- updated-dependencies: - dependency-name: antora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 9e19d2ea1..ca5b2ce83 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.6", + "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", From cd86d84411062a0a81c85b88502a7953c6381337 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 17 Dec 2024 15:35:42 -0500 Subject: [PATCH 2/2] Add the ability to disable configuration properties in docs pom --- docs/antora.yml | 2 +- docs/pom.xml | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 8ac9d3a03..e6ce69515 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: run: - command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests + command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests -DdisableConfigurationProperties local: true scan: dir: ./target/classes/antora-resources/ diff --git a/docs/pom.xml b/docs/pom.xml index ddf676f71..155497b96 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,24 +21,32 @@ none - - - ${project.groupId} - spring-cloud-starter-kubernetes-fabric8 - - - ${project.groupId} - spring-cloud-starter-kubernetes-fabric8-all - - - ${project.groupId} - spring-cloud-starter-kubernetes-fabric8-config - - src/main/asciidoc + + enable-configuration-properties + + + !disableConfigurationProperties + + + + + ${project.groupId} + spring-cloud-starter-kubernetes-fabric8 + + + ${project.groupId} + spring-cloud-starter-kubernetes-fabric8-all + + + ${project.groupId} + spring-cloud-starter-kubernetes-fabric8-config + + + docs