mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-29982
This commit is contained in:
commit
ee4e7bb923
@ -80,6 +80,8 @@ public class GradleBuild {
|
|||||||
|
|
||||||
private GradleVersion expectDeprecationWarnings;
|
private GradleVersion expectDeprecationWarnings;
|
||||||
|
|
||||||
|
private String[] expectedDeprecationMessages;
|
||||||
|
|
||||||
private boolean configurationCache = false;
|
private boolean configurationCache = false;
|
||||||
|
|
||||||
private Map<String, String> scriptProperties = new HashMap<>();
|
private Map<String, String> scriptProperties = new HashMap<>();
|
||||||
@ -152,6 +154,11 @@ public class GradleBuild {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public GradleBuild expectDeprecationMessages(String... messages) {
|
||||||
|
this.expectedDeprecationMessages = messages;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public GradleBuild configurationCache() {
|
public GradleBuild configurationCache() {
|
||||||
this.configurationCache = true;
|
this.configurationCache = true;
|
||||||
return this;
|
return this;
|
||||||
@ -167,7 +174,13 @@ public class GradleBuild {
|
|||||||
BuildResult result = prepareRunner(arguments).build();
|
BuildResult result = prepareRunner(arguments).build();
|
||||||
if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
|
if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
|
||||||
&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
|
&& 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;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -125,6 +125,7 @@ class PaketoBuilderTests {
|
|||||||
container.waitingFor(Wait.forHttp("/test")).start();
|
container.waitingFor(Wait.forHttp("/test")).start();
|
||||||
container.stop();
|
container.stop();
|
||||||
}
|
}
|
||||||
|
this.gradleBuild.expectDeprecationMessages("BOM table is deprecated in this buildpack api version");
|
||||||
result = buildImage(imageName);
|
result = buildImage(imageName);
|
||||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||||
try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
|
try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user