Merge branch '6.1.x' into 6.2.x

jzheaux · jzheaux · commit af4a6978ca3d · 2024-04-26T15:38:10.000-06:00
Closes gh-14972
diff --git a/docs/modules/ROOT/pages/servlet/getting-started.adoc b/docs/modules/ROOT/pages/servlet/getting-started.adoc
@@ -131,7 +131,7 @@ public class DefaultSecurityConfig {
     InMemoryUserDetailsManager inMemoryUserDetailsManager() { <2>
         String generatedPassword = // ...;
         return new InMemoryUserDetailsManager(User.withUsername("user")
-                .password(generatedPassword).roles("ROLE_USER").build());
+                .password(generatedPassword).roles("USER").build());
     }
 
     @Bean

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public class DefaultSecurityConfig {`
`131`	`131`	`InMemoryUserDetailsManager inMemoryUserDetailsManager() { <2>`
`132`	`132`	`String generatedPassword = // ...;`
`133`	`133`	`return new InMemoryUserDetailsManager(User.withUsername("user")`
`134`		`- .password(generatedPassword).roles("ROLE_USER").build());`
	`134`	`+ .password(generatedPassword).roles("USER").build());`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Bean`