Browse Source

Merge branch '3.5.x'

Closes gh-47749
pull/47284/head
Phillip Webb 2 months ago
parent
commit
739cb529fb
  1. 2
      core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacements.java
  2. 2
      core/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java
  3. 2
      documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc
  4. 2
      loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/VirtualZipPerformanceTests.java

2
core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacements.java

@ -81,7 +81,7 @@ final class AutoConfigurationReplacements {
} }
/** /**
* Loads the relocations from the classpath. Relactions are stored in files named * Loads the relocations from the classpath. Relocations are stored in files named
* {@code META-INF/spring/full-qualified-annotation-name.replacements} on the * {@code META-INF/spring/full-qualified-annotation-name.replacements} on the
* classpath. The file is loaded using {@link Properties#load(java.io.InputStream)} * classpath. The file is loaded using {@link Properties#load(java.io.InputStream)}
* with each entry containing an auto-configuration class name as the key and the * with each entry containing an auto-configuration class name as the key and the

2
core/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java

@ -296,7 +296,7 @@ abstract class AbstractApplicationContextRunnerTests<T extends AbstractApplicati
} }
@Test @Test
void getWirhAdditionalContextInterfaceHasCorrectInstanceOf() { void getWithAdditionalContextInterfaceHasCorrectInstanceOf() {
getWithAdditionalContextInterface() getWithAdditionalContextInterface()
.run((context) -> assertThat(context).isInstanceOf(AdditionalContextInterface.class)); .run((context) -> assertThat(context).isInstanceOf(AdditionalContextInterface.class));
} }

2
documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc

@ -66,7 +66,7 @@ include-code::MyTestConfiguration[]
== Lifecycle of Managed Containers == Lifecycle of Managed Containers
If you have used the annotations and extensions provided by Testcontainers, then the lifecycle of container instances is managed entirely by Testcontainers. If you have used the annotations and extensions provided by Testcontainers, then the lifecycle of container instances is managed entirely by Testcontainers.
Please refer to the {url-testcontainers-docs}[offical Testcontainers documentation] for the information. Please refer to the {url-testcontainers-docs}[official Testcontainers documentation] for the information.
When the containers are managed by Spring as beans, then their lifecycle is managed by Spring: When the containers are managed by Spring as beans, then their lifecycle is managed by Spring:

2
loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/VirtualZipPerformanceTests.java

@ -43,7 +43,7 @@ class VirtualZipPerformanceTests {
Path temp; Path temp;
@Test @Test
void sequentialReadPerformace() throws IOException { void sequentialReadPerformance() throws IOException {
File file = createZipWithLargeEntries(); File file = createZipWithLargeEntries();
long start = System.nanoTime(); long start = System.nanoTime();
try (ZipContent zipContent = ZipContent.open(file.toPath(), "test/")) { try (ZipContent zipContent = ZipContent.open(file.toPath(), "test/")) {

Loading…
Cancel
Save