root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove fail-fast logic for versions less than minimum supported 

CLoses gh-41200
This commit is contained in:
Andy Wilkinson 2024-06-21 14:50:37 +01:00
parent 7701201bc3
commit 63c6b1ee72
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
View File

@ -20,11 +20,9 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.gradle.api.GradleException;
import org.gradle.api.Plugin; import org.gradle.api.Plugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.util.GradleVersion;
import org.springframework.boot.gradle.dsl.SpringBootExtension; import org.springframework.boot.gradle.dsl.SpringBootExtension;
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage; import org.springframework.boot.gradle.tasks.bundling.BootBuildImage;
@ -115,20 +113,11 @@ public class SpringBootPlugin implements Plugin<Project> {
@Override @Override
public void apply(Project project) { public void apply(Project project) {
verifyGradleVersion();
createExtension(project); createExtension(project);
Configuration bootArchives = createBootArchivesConfiguration(project); Configuration bootArchives = createBootArchivesConfiguration(project);
registerPluginActions(project, bootArchives); registerPluginActions(project, bootArchives);
} }
private void verifyGradleVersion() {
GradleVersion currentVersion = GradleVersion.current();
if (currentVersion.compareTo(GradleVersion.version("7.5")) < 0) {
throw new GradleException("Spring Boot plugin requires Gradle 7.x (7.5 or later). "
+ "The current version is " + currentVersion);
}
}
private void createExtension(Project project) { private void createExtension(Project project) {
project.getExtensions().create("springBoot", SpringBootExtension.class, project); project.getExtensions().create("springBoot", SpringBootExtension.class, project);
} }

48
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java
View File

@ -1,48 +0,0 @@
/*
* Copyright 2012-2024 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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;
import org.springframework.boot.testsupport.gradle.testkit.GradleBuildExtension;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration tests for {@link SpringBootPlugin}.
*
* @author Andy Wilkinson
*/
@ExtendWith(GradleBuildExtension.class)
class SpringBootPluginIntegrationTests {
final GradleBuild gradleBuild = new GradleBuild();
@Test
@DisabledForJreRange(min = JRE.JAVA_20)
void failFastWithVersionOfGradle7LowerThanRequired() {
BuildResult result = this.gradleBuild.gradleVersion("7.4.1").buildAndFail();
assertThat(result.getOutput())
.contains("Spring Boot plugin requires Gradle 7.x (7.5 or later). The current version is Gradle 7.4.1");
}
}