fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-44211
This commit is contained in:
Andy Wilkinson 2025-02-11 11:10:28 +00:00
commit b8f64681ad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -83,7 +83,7 @@ class LoaderIntegrationTests {
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));
javaRuntimes.add(JavaRuntime.oracleJdk17()); javaRuntimes.add(JavaRuntime.oracleJdk17());
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));
return javaRuntimes.stream().filter(JavaRuntime::isCompatible); return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -111,7 +111,7 @@ class LoaderIntegrationTests {
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));
javaRuntimes.add(JavaRuntime.oracleJdk17()); javaRuntimes.add(JavaRuntime.oracleJdk17());
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));
return javaRuntimes.stream().filter(JavaRuntime::isCompatible); return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
} }