diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index d97c5819c1e..58959e3c7b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -30,8 +30,6 @@ import javax.sql.DataSource; import liquibase.integration.spring.SpringLiquibase; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnJre; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; @@ -132,7 +130,6 @@ class LiquibaseAutoConfigurationTests { } @Test - @EnabledOnJre(JRE.JAVA_8) void changelogSql() { this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 60eff8fb19f..17742f72ff7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.io.PrintWriter; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.io.TempDir; import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata; @@ -412,7 +410,6 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene } @Test - @EnabledForJreRange(min = JRE.JAVA_16) void implicitlyBoundRecordProperties(@TempDir File temp) throws IOException { File exampleRecord = new File(temp, "ExampleRecord.java"); try (PrintWriter writer = new PrintWriter(new FileWriter(exampleRecord))) { @@ -426,7 +423,6 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene } @Test - @EnabledForJreRange(min = JRE.JAVA_16) void multiConstructorRecordProperties(@TempDir File temp) throws IOException { File exampleRecord = new File(temp, "ExampleRecord.java"); try (PrintWriter writer = new PrintWriter(new FileWriter(exampleRecord))) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java index 68f08b6fda2..ca270d50e2e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java @@ -98,8 +98,8 @@ public class SpringBootPlugin implements Plugin { private void verifyGradleVersion() { GradleVersion currentVersion = GradleVersion.current(); - if (currentVersion.compareTo(GradleVersion.version("6.8")) < 0) { - throw new GradleException("Spring Boot plugin requires Gradle 6.8.x, 6.9.x, or 7.x. " + if (currentVersion.compareTo(GradleVersion.version("7.4")) < 0) { + throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.4 or later). " + "The current version is " + currentVersion); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java index dbf5b956224..3b6c27927ed 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,6 @@ import java.io.IOException; import java.io.PrintWriter; import org.junit.jupiter.api.TestTemplate; -import org.junit.jupiter.api.condition.DisabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.gradle.junit.GradleMultiDslExtension; @@ -43,7 +41,6 @@ class RunningDocumentationTests { GradleBuild gradleBuild; @TestTemplate - @DisabledForJreRange(min = JRE.JAVA_13) void bootRunMain() throws IOException { writeMainClass(); assertThat(this.gradleBuild.script("src/docs/gradle/running/boot-run-main").build("bootRun").getOutput()) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java index 5407c189e65..33a676b5ee2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.gradle.plugin; import org.gradle.testkit.runner.BuildResult; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.testsupport.gradle.testkit.GradleBuild; @@ -37,7 +35,6 @@ class SpringBootPluginIntegrationTests { final GradleBuild gradleBuild = new GradleBuild(); - @DisabledForJreRange(min = JRE.JAVA_14) @Test void failFastWithVersionOfGradle7LowerThanRequired() { BuildResult result = this.gradleBuild.gradleVersion("7.3.3").buildAndFail(); @@ -45,10 +42,4 @@ class SpringBootPluginIntegrationTests { .contains("Spring Boot plugin requires Gradle 7.x (7.4 or later). The current version is Gradle 7.3.3"); } - @DisabledForJreRange(min = JRE.JAVA_16) - @Test - void succeedWithVersionOfGradle6MatchingWithIsRequired() { - this.gradleBuild.gradleVersion("6.8").build(); - } - } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java index 01b67591486..2ffd2b988ea 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java @@ -23,8 +23,6 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.ClassFileVersion; import net.bytebuddy.description.annotation.AnnotationDescription; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.function.ThrowingConsumer; import org.springframework.beans.factory.annotation.Autowired; @@ -225,7 +223,6 @@ class ConfigurationPropertiesBeanTests { } @Test - @EnabledForJreRange(min = JRE.JAVA_16) void forValueObjectWithUnannotatedRecordReturnsBean() { Class implicitConstructorBinding = new ByteBuddy(ClassFileVersion.JAVA_V16).makeRecord() .name("org.springframework.boot.context.properties.ImplicitConstructorBinding")