Merge branch 'master' into BAEL-4828

spring-security-modules/pom.xml

@@ -14,13 +14,12 @@
     </parent>
 
     <modules>
-        <module>spring-ldap</module>
         <module>spring-5-security</module>
         <module>spring-5-security-cognito</module>
         <module>spring-5-security-oauth</module>
+        <module>spring-ldap</module>
         <module>spring-security-acl</module>
         <module>spring-security-auth0</module>
-        <module>spring-security-web-angular/server</module>
         <module>spring-security-config</module>
         <module>spring-security-core</module>
         <module>spring-security-web-mvc</module>
@@ -30,18 +29,24 @@
         <module>spring-security-web-mvc-custom</module>
         <module>spring-security-web-digest-auth</module>
         <module>spring-security-ldap</module>
-        <module>spring-security-web-login</module>
-        <module>spring-security-web-persisted-remember-me</module>
-        <module>spring-security-web-sockets</module>
         <module>spring-security-legacy-oidc</module>
+        <module>spring-security-oauth2-sso</module>
         <module>spring-security-oidc</module>
         <module>spring-security-okta</module>
         <module>spring-security-saml</module>
+        <module>spring-security-web-angular/server</module>
+        <module>spring-security-web-boot-1</module>
+        <module>spring-security-web-boot-2</module>
+        <module>spring-security-web-digest-auth</module>
+        <module>spring-security-web-login</module>
+        <module>spring-security-web-mvc-custom</module>
+        <module>spring-security-web-mvc</module>
+        <module>spring-security-web-persisted-remember-me</module>
         <module>spring-security-web-react</module>   
-        <module>spring-security-web-rest</module>
         <module>spring-security-web-rest-basic-auth</module>
         <module>spring-security-web-rest-custom</module>
-        <module>spring-security-oauth2-sso</module>
+        <module>spring-security-web-rest</module>
+        <module>spring-security-web-sockets</module>
         <module>spring-security-web-thymeleaf</module>
         <module>spring-security-web-x509</module>
         <module>spring-session</module>

spring-security-modules/spring-5-security/src/test/java/com/baeldung/xss/PersonControllerIntegrationTest.java

@@ -14,7 +14,7 @@ import java.io.IOException;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class PersonControllerUnitTest {
+class PersonControllerIntegrationTest {
 
     @LocalServerPort
     int randomServerPort;

spring-security-modules/spring-security-web-angular/server/pom.xml

@@ -62,9 +62,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
 </project>