Update :servlet:spring-boot:java:oauth2:resource-server:multi-tenancy to 7

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/README.adoc

@@ -47,7 +47,7 @@ To run as a stand-alone application, do:
 ./gradlew bootRun
 ```
 
-Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there.
+Or import the project into your IDE and run `OAuth2MultitenancyResourceServerApplication` from there.
 
 === Authorizing with tenantOne (JWT)
 

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2ResourceServerApplicationITests.java → servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2MultitenancyResourceServerApplicationITests.java

@@ -35,14 +35,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Integration tests for {@link OAuth2ResourceServerApplication}.
+ * Integration tests for {@link OAuth2MultitenancyResourceServerApplication}.
  *
  * @author Josh Cummings
  */
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2ResourceServerApplicationITests {
+public class OAuth2MultitenancyResourceServerApplicationITests {
 
 	String tenantOneNoScopesToken = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww";
 

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerApplication.java → servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2MultitenancyResourceServerApplication.java

@@ -25,10 +25,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author Josh Cummings
  */
 @SpringBootApplication
-public class OAuth2ResourceServerApplication {
+public class OAuth2MultitenancyResourceServerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(OAuth2ResourceServerApplication.class, args);
+		SpringApplication.run(OAuth2MultitenancyResourceServerApplication.class, args);
 	}
 
 }

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -49,7 +49,7 @@ public class OAuth2ResourceServerSecurityConfiguration {
 		// @formatter:off
 		http
 			.authorizeHttpRequests((authorize) -> authorize
-				.requestMatchers("/**/message/**").hasAuthority("SCOPE_message:read")
+				.requestMatchers("/{tenantId}/message/**").hasAuthority("SCOPE_message:read")
 				.anyRequest().authenticated()
 			)
 			.oauth2ResourceServer((oauth2) -> oauth2