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

Merge branch '2.7.x'

This commit is contained in:
Scott Frederick 2022-02-23 17:56:55 -06:00
parent a7c7a8ef2f ee4e7bb923
commit df549190b5
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,8 @@ public class GradleBuild {
private GradleVersion expectDeprecationWarnings;
private String[] expectedDeprecationMessages;
private boolean configurationCache = false;
private Map<String, String> scriptProperties = new HashMap<>();
@ -152,6 +154,11 @@ public class GradleBuild {
return this;
}
public GradleBuild expectDeprecationMessages(String... messages) {
this.expectedDeprecationMessages = messages;
return this;
}
public GradleBuild configurationCache() {
this.configurationCache = true;
return this;
@ -167,7 +174,13 @@ public class GradleBuild {
BuildResult result = prepareRunner(arguments).build();
if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
assertThat(result.getOutput()).doesNotContain("Deprecated").doesNotContain("deprecated");
String buildOutput = result.getOutput();
if (this.expectedDeprecationMessages != null) {
for (String message : this.expectedDeprecationMessages) {
buildOutput = buildOutput.replaceAll(message, "");
}
}
assertThat(buildOutput).doesNotContain("Deprecated").doesNotContain("deprecated");
}
return result;
}

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

@ -125,6 +125,7 @@ class PaketoBuilderTests {
container.waitingFor(Wait.forHttp("/test")).start();
container.stop();
}
this.gradleBuild.expectDeprecationMessages("BOM table is deprecated in this buildpack api version");
result = buildImage(imageName);
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {