Update to Spring Boot 2.6.0-RC1

Closes gh-350

Author: jzheaux

gradle.properties

@@ -1,3 +1,3 @@
 version=2.6.0-SNAPSHOT
 springSocialVersion=1.1.6.RELEASE
-springBootVersion=2.6.0-M3
+springBootVersion=2.6.0-RC1

spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java

@@ -34,7 +34,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests for {@link ResourceServerProperties}.
@@ -68,7 +68,7 @@ public void validateWhenClientIdNullShouldNotFail() throws Exception {
 		this.properties = new ResourceServerProperties(null, "secret");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
@@ -98,15 +98,15 @@ public void validateWhenJwkKeySetUriProvidedShouldSucceed() throws Exception {
 		this.properties.getJwk().setKeySetUri("https://idp.example.com/token_keys");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
 	public void validateWhenKeyValuePresentShouldSucceed() throws Exception {
 		this.properties.getJwt().setKeyValue("my-key");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
@@ -115,7 +115,7 @@ public void validateWhenKeysUriOrValuePresentAndUserInfoAbsentShouldNotFail() th
 		this.properties.getJwk().setKeySetUri("https://idp.example.com/token_keys");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
@@ -132,15 +132,15 @@ public void validateWhenTokenUriConfiguredShouldNotFail() throws Exception {
 		this.properties.setTokenInfoUri("https://idp.example.com/userinfo");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
 	public void validateWhenUserInfoUriConfiguredShouldNotFail() throws Exception {
 		this.properties.setUserInfoUri("https://idp.example.com/userinfo");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
@@ -160,7 +160,7 @@ public void validateWhenTokenUriAbsentAndClientSecretAbsentShouldNotFail() throw
 		this.properties.setUserInfoUri("https://idp.example.com/userinfo");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	@Test
@@ -171,7 +171,7 @@ public void validateWhenTokenUriNotPreferredAndClientSecretAbsentShouldNotFail()
 		this.properties.setUserInfoUri("https://idp.example.com/userinfo");
 		setListableBeanFactory();
 		this.properties.validate();
-		verifyZeroInteractions(this.errors);
+		verifyNoInteractions(this.errors);
 	}
 
 	private void setListableBeanFactory() {

spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java

@@ -36,7 +36,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Test to validate that a custom {@link RestTemplate} can be defined with OAuth2 SSO.
@@ -62,7 +62,7 @@ public class CustomRestTemplateBasicOAuth2SsoConfigurationTests {
 	@Test
 	public void customRestTemplateCanBePrimary() {
 		RestTemplate restTemplate = this.restTemplate.getIfAvailable();
-		verifyZeroInteractions(restTemplate);
+		verifyNoInteractions(restTemplate);
 		assertThat(this.applicationContext.getBeansOfType(RestTemplate.class)).hasSize(1);
 	}