From f52216ebdc03c5fa31dc9b2d761d6508e93de3ff Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Nov 2024 17:17:17 +0100 Subject: [PATCH 1/7] Update pom.xml --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index e107453a..4dc88c40 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,6 +21,7 @@ none + src/main/asciidoc From ddfdbe074c9a975163f8cd716af1415d5941ca79 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 22:54:35 +0000 Subject: [PATCH 2/7] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-starter-vault-config/pom.xml | 2 +- spring-cloud-vault-config-aws/pom.xml | 2 +- spring-cloud-vault-config-consul/pom.xml | 4 ++-- spring-cloud-vault-config-databases/pom.xml | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 2 +- spring-cloud-vault-config/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4dc88c40..6ecc3686 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. jar diff --git a/pom.xml b/pom.xml index 6233186c..31cb7a84 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 4.1.5-SNAPSHOT + 4.1.5 1.70 v1-rev20201112-1.31.0 diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index 8ff759d9..21cf7910 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 90541095..5bbd6652 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 0eafcf96..7703f741 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 4.1.3-SNAPSHOT + 4.1.3 diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 6a357d71..ccf8e32b 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 36b403c6..98abf6db 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 3c8d9958..90f4d3ee 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index c6176e69..525fb43c 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-vault-dependencies - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Vault Dependencies From fc382b9d1c9d74fa9fee8a78c1b9ce27676188a2 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 22:55:45 +0000 Subject: [PATCH 3/7] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-starter-vault-config/pom.xml | 2 +- spring-cloud-vault-config-aws/pom.xml | 2 +- spring-cloud-vault-config-consul/pom.xml | 4 ++-- spring-cloud-vault-config-databases/pom.xml | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 2 +- spring-cloud-vault-config/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 6ecc3686..4dc88c40 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 31cb7a84..6233186c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Vault @@ -42,7 +42,7 @@ UTF-8 - 4.1.5 + 4.1.5-SNAPSHOT 1.70 v1-rev20201112-1.31.0 diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index 21cf7910..8ff759d9 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 5bbd6652..90541095 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 7703f741..0eafcf96 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 4.1.3 + 4.1.3-SNAPSHOT diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index ccf8e32b..6a357d71 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 98abf6db..36b403c6 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 90f4d3ee..3c8d9958 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 525fb43c..c6176e69 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-vault-dependencies - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Vault Dependencies From a843fcedc7c983b8d830413d6fe09fbac6d4f265 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 22:55:46 +0000 Subject: [PATCH 4/7] Bumping versions to 4.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-starter-vault-config/pom.xml | 2 +- spring-cloud-vault-config-aws/pom.xml | 2 +- spring-cloud-vault-config-consul/pom.xml | 2 +- spring-cloud-vault-config-databases/pom.xml | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 2 +- spring-cloud-vault-config/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4dc88c40..68629624 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 6233186c..f285e182 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Vault diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index 8ff759d9..b86aec2f 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 90541095..79e5d6ae 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 0eafcf96..bd56ebda 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 6a357d71..7bb050bd 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 36b403c6..a355e7fe 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 3c8d9958..49b36123 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-vault-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index c6176e69..31f2a8c0 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -13,7 +13,7 @@ spring-cloud-vault-dependencies - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Vault Dependencies From aa33fbad7657d2c9dabfb1a9446ff8222b6f86a9 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 22:56:55 +0000 Subject: [PATCH 5/7] Bumping dependency versions after release --- pom.xml | 4 ++-- spring-cloud-vault-config-consul/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f285e182..9bc626de 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT @@ -42,7 +42,7 @@ UTF-8 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT 1.70 v1-rev20201112-1.31.0 diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index bd56ebda..abf23066 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -16,7 +16,7 @@ Spring Cloud Vault Config Consul support - 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 31f2a8c0..722c9ef2 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT From 64aa145d1a7b874a2aa7abd0bebc71ed7274e1b7 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Nov 2024 18:12:39 +0100 Subject: [PATCH 6/7] Revert "Update pom.xml" This reverts commit f52216ebdc03c5fa31dc9b2d761d6508e93de3ff. --- docs/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 68629624..35c72dae 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,6 @@ none - src/main/asciidoc From 2fbe26a79090861d0f4c8061594f6c60b26344c1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 17 Dec 2024 19:55:24 -0500 Subject: [PATCH 7/7] Add the ability to disable configuration properties in docs pom --- docs/antora.yml | 2 +- docs/pom.xml | 52 ++++++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 5cb6f868..1694d7c2 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 35c72dae..3ed2072b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,28 +21,6 @@ none - - - ${project.groupId} - spring-cloud-starter-vault-config - - - ${project.groupId} - spring-cloud-vault-config-aws - - - ${project.groupId} - spring-cloud-vault-config-consul - - - ${project.groupId} - spring-cloud-vault-config-databases - - - ${project.groupId} - spring-cloud-vault-config-rabbitmq - - src/main/asciidoc @@ -76,6 +54,36 @@ + + enable-configuration-properties + + + !disableConfigurationProperties + + + + + ${project.groupId} + spring-cloud-starter-vault-config + + + ${project.groupId} + spring-cloud-vault-config-aws + + + ${project.groupId} + spring-cloud-vault-config-consul + + + ${project.groupId} + spring-cloud-vault-config-databases + + + ${project.groupId} + spring-cloud-vault-config-rabbitmq + + + docs