Merge branch '4.1.x'

spring-cloud · Sep 5, 2024 · a229876 · a229876
2 parents 1b22bb7 + 0caa87a
commit a229876
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc b/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc
@@ -453,3 +453,18 @@ does not exist, the config server will by default also try to checkout a branch
 you would like to disable to the fallback branch behavior you can set
 `spring.cloud.config.server.git.tryMasterBranch` to `false`.
 
+[[container]]
+== Running The Config Server Using Git In A Container
+
+If you are getting a `java.io.IOException` when running the Config Server in a container that is similar to:
+
+```
+2022-01-03 20:04:02,892 [tributeWriter-2] ERROR org.eclipse.jgit.util.FS$FileStoreAttributes.saveToConfig - Cannot save config file 'FileBasedConfig[/.config/jgit/config]'
+java.io.IOException: Creating directories for /.config/jgit failed
+```
+
+You must either:
+
+1.  Provide a user with a writeable home directory inside the container.
+2.  Set the environment variable `XDG_CONFIG_HOME` inside the container to point to a directory where the Java process has write permissions.
+
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 		<spring-cloud-commons.version>4.2.0-SNAPSHOT</spring-cloud-commons.version>
 		<aws-java-sdk.version>2.18.41</aws-java-sdk.version>
 		<google-api-services-iam.version>v1-rev20201112-1.30.10</google-api-services-iam.version>
-		<testcontainers.version>1.17.3</testcontainers.version>
+		<testcontainers.version>1.17.6</testcontainers.version>
 		<wiremock.version>2.31.0</wiremock.version>
 		<spring-cloud-aws.version>3.0.0</spring-cloud-aws.version>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>

diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
@@ -74,7 +74,7 @@
 			<dependency>
 				<groupId>org.tmatesoft.svnkit</groupId>
 				<artifactId>svnkit</artifactId>
-				<version>1.10.1</version>
+				<version>1.10.11</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
@@ -215,7 +215,7 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-core</artifactId>
-			<version>1.12.287</version>
+			<version>1.12.770</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -255,7 +255,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 				<executions>
 					<execution>
 						<goals>