Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse Source
This commit is contained in:
Scott Frederick 2023-09-26 18:19:48 -05:00
commit 5ae4ba83a7
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
View File

@ -44,6 +44,11 @@ public final class GradleVersions {
return allCompatible().get(0);
}
public static String maximumCompatible() {
List<String> versions = allCompatible();
return versions.get(versions.size() - 1);
}
private static boolean isJavaVersion(JavaVersion version) {
return JavaVersion.current().isCompatibleWith(version);
}

5
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
View File

@ -46,6 +46,7 @@ import org.springframework.boot.image.assertions.ImageAssertions;
import org.springframework.boot.image.junit.GradleBuildInjectionExtension;
import org.springframework.boot.testsupport.gradle.testkit.GradleBuild;
import org.springframework.boot.testsupport.gradle.testkit.GradleBuildExtension;
import org.springframework.boot.testsupport.gradle.testkit.GradleVersions;
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
@ -72,6 +73,7 @@ class PaketoBuilderTests {
this.gradleBuild.scriptPropertyFrom(new File("../../gradle.properties"), "nativeBuildToolsVersion");
this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.*true.*Deprecated");
this.gradleBuild.expectDeprecationMessages("BOM table is deprecated");
this.gradleBuild.gradleVersion(GradleVersions.maximumCompatible());
}
@Test
@ -298,6 +300,9 @@ class PaketoBuilderTests {
@EnabledForJreRange(max = JRE.JAVA_17)
void nativeApp() throws Exception {
this.gradleBuild.expectDeprecationMessages("uses or overrides a deprecated API");
// these deprecations are transitive from the Native Build Tools Gradle plugin
this.gradleBuild.expectDeprecationMessages("has been deprecated. This is scheduled to be removed in Gradle 9.0");
this.gradleBuild.expectDeprecationMessages("upgrading_version_8.html#deprecated_access_to_convention");
writeMainClass();
String imageName = "paketo-integration/" + this.gradleBuild.getProjectDir().getName();
ImageReference imageReference = ImageReference.of(ImageName.of(imageName));

2
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle
View File

@ -39,5 +39,5 @@ application {
bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = bootDistZip.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
}

2
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle
View File

@ -39,5 +39,5 @@ application {
bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = distZip.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
}

2
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
View File

@ -32,5 +32,5 @@ war {
bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = war.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*']
environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*']
}