Skip to content

Commit

Permalink
Start building against Spring Framework 5.3.4 snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
snicoll committed Jan 19, 2021
1 parent 59b0132 commit e50bcc6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-dependencies/build.gradle
Expand Up @@ -1564,7 +1564,7 @@ bom {
]
}
}
library("Spring Framework", "5.3.3") {
library("Spring Framework", "5.3.4-SNAPSHOT") {
group("org.springframework") {
imports = [
"spring-framework-bom"
Expand Down
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2021 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.
Expand All @@ -18,6 +18,7 @@

import java.io.IOException;
import java.lang.reflect.Constructor;
import java.time.Duration;
import java.util.Map;

import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down Expand Up @@ -97,6 +98,11 @@ public void verify() {
getDelegate().verify();
}

@Override
public void verify(Duration timeout) {
getDelegate().verify(timeout);
}

@Override
public void reset() {
Map<RestTemplate, RequestExpectationManager> expectationManagers = this.customizer.getExpectationManagers();
Expand Down
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2021 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.
Expand All @@ -20,6 +20,7 @@
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.time.Duration;

import org.springframework.boot.web.client.RootUriTemplateHandler;
import org.springframework.http.client.ClientHttpRequest;
Expand Down Expand Up @@ -111,6 +112,11 @@ public void verify() {
this.expectationManager.verify();
}

@Override
public void verify(Duration timeout) {
this.expectationManager.verify(timeout);
}

@Override
public void reset() {
this.expectationManager.reset();
Expand Down

0 comments on commit e50bcc6

Please sign in to comment.