From 684f1c3d0b170fdc1fb8ddb2b6e210ebcc3d6da2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 08:41:02 -0400 Subject: [PATCH 01/11] Bump jgit.version from 6.10.0.202406032230-r to 6.10.1.202505221210-r (#2869) Bumps `jgit.version` from 6.10.0.202406032230-r to 6.10.1.202505221210-r. Updates `org.eclipse.jgit:org.eclipse.jgit` from 6.10.0.202406032230-r to 6.10.1.202505221210-r Updates `org.eclipse.jgit:org.eclipse.jgit.junit.http` from 6.10.0.202406032230-r to 6.10.1.202505221210-r Updates `org.eclipse.jgit:org.eclipse.jgit.http.apache` from 6.10.0.202406032230-r to 6.10.1.202505221210-r Updates `org.eclipse.jgit:org.eclipse.jgit.ssh.apache` from 6.10.0.202406032230-r to 6.10.1.202505221210-r --- updated-dependencies: - dependency-name: org.eclipse.jgit:org.eclipse.jgit dependency-version: 6.10.1.202505221210-r dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jgit:org.eclipse.jgit.junit.http dependency-version: 6.10.1.202505221210-r dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jgit:org.eclipse.jgit.http.apache dependency-version: 6.10.1.202505221210-r dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.apache dependency-version: 6.10.1.202505221210-r 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> --- spring-cloud-config-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 3b6394af..8b1866da 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-config-dependencies Spring Cloud Config Dependencies - 6.10.0.202406032230-r + 6.10.1.202505221210-r 3.1.2 2.1.1.RELEASE 2.0.10 From 2b7a65574700c2c1ca2ff62468822501f64fae7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 06:43:31 -0400 Subject: [PATCH 02/11] Bump software.amazon.awssdk:bom from 2.31.58 to 2.31.59 (#2893) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb89d887..55bd68d0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ config 4.3.1-SNAPSHOT - 2.31.58 + 2.31.59 v1-rev20201112-1.30.10 2.35.2 3.3.1 From 8c9afae9908568b8dda837b6f74fa94f16f614ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 05:12:01 -0400 Subject: [PATCH 03/11] Bump software.amazon.awssdk:bom from 2.31.59 to 2.31.60 (#2895) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55bd68d0..aad1a00e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ config 4.3.1-SNAPSHOT - 2.31.59 + 2.31.60 v1-rev20201112-1.30.10 2.35.2 3.3.1 From 9c3631b2b74ab2243324aba79662833bb902df49 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 11 Jun 2025 00:53:46 +0000 Subject: [PATCH 04/11] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 5d9ed438..6c104328 100644 --- a/README.adoc +++ b/README.adoc @@ -116,7 +116,7 @@ a modified file in the correct place. Just commit it and push the change. [[working-with-the-code]] == Working with the code If you don't have an IDE preference we would recommend that you use -https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://spring.io/tools[Spring Tools Suite] or https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. From 27a505bbce50ae2bdaba6cad27a78c700a207eb9 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 11 Jun 2025 10:28:07 +0000 Subject: [PATCH 05/11] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 5d9ed438..6c104328 100644 --- a/README.adoc +++ b/README.adoc @@ -116,7 +116,7 @@ a modified file in the correct place. Just commit it and push the change. [[working-with-the-code]] == Working with the code If you don't have an IDE preference we would recommend that you use -https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://spring.io/tools[Spring Tools Suite] or https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. From 1ae16fe1eb3bc0b2864c13fc7eeabd6842201355 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 11 Jun 2025 13:14:33 +0000 Subject: [PATCH 06/11] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 5d9ed438..6c104328 100644 --- a/README.adoc +++ b/README.adoc @@ -116,7 +116,7 @@ a modified file in the correct place. Just commit it and push the change. [[working-with-the-code]] == Working with the code If you don't have an IDE preference we would recommend that you use -https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://spring.io/tools[Spring Tools Suite] or https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. From c624545671bb9a43dbcb173e1996ec3c000da690 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jun 2025 09:50:11 -0400 Subject: [PATCH 07/11] Bump software.amazon.awssdk:bom from 2.31.60 to 2.31.61 (#2899) Bumps software.amazon.awssdk:bom from 2.31.60 to 2.31.61. --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-version: 2.31.61 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aad1a00e..a307bf36 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ config 4.3.1-SNAPSHOT - 2.31.60 + 2.31.61 v1-rev20201112-1.30.10 2.35.2 3.3.1 From 3c9b82007c2fc247d88a44cb325a9a63bdacaf9a Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 11 Jun 2025 09:51:19 -0400 Subject: [PATCH 08/11] Build the 4.3.x branch Signed-off-by: Ryan Baxter --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index b71eb0ba..48671a22 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 4.2.x, 4.1.x, 4.0.x, 3.1.x ] + branches: [ main, 4.3.x, 4.2.x, 4.1.x, 4.0.x, 3.1.x ] pull_request: - branches: [ main, 4.2.x, 4.1.x, 4.0.x, 3.1.x ] + branches: [ main, 4.3.x, 4.2.x, 4.1.x, 4.0.x, 3.1.x ] jobs: build: From ddc83ed6e7a770606a8b220aafeb9a515ca4eb52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 08:59:09 -0400 Subject: [PATCH 09/11] Bump software.amazon.awssdk:bom from 2.31.61 to 2.31.62 (#2905) Bumps software.amazon.awssdk:bom from 2.31.61 to 2.31.62. --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-version: 2.31.62 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a307bf36..b16e1bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ config 4.3.1-SNAPSHOT - 2.31.61 + 2.31.62 v1-rev20201112-1.30.10 2.35.2 3.3.1 From 3d89cdf14b2313c7458f94c0d2d2bc6ec3b8d4b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jun 2025 08:56:57 -0400 Subject: [PATCH 10/11] Bump software.amazon.awssdk:bom from 2.31.62 to 2.31.63 (#2909) Bumps software.amazon.awssdk:bom from 2.31.62 to 2.31.63. --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-version: 2.31.63 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b16e1bf3..14ed2398 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ config 4.3.1-SNAPSHOT - 2.31.62 + 2.31.63 v1-rev20201112-1.30.10 2.35.2 3.3.1 From ca6c5244333dc2809f7f14be663deb5e226a81a9 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Fri, 13 Jun 2025 21:55:41 +0700 Subject: [PATCH 11/11] Correct antora attribute (#2907) Signed-off-by: Tran Ngoc Nhan --- .../pages/server/creating-a-key-store-for-testing.adoc | 5 ++--- .../pages/server/environment-repository/git-backend.adoc | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/pages/server/creating-a-key-store-for-testing.adoc b/docs/modules/ROOT/pages/server/creating-a-key-store-for-testing.adoc index 975f6ab3..669970ed 100644 --- a/docs/modules/ROOT/pages/server/creating-a-key-store-for-testing.adoc +++ b/docs/modules/ROOT/pages/server/creating-a-key-store-for-testing.adoc @@ -11,9 +11,8 @@ $ keytool -genkeypair -alias mytestkey -keyalg RSA \ NOTE: When using JDK 11 or above you may get the following warning when using the command above. In this case you probably want to make sure the `keypass` and `storepass` values match. ----- -Warning: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value. ----- + +WARNING: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value. Put the `server.jks` file in the classpath (for instance) and then, in your `bootstrap.yml`, for the Config Server, create the following settings: diff --git a/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc b/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc index 35608a04..cb7df396 100644 --- a/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc +++ b/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc @@ -64,7 +64,7 @@ spring: You can also support a "`one repository per profile`" policy by using a similar pattern but with `\{profile}`. -Additionally, using the special string "(\{special-string})" within your `\{application}` parameters can enable support for multiple +Additionally, using the special string `(\{special-string})` within your `\{application}` parameters can enable support for multiple organizations, as shown in the following example: [source,yaml] @@ -223,10 +223,13 @@ JGit requires RSA keys in PEM format. Below is an example ssh-keygen (from opens ssh-keygen -m PEM -t rsa -b 4096 -f ~/config_server_deploy_key.rsa ``` -Warning: When working with SSH keys, the expected ssh private-key must begin with ```-----BEGIN RSA PRIVATE KEY-----```. If the key starts with ```-----BEGIN OPENSSH PRIVATE KEY-----``` then the RSA key will not load when spring-cloud-config server is started. The error looks like: +[WARNING] +===== +When working with SSH keys, the expected ssh private-key must begin with ```-----BEGIN RSA PRIVATE KEY-----```. If the key starts with ```-----BEGIN OPENSSH PRIVATE KEY-----``` then the RSA key will not load when spring-cloud-config server is started. The error looks like: ``` - Error in object 'spring.cloud.config.server.git': codes [PrivateKeyIsValid.spring.cloud.config.server.git,PrivateKeyIsValid]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [spring.cloud.config.server.git.,]; arguments []; default message []]; default message [Property 'spring.cloud.config.server.git.privateKey' is not a valid private key] ``` +===== To correct the above error the RSA key must be converted to PEM format. An example using openssh is provided above for generating a new key in the appropriate format.