Merge remote-tracking branch 'origin/7.0.x'

Author: jzheaux

build.gradle

@@ -12,7 +12,7 @@ allprojects {
 	apply plugin: 'io.spring.javaformat'
 
 	dependencies {
-		checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42"
+		checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.47"
 	}
 
 	// Ensure every test task has at least a single test

reactive/rsocket/hello-security/src/integTest/java/example/HelloRSocketApplicationITests.java

@@ -37,11 +37,10 @@
  *
  * @author Rob Winch
  * @author Eddú Meléndez
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = "spring.rsocket.server.port=0")
-public class HelloRSocketApplicationITests {
+class HelloRSocketApplicationITests {
 
 	@Autowired
 	RSocketRequester.Builder requester;

reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java

@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;

reactive/webflux-fn/hello/src/test/java/example/HelloTests.java

@@ -29,7 +29,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;

reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java

@@ -31,10 +31,9 @@
  * Integration tests for WebFlux based form log in sample.
  *
  * @author Rob Winch
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class WebfluxFormApplicationITests {
+class WebfluxFormApplicationITests {
 
 	WebDriver driver;
 

reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java

@@ -41,7 +41,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class WebfluxX509ApplicationITest {
+class WebfluxX509ApplicationITest {
 
 	@LocalServerPort
 	int port;

reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java

@@ -33,7 +33,7 @@
  * @author Michael Simons
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class HelloSecurityExplicitITests {
+class HelloSecurityExplicitITests {
 
 	private WebDriver driver;
 

reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java

@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloSecurityTests {
+class HelloSecurityTests {
 
 	@Autowired
 	WebTestClient rest;

reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java

@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloSecurityTests {
+class HelloSecurityTests {
 
 	@Autowired
 	WebTestClient rest;

reactive/webflux/java/hello/src/test/java/example/HelloTests.java

@@ -29,7 +29,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;