Skip to content

Commit d70e18a

Browse files
committed
Limit tests to Gradle versions supported by CycloneDX plugin
See gh-47736
1 parent 5eb0dd1 commit d70e18a

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibility.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,6 @@
5050

5151
String versionsLessThan() default "";
5252

53+
String versionsAtLeast() default "";
54+
5355
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
6464
gradleVersions = gradleVersions
6565
.filter((version) -> GradleVersion.version(version).compareTo(upperExclusive) < 0);
6666
}
67+
if (StringUtils.hasText(gradleCompatibility.versionsAtLeast())) {
68+
GradleVersion lowerInclusive = GradleVersion.version(gradleCompatibility.versionsAtLeast());
69+
gradleVersions = gradleVersions
70+
.filter((version) -> GradleVersion.version(version).compareTo(lowerInclusive) >= 0);
71+
}
6772
return gradleVersions.flatMap((version) -> {
6873
List<TestTemplateInvocationContext> invocationContexts = new ArrayList<>();
6974
BuildOutput buildOutput = new BuildOutput(testClass);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/CycloneDxPluginActionIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*
3535
* @author Andy Wilkinson
3636
*/
37-
@GradleCompatibility
37+
@GradleCompatibility(versionsAtLeast = "8.0")
3838
class CycloneDxPluginActionIntegrationTests {
3939

4040
GradleBuild gradleBuild;
@@ -50,7 +50,7 @@ void sbomIsIncludedInUberWar() throws IOException {
5050
}
5151

5252
private void sbomIsIncludedInUberArchive(String taskName, String sbomLocationPrefix) throws IOException {
53-
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("7.6.6").build(taskName);
53+
BuildResult result = this.gradleBuild.expectDeprecationMessages("Unknown keyword deprecated").build(taskName);
5454
assertThat(result.task(":cyclonedxBom").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
5555
File[] libs = new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles();
5656
assertThat(libs).hasSize(1);

0 commit comments

Comments
 (0)