Upgrade to Spring Boot 2.2.0.RELEASE

gradle.properties

@@ -1,5 +1,5 @@
 aspectjVersion=1.9.3
 gaeVersion=1.9.76
-springBootVersion=2.2.0.M6
+springBootVersion=2.2.0.RELEASE
 version=5.2.1.BUILD-SNAPSHOT
 org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError

samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java

@@ -15,8 +15,6 @@
  */
 package sample;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.rsocket.context.RSocketServerInitializedEvent;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -27,6 +25,9 @@
 import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -91,7 +92,7 @@ static class Config implements ApplicationListener<RSocketServerInitializedEvent
 
 		@Override
 		public void onApplicationEvent(RSocketServerInitializedEvent event) {
-			this.port = event.getrSocketServer().address().getPort();
+			this.port = event.getServer().address().getPort();
 		}
 	}
 }

samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java

@@ -16,14 +16,12 @@
 
 package sample;
 
-import org.springframework.boot.rsocket.server.ServerRSocketFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.rsocket.core.SecuritySocketAcceptorInterceptor;
 
 /**
  * @author Rob Winch
@@ -43,9 +41,4 @@ MapReactiveUserDetailsService userDetailsService() {
 		return new MapReactiveUserDetailsService(user);
 	}
 
-	@Bean
-	ServerRSocketFactoryCustomizer springSecurityRSocketSecurity(
-			SecuritySocketAcceptorInterceptor interceptor) {
-		return builder -> builder.addSocketAcceptorPlugin(interceptor);
-	}
 }

samples/boot/saml2login/src/integration-test/java/org/springframework/security/samples/Saml2LoginIntegrationTests.java

@@ -113,6 +113,7 @@ public class Saml2LoginIntegrationTests {
 	@EnableAutoConfiguration
 	@ComponentScan(basePackages = "sample")
 	public static class SpringBootApplicationTestConfig {
+
 	}
 
 	@Test

samples/boot/saml2login/src/main/java/sample/Saml2LoginApplication.java

@@ -17,12 +17,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
-
-import boot.saml2.config.Saml2LoginBootConfiguration;
 
 @SpringBootApplication
-@Import(Saml2LoginBootConfiguration.class)
 public class Saml2LoginApplication {
 
 	public static void main(String[] args) {