From 00625d4e0e23510c6bc54e2067abf533213163cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:31:16 -0500 Subject: [PATCH 01/15] Bump @antora/collector-extension in /docs (#2638) --- updated-dependencies: - dependency-name: "@antora/collector-extension" 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 e4aad62b..224f6752 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.4", + "@antora/collector-extension": "1.0.0-beta.5", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 788f05c1cfa8623804477b1fca203d436845b8fe Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 20 Nov 2024 13:12:55 +0000 Subject: [PATCH 02/15] Bumping versions --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 7841220b..8534f117 100644 --- a/README.adoc +++ b/README.adoc @@ -193,9 +193,9 @@ given the ability to merge pull requests. [[code-of-conduct]] == Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +unacceptable behavior to code-of-conduct@spring.io. [[code-conventions-and-housekeeping]] == Code Conventions and Housekeeping From 0eada15c0d463e8ecc0d2693742b64a062a51309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:38:26 -0500 Subject: [PATCH 03/15] Bump @antora/collector-extension in /docs (#2648) --- updated-dependencies: - dependency-name: "@antora/collector-extension" 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 224f6752..1eebd05f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.5", + "@antora/collector-extension": "1.0.0-rc.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 1195bbb279147974eaa913184fca60d85744da67 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Nov 2024 17:06:00 +0100 Subject: [PATCH 04/15] Update pom.xml --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 324c7f66..69cad676 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,12 +27,14 @@ .* ${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/ + src/main/asciidoc From 30511a1c210f2fc8b53a026b873e97da0ec95eee Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:33:04 +0000 Subject: [PATCH 05/15] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 69cad676..ac2a76db 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. jar diff --git a/pom.xml b/pom.xml index da272146..d25653a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 @@ -27,7 +27,7 @@ config - 4.1.5-SNAPSHOT + 4.1.5 2.18.41 v1-rev20201112-1.30.10 2.31.0 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 19242e8a..d1c250bc 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 7878f2ba..a86132e3 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 1ab38dba..34ba9f41 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-config-dependencies - 4.1.4-SNAPSHOT + 4.1.4 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 2a2d7016..50592ccd 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.1.3-SNAPSHOT + 4.1.3 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 3da45498..bad1d7cf 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index a758a712..885c5f14 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index fcae302f..10f424af 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-starter-config - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 71fe7bb57890f5ff2f73d60e8107ca2d6950e712 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:33:57 +0000 Subject: [PATCH 06/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ac2a76db..69cad676 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index d25653a0..da272146 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.1.5 + 4.1.5-SNAPSHOT 2.18.41 v1-rev20201112-1.30.10 2.31.0 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index d1c250bc..19242e8a 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a86132e3..7878f2ba 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 34ba9f41..1ab38dba 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-config-dependencies - 4.1.4 + 4.1.4-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 50592ccd..2a2d7016 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.1.3 + 4.1.3-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index bad1d7cf..3da45498 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 885c5f14..a758a712 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 10f424af..fcae302f 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-starter-config - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From ef4059f7a46497817d788660cb8e7a56998b302b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:34:01 +0000 Subject: [PATCH 07/15] Bumping versions to 4.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 69cad676..29a41388 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index da272146..b561a020 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Config Spring Cloud Config diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 19242e8a..664d162d 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 7878f2ba..eca1c03a 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 1ab38dba..340af060 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-config-dependencies - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 2a2d7016..5897031f 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 3da45498..f7318702 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index a758a712..b2f333c5 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index fcae302f..e13eceb3 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-starter-config - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 4a604b48a3e22876330c8b5cd9dde0c99ad78688 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:34:55 +0000 Subject: [PATCH 08/15] Bumping dependency versions after release --- pom.xml | 4 ++-- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b561a020..ffffcc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT 2.18.41 v1-rev20201112-1.30.10 2.31.0 diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 340af060..6be02b96 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 5897031f..3e741368 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT From 9034d9e6ba9706c3d9a3aee705f738ee10ec1aac Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:35:17 +0000 Subject: [PATCH 09/15] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 29a41388..ac2a76db 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. jar diff --git a/pom.xml b/pom.xml index ffffcc6b..d25653a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4 @@ -27,7 +27,7 @@ config - 4.1.6-SNAPSHOT + 4.1.5 2.18.41 v1-rev20201112-1.30.10 2.31.0 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 664d162d..d1c250bc 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index eca1c03a..a86132e3 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 6be02b96..34ba9f41 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-config-dependencies - 4.1.5-SNAPSHOT + 4.1.4 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 3e741368..50592ccd 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.1.4-SNAPSHOT + 4.1.3 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index f7318702..bad1d7cf 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index b2f333c5..885c5f14 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index e13eceb3..10f424af 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-starter-config - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From c41bf0d3a590bfbb536ef4ca0ca7c406f2145aa5 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:36:07 +0000 Subject: [PATCH 10/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ac2a76db..29a41388 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index d25653a0..ffffcc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.5-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.1.5 + 4.1.6-SNAPSHOT 2.18.41 v1-rev20201112-1.30.10 2.31.0 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index d1c250bc..664d162d 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a86132e3..eca1c03a 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 34ba9f41..6be02b96 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-config-dependencies - 4.1.4 + 4.1.5-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 50592ccd..3e741368 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.1.3 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index bad1d7cf..f7318702 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 885c5f14..b2f333c5 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 10f424af..e13eceb3 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-starter-config - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 42884e78ed5f637193e889d050bffabd6df598ab Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Nov 2024 18:00:15 +0100 Subject: [PATCH 11/15] Revert "Update pom.xml" This reverts commit 1195bbb279147974eaa913184fca60d85744da67. --- docs/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 29a41388..ee2a1b50 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,14 +27,12 @@ .* ${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/ - src/main/asciidoc From cf7e81e4df0e6f9996d029d1522907fb53b758e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 08:45:22 -0500 Subject: [PATCH 12/15] Bump @antora/collector-extension from 1.0.0-rc.1 to 1.0.0 in /docs (#2658) --- updated-dependencies: - dependency-name: "@antora/collector-extension" 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 1eebd05f..219e9a48 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-rc.1", + "@antora/collector-extension": "1.0.0", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 8877416641d8e6aa231f6fe096302b1ec01b8dd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 08:52:11 -0500 Subject: [PATCH 13/15] Bump @antora/collector-extension from 1.0.0 to 1.0.1 in /docs (#2673) --- updated-dependencies: - dependency-name: "@antora/collector-extension" 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 219e9a48..9e19d2ea 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0", + "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From a16733aad6ade1eb901e71017217e8b1f20d73b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 08:52:57 -0500 Subject: [PATCH 14/15] Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs (#2672) 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 9e19d2ea..ca5b2ce8 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 16f93aa9dbf2acc9d423226ae550918b7b3e41a5 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 13 Dec 2024 19:57:49 -0500 Subject: [PATCH 15/15] Remove unused code branch (#2679) --- .../server/support/GitCredentialsProviderFactory.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java index 05588b00..d6cf9c7c 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java @@ -88,17 +88,10 @@ public class GitCredentialsProviderFactory { aws.setPassword(password); provider = aws; } - else if (hasText(username)) { + else if (hasText(username) && password != null) { this.logger.debug("Constructing UsernamePasswordCredentialsProvider for URI " + uri); provider = new UsernamePasswordCredentialsProvider(username, password.toCharArray()); } - else if (hasText(username) && !hasText(passphrase)) { - // useful for token based login gh-1602 - // see - // https://stackoverflow.com/questions/28073266/how-to-use-jgit-to-push-changes-to-remote-with-oauth-access-token - this.logger.debug("Constructing UsernamePasswordCredentialsProvider for URI " + uri); - provider = new UsernamePasswordCredentialsProvider(username, (String) null); - } else if (hasText(passphrase)) { this.logger.debug("Constructing PassphraseCredentialsProvider for URI " + uri); provider = new PassphraseCredentialsProvider(passphrase);