Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-45594
This commit is contained in:
Stéphane Nicoll
2025-05-18 09:26:57 +02:00
parent 8ef423e824 fd285085d2
commit fab15af876
14 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliInspectResponse.java
View File

@@ -53,7 +53,7 @@ record DockerCliInspectResponse(String id, DockerCliInspectResponse.Config confi
}
/**
* A container's resources (cgroups config, ulimits, etc).
* A container's resources (cgroups config, ulimits, etc.).
*
* @param networkMode the network mode to use for this container
*/

2
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerComposeFileTests.java
View File

@@ -50,7 +50,7 @@ class DockerComposeFileTests {
DockerComposeFile c2 = DockerComposeFile.of(f1);
DockerComposeFile c3 = DockerComposeFile.find(f1.getParentFile());
DockerComposeFile c4 = DockerComposeFile.of(f2);
assertThat(c1.hashCode()).isEqualTo(c2.hashCode()).isEqualTo(c3.hashCode());
assertThat(c1).hasSameHashCodeAs(c2).hasSameHashCodeAs(c3);
assertThat(c1).isEqualTo(c1).isEqualTo(c2).isEqualTo(c3).isNotEqualTo(c4);
}