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

Merge branch '3.4.x'

Browse Source 
This sets the default value of 'server.tomcat.use-apr' to 'NEVER'.

Closes gh-44705
This commit is contained in:
Moritz Halbritter
2025-03-13 08:58:18 +01:00
parent 19c386040b 7fcf34eaeb
commit a53aba6abc
10 changed files with 160 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
View File

@@ -67,15 +67,12 @@ class LoaderIntegrationTests {
.withLogConsumer(this.output)
.withCopyFileToContainer(MountableFile.forHostPath(findApplication().toPath()), "/app.jar")
.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
.withCommand(command(javaRuntime));
.withCommand(command());
}
private String[] command(JavaRuntime javaRuntime) {
private String[] command() {
List<String> command = new ArrayList<>();
command.add("java");
if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
command.add("--enable-native-access=ALL-UNNAMED");
}
command.add("-jar");
command.add("app.jar");
return command.toArray(new String[0]);

7
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
View File

@@ -90,15 +90,12 @@ class LoaderIntegrationTests {
.withLogConsumer(this.output)
.withCopyFileToContainer(findApplication(name, classifier), "/app.jar")
.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
.withCommand(command(javaRuntime));
.withCommand(command());
}
private String[] command(JavaRuntime javaRuntime) {
private String[] command() {
List<String> command = new ArrayList<>();
command.add("java");
if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
command.add("--enable-native-access=ALL-UNNAMED");
}
command.add("-jar");
command.add("app.jar");
return command.toArray(new String[0]);