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 1/4] 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 27a505bbce50ae2bdaba6cad27a78c700a207eb9 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 11 Jun 2025 10:28:07 +0000 Subject: [PATCH 2/4] 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 3/4] 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 ca6c5244333dc2809f7f14be663deb5e226a81a9 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Fri, 13 Jun 2025 21:55:41 +0700 Subject: [PATCH 4/4] 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.