Merge branch '2.3.x'

Closes gh-22153
pull/22163/head
Madhura Bhave 4 years ago
commit 75abb9cc18

@ -107,7 +107,7 @@ public class ArtifactoryService {
ResponseEntity<BuildInfoResponse> entity = this.restTemplate
.getForEntity(BUILD_INFO_URL + buildName + "/" + buildNumber, BuildInfoResponse.class);
BuildInfoResponse.Status status = entity.getBody().getBuildInfo().getStatuses()[0];
logger.debug("Reutned repository " + status.getRepository() + " expecting " + targetRepo);
logger.debug("Returned repository " + status.getRepository() + " expecting " + targetRepo);
return status.getRepository().equals(targetRepo);
}
catch (HttpClientErrorException ex) {

@ -2972,7 +2972,7 @@ class ExampleIntegrationTests {
This will start up a docker container running Neo4j (if Docker is running locally) before any of the tests are run.
In most cases, you will need to configure the application using details from the running container, such as container IP or port.
This can be done with a static `@DynamicPropertySource` method that allows adding adding dynamic property values to the Spring Environment.
This can be done with a static `@DynamicPropertySource` method that allows adding dynamic property values to the Spring Environment.
[source,java,indent=0,subs="verbatim,quotes,attributes"]
----

@ -136,7 +136,7 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli
@Override
protected void doClose() {
if (this.isActive()) {
if (isActive()) {
AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC);
}
super.doClose();

@ -164,7 +164,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
@Override
protected void doClose() {
if (this.isActive()) {
if (isActive()) {
AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC);
}
super.doClose();

@ -105,7 +105,7 @@ class AvailabilityChangeEventTests {
@Override
String getDescription() {
return "I have aslo been overridden";
return "I have also been overridden";
}
};

Loading…
Cancel
Save